right_scraper 5.2.8 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91364df79700801d6523594f7c89b052ff240e63
-  data.tar.gz: c3bccc9a05fbb13b21dc7901ab95f7ccdd86121b
+  metadata.gz: fbe07e9cf37a9a0238de7b1a24a8441df3217d69
+  data.tar.gz: 9bd77beb7c966c4b131109633e4684c06903ba9c
 SHA512:
-  metadata.gz: 7ebe33e725fb0d117cbd7d8890f4d1edcf6e74582f3ddf4d83b2eb08fece23f7c4e677c8801b836b2e5b8e8d37f8964f6b78e75d65368b012fab6c9685d887dc
-  data.tar.gz: cde2a6855873730f0704fcb499e0335bf8c05d54890660b808ebb931fdc93419417ebd6c5743c6ec6c25c4dccf11006ec0a82fe6ce159b03ab68b250c4fd5d7f
+  metadata.gz: 462d861098695ee9f831874d613d498d1bae887d4449fd70390381cfdefcc4af77440d4372017dabcf05a0c5443215144fea4b3ec5c1fbdc72fe3a7210146425
+  data.tar.gz: 2a3a59bc1391c2562b804eed520a8314372e400b92e5dbede329fea0a5d85dae4a5ebbf31f0db391f653cef69f247137a07b9446e1a5992827ecfe5c4fc9783f

data/lib/right_scraper/scanners/cookbook_metadata.rb

@@ -26,6 +26,7 @@ require 'right_scraper/scanners'
 
 require 'fileutils'
 require 'json'
+require 'right_git'
 require 'right_popen'
 require 'right_popen/safe_output_buffer'
 require 'tmpdir'
@@ -37,11 +38,13 @@ module RightScraper::Scanners
     JSON_METADATA = 'metadata.json'
     RUBY_METADATA = 'metadata.rb'
 
-    UNDEFINED_COOKBOOK_NAME = 'undefined'
+    UNDEFINED_COOKBOOK_NAME    = 'undefined'
     KNIFE_METADATA_SCRIPT_NAME = 'knife_metadata.rb'
+    KNIFE_METADATA_TIMEOUT     = 60  # 1m
 
     JAILED_FILE_SIZE_CONSTRAINT = 128 * 1024  # 128 KB
-    FREED_FILE_SIZE_CONSTRAINT = 64 * 1024  # 64 KB
+    FREED_FILE_SIZE_CONSTRAINT  = 64 * 1024  # 64 KB
+
 
     attr_reader :freed_dir
 
@@ -244,16 +247,19 @@ module RightScraper::Scanners
         # imposed on the current process by a container (timeout, memory, etc.)
         shell = ::RightGit::Shell::Default
         output = StringIO.new
-        exitstatus = shell.execute(
-          "#{ruby} #{dst_knife_script_path.inspect} #{jailed_cookbook_dir.inspect} 2>&1",
-          directory: dst_knife_script_dir,
-          outstream: output,
-          raise_on_failure: false,
-          set_env_vars: { LC_ALL: 'en_US.UTF-8' },  # character encoding for emitted JSON
-          clear_env_vars: %w{BUNDLE_BIN_PATH BUNDLE_GEMFILE})
-        if exitstatus != 0
+        begin
+          shell.execute(
+            "#{ruby} #{dst_knife_script_path.inspect} #{jailed_cookbook_dir.inspect} 2>&1",
+            directory: dst_knife_script_dir,
+            outstream: output,
+            raise_on_failure: true,
+            set_env_vars: { LC_ALL: 'en_US.UTF-8' },  # character encoding for emitted JSON
+            clear_env_vars: %w{BUNDLE_BIN_PATH BUNDLE_GEMFILE},
+            timeout: KNIFE_METADATA_TIMEOUT)
+          output = output.string
+        rescue ::RightGit::Shell::ShellError => e
           output = output.string
-          raise MetadataError, "Failed to run chef knife: #{output[0, 1024]}"
+          raise MetadataError, "Failed to run chef knife: #{e.message}\n#{output[0, 1024]}"
         end
 
         # free files from jail.

data/lib/right_scraper/version.rb

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