berkshelf 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb46a7f69b8ffe285a82a5d5c2f3c50a8c0675fe
-  data.tar.gz: cdffca6593306424fcc6b610ec9461432aecfd30
+  metadata.gz: 6e042c41f6e111456d8c709b6d32a321a6ed1932
+  data.tar.gz: 46a8cb9c386f424b175ffb865b8be0efd0bf8a8b
 SHA512:
-  metadata.gz: 861440210543c39944ddb44aaab1aa47ca3fa3cdf4de430d66b5e15945ecc08aef4a151b08a444bf1ed94752f6383b4cf8e7775b1110d2d18bef327a78f1c540
-  data.tar.gz: 96d9786d0c9c023954200ee7a3cc4b13febb96bf261f270bde5e4801e90af1befcd853cedc3d2e58543f45c982b13cb3610dff0a7bda8593e1a46f6a8cded031
+  metadata.gz: dbb46bb7460503678d2b272fb9b9be7d954dcdbd531d02c7856da72ab32a816861493458249937b248dcd684d7a5d210ac977f5b439a56b7d1a9a00cb18605e9
+  data.tar.gz: 222e26dd8a1e99687403824bd81e6320fbc3e6f5288385e6d1cdd995c26bdca3dffc0ccef7070fa191801e3e3d16a86534d4c4ac35cad06e7e20baaa482f7bbd

data/Gemfile.lock

@@ -20,7 +20,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (6.1.0)
+    berkshelf (6.1.1)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -91,8 +91,8 @@ GEM
       mixlib-log (~> 1.3)
       rack (~> 2.0)
       uuidtools (~> 2.1)
-    chefstyle (0.5.0)
-      rubocop (= 0.47.1)
+    chefstyle (0.6.0)
+      rubocop (= 0.49.1)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     cleanroom (1.0.0)
@@ -114,7 +114,7 @@ GEM
       gherkin (~> 4.0)
     cucumber-wire (0.0.1)
     dep-selector-libgecode (1.3.1)
-    dep_selector (1.0.4)
+    dep_selector (1.0.5)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
     descendants_tracker (0.0.4)
@@ -195,6 +195,7 @@ GEM
     nio4r (2.1.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -247,7 +248,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    rubocop (0.47.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -271,7 +273,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.0)
     uuidtools (2.1.5)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
@@ -311,4 +313,4 @@ DEPENDENCIES
   yard (>= 0.8)
 
 BUNDLED WITH
-   1.15.0
+   1.15.1

data/features/step_definitions/json_steps.rb

@@ -1,6 +1,6 @@
 class Hash
   def sort_by_key(&block)
-    self.keys.sort(&block).reduce({}) do |seed, key|
+    keys.sort(&block).reduce({}) do |seed, key|
       seed[key] = self[key]
       if seed[key].is_a?(Hash)
         seed[key] = seed[key].sort_by_key(&block)

data/lib/berkshelf/berksfile.rb

@@ -448,7 +448,7 @@ module Berkshelf
       end
 
       # NOTE: We intentionally do NOT pass options to the installer
-      self.install
+      install
     end
 
     # Retrieve information about a given cookbook that is installed by this Berksfile.

data/lib/berkshelf/cli.rb

@@ -18,22 +18,20 @@ module Berkshelf
       end
 
       def execute!
-        begin
-          $stdin  = @stdin
-          $stdout = @stdout
-          $stderr = @stderr
-
-          Berkshelf::Cli.start(@argv)
-          @kernel.exit(0)
-        rescue Berkshelf::BerkshelfError => e
-          Berkshelf.ui.error e
-          Berkshelf.ui.error "\t" + e.backtrace.join("\n\t") if ENV["BERKSHELF_DEBUG"]
-          @kernel.exit(e.status_code)
-        rescue Ridley::Errors::RidleyError => e
-          Berkshelf.ui.error "#{e.class} #{e}"
-          Berkshelf.ui.error "\t" + e.backtrace.join("\n\t") if ENV["BERKSHELF_DEBUG"]
-          @kernel.exit(47)
-        end
+        $stdin  = @stdin
+        $stdout = @stdout
+        $stderr = @stderr
+
+        Berkshelf::Cli.start(@argv)
+        @kernel.exit(0)
+      rescue Berkshelf::BerkshelfError => e
+        Berkshelf.ui.error e
+        Berkshelf.ui.error "\t" + e.backtrace.join("\n\t") if ENV["BERKSHELF_DEBUG"]
+        @kernel.exit(e.status_code)
+      rescue Ridley::Errors::RidleyError => e
+        Berkshelf.ui.error "#{e.class} #{e}"
+        Berkshelf.ui.error "\t" + e.backtrace.join("\n\t") if ENV["BERKSHELF_DEBUG"]
+        @kernel.exit(47)
       end
     end
 
@@ -42,7 +40,7 @@ module Berkshelf
         if given_args.length > 1 && !(given_args & Thor::HELP_MAPPINGS).empty?
           command = given_args.first
 
-          if self.subcommands.include?(command)
+          if subcommands.include?(command)
             super(meth, [command, "help"].compact, nil, config)
           else
             super(meth, ["help", command].compact, nil, config)

data/lib/berkshelf/config.rb

@@ -55,7 +55,7 @@ module Berkshelf
       # @return [Config]
       def reload
         @instance = nil
-        self.instance
+        instance
       end
 
       # force proper X509 types from any configuration strings
@@ -76,12 +76,12 @@ module Berkshelf
     def initialize(path = self.class.path, options = {})
       super(path, options).tap do
         # Deprecation
-        if !self.vagrant.omnibus.enabled.nil?
+        if !vagrant.omnibus.enabled.nil?
           Berkshelf.ui.warn "`vagrant.omnibus.enabled' is deprecated and " \
             "will be removed in a future release. Please remove the " \
             "`enabled' attribute from your Berkshelf config."
         end
-        if !self.vagrant.vm.box_url.nil?
+        if !vagrant.vm.box_url.nil?
           Berkshelf.ui.warn "`vagrant.vm.box_url' is deprecated and " \
             "will be removed in a future release. Please remove the " \
             "`box_url' attribute from your Berkshelf config."

data/lib/berkshelf/dependency.rb

@@ -168,7 +168,7 @@ module Berkshelf
     end
 
     def <=>(other)
-      [self.name, self.version_constraint] <=> [other.name, other.version_constraint]
+      [name, version_constraint] <=> [other.name, other.version_constraint]
     end
 
     def to_s

data/lib/berkshelf/source_uri.rb

@@ -28,8 +28,8 @@ module Berkshelf
     def validate
       super
 
-      unless VALID_SCHEMES.include?(self.scheme)
-        raise InvalidSourceURI.new(self, "invalid URI scheme '#{self.scheme}'. Valid schemes: #{VALID_SCHEMES}")
+      unless VALID_SCHEMES.include?(scheme)
+        raise InvalidSourceURI.new(self, "invalid URI scheme '#{scheme}'. Valid schemes: #{VALID_SCHEMES}")
       end
     rescue Addressable::URI::InvalidURIError => ex
       raise InvalidSourceURI.new(self, ex)

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "6.1.0"
+  VERSION = "6.1.1"
 end

data/spec/support/git.rb

@@ -122,7 +122,7 @@ module Berkshelf
         # @return [Pathname]
       def ensure_and_return(path)
         FileUtils.mkdir(path) unless File.exist?(path)
-        return Pathname.new(path).expand_path
+        Pathname.new(path).expand_path
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable