lib/reportir.rb in reportir-0.3.1 vs lib/reportir.rb in reportir-0.3.3

@@ -6,29 +6,31 @@
   @@step = 0
   @@tests = [] # has to be array for front-end
 
   def upload_result_to_s3_as_static_site
     check_for_env_vars
+    upload_template unless template_uploaded?
     clear_previous_results_from_s3
     save_final_markup
     write_javascript_models
     upload_to_s3
     delete_tmp_files_for_this_test
   end
-
-  def s3_screenshot(method)
-    create_current_test  #TODO: before-filter??
-    @@step = @@step+=1
-    image_name = "#{@@step}-#{method}" 
-    local_path = "#{local_test_root}/#{image_name}.png"
-    FileUtils.mkdir_p(local_test_root) unless Dir.exists?(local_test_root)
-    @browser.screenshot.save(local_path)
-    current_test[:screenshots] << { name: image_name, src: "#{public_path_for_this_test}/#{image_name}.png" }
-  end
   
   private
 
+  def upload_template
+    puts ''
+    puts ''
+    puts '====== UPLOADING TEMPLATE ========='
+    upload_directory(static_site_template_path, '')   
+  end
+
+  def template_uploaded?
+    bucket.object('index.html').exists?
+  end
+
   def check_for_env_vars
     raise Reportir::Error.new 'Missing ENV AWS_DEFAULT_BUCKET' unless ENV['AWS_DEFAULT_BUCKET']
     raise Reportir::Error.new 'Missing ENV AWS_SECRET_ACCESS_KEY' unless ENV['AWS_SECRET_ACCESS_KEY']
     raise Reportir::Error.new 'Missing ENV AWS_ACCESS_KEY_ID' unless ENV['AWS_ACCESS_KEY_ID']
     raise Reportir::Error.new 'Missing ENV AWS_DEFAULT_REGION' unless ENV['AWS_DEFAULT_REGION']
@@ -64,25 +66,47 @@
   end
 
   def upload_to_s3
     puts ''
     puts ''
-    puts '====== STARTING S3 UPLOAD ========='
-    ::Aws::S3::Resource.new.bucket(ENV['AWS_DEFAULT_BUCKET']).object('js/models.js').upload_file(local_model_file_path)
+    puts '====== UPLOADING RESULTS ========='
+    bucket.object('js/models.js').upload_file(local_model_file_path)
     puts "Uploading #{local_model_file_path} to /js/models.js"
-    ::S3Uploader.upload_directory(local_test_root, ENV['AWS_DEFAULT_BUCKET'], { 
-      :destination_dir => public_path_for_this_test, 
-      :threads => 5, 
-      s3_key: ENV['AWS_ACCESS_KEY_ID'], 
-      s3_secret: ENV['AWS_SECRET_ACCESS_KEY'], 
-      region: ENV['AWS_DEFAULT_REGION'] })   
+    upload_directory(local_test_root, public_path_for_this_test)
     puts ''
     puts ''
     puts '====== S3 UPLOAD COMPLETE ========='
     puts 'URL: ' + static_site_url
     puts '==================================='
     puts ''
     puts ''
+  end
+
+  def s3_screenshot(method)
+    create_current_test  #TODO: before-filter??
+    @@step = @@step+=1
+    image_name = "#{@@step}-#{method}" 
+    local_path = "#{local_test_root}/#{image_name}.png"
+    FileUtils.mkdir_p(local_test_root) unless Dir.exists?(local_test_root)
+    @browser.screenshot.save(local_path)
+    current_test[:screenshots] << { name: image_name, src: "#{public_path_for_this_test}/#{image_name}.png" }
+  end
+
+  def bucket
+    @bucket ||= ::Aws::S3::Resource.new.bucket(ENV['AWS_DEFAULT_BUCKET'])
+  end
+
+  def upload_directory(local, remote)
+    ::S3Uploader.upload_directory(local, ENV['AWS_DEFAULT_BUCKET'], { 
+      :destination_dir => remote, 
+      :threads => 5, 
+      s3_key: ENV['AWS_ACCESS_KEY_ID'], 
+      s3_secret: ENV['AWS_SECRET_ACCESS_KEY'], 
+      region: ENV['AWS_DEFAULT_REGION'] })
+  end
+
+  def static_site_template_path
+    Gem.find_files('reportir')[1] +'/static_site_template'
   end
 
   def current_test
     @@tests.select{ |test| test[:name] == test_name }.first
   end