berkshelf 5.5.0 → 5.6.0

data/lib/berkshelf/commands/shelf.rb

@@ -1,7 +1,7 @@
 module Berkshelf
   # All tasks that operate on the Berkshelf shelf.
   class Shelf < Thor
-    desc 'list', 'List all cookbooks and their versions'
+    desc "list", "List all cookbooks and their versions"
     def list
       cookbooks = store.cookbooks.inject({}) do |hash, cookbook|
         (hash[cookbook.cookbook_name] ||= []).push(cookbook.version)
@@ -9,17 +9,17 @@ module Berkshelf
       end
 
       if cookbooks.empty?
-        Berkshelf.formatter.msg 'There are no cookbooks in the Berkshelf shelf'
+        Berkshelf.formatter.msg "There are no cookbooks in the Berkshelf shelf"
       else
-        Berkshelf.formatter.msg 'Cookbooks in the Berkshelf shelf:'
+        Berkshelf.formatter.msg "Cookbooks in the Berkshelf shelf:"
         cookbooks.sort.each do |cookbook, versions|
           Berkshelf.formatter.msg("  * #{cookbook} (#{versions.sort.join(', ')})")
         end
       end
     end
 
-    method_option :version, aliases: '-v', type: :string, desc: 'Version to show'
-    desc 'show', 'Display information about a cookbook in the Berkshelf shelf'
+    method_option :version, aliases: "-v", type: :string, desc: "Version to show"
+    desc "show", "Display information about a cookbook in the Berkshelf shelf"
     def show(name)
       cookbooks = find(name, options[:version])
 
@@ -35,9 +35,9 @@ module Berkshelf
       end
     end
 
-    method_option :version, aliases: '-v', type: :string,  desc: 'Version to remove'
-    method_option :force,   aliases: '-f', type: :boolean, desc: 'Force removal, even if other cookbooks are contingent', default: false
-    desc 'uninstall', 'Remove a cookbook from the Berkshelf shelf'
+    method_option :version, aliases: "-v", type: :string,  desc: "Version to remove"
+    method_option :force,   aliases: "-f", type: :boolean, desc: "Force removal, even if other cookbooks are contingent", default: false
+    desc "uninstall", "Remove a cookbook from the Berkshelf shelf"
     def uninstall(name)
       cookbooks = find(name, options[:version])
       cookbooks.each { |c| uninstall_cookbook(c, options[:force]) }
@@ -67,14 +67,15 @@ module Berkshelf
       #   the list of cookbooks that match the parameters - this is always an
       #   array!
       def find(name, version = nil)
-        cookbooks = if version
-          [store.cookbook(name, version)].compact
-        else
-          store.cookbooks(name).sort
-        end
+        cookbooks =
+          if version
+            [store.cookbook(name, version)].compact
+          else
+            store.cookbooks(name).sort
+          end
 
         if cookbooks.empty?
-          raise CookbookNotFound.new(name, version, 'in the Berkshelf shelf')
+          raise CookbookNotFound.new(name, version, "in the Berkshelf shelf")
         end
 
         cookbooks
@@ -95,10 +96,10 @@ module Berkshelf
       #   if contingencies exist
       def uninstall_cookbook(cookbook, force = false)
         unless options[:force] || (contingent = contingencies(cookbook)).empty?
-          contingent = contingent.map { |c| "#{c.cookbook_name} (#{c.version})" }.join(', ')
+          contingent = contingent.map { |c| "#{c.cookbook_name} (#{c.version})" }.join(", ")
           confirm = Berkshelf.ui.ask("[#{contingent}] depend on #{cookbook.cookbook_name}.\n\nAre you sure you want to continue? (y/N)")
 
-          exit unless confirm.to_s.upcase[0] == 'Y'
+          exit unless confirm.to_s.upcase[0] == "Y"
         end
 
         FileUtils.rm_rf(cookbook.path)
@@ -120,7 +121,7 @@ module Berkshelf
   end
 
   class Cli < Thor
-    desc 'shelf SUBCOMMAND', 'Interact with the cookbook store'
-    subcommand 'shelf', Berkshelf::Shelf
+    desc "shelf SUBCOMMAND", "Interact with the cookbook store"
+    subcommand "shelf", Berkshelf::Shelf
   end
 end

data/lib/berkshelf/commands/test_command.rb

@@ -1,5 +1,5 @@
 begin
-  require 'kitchen/cli'
+  require "kitchen/cli"
 rescue LoadError; end
 
 module Berkshelf
@@ -8,6 +8,6 @@ module Berkshelf
   end
 
   class Cli < Thor
-    register(Berkshelf::TestCommand, 'test', 'test [COMMAND]', 'Testing tasks for your cookbook', hide: true)
+    register(Berkshelf::TestCommand, "test", "test [COMMAND]", "Testing tasks for your cookbook", hide: true)
   end
 end if defined?(Kitchen::CLI)

data/lib/berkshelf/community_rest.rb

@@ -1,6 +1,6 @@
-require 'open-uri'
-require 'retryable'
-require 'mixlib/archive'
+require "open-uri"
+require "retryable"
+require "mixlib/archive"
 
 module Berkshelf
   class CommunityREST < Faraday::Connection
@@ -25,30 +25,30 @@ module Berkshelf
       #
       # @return [String]
       def uri_escape_version(version)
-        version.to_s.gsub('.', '_')
+        version.to_s.tr(".", "_")
       end
 
       # @param [String] uri
       #
       # @return [String]
       def version_from_uri(uri)
-        File.basename(uri.to_s).gsub('_', '.')
+        File.basename(uri.to_s).tr("_", ".")
       end
 
       private
 
-        def is_gzip_file(path)
-          # You cannot write "\x1F\x8B" because the default encoding of
-          # ruby >= 1.9.3 is UTF-8 and 8B is an invalid in UTF-8.
-          IO.binread(path, 2) == [0x1F, 0x8B].pack("C*")
-        end
+      def is_gzip_file(path)
+        # You cannot write "\x1F\x8B" because the default encoding of
+        # ruby >= 1.9.3 is UTF-8 and 8B is an invalid in UTF-8.
+        IO.binread(path, 2) == [0x1F, 0x8B].pack("C*")
+      end
 
-        def is_tar_file(path)
-          IO.binread(path, 8, 257).to_s == "ustar\x0000"
-        end
+      def is_tar_file(path)
+        IO.binread(path, 8, 257).to_s == "ustar\x0000"
+      end
     end
 
-    V1_API = 'https://supermarket.chef.io'.freeze
+    V1_API = "https://supermarket.chef.io".freeze
 
     # @return [String]
     attr_reader :api_uri
@@ -97,14 +97,14 @@ module Berkshelf
     # @return [String, nil]
     #   cookbook filepath, or nil if archive does not contain a cookbook
     def download(name, version)
-      archive   = stream(find(name, version)[:file])
+      archive = stream(find(name, version)[:file])
       scratch = Dir.mktmpdir
       extracted = self.class.unpack(archive.path, scratch)
 
       if File.cookbook?(extracted)
         extracted
       else
-        Dir.glob(File.join(extracted, '*')).find do |dir|
+        Dir.glob(File.join(extracted, "*")).find do |dir|
           File.cookbook?(dir)
         end
       end
@@ -133,7 +133,7 @@ module Berkshelf
 
       case response.status
       when (200..299)
-        self.class.version_from_uri response.body['latest_version']
+        self.class.version_from_uri response.body["latest_version"]
       when 404
         raise CookbookNotFound.new(name, nil, "at `#{api_uri}'")
       else
@@ -149,7 +149,7 @@ module Berkshelf
 
       case response.status
       when (200..299)
-        response.body['versions'].collect do |version_uri|
+        response.body["versions"].collect do |version_uri|
           self.class.version_from_uri(version_uri)
         end
       when 404
@@ -176,11 +176,11 @@ module Berkshelf
     #
     # @return [Tempfile]
     def stream(target)
-      local = Tempfile.new('community-rest-stream')
+      local = Tempfile.new("community-rest-stream")
       local.binmode
 
       Retryable.retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
-        open(target, 'rb', open_uri_options) do |remote|
+        open(target, "rb", open_uri_options) do |remote|
           local.write(remote.read)
         end
       end
@@ -192,27 +192,27 @@ module Berkshelf
 
     private
 
-      def open_uri_options
-        options = {}
-        options.merge!(headers)
-        options.merge!(open_uri_proxy_options)
-		    options.merge!(ssl_verify_mode: ssl_verify_mode)
-      end
+    def open_uri_options
+      options = {}
+      options.merge!(headers)
+      options.merge!(open_uri_proxy_options)
+      options.merge!(ssl_verify_mode: ssl_verify_mode)
+    end
 
-      def open_uri_proxy_options
-        if proxy && proxy[:user] && proxy[:password]
-          {proxy_http_basic_authentication: [ proxy[:uri], proxy[:user], proxy[:password] ]}
-        else
-          {}
-        end
+    def open_uri_proxy_options
+      if proxy && proxy[:user] && proxy[:password]
+        { proxy_http_basic_authentication: [ proxy[:uri], proxy[:user], proxy[:password] ] }
+      else
+        {}
       end
+    end
 
-      def ssl_verify_mode
-        if Berkshelf::Config.instance.ssl.verify.nil? || Berkshelf::Config.instance.ssl.verify
-          OpenSSL::SSL::VERIFY_PEER
-        else
-          OpenSSL::SSL::VERIFY_NONE
-        end
+    def ssl_verify_mode
+      if Berkshelf::Config.instance.ssl.verify.nil? || Berkshelf::Config.instance.ssl.verify
+        OpenSSL::SSL::VERIFY_PEER
+      else
+        OpenSSL::SSL::VERIFY_NONE
       end
+    end
   end
 end

data/lib/berkshelf/config.rb

@@ -1,17 +1,17 @@
-require 'buff/config/json'
-require 'openssl'
+require "buff/config/json"
+require "openssl"
 
 module Berkshelf
   class Config < Buff::Config::JSON
     class << self
       # @return [String]
       def store_location
-        File.join(Berkshelf.berkshelf_path, 'config.json')
+        File.join(Berkshelf.berkshelf_path, "config.json")
       end
 
       # @return [String]
       def local_location
-        ENV['BERKSHELF_CONFIG'] || File.join('.', '.berkshelf', 'config.json')
+        ENV["BERKSHELF_CONFIG"] || File.join(".", ".berkshelf", "config.json")
       end
 
       # @return [String]
@@ -41,11 +41,12 @@ module Berkshelf
       #
       # @return [Config]
       def instance
-        @instance ||= if file
-          from_json file
-        else
-          new
-        end
+        @instance ||=
+          if file
+            from_json file
+          else
+            new
+          end
         coerce_ssl
       end
 
@@ -56,7 +57,7 @@ module Berkshelf
         @instance = nil
         self.instance
       end
-    
+
       # force proper X509 types from any configuration strings
       #
       # @return [Config]
@@ -88,97 +89,97 @@ module Berkshelf
       end
     end
 
-    attribute 'api.timeout',
+    attribute "api.timeout",
       type: String,
-      default: '30'
-    attribute 'chef.chef_server_url',
+      default: "30"
+    attribute "chef.chef_server_url",
       type: String,
       default: Berkshelf.chef_config.chef_server_url
-    attribute 'chef.validation_client_name',
+    attribute "chef.validation_client_name",
       type: String,
       default: Berkshelf.chef_config.validation_client_name
-    attribute 'chef.validation_key_path',
+    attribute "chef.validation_key_path",
       type: String,
       default: Berkshelf.chef_config.validation_key
-    attribute 'chef.client_key',
+    attribute "chef.client_key",
       type: String,
       default: Berkshelf.chef_config.client_key
-    attribute 'chef.node_name',
+    attribute "chef.node_name",
       type: String,
       default: Berkshelf.chef_config.node_name
-    attribute 'chef.trusted_certs_dir',
+    attribute "chef.trusted_certs_dir",
       type: String,
       default: Berkshelf.chef_config.trusted_certs_dir
-    attribute 'cookbook.copyright',
+    attribute "cookbook.copyright",
       type: String,
       default: Berkshelf.chef_config.cookbook_copyright
-    attribute 'cookbook.email',
+    attribute "cookbook.email",
       type: String,
       default: Berkshelf.chef_config.cookbook_email
-    attribute 'cookbook.license',
+    attribute "cookbook.license",
       type: String,
       default: Berkshelf.chef_config.cookbook_license
-    attribute 'allowed_licenses',
+    attribute "allowed_licenses",
       type: Array,
       default: Array.new
-    attribute 'raise_license_exception',
+    attribute "raise_license_exception",
       type: Buff::Boolean,
       default: false
-    attribute 'vagrant.vm.box',
+    attribute "vagrant.vm.box",
       type: String,
-      default: 'bento/ubuntu-14.04',
+      default: "bento/ubuntu-14.04",
       required: true
     # @todo Deprecated, remove?
-    attribute 'vagrant.vm.box_url',
+    attribute "vagrant.vm.box_url",
       type: String,
       default: nil
-    attribute 'vagrant.vm.forward_port',
+    attribute "vagrant.vm.forward_port",
       type: Hash,
       default: Hash.new
-    attribute 'vagrant.vm.provision',
+    attribute "vagrant.vm.provision",
       type: String,
-      default: 'chef_solo'
+      default: "chef_solo"
     # @todo Deprecated, remove. There's a really weird tri-state here where
     # nil is used to represent an unset value, just FYI
-    attribute 'vagrant.omnibus.enabled',
+    attribute "vagrant.omnibus.enabled",
       type: Buff::Boolean,
       default: nil
-    attribute 'vagrant.omnibus.version',
+    attribute "vagrant.omnibus.version",
       type: String,
-      default: 'latest'
-    attribute 'ssl.verify',
+      default: "latest"
+    attribute "ssl.verify",
       type: Buff::Boolean,
       default: true,
       required: true
-    attribute 'ssl.cert_store',
+    attribute "ssl.cert_store",
       type: Buff::Boolean,
       default: false,
       required: false
-    attribute 'ssl.ca_file',
+    attribute "ssl.ca_file",
       type: String,
       default: nil,
       required: false
-    attribute 'ssl.ca_path',
+    attribute "ssl.ca_path",
       type: String,
       default: nil,
       required: false
-    attribute 'ssl.client_cert',
+    attribute "ssl.client_cert",
       type: String,
       default: nil,
       required: false
-    attribute 'ssl.client_key',
+    attribute "ssl.client_key",
       type: String,
       default: nil,
       required: false
-    attribute 'github',
+    attribute "github",
       type: Array,
       default: [],
       required: false
-    attribute 'gitlab',
+    attribute "gitlab",
       type: Array,
       default: [],
       required: false
-    attribute 'github_protocol',
+    attribute "github_protocol",
       # :git, :ssh, or :https
       type: Symbol,
       default: :https,

data/lib/berkshelf/cookbook_generator.rb

@@ -1,6 +1,6 @@
 module Berkshelf
   class CookbookGenerator < BaseGenerator
-    require_relative 'config'
+    require_relative "config"
 
     LICENSE_MAP = {
       "apachev2" => "Apache 2.0",
@@ -27,7 +27,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"
 
     class_option :foodcritic,
       type: :boolean,
@@ -78,56 +78,56 @@ module Berkshelf
         template "default_recipe.erb", target.join("recipes/default.rb")
       end
 
-      template 'metadata.rb.erb', target.join('metadata.rb')
-      template license_file, target.join('LICENSE')
-      template 'README.md.erb', target.join('README.md')
-      template 'CHANGELOG.md.erb', target.join('CHANGELOG.md')
+      template "metadata.rb.erb", target.join("metadata.rb")
+      template license_file, target.join("LICENSE")
+      template "README.md.erb", target.join("README.md")
+      template "CHANGELOG.md.erb", target.join("CHANGELOG.md")
 
       Berkshelf::InitGenerator.new([target], options.merge(default_options)).invoke_all
     end
 
     private
 
-      def commented(content)
-        content.split("\n").collect { |s| s == "" ? "#" : "# #{s}"}.join("\n")
-      end
+    def commented(content)
+      content.split("\n").collect { |s| s == "" ? "#" : "# #{s}" }.join("\n")
+    end
 
-      def license_name
-        LICENSE_MAP.fetch(options[:license]) do |license|
-          raise Berkshelf::LicenseNotFound.new(license)
-        end
+    def license_name
+      LICENSE_MAP.fetch(options[:license]) do |license|
+        raise Berkshelf::LicenseNotFound.new(license)
       end
+    end
 
-      def license
-        ERB.new(File.read(File.join(self.class.source_root, license_file))).result(binding)
-      end
+    def license
+      ERB.new(File.read(File.join(self.class.source_root, license_file))).result(binding)
+    end
 
-      def license_file
-        case options[:license]
-        when 'apachev2'; 'licenses/apachev2.erb'
-        when 'gplv2'; 'licenses/gplv2.erb'
-        when 'gplv3'; 'licenses/gplv3.erb'
-        when 'mit'; 'licenses/mit.erb'
-        when 'reserved'; 'licenses/reserved.erb'
-        else
-          raise Berkshelf::LicenseNotFound.new(options[:license])
-        end
+    def license_file
+      case options[:license]
+      when "apachev2" then "licenses/apachev2.erb"
+      when "gplv2" then "licenses/gplv2.erb"
+      when "gplv3" then "licenses/gplv3.erb"
+      when "mit" then "licenses/mit.erb"
+      when "reserved" then "licenses/reserved.erb"
+      else
+        raise Berkshelf::LicenseNotFound.new(options[:license])
       end
+    end
 
-      def copyright_year
-        Time.now.year
-      end
+    def copyright_year
+      Time.now.year
+    end
 
-      def maintainer
-        options[:maintainer]
-      end
+    def maintainer
+      options[:maintainer]
+    end
 
-      def maintainer_email
-        options[:maintainer_email]
-      end
+    def maintainer_email
+      options[:maintainer_email]
+    end
 
-      def default_options
-        { metadata_entry: true, chefignore: true, cookbook_name: name }
-      end
+    def default_options
+      { metadata_entry: true, chefignore: true, cookbook_name: name }
+    end
   end
 end