reportir 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cb01b1a604f9888f722f21013657a051b495665
-  data.tar.gz: f553df14eab79c36afda261583c4467a540ca483
+  metadata.gz: 984561d1c0d5ce2d7d61d43bc6da95651679cd6c
+  data.tar.gz: bc8caa6a3a64650fa85194017ca2551c2f02264c
 SHA512:
-  metadata.gz: 093c01da36eb90fe37576e18c18b1a83bbcaa99d4c20f26e0cf453778dfe9603d159f3ad77765bd09154e1c9cfd1c8fc72b5ff15f3a3ae1416475807a377a54f
-  data.tar.gz: fa969ce3129bb88e7fe4550cb9cf009d847711f32bd1c9542d513f69bff14b37a78ae2cfca13467b34fb8b36d385adbc3cb68b47b46b81f35510cf572311259b
+  metadata.gz: 05fb3a93750af32b5c528a886d868ae14be35e85b34ad52ede3517b5c9b4a9864ebbaf74293c65482bce33c75ad4b2e3f34cdbb72f0a78b72ab882fb413194c7
+  data.tar.gz: df018eeb4a717cc113f78ea55e158df646e90248702b275156d65b5c83517b079862703472dcae19f04a59757343d5d1d76433885c7bd2b3a635e9e0a856d583

data/lib/reportir/version.rb

@@ -1,3 +1,3 @@
 module Reportir
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/lib/reportir.rb

@@ -8,25 +8,27 @@ module Reportir
 
   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']
@@ -66,15 +68,10 @@ module Reportir
   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 ========='
@@ -84,6 +81,33 @@ module Reportir
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reportir
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Dean Shelton