reportir 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 984561d1c0d5ce2d7d61d43bc6da95651679cd6c
-  data.tar.gz: bc8caa6a3a64650fa85194017ca2551c2f02264c
+  metadata.gz: b1a0a872f186144298bd154d38a3203533f390e0
+  data.tar.gz: 76ea24f9b85688e68cff714959351038940bf861
 SHA512:
-  metadata.gz: 05fb3a93750af32b5c528a886d868ae14be35e85b34ad52ede3517b5c9b4a9864ebbaf74293c65482bce33c75ad4b2e3f34cdbb72f0a78b72ab882fb413194c7
-  data.tar.gz: df018eeb4a717cc113f78ea55e158df646e90248702b275156d65b5c83517b079862703472dcae19f04a59757343d5d1d76433885c7bd2b3a635e9e0a856d583
+  metadata.gz: 226a7bd746ce679c3ace4c4d8b92ac7ea1f5ab43d59ac5471427857bc9e67b18ad0af8d8c925d05740681fbb636a408379c74276814dc9d47e43d9508ce8c4be
+  data.tar.gz: dd9a43850739b4a1c9f27ed17e9cc398529deb81269f50fdb30ebfac84d1ee1140d078a47929a62a7791e7d4bc84dad5c498f8bc4be03236b8cb6c761b98b1bb

data/lib/reportir.rb

@@ -2,12 +2,25 @@ require "reportir/version"
 require 's3_uploader'
 require 'aws-sdk'
 
+#TODO: RSpec::Core::Formatters.register
+
 module Reportir
   @@step = 0
   @@tests = [] # has to be array for front-end
 
   def upload_result_to_s3_as_static_site
-    check_for_env_vars
+    return upload_everything_to_s3 if upload_to_s3_possible?
+    save_report_locally
+  end
+
+  def save_report_locally
+    copy_template_to_temp_dir
+    write_javascript_models
+    save_final_markup
+    puts "Upload to s3 not possible. Missing ENV vars. Report saved to #{local_root}"
+  end
+
+  def upload_everything_to_s3
     upload_template unless template_uploaded?
     clear_previous_results_from_s3
     save_final_markup
@@ -15,12 +28,24 @@ module Reportir
     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 copy_template_to_temp_dir
+    FileUtils.cp_r(static_site_template_path+'/.', local_root)
+  end
+
   def upload_template
-    puts ''
-    puts ''
     puts '====== UPLOADING TEMPLATE ========='
     upload_directory(static_site_template_path, '')   
   end
@@ -29,11 +54,27 @@ module Reportir
     bucket.object('index.html').exists?
   end
 
+  def upload_to_s3_possible?
+    check_for_env_vars
+    true
+  rescue Reportir::Error
+    return false
+  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']
+    raise Reportir::Error.new 'Missing ENV AWS_DEFAULT_BUCKET' unless aws_config[:bucket]
+    raise Reportir::Error.new 'Missing ENV AWS_SECRET_ACCESS_KEY' unless aws_config[:secret]
+    raise Reportir::Error.new 'Missing ENV AWS_ACCESS_KEY_ID' unless aws_config[:key]
+    raise Reportir::Error.new 'Missing ENV AWS_DEFAULT_REGION' unless aws_config[:region]
+  end
+
+  def aws_config
+    {
+      bucket: ENV['AWS_DEFAULT_BUCKET'],
+      secret: ENV['AWS_SECRET_ACCESS_KEY'],
+      key: ENV['AWS_ACCESS_KEY_ID'],
+      region: ENV['AWS_DEFAULT_REGION']
+    }
   end
 
   def delete_tmp_files_for_this_test
@@ -49,15 +90,15 @@ module Reportir
 
   def write_javascript_models
     string = %{
-      var navigation = #{array_of_test_names.to_json};\n
-      var tests = #{@@tests.to_json};\n
+      var navigation = #{array_of_test_names.to_json};
+      var tests = #{@@tests.to_json};
     }
     File.open(local_model_file_path, "w") { |f| f.write(string) }
   end
 
   def clear_previous_results_from_s3
     puts "deleting all previous test data from s3"
-    ::Aws::S3::Bucket.new(ENV['AWS_DEFAULT_BUCKET']).delete_objects({
+    ::Aws::S3::Bucket.new(aws_config[:bucket]).delete_objects({
       delete: {
         objects: [{ key: "#{public_path_for_this_test}" }],
         quiet: true
@@ -66,42 +107,26 @@ module Reportir
   end
 
   def upload_to_s3
-    puts ''
-    puts ''
     puts '====== UPLOADING RESULTS ========='
     bucket.object('js/models.js').upload_file(local_model_file_path)
     puts "Uploading #{local_model_file_path} to /js/models.js"
     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'])
+    @bucket ||= ::Aws::S3::Resource.new.bucket(aws_config[:bucket])
   end
 
   def upload_directory(local, remote)
-    ::S3Uploader.upload_directory(local, ENV['AWS_DEFAULT_BUCKET'], { 
+    ::S3Uploader.upload_directory(local, aws_config[: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'] })
+      s3_key: aws_config[:key], 
+      s3_secret: aws_config[:secret], 
+      region: aws_config[:region] })
   end
 
   def static_site_template_path
@@ -123,7 +148,7 @@ module Reportir
   end
 
   def local_model_file_path
-    "#{local_root}/models.js"
+    "#{local_root}/js/models.js"
   end
 
   def local_test_root
@@ -148,7 +173,7 @@ module Reportir
 
   def static_site_url
     # TODO: use aws-sdk for this.
-    "http://#{ENV['AWS_DEFAULT_BUCKET']}.s3-website-#{ENV['AWS_DEFAULT_REGION']}.amazonaws.com"
+    "http://#{aws_config[:bucket]}.s3-website-#{aws_config[:region]}.amazonaws.com"
   end
 
   class Error < ::StandardError; end

data/lib/reportir/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reportir
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Dean Shelton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler