simplecov-s3 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd9cb36e71a3e0ba0af0873074af077bb96c92b8
-  data.tar.gz: 53977763c8dbe8ea5476e9ed4fa9a0c6a8a09a41
+  metadata.gz: 1be02985d6dccbe11b92af4e97c018a3a2d40f8b
+  data.tar.gz: 4fda1155fdf6891ca9012d3cc8004e83489f4e1f
 SHA512:
-  metadata.gz: 556747ea5527d9c5ec04afae92bad25a8feaeca9f66c7c329d37efae9a0d169db9c5019e717bdcfa779ff892bbfa517325065a45dda12912f8a56b20fcbc5cbc
-  data.tar.gz: 3196d83cc74fde660ec40e6d9dfa421798b3da7ce6aea7caae17058aa317f006d118faa92cf34caefc516f2ebdbff7fb3a00724fe38a1a3e750edc5db962d5c0
+  metadata.gz: f76ff1bda128f0522921f2fda81d811c593d71af79f281832a366922b8717ab0855698f32adaa5759ea070f605dc2b11d67c1f35e683f81a5d4f7a479807b727
+  data.tar.gz: 4cacc8f463f1a0ac29dbcd756d963e0b9e1ef636defb66401e9e8256dc728b7749b689c0dd9833999fde52921ddf09ce8b9207b998e0dbc6de1e7c50a5ca7807

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 Gemfile.lock
 EYIntegratedGemfile.lock
+knapsack_rspec_report.json
 pkg/*
 .rvmrc
 coverage

data/Gemfile

@@ -2,6 +2,8 @@ source "http://rubygems.org"
 
 gemspec
 
+gem 'mime-types'
+
 group :test do
   gem 'rake'
   gem 'pry'

data/lib/simplecov-s3.rb

@@ -32,7 +32,10 @@ module SimpleCov
       @shared_secret = opts[:shared_secret]
       @assets_url = opts[:assets_url]
       @bucket_name = opts[:bucket_name]
-      @build_units = opts[:build_units]
+      @build_units = opts[:build_units].to_i
+      if @build_units <= 1
+        raise "Missing build_units in config (need a value greater than 0)"
+      end
       @postback_url = opts[:postback_url]
       @build_unit = opts[:build_unit]
       @build_id = opts[:build_id]
@@ -41,7 +44,8 @@ module SimpleCov
       if @project_name.empty?
         @project_name = "unknown"
       end
-      @history_limit = opts[:history_limit] || 15
+      @history_limit = opts[:history_limit] || (@build_units.to_i * 3)
+      @additional_artifacts_to_merge = opts[:additional_artifacts_to_merge] || []
     end
 
     def push_partial(opts = {})
@@ -49,6 +53,13 @@ module SimpleCov
         result = SimpleCov::ResultMerger.merged_result
         data_to_push = result.original_result.merge("BUILD_UNIT" => @build_unit).to_json
         put_file("#{@project_name}-#{commit_time}-coverageJSON/#{hashed_build_id}/#{@job_id}", data_to_push)
+        @additional_artifacts_to_merge.each do |artifact|
+          key = artifact[:key]
+          file = artifact[:file]
+          filedata = File.read(file)
+          puts "pushing additional artifact #{key} #{file} #{filedata[0,100]}"
+          put_file("#{@project_name}-#{commit_time}-#{key}/#{hashed_build_id}/#{@job_id}", filedata)
+        end
       rescue => e
         puts e.inspect
         puts e.backtrace
@@ -84,7 +95,28 @@ module SimpleCov
         merged = result.original_result.merge_resultset(merged)
       end
       result = SimpleCov::Result.new(merged)
-      push_coverage_to("#{@project_name}-#{Time.now.to_i}-coverageRESULT/#{SecureRandom.urlsafe_base64(33)}", gen_body(result), result.covered_percent, @postback_url)
+      uniq_id = SecureRandom.urlsafe_base64(33)
+      push_coverage_to("#{@project_name}-#{Time.now.to_i}-coverageRESULT/#{uniq_id}", gen_body(result), result.covered_percent, @postback_url)
+      @additional_artifacts_to_merge.each do |artifact|
+        key = artifact[:key]
+        file = artifact[:file]
+        merge_with = artifact[:merge_with]
+        files = files_for_key(key).map do |f|
+          data = f.body
+          puts "merging additional artifact #{f.key} #{data[0,100]}"
+          data
+        end
+        while files.size > 1
+          a, b, *files = files
+          files << merge_with.call(a, b)
+        end
+        File.open(file, "w+"){|f| f.write(files.first)}
+        puts "Merged artifact #{key} contents:"
+        puts files.first
+        save_merged_artifact_in_s3_at = "#{@project_name}-#{Time.now.to_i}-#{key}/#{uniq_id}"
+        puts "Also saving in S3 at path: #{save_merged_artifact_in_s3_at}"
+        put_file(save_merged_artifact_in_s3_at, files.first)
+      end
       cleanup_files
     end
 
@@ -112,11 +144,15 @@ module SimpleCov
       @connection.directories.get(@bucket_name).files.create(:key => path, :body => data, :content_type => "text/html")
     end
 
-    def json_files
-      expected_dir = "#{@project_name}-#{commit_time}-coverageJSON/#{hashed_build_id}/"
+    def files_for_key(key)
+      expected_dir = "#{@project_name}-#{commit_time}-#{key}/#{hashed_build_id}/"
       @connection.directories.get(@bucket_name, :prefix => expected_dir).files
     end
 
+    def json_files
+      files_for_key("coverageJSON")
+    end
+
     def gen_body(result)
       Formatter.new.format(result).gsub("./assets",@assets_url)
     end

data/lib/simplecov-s3/version.rb

@@ -1,5 +1,5 @@
 module SimpleCov
   class S3
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/spec/a_spec.rb

@@ -18,6 +18,7 @@ describe SimpleCov::S3 do
       }
     s3conn = Fog::Storage.new(fog_opts)
     s3conn.directories.create(:key => "somebucket")
+    knapsack_rspec_report_path = File.expand_path("knapsack_rspec_report.json")
     cov_opts = {
       :fog => fog_opts,
       :project_name => "ey/simplecov-s3", #ENV["TRAVIS_REPO_SLUG"],
@@ -30,14 +31,22 @@ describe SimpleCov::S3 do
       :assets_url => "http://somebucket.s3-website-us-east-1.amazonaws.com/assets",
       :shared_secret => "XXXXXXXXXXXX", #used so build units can find each other, and for covereage postback
       :postback_url => "https://bot.example.org/coverage",
+      :additional_artifacts_to_merge => [{
+        key: "knapsack",
+        file: knapsack_rspec_report_path,
+        merge_with: Proc.new{|a,b| JSON.pretty_generate(JSON.parse(a).merge(JSON.parse(b))) }
+      }]
     }
+    File.open(knapsack_rspec_report_path, "w"){|fp| fp.write({foo: "bar"}.to_json)}
     cov = SimpleCov::S3.new(cov_opts)
     cov.push_partial(:debug => true)
     cov.pull_merge_and_push_full
+    File.open(knapsack_rspec_report_path, "w"){|fp| fp.write({bar: "baz"}.to_json)}
     cov2 = SimpleCov::S3.new(cov_opts.merge(:job_id => "457", :build_unit => "6"))
     cov2.push_partial(:debug => true)
     cov2.pull_merge_and_push_full
     cov2.push_full
+    expect(JSON.parse(File.read(knapsack_rspec_report_path))).to eq('foo' => 'bar', 'bar' => 'baz')
     #TODO: assert on the resulting contents of S3?
   end
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Merge simplecov outputs using S3 as shared storage (and publish the results
@@ -60,9 +60,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -80,21 +80,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Merge simplecov outputs using S3 as shared storage (and publish the results
   as html to S3)
 test_files:
 - spec/a_spec.rb
-has_rdoc: