berkshelf 5.5.0 → 5.6.0

data/lib/berkshelf/mixin/git.rb

@@ -1,4 +1,4 @@
-require 'buff/shell_out'
+require "buff/shell_out"
 
 module Berkshelf
   module Mixin
@@ -13,11 +13,11 @@ module Berkshelf
       # @raise [String]
       #   the +$stdout+ from the command
       def git(command, error = true)
-        unless Berkshelf.which('git') || Berkshelf.which('git.exe') || Berkshelf.which('git.bat')
+        unless Berkshelf.which("git") || Berkshelf.which("git.exe") || Berkshelf.which("git.bat")
           raise GitNotInstalled.new
         end
 
-        response = Buff::ShellOut.shell_out(%|git #{command}|)
+        response = Buff::ShellOut.shell_out(%{git #{command}})
 
         if error && !response.success?
           raise GitCommandError.new(command, cache_path, response.stderr)

data/lib/berkshelf/packager.rb

@@ -1,5 +1,5 @@
-require 'archive/tar/minitar'
-require 'zlib'
+require "archive/tar/minitar"
+require "zlib"
 
 module Berkshelf
   # A class for archiving and compressing directory containing one or more cookbooks.
@@ -65,9 +65,9 @@ module Berkshelf
     private
 
       # @return [String]
-      attr_reader :out_dir
+    attr_reader :out_dir
 
       # @return [String]
-      attr_reader :filename
+    attr_reader :filename
   end
 end

data/lib/berkshelf/resolver.rb

@@ -1,7 +1,7 @@
 module Berkshelf
   class Resolver
 
-    require_relative 'resolver/graph'
+    require_relative "resolver/graph"
 
     extend Forwardable
 
@@ -75,7 +75,7 @@ module Berkshelf
       graph.populate_store
       graph.populate(berksfile.sources)
 
-      Solve.it!(graph, demand_array, ENV['DEBUG_RESOLVER'] ? { ui: Berkshelf.ui } : {}).collect do |name, version|
+      Solve.it!(graph, demand_array, ENV["DEBUG_RESOLVER"] ? { ui: Berkshelf.ui } : {}).collect do |name, version|
         dependency = get_demand(name) || Dependency.new(berksfile, name)
         dependency.locked_version = version
 

data/lib/berkshelf/resolver/graph.rb

@@ -50,7 +50,7 @@ module Berkshelf
       # @return [Array<Berkshelf::RemoteCookbook>]
       def universe(sources)
         cookbooks = []
-        Array(sources).each { |source| cookbooks = cookbooks | source.universe }
+        Array(sources).each { |source| cookbooks |= source.universe }
         cookbooks
       end
     end

data/lib/berkshelf/shell.rb

@@ -1,4 +1,4 @@
-require 'thor'
+require "thor"
 
 module Berkshelf
   # Subclass the current shell (which is different based on the OS)

data/lib/berkshelf/source.rb

@@ -1,6 +1,6 @@
-require 'berkshelf/api-client'
-require 'berkshelf/ssl_policies'
-require 'openssl'
+require "berkshelf/api-client"
+require "berkshelf/ssl_policies"
+require "openssl"
 
 module Berkshelf
   class Source
@@ -11,7 +11,7 @@ module Berkshelf
     # @param [String, Berkshelf::SourceURI] source
     def initialize(source)
       @source = source
-      @universe   = nil
+      @universe = nil
     end
 
     def ssl_policy
@@ -20,7 +20,7 @@ module Berkshelf
 
     def api_client
       @api_client ||= begin
-                        ssl_options = {verify: Berkshelf::Config.instance.ssl.verify}
+                        ssl_options = { verify: Berkshelf::Config.instance.ssl.verify }
                         ssl_options[:cert_store] = ssl_policy.store if ssl_policy.store
 
                         if source == :chef_server
@@ -30,7 +30,7 @@ module Berkshelf
                             open_timeout: [(api_timeout / 10), 3].max,
                             client_name: Berkshelf::Config.instance.chef.node_name,
                             server_url: Berkshelf::Config.instance.chef.chef_server_url,
-                            client_key: Berkshelf::Config.instance.chef.client_key,
+                            client_key: Berkshelf::Config.instance.chef.client_key
                           )
                         else
                           APIClient.new(uri,

data/lib/berkshelf/source_uri.rb

@@ -1,4 +1,4 @@
-require 'addressable/uri'
+require "addressable/uri"
 
 module Berkshelf
   class SourceURI < Addressable::URI
@@ -22,7 +22,7 @@ module Berkshelf
       end
     end
 
-    VALID_SCHEMES = [ "http", "https" ].freeze
+    VALID_SCHEMES = %w{http https}.freeze
 
     # @raise [Berkshelf::InvalidSourceURI]
     def validate

data/lib/berkshelf/ssl_policies.rb

@@ -1,4 +1,4 @@
-require 'openssl'
+require "openssl"
 
 module Berkshelf
   class SSLPolicy
@@ -18,13 +18,13 @@ module Berkshelf
     def add_trusted_cert(cert)
       @store.add_cert(cert)
     rescue OpenSSL::X509::StoreError => e
-      raise e unless e.message == 'cert already in hash table'
+      raise e unless e.message == "cert already in hash table"
     end
 
     def trusted_certs_dir
       config_dir = Berkshelf.config.chef.trusted_certs_dir.to_s
       if config_dir.empty? || !::File.exist?(config_dir)
-        File.join(ENV['HOME'], '.chef', 'trusted_certs')
+        File.join(ENV["HOME"], ".chef", "trusted_certs")
       else
         config_dir
       end

data/lib/berkshelf/thor.rb

@@ -1 +1 @@
-require 'berkshelf/cli'
+require "berkshelf/cli"

data/lib/berkshelf/uploader.rb

@@ -44,32 +44,32 @@ module Berkshelf
       # wrapping.
       #
       # @param [Array<String>] cookbooks
-      def upload(cookbooks)
-        Berkshelf.log.info "Starting upload"
-
-        Berkshelf.ridley_connection(options) do |connection|
-          cookbooks.each do |cookbook|
-            Berkshelf.log.debug "  Uploading #{cookbook}"
-
-            begin
-              connection.cookbook.upload(cookbook.path,
-                name:     cookbook.cookbook_name,
-                force:    options[:force],
-                freeze:   options[:freeze],
-                validate: options[:validate],
-              )
-
-              Berkshelf.formatter.uploaded(cookbook, connection)
-            rescue Ridley::Errors::FrozenCookbook
-              if options[:halt_on_frozen]
-                raise FrozenCookbook.new(cookbook)
-              end
-
-              Berkshelf.formatter.skipping(cookbook, connection)
+    def upload(cookbooks)
+      Berkshelf.log.info "Starting upload"
+
+      Berkshelf.ridley_connection(options) do |connection|
+        cookbooks.each do |cookbook|
+          Berkshelf.log.debug "  Uploading #{cookbook}"
+
+          begin
+            connection.cookbook.upload(cookbook.path,
+              name:     cookbook.cookbook_name,
+              force:    options[:force],
+              freeze:   options[:freeze],
+              validate: options[:validate]
+            )
+
+            Berkshelf.formatter.uploaded(cookbook, connection)
+          rescue Ridley::Errors::FrozenCookbook
+            if options[:halt_on_frozen]
+              raise FrozenCookbook.new(cookbook)
             end
+
+            Berkshelf.formatter.skipping(cookbook, connection)
           end
         end
       end
+    end
 
       # Filter cookbooks based off the list of dependencies in the Berksfile.
       #
@@ -80,37 +80,37 @@ module Berkshelf
       #
       # @return [Array<CachedCookbook>]
       #
-      def filtered_cookbooks
-        # Create a copy of the dependencies. We need to make a copy, or else
-        # we would be adding dependencies directly to the Berksfile object, and
-        # that would be a bad idea...
-        dependencies = berksfile.dependencies.map(&:name)
+    def filtered_cookbooks
+      # Create a copy of the dependencies. We need to make a copy, or else
+      # we would be adding dependencies directly to the Berksfile object, and
+      # that would be a bad idea...
+      dependencies = berksfile.dependencies.map(&:name)
 
-        checked   = {}
-        cookbooks = {}
+      checked   = {}
+      cookbooks = {}
 
-        dependencies.each do |dependency|
-          next if checked[dependency]
+      dependencies.each do |dependency|
+        next if checked[dependency]
 
-          lockfile.graph.find(dependency).dependencies.each do |name, _|
-            cookbooks[name] ||= lockfile.retrieve(name)
-            dependencies << name
-          end
-
-          checked[dependency] = true
-          cookbooks[dependency] ||= lockfile.retrieve(dependency)
+        lockfile.graph.find(dependency).dependencies.each do |name, _|
+          cookbooks[name] ||= lockfile.retrieve(name)
+          dependencies << name
         end
 
-        # This is a temporary change and will be removed in a future release. We should
-        # add the ability to define a custom uploader which would allow the authors of Chef-Guard
-        # to define their upload strategy instead of using Ridley.
-        #
-        # See https://github.com/berkshelf/berkshelf/pull/1316 for details.
-        if Berkshelf.chef_config.knife[:chef_guard] == true
-          cookbooks.values
-        else
-          cookbooks.values.sort
-        end
+        checked[dependency] = true
+        cookbooks[dependency] ||= lockfile.retrieve(dependency)
       end
+
+      # This is a temporary change and will be removed in a future release. We should
+      # add the ability to define a custom uploader which would allow the authors of Chef-Guard
+      # to define their upload strategy instead of using Ridley.
+      #
+      # See https://github.com/berkshelf/berkshelf/pull/1316 for details.
+      if Berkshelf.chef_config.knife[:chef_guard] == true
+        cookbooks.values
+      else
+        cookbooks.values.sort
+      end
+    end
   end
 end

data/lib/berkshelf/validator.rb

@@ -24,9 +24,9 @@ module Berkshelf
         Array(cookbooks).each do |cookbook|
           path = cookbook.path.to_s
 
-          files = Dir.glob(File.join(path, '**', '*.rb')).select do |f|
+          files = Dir.glob(File.join(path, "**", "*.rb")).select do |f|
             parent = Pathname.new(path).dirname.to_s
-            f.gsub(parent, '') =~ /[[:space:]]/
+            f.gsub(parent, "") =~ /[[:space:]]/
           end
 
           raise InvalidCookbookFiles.new(cookbook, files) unless files.empty?

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.5.0"
+  VERSION = "5.6.0"
 end

data/lib/berkshelf/visualizer.rb

@@ -1,6 +1,6 @@
-require 'buff/shell_out'
-require 'set'
-require 'tempfile'
+require "buff/shell_out"
+require "set"
+require "tempfile"
 
 module Berkshelf
   class Visualizer
@@ -56,7 +56,7 @@ module Berkshelf
       out = %|digraph Solve__Graph {\n|
 
       nodes.each do |node|
-        out << %|  "#{node}" [ fontsize = 10, label = "#{node}" ]\n|
+        out << %{  "#{node}" [ fontsize = 10, label = "#{node}" ]\n}
       end
 
       nodes.each do |node|
@@ -67,7 +67,7 @@ module Berkshelf
             else
               label = " #{version}"
             end
-            out << %|  "#{node}" -> "#{name}" [ fontsize = 10, label = "#{label}" ]\n|
+            out << %{  "#{node}" -> "#{name}" [ fontsize = 10, label = "#{label}" ]\n}
           end
         end
       end
@@ -76,8 +76,8 @@ module Berkshelf
       out
     end
 
-    def to_dot_file(outfile = 'graph.dot')
-      File.open(outfile, 'w') { |f| f.write(to_dot) }
+    def to_dot_file(outfile = "graph.dot")
+      File.open(outfile, "w") { |f| f.write(to_dot) }
       File.expand_path(outfile)
     end
 
@@ -88,16 +88,16 @@ module Berkshelf
     #
     # @return [String]
     #   the path where the file was written
-    def to_png(outfile = 'graph.png')
-      tempfile = Tempfile.new('dotdotfile')
+    def to_png(outfile = "graph.png")
+      tempfile = Tempfile.new("dotdotfile")
       tempfile.write(to_dot)
       tempfile.rewind
 
-      unless Berkshelf.which('dot') || Berkshelf.which('dot.exe')
+      unless Berkshelf.which("dot") || Berkshelf.which("dot.exe")
         raise GraphvizNotInstalled.new
       end
 
-      command = %|dot -T png #{tempfile.path} -o "#{outfile}"|
+      command = %{dot -T png #{tempfile.path} -o "#{outfile}"}
       response = shell_out(command)
 
       unless response.success?

data/spec/config/knife.rb

@@ -5,6 +5,6 @@ client_key               File.expand_path("spec/config/berkshelf.pem")
 validation_client_name   "validator"
 validation_key           File.expand_path("spec/config/validator.pem")
 chef_server_url          "http://localhost:26310"
-cache_type               'BasicFile'
+cache_type               "BasicFile"
 cache_options( :path => "#{ENV['HOME']}/.chef/checksums" )
-cookbook_path            []
+cookbook_path []

data/spec/fixtures/Berksfile

@@ -1,3 +1,3 @@
-cookbook 'ntp', '<= 1.0.0'
-cookbook 'mysql'
-cookbook 'nginx', '< 0.101.2'
+cookbook "ntp", "<= 1.0.0"
+cookbook "mysql"
+cookbook "nginx", "< 0.101.2"

data/spec/fixtures/cookbook-path/jenkins-config/metadata.rb

@@ -1,4 +1,4 @@
-name 'jenkins-config'
-version '0.1.0'
+name "jenkins-config"
+version "0.1.0"
 
-depends 'jenkins', '~> 2.0'
+depends "jenkins", "~> 2.0"

data/spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb

@@ -1,6 +1,6 @@
-name 'jenkins'
-version '2.0.3'
+name "jenkins"
+version "2.0.3"
 
-depends 'apt', '~> 2.0'
-depends 'runit', '~> 1.5'
-depends 'yum', '~> 3.0'
+depends "apt", "~> 2.0"
+depends "runit", "~> 1.5"
+depends "yum", "~> 3.0"

data/spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb

@@ -1,5 +1,5 @@
-name 'jenkins'
-version '2.0.4'
+name "jenkins"
+version "2.0.4"
 
-depends 'apt', '~> 2.0'
-depends 'runit', '~> 1.5'
+depends "apt", "~> 2.0"
+depends "runit", "~> 1.5"

data/spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb

@@ -1,3 +1,3 @@
-name       'example_cookbook'
-maintainer 'Berkshelf Core'
-version    '0.5.0'
+name       "example_cookbook"
+maintainer "Berkshelf Core"
+version    "0.5.0"

data/spec/fixtures/cookbooks/example_cookbook/metadata.rb

@@ -1,3 +1,3 @@
-name       'example_cookbook'
-maintainer 'Berkshelf Core'
-version    '0.5.0'
+name       "example_cookbook"
+maintainer "Berkshelf Core"
+version    "0.5.0"

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'spork'
+require "spork"
 
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
@@ -7,12 +7,12 @@ end
 BERKS_SPEC_DATA = File.expand_path("../data", __FILE__)
 
 Spork.prefork do
-  require 'rspec'
-  require 'cleanroom/rspec'
-  require 'webmock/rspec'
-  require 'berkshelf/api/rspec' unless windows?
+  require "rspec"
+  require "cleanroom/rspec"
+  require "webmock/rspec"
+  require "berkshelf/api/rspec" unless windows?
 
-  Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
+  Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
   RSpec.configure do |config|
     config.include Berkshelf::RSpec::FileSystemMatchers
@@ -44,7 +44,7 @@ Spork.prefork do
     end
 
     config.before(:all) do
-      ENV['BERKSHELF_PATH'] = berkshelf_path.to_s
+      ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
     end
 
     config.before(:each) do
@@ -71,7 +71,7 @@ Spork.prefork do
 end
 
 Spork.each_run do
-  require 'berkshelf'
+  require "berkshelf"
 
   module Berkshelf
     class GitLocation
@@ -80,7 +80,7 @@ Spork.each_run do
       alias :real_clone :clone
       def clone
         fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
-        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/,'-'))
+        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/, "-"))
         @uri = "file://#{fake_remote}"
         real_clone
       end