Renamed prepared -> contracted

features/support/data.rb

@@ -218,8 +218,8 @@ def extracted_file
   @extracted_file ||= "#{osm_file}_#{fingerprint_extract}"
 end
 
-def prepared_file
-  @prepared_file ||= "#{osm_file}_#{fingerprint_extract}_#{fingerprint_prepare}"
+def contracted_file
+  @contracted_file ||= "#{osm_file}_#{fingerprint_extract}_#{fingerprint_prepare}"
 end
 
 def write_osm
@@ -237,14 +237,14 @@ def extracted?
   end
 end
 
-def prepared?
+def contracted?
   Dir.chdir TEST_FOLDER do
-    File.exist?("#{prepared_file}.osrm.hsgr")
+    File.exist?("#{contracted_file}.osrm.hsgr")
   end
 end
 
 def write_timestamp
-  File.open( "#{prepared_file}.osrm.timestamp", 'w') {|f| f.write(OSM_TIMESTAMP) }
+  File.open( "#{contracted_file}.osrm.timestamp", 'w') {|f| f.write(OSM_TIMESTAMP) }
 end
 
 def write_input_data
@@ -295,16 +295,16 @@ def prepare_data
     end
     begin
       ["osrm.hsgr","osrm.fileIndex","osrm.geometry","osrm.nodes","osrm.ramIndex","osrm.core","osrm.edges"].each do |file|
-        log "Renaming #{extracted_file}.#{file} to #{prepared_file}.#{file}", :preprocess
-        File.rename "#{extracted_file}.#{file}", "#{prepared_file}.#{file}"
+        log "Renaming #{extracted_file}.#{file} to #{contracted_file}.#{file}", :preprocess
+        File.rename "#{extracted_file}.#{file}", "#{contracted_file}.#{file}"
       end
     rescue Exception => e
       raise FileError.new nil, "failed to rename data file after preparing."
     end
     begin
       ["osrm.names","osrm.restrictions","osrm"].each do |file|
-        log "Copying #{extracted_file}.#{file} to #{prepared_file}.#{file}", :preprocess
-        FileUtils.cp "#{extracted_file}.#{file}", "#{prepared_file}.#{file}"
+        log "Copying #{extracted_file}.#{file} to #{contracted_file}.#{file}", :preprocess
+        FileUtils.cp "#{extracted_file}.#{file}", "#{contracted_file}.#{file}"
       end
     rescue Exception => e
       raise FileError.new nil, "failed to copy data file after preparing."
@@ -316,6 +316,6 @@ end
 def reprocess
   write_input_data
   extract_data unless extracted?
-  prepare_data unless prepared?
+  prepare_data unless contracted?
   log_preprocess_done
 end

features/support/run.rb

@@ -12,9 +12,9 @@ def run_bin bin, options
       opt.gsub! "{extracted_base}", "#{extracted_file}" 
     end
 
-    if opt.include? '{prepared_base}'
-      raise "*** {prepared_base} is missing" unless prepared_file
-      opt.gsub! "{prepared_base}", "#{prepared_file}" 
+    if opt.include? '{contracted_base}'
+      raise "*** {contracted_base} is missing" unless contracted_file
+      opt.gsub! "{contracted_base}", "#{contracted_file}" 
     end
     if opt.include? '{profile}'
       opt.gsub! "{profile}", "#{PROFILES_PATH}/#{@profile}.lua"