berkshelf 5.5.0 → 5.6.0

data/features/step_definitions/filesystem_steps.rb

@@ -1,4 +1,4 @@
-require 'aruba/api'
+require "aruba/api"
 
 World(Aruba::Api)
 World(Berkshelf::RSpec::ChefAPI)
@@ -22,12 +22,12 @@ end
 Given /^the cookbook store has the git cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version, sha|
     folder   = "#{name}-#{sha}"
-    metadata = File.join(folder, 'metadata.rb')
+    metadata = File.join(folder, "metadata.rb")
 
     create_directory(folder)
     write_file(metadata, [
       "name '#{name}'",
-      "version '#{version}'"
+      "version '#{version}'",
     ].join("\n"))
   end
 end
@@ -133,7 +133,6 @@ Then /^I should have a new cookbook skeleton "(.*?)" with Chef-Minitest support$
   }
 end
 
-
 Then /^I should have a new cookbook skeleton "(.*?)" with Foodcritic support$/ do |name|
   steps %Q{ Then I should have a new cookbook skeleton "#{name}" }
 
@@ -215,15 +214,15 @@ Then(/^I should have a new cookbook skeleton "(.*?)" with no Test Kitchen suppor
 end
 
 Then /^the cookbook "(.*?)" should have the following files:$/ do |name, files|
-  check_file_presence(files.raw.map{|file_row| ::File.join(name, file_row[0])}, true)
+  check_file_presence(files.raw.map { |file_row| ::File.join(name, file_row[0]) }, true)
 end
 
 Then /^the cookbook "(.*?)" should not have the following files:$/ do |name, files|
-  check_file_presence(files.raw.map{|file_row| ::File.join(name, file_row[0])}, false)
+  check_file_presence(files.raw.map { |file_row| ::File.join(name, file_row[0]) }, false)
 end
 
 Then /^the git cookbook "(.*?)" should not have the following directories:$/ do |name, directories|
-  check_directory_presence(directories.raw.map{|directory_row| ::File.join(cookbook_store.storage_path.to_path, name, directory_row[0])}, false)
+  check_directory_presence(directories.raw.map { |directory_row| ::File.join(cookbook_store.storage_path.to_path, name, directory_row[0]) }, false)
 end
 
 Then /^the file "(.*?)" in the cookbook "(.*?)" should contain:$/ do |file_name, cookbook_name, content|
@@ -238,19 +237,21 @@ end
 Then /^the resulting "(.+)" Vagrantfile should contain:$/ do |cookbook_name, content|
   expect(Pathname.new(current_dir).join(cookbook_name)).to have_structure {
     file "Vagrantfile" do
-      content.respond_to?(:raw) ?
-        content.raw.flatten.each { |string| contains string } :
+      if content.respond_to?(:raw)
+        content.raw.flatten.each { |string| contains string }
+      else
         contains(content)
+      end
     end
   }
 end
 
 Then /^the directory "(.*?)" should have the following files:$/ do |name, files|
-  check_file_presence(files.raw.map{|file_row| ::File.join(name, file_row[0])}, true)
+  check_file_presence(files.raw.map { |file_row| ::File.join(name, file_row[0]) }, true)
 end
 
 Then /^the directory "(.*?)" should not have the following files:$/ do |name, files|
-  check_file_presence(files.raw.map{|file_row| ::File.join(name, file_row[0])}, false)
+  check_file_presence(files.raw.map { |file_row| ::File.join(name, file_row[0]) }, false)
 end
 
 Then /^the file "(.*?)" in the directory "(.*?)" should not contain:$/ do |file_name, directory_name, content|

data/features/support/env.rb

@@ -1,18 +1,18 @@
-require 'spork'
+require "spork"
 
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
 Spork.prefork do
-  require 'aruba/cucumber'
-  require 'aruba/in_process'
-  require 'aruba/spawn_process'
-  require 'cucumber/rspec/doubles'
-  require 'berkshelf/api/rspec' unless windows?
-  require 'berkshelf/api/cucumber' unless windows?
+  require "aruba/cucumber"
+  require "aruba/in_process"
+  require "aruba/spawn_process"
+  require "cucumber/rspec/doubles"
+  require "berkshelf/api/rspec" unless windows?
+  require "berkshelf/api/cucumber" unless windows?
 
-  Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
+  Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
   World(Berkshelf::RSpec::PathHelpers)
   World(Berkshelf::RSpec::Kitchen)
@@ -29,13 +29,13 @@ Spork.prefork do
 
     # Legacy ENV variables until we can move over to all InProcess
     Berkshelf.instance_variable_set(:@berkshelf_path, nil)
-    ENV['BERKSHELF_PATH'] = berkshelf_path.to_s
-    ENV['BERKSHELF_CONFIG'] = Berkshelf.config.path.to_s
-    ENV['BERKSHELF_CHEF_CONFIG'] = chef_config_path.to_s
+    ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
+    ENV["BERKSHELF_CONFIG"] = Berkshelf.config.path.to_s
+    ENV["BERKSHELF_CHEF_CONFIG"] = chef_config_path.to_s
 
     aruba.config.command_launcher = :in_process
     aruba.config.main_class = Berkshelf::Cli::Runner
-    @dirs                       = ["spec/tmp/aruba"] # set aruba's temporary directory
+    @dirs = ["spec/tmp/aruba"] # set aruba's temporary directory
 
     stub_kitchen!
     clean_tmp_path
@@ -50,9 +50,9 @@ Spork.prefork do
         options: {
           url: "http://localhost:#{CHEF_SERVER_PORT}",
           client_name: "reset",
-          client_key: File.expand_path("spec/config/berkshelf.pem")
-        }
-      }
+          client_key: File.expand_path("spec/config/berkshelf.pem"),
+        },
+      },
     ]
 
     Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
@@ -62,21 +62,21 @@ Spork.prefork do
     @aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15
   end
 
-  Before('@spawn') do
+  Before("@spawn") do
     aruba.config.command_launcher = :spawn
 
     Berkshelf.instance_variable_set(:@berkshelf_path, nil)
-    set_environment_variable('BERKSHELF_PATH', berkshelf_path.to_s)
-    set_environment_variable('BERKSHELF_CONFIG', Berkshelf.config.path.to_s)
-    set_environment_variable('BERKSHELF_CHEF_CONFIG', chef_config_path.to_s)
+    set_environment_variable("BERKSHELF_PATH", berkshelf_path.to_s)
+    set_environment_variable("BERKSHELF_CONFIG", Berkshelf.config.path.to_s)
+    set_environment_variable("BERKSHELF_CHEF_CONFIG", chef_config_path.to_s)
   end
 
-  Before('@slow_process') do
+  Before("@slow_process") do
     aruba.config.io_wait_timeout = Cucumber::JRUBY ? 70 : 30
     @aruba_timeout_seconds = Cucumber::JRUBY ? 140 : 60
   end
 end
 
 Spork.each_run do
-  require 'berkshelf/cli'
+  require "berkshelf/cli"
 end

data/lib/berkshelf.rb

@@ -1,49 +1,49 @@
-require 'buff/extensions'
-require 'cleanroom'
-require 'digest/md5'
-require 'forwardable'
-require 'json'
-require 'pathname'
-require 'ridley'
-require 'semverse'
-require 'solve'
-require 'thor'
-require 'uri'
-require 'celluloid'
+require "buff/extensions"
+require "cleanroom"
+require "digest/md5"
+require "forwardable"
+require "json"
+require "pathname"
+require "ridley"
+require "semverse"
+require "solve"
+require "thor"
+require "uri"
+require "celluloid"
 
 JSON.create_id = nil
 
-require_relative 'berkshelf/core_ext'
-require_relative 'berkshelf/thor_ext'
+require_relative "berkshelf/core_ext"
+require_relative "berkshelf/thor_ext"
 
 module Berkshelf
   Encoding.default_external = Encoding::UTF_8
 
-  require_relative 'berkshelf/version'
-  require_relative 'berkshelf/errors'
+  require_relative "berkshelf/version"
+  require_relative "berkshelf/errors"
 
   module Mixin
-    autoload :Git,     'berkshelf/mixin/git'
-    autoload :Logging, 'berkshelf/mixin/logging'
+    autoload :Git,     "berkshelf/mixin/git"
+    autoload :Logging, "berkshelf/mixin/logging"
   end
 
-  autoload :FileSyncer, 'berkshelf/file_syncer'
-  autoload :Shell,      'berkshelf/shell'
-  autoload :Uploader,   'berkshelf/uploader'
-  autoload :Visualizer, 'berkshelf/visualizer'
+  autoload :FileSyncer, "berkshelf/file_syncer"
+  autoload :Shell,      "berkshelf/shell"
+  autoload :Uploader,   "berkshelf/uploader"
+  autoload :Visualizer, "berkshelf/visualizer"
 
-  autoload :BaseFormatter,  'berkshelf/formatters/base'
-  autoload :HumanFormatter, 'berkshelf/formatters/human'
-  autoload :JsonFormatter,  'berkshelf/formatters/json'
-  autoload :NullFormatter,  'berkshelf/formatters/null'
+  autoload :BaseFormatter,  "berkshelf/formatters/base"
+  autoload :HumanFormatter, "berkshelf/formatters/human"
+  autoload :JsonFormatter,  "berkshelf/formatters/json"
+  autoload :NullFormatter,  "berkshelf/formatters/null"
 
-  autoload :Location,       'berkshelf/location'
-  autoload :BaseLocation,   'berkshelf/locations/base'
-  autoload :GitLocation,    'berkshelf/locations/git'
-  autoload :GithubLocation, 'berkshelf/locations/github'
-  autoload :PathLocation,   'berkshelf/locations/path'
+  autoload :Location,       "berkshelf/location"
+  autoload :BaseLocation,   "berkshelf/locations/base"
+  autoload :GitLocation,    "berkshelf/locations/git"
+  autoload :GithubLocation, "berkshelf/locations/github"
+  autoload :PathLocation,   "berkshelf/locations/path"
 
-  DEFAULT_FILENAME = 'Berksfile'.freeze
+  DEFAULT_FILENAME = "Berksfile".freeze
 
   class << self
     include Mixin::Logging
@@ -53,7 +53,7 @@ module Berkshelf
 
     # @return [Pathname]
     def root
-      @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
+      @root ||= Pathname.new(File.expand_path("../", File.dirname(__FILE__)))
     end
 
     # @return [Berkshelf::Shell]
@@ -69,7 +69,7 @@ module Berkshelf
     #
     # @return [String]
     def berkshelf_path
-      @berkshelf_path ||= File.expand_path(ENV['BERKSHELF_PATH'] || '~/.berkshelf')
+      @berkshelf_path ||= File.expand_path(ENV["BERKSHELF_PATH"] || "~/.berkshelf")
     end
 
     # The Berkshelf configuration.
@@ -88,7 +88,7 @@ module Berkshelf
     #
     # @return [Ridley::Chef::Config]
     def chef_config
-      @chef_config ||= Ridley::Chef::Config.new(ENV['BERKSHELF_CHEF_CONFIG'])
+      @chef_config ||= Ridley::Chef::Config.new(ENV["BERKSHELF_CHEF_CONFIG"])
     end
 
     # @param [Ridley::Chef::Config]
@@ -139,15 +139,15 @@ module Berkshelf
       ridley_options[:ssl]         = ssl_options
 
       unless ridley_options[:server_url].present?
-        raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.server_url'
+        raise ChefConnectionError, "Missing required attribute in your Berkshelf configuration: chef.server_url"
       end
 
       unless ridley_options[:client_name].present?
-        raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.node_name'
+        raise ChefConnectionError, "Missing required attribute in your Berkshelf configuration: chef.node_name"
       end
 
       unless ridley_options[:client_key].present?
-        raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.client_key'
+        raise ChefConnectionError, "Missing required attribute in your Berkshelf configuration: chef.client_key"
       end
 
       # @todo  Something scary going on here - getting an instance of Kitchen::Logger from test-kitchen
@@ -179,8 +179,8 @@ module Berkshelf
     def which(executable)
       if File.file?(executable) && File.executable?(executable)
         executable
-      elsif ENV['PATH']
-        path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |p|
+      elsif ENV["PATH"]
+        path = ENV["PATH"].split(File::PATH_SEPARATOR).find do |p|
           File.executable?(File.join(p, executable))
         end
         path && File.expand_path(executable, path)
@@ -189,36 +189,36 @@ module Berkshelf
 
     private
 
-      def null_stream
-        @null ||= begin
-          strm = STDOUT.clone
-          strm.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
-          strm.sync = true
-          strm
-        end
+    def null_stream
+      @null ||= begin
+        strm = STDOUT.clone
+        strm.reopen(RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ ? "NUL:" : "/dev/null")
+        strm.sync = true
+        strm
       end
+    end
   end
 end
 
-require_relative 'berkshelf/lockfile'
-require_relative 'berkshelf/base_generator'
-require_relative 'berkshelf/berksfile'
-require_relative 'berkshelf/cached_cookbook'
-require_relative 'berkshelf/cli'
-require_relative 'berkshelf/community_rest'
-require_relative 'berkshelf/cookbook_generator'
-require_relative 'berkshelf/cookbook_store'
-require_relative 'berkshelf/config'
-require_relative 'berkshelf/dependency'
-require_relative 'berkshelf/downloader'
-require_relative 'berkshelf/init_generator'
-require_relative 'berkshelf/installer'
-require_relative 'berkshelf/logger'
-require_relative 'berkshelf/resolver'
-require_relative 'berkshelf/source'
-require_relative 'berkshelf/source_uri'
-require_relative 'berkshelf/validator'
-require_relative 'berkshelf/ssl_policies'
+require_relative "berkshelf/lockfile"
+require_relative "berkshelf/base_generator"
+require_relative "berkshelf/berksfile"
+require_relative "berkshelf/cached_cookbook"
+require_relative "berkshelf/cli"
+require_relative "berkshelf/community_rest"
+require_relative "berkshelf/cookbook_generator"
+require_relative "berkshelf/cookbook_store"
+require_relative "berkshelf/config"
+require_relative "berkshelf/dependency"
+require_relative "berkshelf/downloader"
+require_relative "berkshelf/init_generator"
+require_relative "berkshelf/installer"
+require_relative "berkshelf/logger"
+require_relative "berkshelf/resolver"
+require_relative "berkshelf/source"
+require_relative "berkshelf/source_uri"
+require_relative "berkshelf/validator"
+require_relative "berkshelf/ssl_policies"
 
 Ridley.logger          = Berkshelf.logger
 Berkshelf.logger.level = Logger::WARN

data/lib/berkshelf/base_generator.rb

@@ -1,10 +1,10 @@
-require 'thor/group'
+require "thor/group"
 
 module Berkshelf
   class BaseGenerator < Thor::Group
     class << self
       def source_root
-        Berkshelf.root.join('generator_files')
+        Berkshelf.root.join("generator_files")
       end
     end
 
@@ -12,12 +12,11 @@ module Berkshelf
     # this generator.
     #
     # @return [Array<String>]
-    PATTERNS = [
-      "environment",
-      "application",
-      "library",
-      "wrapper"
-    ].freeze
+    PATTERNS = %w{
+environment
+application
+library
+wrapper}.freeze
 
     shell = Berkshelf.ui
 
@@ -36,8 +35,8 @@ module Berkshelf
 
     private
 
-      def target
-        @target ||= Pathname.new(File.expand_path(path))
-      end
+    def target
+      @target ||= Pathname.new(File.expand_path(path))
+    end
   end
 end

data/lib/berkshelf/berksfile.rb

@@ -31,7 +31,7 @@ module Berkshelf
 
     # Don't vendor VCS files.
     # Reference GNU tar --exclude-vcs: https://www.gnu.org/software/tar/manual/html_section/tar_49.html
-    EXCLUDED_VCS_FILES_WHEN_VENDORING = ['.arch-ids', '{arch}', '.bzr', '.bzrignore', '.bzrtags', 'CVS', '.cvsignore', '_darcs', '.git', '.hg', '.hgignore', '.hgrags', 'RCS', 'SCCS', '.svn', '**/.git'].freeze
+    EXCLUDED_VCS_FILES_WHEN_VENDORING = [".arch-ids", "{arch}", ".bzr", ".bzrignore", ".bzrtags", "CVS", ".cvsignore", "_darcs", ".git", ".hg", ".hgignore", ".hgrags", "RCS", "SCCS", ".svn", "**/.git"].freeze
 
     include Mixin::Logging
     include Cleanroom
@@ -71,7 +71,7 @@ module Berkshelf
       @preferred_solver = :gecode
 
       if options[:except] && options[:only]
-        raise ArgumentError, 'Cannot specify both :except and :only!'
+        raise ArgumentError, "Cannot specify both :except and :only!"
       elsif options[:except]
         except = Array(options[:except]).collect(&:to_sym)
         @filter = ->(dependency) { (except & dependency.groups).empty? }
@@ -173,7 +173,7 @@ module Berkshelf
     #   path to the metadata file
     def metadata(options = {})
       path          = options[:path] || File.dirname(filepath)
-      metadata_path = File.expand_path(File.join(path, 'metadata.rb'))
+      metadata_path = File.expand_path(File.join(path, "metadata.rb"))
       metadata      = Ridley::Chef::Cookbook::Metadata.from_file(metadata_path)
 
       add_dependency(metadata.name, nil, path: path, metadata: true)
@@ -306,7 +306,7 @@ module Berkshelf
       end
 
       if options[:path]
-        metadata_file = File.join(options[:path], 'metadata.rb')
+        metadata_file = File.join(options[:path], "metadata.rb")
       end
 
       options[:constraint] = constraint
@@ -512,15 +512,15 @@ module Berkshelf
 
           latest = cookbooks.select do |cookbook|
             dependency.version_constraint.satisfies?(cookbook.version) &&
-            Semverse::Version.coerce(cookbook.version) > dependency.locked_version
+              Semverse::Version.coerce(cookbook.version) > dependency.locked_version
           end.sort_by { |cookbook| cookbook.version }.last
 
           unless latest.nil?
             hash[name] ||= {
-              'local' => dependency.locked_version,
-              'remote' => {
-                source => Semverse::Version.coerce(latest.version)
-              }
+              "local" => dependency.locked_version,
+              "remote" => {
+                source => Semverse::Version.coerce(latest.version),
+              },
             }
           end
         end
@@ -609,7 +609,7 @@ module Berkshelf
       packager.validate!
 
       outdir = Dir.mktmpdir do |temp_dir|
-        Berkshelf.ui.mute { vendor(File.join(temp_dir, 'cookbooks')) }
+        Berkshelf.ui.mute { vendor(File.join(temp_dir, "cookbooks")) }
         packager.run(temp_dir)
       end
 
@@ -626,7 +626,7 @@ module Berkshelf
     # @return [String, nil]
     #   the expanded path cookbooks were vendored to or nil if nothing was vendored
     def vendor(destination)
-      Dir.mktmpdir('vendor') do |scratch|
+      Dir.mktmpdir("vendor") do |scratch|
         chefignore       = nil
         cached_cookbooks = install
         raw_metadata_files = []
@@ -639,8 +639,8 @@ module Berkshelf
           FileUtils.mkdir_p(cookbook_destination)
 
           # Dir.glob does not support backslash as a File separator
-          src   = cookbook.path.to_s.gsub('\\', '/')
-          files = FileSyncer.glob(File.join(src, '*'))
+          src   = cookbook.path.to_s.tr('\\', "/")
+          files = FileSyncer.glob(File.join(src, "*"))
 
           chefignore = Ridley::Chef::Chefignore.new(cookbook.path.to_s) rescue nil
           chefignore.apply!(files) if chefignore
@@ -649,7 +649,7 @@ module Berkshelf
             cookbook.compile_metadata(cookbook_destination)
           end
 
-          raw_metadata_files << File::join(cookbook.cookbook_name, 'metadata.rb')
+          raw_metadata_files << File.join(cookbook.cookbook_name, "metadata.rb")
 
           FileUtils.cp_r(files, cookbook_destination)
         end
@@ -694,17 +694,17 @@ module Berkshelf
     #
     # @return [String] path
     #   the path where the image was written
-    def viz(outfile = nil, format = 'png')
-      outfile = File.join(Dir.pwd, outfile || 'graph.png')
+    def viz(outfile = nil, format = "png")
+      outfile = File.join(Dir.pwd, outfile || "graph.png")
 
       validate_lockfile_present!
       validate_lockfile_trusted!
       vizualiser = Visualizer.from_lockfile(lockfile)
 
       case format
-      when 'dot'
+      when "dot"
         vizualiser.to_dot_file(outfile)
-      when 'png'
+      when "png"
         vizualiser.to_png(outfile)
       else
         raise ConfigurationError, "Vizualiser format #{format} not recognised."
@@ -730,10 +730,10 @@ module Berkshelf
       #   if the lockfile does not exist on disk
       #
       # @return [true]
-      def validate_lockfile_present!
-        raise LockfileNotFound unless lockfile.present?
-        true
-      end
+    def validate_lockfile_present!
+      raise LockfileNotFound unless lockfile.present?
+      true
+    end
 
       # Ensure that all dependencies defined in the Berksfile exist in this
       # lockfile.
@@ -743,10 +743,10 @@ module Berkshelf
       #   exist (or are not satisifed by) the lockfile
       #
       # @return [true]
-      def validate_lockfile_trusted!
-        raise LockfileOutOfSync unless lockfile.trusted?
-        true
-      end
+    def validate_lockfile_trusted!
+      raise LockfileOutOfSync unless lockfile.trusted?
+      true
+    end
 
       # Ensure that all dependencies in the lockfile are installed on this
       # system. You should validate that the lockfile can be trusted before
@@ -757,16 +757,16 @@ module Berkshelf
       #   this system
       #
       # @return [true]
-      def validate_dependencies_installed!
-        lockfile.graph.locks.each do |_, dependency|
-          unless dependency.installed?
-            raise DependencyNotInstalled.new(dependency)
-          end
+    def validate_dependencies_installed!
+      lockfile.graph.locks.each do |_, dependency|
+        unless dependency.installed?
+          raise DependencyNotInstalled.new(dependency)
         end
-
-        true
       end
 
+      true
+    end
+
       # Determine if any cookbooks were specified that aren't in our shelf.
       #
       # @param [Array<String>] names
@@ -774,12 +774,12 @@ module Berkshelf
       #
       # @raise [DependencyNotFound]
       #   if a cookbook name is given that does not exist
-      def validate_cookbook_names!(names)
-        missing = names - lockfile.graph.locks.keys
+    def validate_cookbook_names!(names)
+      missing = names - lockfile.graph.locks.keys
 
-        unless missing.empty?
-          raise DependencyNotFound.new(missing)
-        end
+      unless missing.empty?
+        raise DependencyNotFound.new(missing)
       end
+    end
   end
 end