berkshelf 5.5.0 → 5.6.0

data/lib/berkshelf/cookbook_store.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 module Berkshelf
   class CookbookStore
@@ -7,7 +7,7 @@ module Berkshelf
       #
       # @return [String]
       def default_path
-        File.join(Berkshelf.berkshelf_path, 'cookbooks')
+        File.join(Berkshelf.berkshelf_path, "cookbooks")
       end
 
       # @return [Berkshelf::CookbookStore]
@@ -48,7 +48,7 @@ module Berkshelf
 
     # Destroy the contents of the initialized storage path.
     def clean!
-      FileUtils.rm_rf(Dir.glob(File.join(storage_path, '*')))
+      FileUtils.rm_rf(Dir.glob(File.join(storage_path, "*")))
     end
 
     # Import a cookbook found on the local filesystem into this instance of the cookbook store.
@@ -162,7 +162,7 @@ module Berkshelf
       graph = Solve::Graph.new
       cookbooks(name).each { |cookbook| graph.artifact(name, cookbook.version) }
 
-      name, version = Solve.it!(graph, [[name, constraint]], ENV['DEBUG_RESOLVER'] ? { ui: Berkshelf.ui } : {}).first
+      name, version = Solve.it!(graph, [[name, constraint]], ENV["DEBUG_RESOLVER"] ? { ui: Berkshelf.ui } : {}).first
 
       cookbook(name, version)
     rescue Solve::Errors::NoSolutionError

data/lib/berkshelf/core_ext/file_utils.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 module FileUtils
   class << self

data/lib/berkshelf/dependency.rb

@@ -122,23 +122,24 @@ module Berkshelf
     def cached_cookbook
       return @cached_cookbook if @cached_cookbook
 
-      @cached_cookbook = if location
-        cookbook = location.cached_cookbook
+      @cached_cookbook =
+        if location
+          cookbook = location.cached_cookbook
 
-        # If we have a cached cookbook, tighten our constraints
-        if cookbook
-          self.locked_version     = cookbook.version
-          self.version_constraint = cookbook.version
-        end
+          # If we have a cached cookbook, tighten our constraints
+          if cookbook
+            self.locked_version     = cookbook.version
+            self.version_constraint = cookbook.version
+          end
 
-        cookbook
-      else
-        if locked_version
-          CookbookStore.instance.cookbook(name, locked_version)
+          cookbook
         else
-          CookbookStore.instance.satisfy(name, version_constraint)
+          if locked_version
+            CookbookStore.instance.cookbook(name, locked_version)
+          else
+            CookbookStore.instance.satisfy(name, version_constraint)
+          end
         end
-      end
 
       @cached_cookbook
     end
@@ -175,20 +176,21 @@ module Berkshelf
     end
 
     def inspect
-      '#<Berkshelf::Dependency: ' << [
+      "#<Berkshelf::Dependency: " << [
         "#{name} (#{version_constraint})",
         "locked_version: #{locked_version.inspect}",
         "groups: #{groups}",
-        "location: #{location || 'default'}>"
-      ].join(', ')
+        "location: #{location || 'default'}>",
+      ].join(", ")
     end
 
     def to_lock
-      out = if location || version_constraint.to_s == '>= 0.0.0'
-        "  #{name}\n"
-      else
-        "  #{name} (#{version_constraint})\n"
-      end
+      out =
+        if location || version_constraint.to_s == ">= 0.0.0"
+          "  #{name}\n"
+        else
+          "  #{name} (#{version_constraint})\n"
+        end
 
       out << location.to_lock if location
       out

data/lib/berkshelf/downloader.rb

@@ -1,6 +1,6 @@
-require 'net/http'
-require 'mixlib/archive'
-require 'berkshelf/ssl_policies'
+require "net/http"
+require "mixlib/archive"
+require "berkshelf/ssl_policies"
 
 module Berkshelf
   class Downloader
@@ -48,7 +48,7 @@ module Berkshelf
         end
       end
 
-      raise CookbookNotFound.new(dependency, version, 'in any of the sources')
+      raise CookbookNotFound.new(dependency, version, "in any of the sources")
     end
 
     # @param [Berkshelf::Source] source
@@ -66,21 +66,21 @@ module Berkshelf
         CommunityREST.new(remote_cookbook.location_path).download(name, version)
       when :chef_server
         # @todo Dynamically get credentials for remote_cookbook.location_path
-        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
 
         credentials = {
           server_url: remote_cookbook.location_path,
           client_name: Berkshelf::Config.instance.chef.node_name,
           client_key: Berkshelf::Config.instance.chef.client_key,
-          ssl: ssl_options
+          ssl: ssl_options,
         }
         # @todo  Something scary going on here - getting an instance of Kitchen::Logger from test-kitchen
         # https://github.com/opscode/test-kitchen/blob/master/lib/kitchen.rb#L99
         Celluloid.logger = nil unless ENV["DEBUG_CELLULOID"]
         Ridley.open(credentials) { |r| r.cookbook.download(name, version) }
       when :github
-        require 'octokit'
+        require "octokit"
 
         tmp_dir      = Dir.mktmpdir
         archive_path = File.join(tmp_dir, "#{name}-#{version}.tar.gz")
@@ -89,16 +89,16 @@ module Berkshelf
         # Find the correct github connection options for this specific cookbook.
         cookbook_uri = URI.parse(remote_cookbook.location_path)
         if cookbook_uri.host == "github.com"
-          options = Berkshelf::Config.instance.github.detect { |opts| opts["web_endpoint"] == nil }
-          options = {} if options == nil
+          options = Berkshelf::Config.instance.github.detect { |opts| opts["web_endpoint"].nil? }
+          options = {} if options.nil?
         else
           options = Berkshelf::Config.instance.github.detect { |opts| opts["web_endpoint"] == "#{cookbook_uri.scheme}://#{cookbook_uri.host}" }
-          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options == nil
+          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options.nil?
         end
 
         github_client = Octokit::Client.new(access_token: options[:access_token],
-          api_endpoint: options[:api_endpoint], web_endpoint: options[:web_endpoint],
-          connection_options: {ssl: {verify: options[:ssl_verify].nil? ? true : options[:ssl_verify]}})
+                                            api_endpoint: options[:api_endpoint], web_endpoint: options[:web_endpoint],
+                                            connection_options: { ssl: { verify: options[:ssl_verify].nil? ? true : options[:ssl_verify] } })
 
         begin
           url = URI(github_client.archive_link(cookbook_uri.path.gsub(/^\//, ""), ref: "v#{version}"))
@@ -119,20 +119,20 @@ module Berkshelf
         # we need to figure out where the cookbook is located in the archive. This is because the directory name
         # pattern is not cosistant between private and public github repositories
         cookbook_directory = Dir.entries(unpack_dir).select do |f|
-          (! f.start_with?('.')) && (Pathname.new(File.join(unpack_dir, f)).cookbook?)
+          (! f.start_with?(".")) && (Pathname.new(File.join(unpack_dir, f)).cookbook?)
         end[0]
 
         File.join(unpack_dir, cookbook_directory)
       when :uri
-        require 'open-uri'
+        require "open-uri"
 
         tmp_dir      = Dir.mktmpdir
         archive_path = Pathname.new(tmp_dir) + "#{name}-#{version}.tar.gz"
         unpack_dir   = Pathname.new(tmp_dir) + "#{name}-#{version}"
 
         url = remote_cookbook.location_path
-        open(url, 'rb') do |remote_file|
-          archive_path.open('wb') { |local_file| local_file.write remote_file.read }
+        open(url, "rb") do |remote_file|
+          archive_path.open("wb") { |local_file| local_file.write remote_file.read }
         end
 
         Mixlib::Archive.new(archive_path).extract(unpack_dir)
@@ -140,7 +140,7 @@ module Berkshelf
         # The top level directory is inconsistant. So we unpack it and
         # use the only directory created in the unpack_dir.
         cookbook_directory = unpack_dir.entries.select do |filename|
-          (! filename.to_s.start_with?('.')) && (unpack_dir + filename).cookbook?
+          (! filename.to_s.start_with?(".")) && (unpack_dir + filename).cookbook?
         end.first
 
         (unpack_dir + cookbook_directory).to_s
@@ -153,26 +153,25 @@ module Berkshelf
         cookbook_uri = URI.parse(remote_cookbook.location_path)
         if cookbook_uri.host
           options = Berkshelf::Config.instance.gitlab.detect { |opts| opts["web_endpoint"] == "#{cookbook_uri.scheme}://#{cookbook_uri.host}" }
-          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options == nil
+          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options.nil?
         end
 
         connection ||= Faraday.new(url: options[:web_endpoint]) do |faraday|
-          faraday.headers[:accept] = 'application/x-tar'
+          faraday.headers[:accept] = "application/x-tar"
           faraday.response :logger, @logger unless @logger.nil?
-          faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+          faraday.adapter  Faraday.default_adapter # make requests with Net::HTTP
         end
 
-        resp = connection.get(cookbook_uri.request_uri + '&private_token=' + options[:private_token])
+        resp = connection.get(cookbook_uri.request_uri + "&private_token=" + options[:private_token])
         return nil unless resp.status == 200
         open(archive_path, "wb") { |file| file.write(resp.body) }
 
-        tgz = Zlib::GzipReader.new(File.open(archive_path, "rb"))
-        Archive::Tar::Minitar.unpack(tgz, unpack_dir)
+        Mixlib::Archive.new(archive_path).extract(unpack_dir)
 
         # The top level directory is inconsistant. So we unpack it and
         # use the only directory created in the unpack_dir.
         cookbook_directory = unpack_dir.entries.select do |filename|
-          (! filename.to_s.start_with?('.')) && (unpack_dir + filename).cookbook?
+          (! filename.to_s.start_with?(".")) && (unpack_dir + filename).cookbook?
         end.first
 
         (unpack_dir + cookbook_directory).to_s
@@ -181,7 +180,7 @@ module Berkshelf
         FileUtils.cp_r(remote_cookbook.location_path, tmp_dir)
         File.join(tmp_dir, name)
       else
-        raise RuntimeError, "unknown location type #{remote_cookbook.location_type}"
+        raise "unknown location type #{remote_cookbook.location_type}"
       end
     rescue CookbookNotFound
       nil

data/lib/berkshelf/errors.rb

@@ -61,7 +61,7 @@ module Berkshelf
     end
 
     def to_s
-      out  = "Your Berksfile contains multiple entries named "
+      out = "Your Berksfile contains multiple entries named "
       out << "'#{@name}'. Please remove duplicate dependencies, or put them in "
       out << "different groups."
       out
@@ -83,7 +83,7 @@ module Berkshelf
 
     def to_s
       @original_exception.to_s +
-      "Unable to find a solution for demands: #{demands.join(', ')}"
+        "Unable to find a solution for demands: #{demands.join(', ')}"
     end
 
     alias_method :message, :to_s
@@ -285,11 +285,11 @@ module Berkshelf
 
     def to_s
       "Berkshelf could not find compatible versions for cookbook '#{@dependency.name}':\n" +
-      "  In Berksfile:\n" +
-      "    #{@dependency.name} (#{@dependency.version_constraint})\n\n" +
-      "  In Berksfile.lock:\n" +
-      "    #{@locked.name} (#{@locked.version})\n\n" +
-      "Try running `berks update #{@dependency.name}`, which will try to find '#{@dependency.name}' matching " +
+        "  In Berksfile:\n" +
+        "    #{@dependency.name} (#{@dependency.version_constraint})\n\n" +
+        "  In Berksfile.lock:\n" +
+        "    #{@locked.name} (#{@locked.version})\n\n" +
+        "Try running `berks update #{@dependency.name}`, which will try to find '#{@dependency.name}' matching " +
         "'#{@dependency.version_constraint}'."
     end
 
@@ -314,7 +314,7 @@ module Berkshelf
     set_status_code(130)
 
     def to_s
-      'There was an error connecting to the Chef Server'
+      "There was an error connecting to the Chef Server"
     end
   end
 
@@ -372,7 +372,7 @@ module Berkshelf
 
     def to_s
       "Unknown license: '#{license}'\n" +
-      "Available licenses: #{CookbookGenerator::LICENSES.join(', ')}"
+        "Available licenses: #{CookbookGenerator::LICENSES.join(', ')}"
     end
 
     alias_method :message, :to_s
@@ -440,7 +440,7 @@ module Berkshelf
     set_status_code(140)
 
     def to_s
-      'Lockfile not found! Run `berks install` to create the lockfile.'
+      "Lockfile not found! Run `berks install` to create the lockfile."
     end
   end
 
@@ -467,7 +467,7 @@ module Berkshelf
     set_status_code(144)
 
     def to_s
-      'The lockfile is out of sync! Run `berks install` to sync the lockfile.'
+      "The lockfile is out of sync! Run `berks install` to sync the lockfile."
     end
   end
 
@@ -544,7 +544,7 @@ module Berkshelf
     def intialize(environment_file)
       @environment_file = environment_file
     end
-  
+
     def to_s
       "Could not find environment file #{@environment_file}"
     end
@@ -556,11 +556,11 @@ module Berkshelf
 
   class GitNotInstalled < GitError
     def initialize
-      super 'You need to install Git before you can download ' \
-        'cookbooks from git repositories. For more information, please ' \
-        'see the Git docs: http://git-scm.org. If you have git installed, ' \
-        'please make sure it is in your $PATH and accessible by the user ' \
-        'running this command.'
+      super "You need to install Git before you can download " \
+        "cookbooks from git repositories. For more information, please " \
+        "see the Git docs: http://git-scm.org. If you have git installed, " \
+        "please make sure it is in your $PATH and accessible by the user " \
+        "running this command."
     end
   end
 

data/lib/berkshelf/file_syncer.rb

@@ -1,11 +1,11 @@
-require 'fileutils'
+require "fileutils"
 
 module Berkshelf
   module FileSyncer
     extend self
 
     # Files to be ignored during a directory globbing
-    IGNORED_FILES = %w(. ..).freeze
+    IGNORED_FILES = %w{. ..}.freeze
 
     #
     # Glob across the given pattern, accounting for dotfiles, removing Ruby's
@@ -62,8 +62,8 @@ module Berkshelf
       # user directory: C:/Users/MATTWR~1/AppData/Local/Temp
       # so that it matches the parent of source_files
       source = glob(source).first
-      
-      source_files = glob(File.join(source, '**/*'))
+
+      source_files = glob(File.join(source, "**/*"))
       source_files = source_files.reject do |source_file|
         basename = relative_path_for(source_file, source)
         excludes.any? { |exclude| File.fnmatch?(exclude, basename, File::FNM_DOTMATCH) }
@@ -94,7 +94,7 @@ module Berkshelf
           FileUtils.cp(source_file, "#{destination}/#{relative_path}")
         else
           type = File.ftype(source_file)
-          raise RuntimeError, "Unknown file type: `#{type}' at " \
+          raise "Unknown file type: `#{type}' at " \
             "`#{source_file}'. Failed to sync `#{source_file}' to " \
             "`#{destination}/#{relative_path}'!"
         end
@@ -125,6 +125,7 @@ module Berkshelf
     end
 
     private
+
       #
       # The relative path of the given +path+ to the +parent+.
       #
@@ -135,8 +136,8 @@ module Berkshelf
       #
       # @return [String]
       #
-      def relative_path_for(path, parent)
-        Pathname.new(path).relative_path_from(Pathname.new(parent)).to_s
-      end
+    def relative_path_for(path, parent)
+      Pathname.new(path).relative_path_from(Pathname.new(parent)).to_s
+    end
   end
 end

data/lib/berkshelf/formatters/human.rb

@@ -60,12 +60,12 @@ module Berkshelf
     #   { 'cookbook' => { 'supermarket.chef.io' => #<Cookbook> } }
     def outdated(hash)
       if hash.empty?
-        Berkshelf.ui.info('All cookbooks up to date!')
+        Berkshelf.ui.info("All cookbooks up to date!")
       else
-        Berkshelf.ui.info('The following cookbooks have newer versions:')
+        Berkshelf.ui.info("The following cookbooks have newer versions:")
 
         hash.each do |name, info|
-          info['remote'].each do |remote_source, remote_version|
+          info["remote"].each do |remote_source, remote_version|
             out = "  * #{name} (#{info['local']} => #{remote_version})"
 
             unless remote_source.default?

data/lib/berkshelf/formatters/json.rb

@@ -92,11 +92,11 @@ module Berkshelf
     #   { 'cookbook' => { 'supermarket.chef.io' => #<Cookbook> } }
     def outdated(hash)
       hash.each do |name, info|
-        info['remote'].each do |remote_source, remote_version|
+        info["remote"].each do |remote_source, remote_version|
           source = remote_source.uri.to_s
 
           cookbooks[name] ||= {}
-          cookbooks[name][:local] = info['local'].to_s
+          cookbooks[name][:local] = info["local"].to_s
           cookbooks[name][:remote] ||= {}
           cookbooks[name][:remote][source] = remote_version.to_s
         end

data/lib/berkshelf/init_generator.rb

@@ -1,5 +1,5 @@
 begin
-  require 'kitchen/generator/init'
+  require "kitchen/generator/init"
 rescue LoadError; end
 
 module Berkshelf
@@ -24,17 +24,17 @@ module Berkshelf
     class_option :skip_vagrant,
       type: :boolean,
       default: false,
-      desc: 'Skips adding a Vagrantfile and adding supporting gems to the Gemfile'
+      desc: "Skips adding a Vagrantfile and adding supporting gems to the Gemfile"
 
     class_option :skip_git,
       type: :boolean,
       default: false,
-      desc: 'Skips adding a .gitignore and running git init in the cookbook directory'
+      desc: "Skips adding a .gitignore and running git init in the cookbook directory"
 
     class_option :foodcritic,
       type: :boolean,
       default: false,
-      desc: 'Creates a Thorfile with Foodcritic support to lint test your cookbook'
+      desc: "Creates a Thorfile with Foodcritic support to lint test your cookbook"
 
     class_option :chef_minitest,
       type: :boolean,
@@ -43,12 +43,12 @@ module Berkshelf
     class_option :scmversion,
       type: :boolean,
       default: false,
-      desc: 'Creates a Thorfile with SCMVersion support to manage versions for continuous integration'
+      desc: "Creates a Thorfile with SCMVersion support to manage versions for continuous integration"
 
     class_option :no_bundler,
       type: :boolean,
       default: false,
-      desc: 'Skips generation of a Gemfile and other Bundler specific support'
+      desc: "Skips generation of a Gemfile and other Bundler specific support"
 
     class_option :cookbook_name,
       type: :string
@@ -57,7 +57,7 @@ module Berkshelf
       class_option :skip_test_kitchen,
         type: :boolean,
         default: false,
-        desc: 'Skip adding a testing environment to your cookbook'
+        desc: "Skip adding a testing environment to your cookbook"
     end
 
     def generate
@@ -65,35 +65,35 @@ module Berkshelf
       validate_configuration
       check_option_support
 
-      template 'Berksfile.erb', target.join('Berksfile')
-      template 'Thorfile.erb', target.join('Thorfile')
+      template "Berksfile.erb", target.join("Berksfile")
+      template "Thorfile.erb", target.join("Thorfile")
 
       if options[:chefignore]
-        copy_file 'chefignore', target.join(Ridley::Chef::Chefignore::FILENAME)
+        copy_file "chefignore", target.join(Ridley::Chef::Chefignore::FILENAME)
       end
 
       unless options[:skip_git]
-        template 'gitignore.erb', target.join('.gitignore')
+        template "gitignore.erb", target.join(".gitignore")
 
-        unless File.exists?(target.join('.git'))
+        unless File.exists?(target.join(".git"))
           inside target do
-            git 'init'
+            git "init"
           end
         end
       end
 
       if options[:chef_minitest]
-        empty_directory target.join('files/default/tests/minitest/support')
-        template 'default_test.rb.erb', target.join('files/default/tests/minitest/default_test.rb')
-        template 'helpers.rb.erb', target.join('files/default/tests/minitest/support/helpers.rb')
+        empty_directory target.join("files/default/tests/minitest/support")
+        template "default_test.rb.erb", target.join("files/default/tests/minitest/default_test.rb")
+        template "helpers.rb.erb", target.join("files/default/tests/minitest/support/helpers.rb")
       end
 
       if options[:scmversion]
-        create_file target.join('VERSION'), '0.1.0'
+        create_file target.join("VERSION"), "0.1.0"
       end
 
       unless options[:no_bundler]
-        template 'Gemfile.erb', target.join('Gemfile')
+        template "Gemfile.erb", target.join("Gemfile")
       end
 
       if defined?(Kitchen::Generator::Init)
@@ -103,28 +103,28 @@ module Berkshelf
       end
 
       unless options[:skip_vagrant]
-        template 'Vagrantfile.erb', target.join('Vagrantfile')
+        template "Vagrantfile.erb", target.join("Vagrantfile")
       end
     end
 
     private
 
-      def berkshelf_config
-        Berkshelf.config
-      end
+    def berkshelf_config
+      Berkshelf.config
+    end
 
       # Read the cookbook name from the metadata.rb
       #
       # @return [String]
       #   name of the cookbook
-      def cookbook_name
-        @cookbook_name ||= begin
-          metadata = Ridley::Chef::Cookbook::Metadata.from_file(target.join('metadata.rb').to_s)
-          metadata.name.empty? ? File.basename(target) : metadata.name
-        rescue CookbookNotFound, IOError
-          File.basename(target)
-        end
+    def cookbook_name
+      @cookbook_name ||= begin
+        metadata = Ridley::Chef::Cookbook::Metadata.from_file(target.join("metadata.rb").to_s)
+        metadata.name.empty? ? File.basename(target) : metadata.name
+      rescue CookbookNotFound, IOError
+        File.basename(target)
       end
+    end
 
       # Assert the current working directory is a cookbook
       #
@@ -132,64 +132,64 @@ module Berkshelf
       #   not a cookbook
       #
       # @return [nil]
-      def validate_cookbook
-        path = File.expand_path(File.join(target, 'metadata.rb'))
-        unless File.exists?(path)
-          raise Berkshelf::NotACookbook.new(path)
-        end
+    def validate_cookbook
+      path = File.expand_path(File.join(target, "metadata.rb"))
+      unless File.exists?(path)
+        raise Berkshelf::NotACookbook.new(path)
       end
+    end
 
       # Assert valid configuration
       #
       # @raise [InvalidConfiguration] if the configuration is invalid
       #
       # @return [nil]
-      def validate_configuration
-        unless Berkshelf.config.valid?
-          raise InvalidConfiguration.new(Berkshelf.config.errors)
-        end
+    def validate_configuration
+      unless Berkshelf.config.valid?
+        raise InvalidConfiguration.new(Berkshelf.config.errors)
       end
+    end
 
       # Check for supporting gems for provided options
       #
       # @return [Boolean]
-      def check_option_support
-        assert_option_supported(:foodcritic) &&
-        assert_option_supported(:scmversion, 'thor-scmversion') &&
-        assert_default_supported(:no_bundler, 'bundler')
-      end
+    def check_option_support
+      assert_option_supported(:foodcritic) &&
+        assert_option_supported(:scmversion, "thor-scmversion") &&
+        assert_default_supported(:no_bundler, "bundler")
+    end
 
       # Warn if the supporting gem for an option is not installed
       #
       # @return [Boolean]
-      def assert_option_supported(option, gem_name = option.to_s)
-        if options[option]
-          begin
-            Gem::Specification.find_by_name(gem_name)
-          rescue Gem::LoadError
-            Berkshelf.ui.warn "This cookbook was generated with --#{option}, however, #{gem_name} is not installed."
-            Berkshelf.ui.warn "To make use of --#{option}: gem install #{gem_name}"
-            return false
-          end
+    def assert_option_supported(option, gem_name = option.to_s)
+      if options[option]
+        begin
+          Gem::Specification.find_by_name(gem_name)
+        rescue Gem::LoadError
+          Berkshelf.ui.warn "This cookbook was generated with --#{option}, however, #{gem_name} is not installed."
+          Berkshelf.ui.warn "To make use of --#{option}: gem install #{gem_name}"
+          return false
         end
-        true
       end
+      true
+    end
 
       # Warn if the supporting gem for a default is not installed
       #
       # @return [Boolean]
-      def assert_default_supported(option, gem_name = option.to_s)
-        unless options[option]
-          begin
-            Gem::Specification.find_by_name(gem_name)
-          rescue Gem::LoadError
-            Berkshelf.ui.warn "By default, this cookbook was generated to support #{gem_name}, however, #{gem_name} is not installed."
-            Berkshelf.ui.warn "To skip support for #{gem_name}, use --#{option.to_s.gsub('_', '-')}"
-            Berkshelf.ui.warn "To install #{gem_name}: gem install #{gem_name}"
-            return false
-          end
+    def assert_default_supported(option, gem_name = option.to_s)
+      unless options[option]
+        begin
+          Gem::Specification.find_by_name(gem_name)
+        rescue Gem::LoadError
+          Berkshelf.ui.warn "By default, this cookbook was generated to support #{gem_name}, however, #{gem_name} is not installed."
+          Berkshelf.ui.warn "To skip support for #{gem_name}, use --#{option.to_s.tr('_', '-')}"
+          Berkshelf.ui.warn "To install #{gem_name}: gem install #{gem_name}"
+          return false
         end
-        true
       end
+      true
+    end
   end
 end