right_scraper 5.2.4 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72742c44a4b3b388890b5b5cfeca507fd73f1378
-  data.tar.gz: a105f03f00ecfdda21074cfd95833555f4c8f8bc
+  metadata.gz: 1154c162499f75a8304bcbb3ce686e071750be25
+  data.tar.gz: 817e562768facce3d8d56f82fd2cc152a99d3c33
 SHA512:
-  metadata.gz: 4f7e803cab8c2a9bfe872e80280bf5aa3af99adbd9531b4a821f4ebc0e2c04db5db64bdca1970376ef967703977eb72a3f3216f6cf76695f60d1c907f139a8cd
-  data.tar.gz: fc00f4ecc3f8f9cdf53dc5d75c693a42abbf31f107b592f41ae49a01a667218210337b518141f85c2b7f6eb07668e4d85d0dfc3919f2e838ebc5c69c3eded083
+  metadata.gz: 3c9b09ecb6077caddb0d14e6c7f707c51e6610cb594789f4fe42ef5837eb8281762ae17699fe35ca2c01a44c747d5e7cf1d2148c8e92418da714c60b7dd0d750
+  data.tar.gz: e8bbe7fcd4f632cab82457ff09daf93c8ab8f65731e3be4ce1b741a07b25154a031f194f9021b46cac4d8f9404384c19dc5a36ed2746677b86066db9c9d545b8

data/bin/right_scraper-retrieve

@@ -58,6 +58,7 @@ begin
     # remove any credentials from repository after retrieval; not needed in
     # order to run scanners subsequently.
     %w(first_credential second_credential).each { |k| repository.delete(k) }
+    repository['tag'] = retrieved[:repository].revision  # send back commit SHA, if any, for comparison
     retrieved[:repository] = repository
     retrieved[:warnings] = main.warnings unless main.warnings.empty?
     $stdout.puts(::JSON.generate(retrieved))

data/lib/right_scraper/main.rb

@@ -131,8 +131,14 @@ module RightScraper
     def retrieve(repo)
       errorlen = errors.size
       unless repo.kind_of?(::RightScraper::Repositories::Base)
-        repo = RightScraper::Repositories::Base.from_hash(::RightSupport::Data::Mash.new(repo))
+        repo = ::RightSupport::Data::Mash.new(repo)
+        repository_hash = repo.delete(:repository_hash)  # optional
+        repo = RightScraper::Repositories::Base.from_hash(repo)
+        if repository_hash && repository_hash != repo.repository_hash
+          raise RightScraper::Error, "Repository hash mismatch: #{repository_hash} != #{repo.repository_hash}"
+        end
       end
+
       retriever = nil
 
       # 1. Retrieve the files
@@ -170,7 +176,12 @@ module RightScraper
       options = ::RightSupport::Data::Mash.new(@options).merge(retrieved)
       repo = options[:repository]
       unless repo.kind_of?(::RightScraper::Repositories::Base)
-        repo = RightScraper::Repositories::Base.from_hash(::RightSupport::Data::Mash.new(repo))
+        repo = ::RightSupport::Data::Mash.new(repo)
+        repository_hash = repo.delete(:repository_hash)  # optional
+        repo = RightScraper::Repositories::Base.from_hash(repo)
+        if repository_hash && repository_hash != repo.repository_hash
+          raise RightScraper::Error, "Repository hash mismatch: #{repository_hash} != #{repo.repository_hash}"
+        end
         options[:repository] = repo
       end
       @logger.operation(:scraping, options[:repo_dir]) do

data/lib/right_scraper/version.rb

@@ -23,7 +23,7 @@
 
 module RightScraper
   # for gemspec, etc.
-  GEM_VERSION = '5.2.4'
+  GEM_VERSION = '5.2.5'
 
   # (Fixnum) protocol versioning scheme; prepended to hashes to
   # prevent collisions.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_scraper
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.2.5
 platform: ruby
 authors:
 - Raphael Simon
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws