berkshelf 2.0.18 → 3.0.0.beta1

data/lib/berkshelf/cached_cookbook.rb

@@ -1,7 +1,5 @@
 module Berkshelf
   class CachedCookbook < Ridley::Chef::Cookbook
-    @loaded = Hash.new
-
     class << self
       # @param [#to_s] path
       #   a path on disk to the location of a Cookbook downloaded by the Downloader
@@ -14,12 +12,20 @@ module Berkshelf
         cached_name = File.basename(path.to_s).slice(DIRNAME_REGEXP, 1)
         return nil if cached_name.nil?
 
-        @loaded[path.to_s] ||= from_path(path, name: cached_name)
+        from_path(path, name: cached_name)
       end
     end
 
     DIRNAME_REGEXP = /^(.+)-(.+)$/
 
+    extend Forwardable
+
+    def_delegator :metadata, :description
+    def_delegator :metadata, :maintainer
+    def_delegator :metadata, :maintainer_email
+    def_delegator :metadata, :license
+    def_delegator :metadata, :platforms
+
     # @return [Hash]
     def dependencies
       metadata.recommendations.merge(metadata.dependencies)
@@ -38,19 +44,25 @@ module Berkshelf
       end.join("\n")
     end
 
+    # High-level information about this cached cookbook in JSON format
+    #
+    # @return [String]
     def pretty_json
-      pretty_hash.to_json
+      JSON.pretty_generate(pretty_hash)
     end
 
+    # High-level information about this cached cookbook in Hash format
+    #
+    # @return [Hash]
     def pretty_hash
       {}.tap do |h|
-        h[:name]          = cookbook_name unless name.blank?
+        h[:name]          = cookbook_name unless cookbook_name.blank?
         h[:version]       = version unless version.blank?
-        h[:description]   = metadata.description unless metadata.description.blank?
-        h[:author]        = metadata.maintainer unless metadata.maintainer.blank?
-        h[:email]         = metadata.maintainer_email unless metadata.maintainer_email.blank?
-        h[:license]       = metadata.license unless metadata.license.blank?
-        h[:platforms]     = metadata.platforms.to_hash unless metadata.platforms.blank?
+        h[:description]   = description unless description.blank?
+        h[:author]        = maintainer unless maintainer.blank?
+        h[:email]         = maintainer_email unless maintainer_email.blank?
+        h[:license]       = license unless license.blank?
+        h[:platforms]     = platforms.to_hash unless platforms.blank?
         h[:dependencies]  = dependencies.to_hash unless dependencies.blank?
       end
     end

data/lib/berkshelf/chef/config.rb

@@ -8,6 +8,7 @@ module Berkshelf
 
       class << self
         private
+
           # Return the most sensible path to the Chef configuration file. This can
           # be configured by setting a value for the 'BERKSHELF_CHEF_CONFIG' environment
           # variable.

data/lib/berkshelf/cli.rb

@@ -7,6 +7,37 @@ require_relative 'commands/test_command'
 
 module Berkshelf
   class Cli < Thor
+    # This is the main entry point for the CLI. It exposes the method {#execute!} to
+    # start the CLI.
+    #
+    # @note the arity of {#initialize} and {#execute!} are extremely important for testing purposes. It
+    #   is a requirement to perform in-process testing with Aruba. In process testing is much faster
+    #   than spawning a new Ruby process for each test.
+    class Runner
+      def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
+        @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+      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
+      end
+    end
+
     class << self
       def dispatch(meth, given_args, given_opts, config)
         unless (given_args & ['-h', '--help']).empty?
@@ -31,7 +62,8 @@ module Berkshelf
         unless File.exist?(@options[:config])
           raise ConfigNotFound.new(:berkshelf, @options[:config])
         end
-        Berkshelf::Config.set_path(@options[:config])
+
+        Berkshelf.config = Berkshelf::Config.from_file(@options[:config])
       end
 
       if @options[:debug]
@@ -85,7 +117,7 @@ module Berkshelf
       desc: 'create a new configuration file even if one already exists.'
     method_option :path,
       type: :string,
-      default: Berkshelf::Config.path,
+      default: Berkshelf.config.path,
       desc: 'The path to save the configuration file'
     desc 'configure', 'Create a new Berkshelf configuration file'
     def configure
@@ -95,7 +127,7 @@ module Berkshelf
         raise Berkshelf::ConfigExists, 'A configuration file already exists. Re-run with the --force flag if you wish to overwrite it.'
       end
 
-      @config = Berkshelf::Config.new(path)
+      config = Berkshelf::Config.new(path)
 
       [
         'chef.chef_server_url',
@@ -106,7 +138,7 @@ module Berkshelf
         'vagrant.vm.box',
         'vagrant.vm.box_url',
       ].each do |attribute|
-        default = @config.get_attribute(attribute)
+        default = config.get_attribute(attribute)
 
         message = "Enter value for #{attribute}"
         message << " (default: '#{default}')" if default
@@ -115,15 +147,16 @@ module Berkshelf
         input = Berkshelf.ui.ask(message)
 
         if input.present?
-          @config.set_attribute(attribute, input)
+          config.set_attribute(attribute, input)
         end
       end
 
-      unless @config.valid?
-        raise InvalidConfiguration.new(@config.errors)
+      unless config.valid?
+        raise InvalidConfiguration.new(config.errors)
       end
 
-      @config.save
+      config.save
+      Berkshelf.config = config
 
       Berkshelf.formatter.msg "Config written to: '#{path}'"
     end
@@ -155,7 +188,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      default: Berkshelf::DEFAULT_FILENAME,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -180,7 +213,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      default: Berkshelf::DEFAULT_FILENAME,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -209,11 +242,6 @@ module Berkshelf
       default: false,
       desc: 'Skip Ruby syntax check when uploading cookbooks.',
       aliases: '-s'
-    method_option :skip_dependencies,
-      type: :boolean,
-      desc: 'Skip uploading dependent cookbook(s).',
-      default: false,
-      aliases: '-D'
     method_option :halt_on_frozen,
       type: :boolean,
       default: false,
@@ -225,14 +253,13 @@ module Berkshelf
       upload_options             = Hash[options.except(:no_freeze, :berksfile)].symbolize_keys
       upload_options[:cookbooks] = cookbook_names
       upload_options[:freeze]    = false if options[:no_freeze]
-      upload_options[:validate]  = false if options[:skip_syntax_check]
 
       berksfile.upload(upload_options)
     end
 
     method_option :berksfile,
       type: :string,
-      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      default: Berkshelf::DEFAULT_FILENAME,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -240,11 +267,6 @@ module Berkshelf
       type: :boolean,
       default: nil,
       desc: 'Disable/Enable SSL verification when locking cookbooks.'
-    method_option :from_file,
-      type: :string,
-      desc: 'overwrite environment attributes when using apply using local environment file',
-      aliases: '-f',
-      banner: 'PATH'
     desc 'apply ENVIRONMENT', 'Apply the cookbook version locks from Berksfile.lock to a Chef environment'
     def apply(environment_name)
       berksfile    = ::Berkshelf::Berksfile.from_file(options[:berksfile])
@@ -255,7 +277,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      default: Berkshelf::DEFAULT_FILENAME,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -267,36 +289,22 @@ module Berkshelf
       type: :array,
       desc: 'Only cookbooks that are in these groups.',
       aliases: '-o'
-    desc 'outdated [COOKBOOKS]', 'Show outdated cookbooks (from the community site)'
+    desc 'outdated [COOKBOOKS]', 'List dependencies that have new versions available that satisfy their constraints'
     def outdated(*cookbook_names)
-      berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
+      berksfile = Berkshelf::Berksfile.from_file(options[:berksfile])
       Berkshelf.formatter.msg 'Listing outdated cookbooks with newer versions available...'
-      Berkshelf.formatter.msg 'BETA: this feature will only pull differences from the community site and will'
-      Berkshelf.formatter.msg 'BETA: ignore all other sources you may have defined'
-      Berkshelf.formatter.msg ''
-
-      outdated_options = {
-        cookbooks: cookbook_names
-      }.merge(options).symbolize_keys
-
-      outdated = berksfile.outdated(outdated_options)
 
-      if outdated.empty?
-        Berkshelf.formatter.msg 'All cookbooks up to date'
-      else
-        outdated.each do |cookbook, latest_version|
-          Berkshelf.formatter.msg "Cookbook '#{cookbook.name} (#{cookbook.version_constraint})' is outdated (#{latest_version})"
-        end
-      end
+      outdated_options = { cookbooks: cookbook_names }.merge(options).symbolize_keys
+      berksfile.outdated(outdated_options)
     end
 
     desc 'init [PATH]', 'Initialize Berkshelf in the given directory'
-    def init(path = Dir.pwd)
+    def init(path = '.')
       Berkshelf.formatter.deprecation '--git is now the default' if options[:git]
       Berkshelf.formatter.deprecation '--vagrant is now the default' if options[:vagrant]
 
       if File.chef_cookbook?(path)
-        options[:chefignore] = true
+        options[:chefignore]     = true
         options[:metadata_entry] = true
       end
 
@@ -311,16 +319,16 @@ module Berkshelf
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
-    desc 'list', 'List all cookbooks (and dependencies) specified in the Berksfile'
+    desc 'list', 'List all cookbooks and their dependencies specified by your Berksfile'
     def list
-      berksfile = Berksfile.from_file(options[:berksfile])
-      sources = Berkshelf.ui.mute { berksfile.resolve(berksfile.sources)[:solution] }.sort
+      berksfile    = Berksfile.from_file(options[:berksfile])
+      dependencies = Berkshelf.ui.mute { berksfile.install }.sort
 
-      if sources.empty?
+      if dependencies.empty?
         Berkshelf.formatter.msg 'There are no cookbooks installed by your Berksfile'
       else
         Berkshelf.formatter.msg 'Cookbooks installed by your Berksfile:'
-        print_list(sources)
+        print_list(dependencies)
       end
     end
 
@@ -333,12 +341,11 @@ module Berkshelf
     desc "show [COOKBOOK]", "Display name, author, copyright, and dependency information about a cookbook"
     def show(name)
       berksfile = Berksfile.from_file(options[:berksfile])
+      cookbook  = Berkshelf.ui.mute { berksfile.install(cookbooks: name) }.first
 
-      cookbook = Berkshelf.ui.mute {
-        berksfile.resolve(berksfile.find(name))[:solution].first
-      }
-
-      raise CookbookNotFound, "Cookbook '#{name}' is not installed by your Berksfile" unless cookbook
+      unless cookbook
+        raise CookbookNotFound, "Cookbook '#{name}' is not installed by your Berksfile"
+      end
 
       Berkshelf.formatter.show(cookbook)
     end
@@ -351,10 +358,9 @@ module Berkshelf
       banner: 'PATH'
     desc 'contingent COOKBOOK', 'List all cookbooks that depend on the given cookbook'
     def contingent(name)
-      berksfile = Berksfile.from_file(options[:berksfile])
-
-      sources = Berkshelf.ui.mute { berksfile.resolve(berksfile.sources)[:solution] }.sort
-      dependencies = sources.select { |cookbook| cookbook.dependencies.include?(name) }
+      berksfile    = Berksfile.from_file(options[:berksfile])
+      dependencies = Berkshelf.ui.mute { berksfile.install }.sort
+      dependencies = dependencies.select { |cookbook| cookbook.dependencies.include?(name) }
 
       if dependencies.empty?
         Berkshelf.formatter.msg "There are no cookbooks contingent upon '#{name}' defined in this Berksfile"
@@ -366,25 +372,21 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      default: Berkshelf::DEFAULT_FILENAME,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
     method_option :output,
       type: :string,
-      default: Dir.pwd,
+      default: '.',
       desc: 'Path to output the tarball',
       aliases: '-o',
       banner: 'PATH'
-    method_option :skip_dependencies,
-      type: :boolean,
-      desc: 'Skip packaging dependent cookbook(s).',
-      default: false
     method_option :ignore_chefignore,
       type: :boolean,
       desc: 'Do not apply the chefignore to the packaged contents',
       default: false
-    desc 'package [COOKBOOK]', 'Package a cookbook (and dependencies) as a tarball'
+    desc "package [COOKBOOK]", "Package a cookbook and it's dependencies as a tarball"
     def package(name = nil)
       berksfile = Berkshelf::Berksfile.from_file(options[:berksfile])
       berksfile.package(name, options)
@@ -402,10 +404,6 @@ module Berkshelf
       Berkshelf.formatter.deprecation '--git is now the default' if options[:git]
       Berkshelf.formatter.deprecation '--vagrant is now the default' if options[:vagrant]
 
-      unless Config.instance.valid?
-        raise InvalidConfiguration.new(Config.instance.errors)
-      end
-
       ::Berkshelf::CookbookGenerator.new([File.join(Dir.pwd, name), name], options).invoke_all
     end
     tasks['cookbook'].options = Berkshelf::CookbookGenerator.class_options

data/lib/berkshelf/commands/shelf.rb

@@ -102,7 +102,7 @@ module Berkshelf
           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.upcase[0] == 'Y'
+          exit unless confirm.to_s.upcase[0] == 'Y'
         end
 
         FileUtils.rm_rf(cookbook.path)

data/lib/berkshelf/community_rest.rb

@@ -2,8 +2,6 @@ require 'open-uri'
 require 'retryable'
 require 'addressable/uri'
 
-require_relative 'core_ext/openuri'
-
 module Berkshelf
   class CommunityREST < Faraday::Connection
     class << self
@@ -18,8 +16,6 @@ module Berkshelf
           Archive::Tar::Minitar.unpack(Zlib::GzipReader.new(File.open(target, 'rb')), destination)
         elsif is_tar_file(target)
           Archive::Tar::Minitar.unpack(target, destination)
-        elsif is_bzip2_file(target)
-          Archive::Tar::Minitar.unpack(RBzip2::Decompressor.new(File.open(target, 'rb')), destination)
         else
           raise Berkshelf::UnknownCompressionType.new(target)
         end
@@ -41,6 +37,7 @@ module Berkshelf
       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.
@@ -50,13 +47,9 @@ module Berkshelf
         def is_tar_file(path)
           IO.binread(path, 8, 257).to_s == "ustar\x0000"
         end
-
-        def is_bzip2_file(path)
-          IO.binread(path, 3) == 'BZh'
-        end
     end
 
-    V1_API = 'http://cookbooks.opscode.com/api/v1/cookbooks'.freeze
+    V1_API = 'http://cookbooks.opscode.com/api/v1'.freeze
 
     # @return [String]
     attr_reader :api_uri
@@ -82,8 +75,7 @@ module Berkshelf
 
       builder = Faraday::Builder.new do |b|
         b.response :parse_json
-        b.response :follow_redirects
-
+        b.response :gzip
         b.request :retry,
           max: @retries,
           interval: @retry_interval,
@@ -100,20 +92,21 @@ module Berkshelf
     #
     # @return [String]
     def download(name, version)
-      archive = stream(find(name, version)[:file])
-      self.class.unpack(archive.path)
+      archive   = stream(find(name, version)[:file])
+      extracted = self.class.unpack(archive.path)
+      Dir.glob(File.join(extracted, "*")).first
     ensure
       archive.unlink unless archive.nil?
     end
 
     def find(name, version)
-      response = get("#{name}/versions/#{self.class.uri_escape_version(version)}")
+      response = get("cookbooks/#{name}/versions/#{self.class.uri_escape_version(version)}")
 
       case response.status
       when (200..299)
         response.body
       when 404
-        raise CookbookNotFound, "Cookbook '#{name}' not found at site: '#{api_uri}'"
+        raise CookbookNotFound, "Cookbook '#{name}' (#{version}) not found at site: '#{api_uri}'"
       else
         raise CommunitySiteError, "Error finding cookbook '#{name}' (#{version}) at site: '#{api_uri}'"
       end
@@ -123,7 +116,7 @@ module Berkshelf
     #
     # @return [String]
     def latest_version(name)
-      response = get(name)
+      response = get("cookbooks/#{name}")
 
       case response.status
       when (200..299)
@@ -139,7 +132,7 @@ module Berkshelf
     #
     # @return [Array]
     def versions(name)
-      response = get(name)
+      response = get("cookbooks/#{name}")
 
       case response.status
       when (200..299)