right_scraper 5.2.3 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e3e56526cb55dd6f512036c2f09bba4482877f7
-  data.tar.gz: 1530ce3466c3ca85870bb34994b3755bdd71e343
+  metadata.gz: 72742c44a4b3b388890b5b5cfeca507fd73f1378
+  data.tar.gz: a105f03f00ecfdda21074cfd95833555f4c8f8bc
 SHA512:
-  metadata.gz: 8a41b45ff42e741c2a2bf39511624a5f9a94a0f838d584f0ce7a2bde7ad02eef62fb5002e751764dc846c80df86f8b20ac79cae05bf8ee57cab06738482c3dd0
-  data.tar.gz: 82e8795bee0fa38a5b4d5d8841820187773c2bcccf6def8b2ede9cc6955593e4b58c072b80bf03d8da87299ea111e51042a5d7674db6ff586012193d6d1feda5
+  metadata.gz: 4f7e803cab8c2a9bfe872e80280bf5aa3af99adbd9531b4a821f4ebc0e2c04db5db64bdca1970376ef967703977eb72a3f3216f6cf76695f60d1c907f139a8cd
+  data.tar.gz: fc00f4ecc3f8f9cdf53dc5d75c693a42abbf31f107b592f41ae49a01a667218210337b518141f85c2b7f6eb07668e4d85d0dfc3919f2e838ebc5c69c3eded083

data/bin/right_scraper-retrieve

@@ -69,14 +69,14 @@ begin
   exit 0
 rescue ::RightScraper::Error, ::RightGit::Shell::ShellError => e
   # all explicitly raised scraper errors derive from these errors.
-  result = { errors: [e.message] }
+  result = { errors: [[e.class, :retreive, e.message]] }
   $stderr.puts(::JSON.generate(result))
   exit 3
 rescue ::SystemExit => e
   exit e.status
 rescue ::Exception => e
   result = {
-    errors: ['internal error'],
+    errors: [[e.class, :internal_error, e.message]],
     unhandled_exception: {
       class: e.class,
       message: e.message,
@@ -88,3 +88,5 @@ rescue ::Exception => e
 ensure
   main.cleanup rescue nil if main
 end
+
+@logger.note_error($!, :available, "download retriever is unavailable")

data/bin/right_scraper-scan

@@ -65,7 +65,7 @@ begin
     # CookbookMetadata. the reason is that we expect this scanner to only be
     # called in unprivileged isolation followed by more scanners with more
     # privileges and only the latter need to return fully resolved resources.
-    if main.scanners != [RightScraper::Scanners::CookbookMetadata]
+    if main.scanners != [::RightScraper::Scanners::CookbookMetadata]
       result[:resources] = main.resources.map do |r|
         # remove relational repository from each returned cookbook due to being
         # the same for each resource and already known to caller.
@@ -83,14 +83,14 @@ begin
   exit 0
 rescue ::RightScraper::Error, ::RightGit::Shell::ShellError => e
   # all explicitly raised scraper errors derive from these errors.
-  result = { errors: [e.message] }
+  result = { errors: [[e.class, :scan, e.message]] }
   $stderr.puts(::JSON.generate(result))
   exit 3
 rescue ::SystemExit => e
   exit e.status
 rescue ::Exception => e
   result = {
-    errors: ['internal error'],
+    errors: [[e.class, :internal_error, e.message]],
     unhandled_exception: {
       class: e.class,
       message: e.message,

data/lib/right_scraper/main.rb

@@ -38,8 +38,7 @@ module RightScraper
   # class functionality.
   class Main
 
-    # (Array):: Scraped resources
-    attr_reader :resources
+    attr_reader :logger, :resources
 
     # Initialize scrape destination directory
     #
@@ -61,7 +60,6 @@ module RightScraper
         :scanners    => nil,
         :builders    => nil,
       ).merge(options)
-      @old_logger_callback = nil
       @temporary = !options.has_key?(:basedir)
       options[:basedir] ||= Dir.mktmpdir
       options[:logger] ||= ::RightScraper::Loggers::Default.new
@@ -110,12 +108,12 @@ module RightScraper
     # === Raise
     # 'Invalid repository type':: If repository type is not known
     def scrape(repo, incremental=true, &callback)
-      @old_logger_callback = @logger.callback
+      old_logger_callback = @logger.callback
       @logger.callback = callback
       errorlen = errors.size
       begin
-        if retrieved = retrieve(repo, &callback)
-          scan(retrieved, &callback)
+        if retrieved = retrieve(repo)
+          scan(retrieved)
         end
       rescue Exception
         # legacy logger handles communication with the end user and appending
@@ -123,6 +121,7 @@ module RightScraper
         # has no such guaranteed communication so the caller will decide how to
         # handle errors, etc.
       ensure
+        @logger.callback = old_logger_callback
         cleanup
       end
       errors.size == errorlen
@@ -188,8 +187,6 @@ module RightScraper
 
     # cleans up temporary files, etc.
     def cleanup
-      @logger.callback = @old_logger_callback
-      @old_logger_callback = nil
       ::FileUtils.remove_entry_secure(base_dir) rescue nil if @temporary
     end
 

data/lib/right_scraper/version.rb

@@ -23,7 +23,7 @@
 
 module RightScraper
   # for gemspec, etc.
-  GEM_VERSION = '5.2.3'
+  GEM_VERSION = '5.2.4'
 
   # (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.3
+  version: 5.2.4
 platform: ruby
 authors:
 - Raphael Simon
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws