berkshelf 1.1.6 → 1.2.0.rc1

data/features/step_definitions/configure_cli_steps.rb

@@ -1,3 +1,9 @@
+Given /^I have a default Chef config$/ do
+  path = tmp_path.join('chef_config').to_s
+  generate_chef_config(path)
+  ENV['BERKSHELF_CHEF_CONFIG'] = path
+end
+
 Then /^a Berkshelf config file should exist and contain:$/ do |table|
   config = Berkshelf::Config.from_file(Berkshelf::Config.path)
   table.raw.each do |key, value|

data/features/step_definitions/filesystem_steps.rb

@@ -23,7 +23,9 @@ Given /^I have a default Berkshelf config file$/ do
 end
 
 Given /^I have a Berkshelf config file containing:$/ do |contents|
-  Berkshelf::Config.new.from_json(contents).save
+  File.open(Berkshelf::Config.path, 'w+') do |f|
+    f.write(contents)
+  end
 end
 
 Given /^I do not have a Berkshelf config file$/ do

data/features/step_definitions/json_steps.rb

@@ -1,3 +1,10 @@
 Then /^the output should be JSON$/ do
   lambda { parse_json(all_output) }.should_not raise_error
 end
+
+Then /^the file "(.*?)" should contain JSON:$/ do |file, data|
+  target = MultiJson.decode(data)
+  actual = MultiJson.decode(File.read(File.join(current_dir, file)))
+
+  target.should eql(actual)
+end

data/features/support/env.rb

@@ -7,7 +7,6 @@ Spork.prefork do
   require 'rspec'
   require 'pp'
   require 'aruba/cucumber'
-  require 'vcr'
 
   APP_ROOT = File.expand_path('../../../', __FILE__)
 
@@ -26,17 +25,13 @@ Spork.prefork do
 
   ENV["GIT_SSH"] = git_ssh_path
 
-
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
-  Around do |scenario, block|
-    VCR.use_cassette(scenario.name) do
-      block.call
-    end
-  end
+  World(Berkshelf::TestGenerators)
 
   Before do
     clean_cookbook_store
+    generate_berks_config(File.join(ENV["BERKSHELF_PATH"], 'config.json'))
     @aruba_io_wait_seconds = 5
     @aruba_timeout_seconds = 16
   end
@@ -47,7 +42,7 @@ Spork.prefork do
   end
 
   def cookbook_store
-    Pathname.new(File.join(ENV["BERKSHELF_PATH"],"cookbooks"))
+    Pathname.new(File.join(ENV["BERKSHELF_PATH"], "cookbooks"))
   end
 
   def clean_cookbook_store

data/features/upload_command.feature

@@ -94,175 +94,123 @@ Feature: upload command
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: Running the upload command with multiple cookbooks
+  Scenario: explicitly specifying multiple cookbooks to upload
     Given I write to "Berksfile" with:
       """
-      cookbook "build-essential"
-      cookbook "chef-client"
-      cookbook "database"
-      cookbook "editor"
-      cookbook "git"
-      cookbook "known_host"
-      cookbook "networking_basic"
+      cookbook "ntp"
       cookbook "vim"
+      cookbook "apt"
       """
     And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | build-essential  |
-      | chef-client      |
-      | database         |
-      | editor           |
-      | git              |
-      | known_host       |
-      | networking_basic |
-      | vim              |
-    When I run `berks upload build-essential chef-client database`
-    Then the output should contain "Uploading build-essential"
-    And the output should contain "Uploading chef-client"
-    And the output should contain "Uploading database"
-    And the output should not contain "Uploading editor"
-    And the output should not contain "Uploading git"
-    And the output should not contain "Uploading known_host"
-    And the output should not contain "Uploading networking_basic"
-    And the output should not contain "Uploading vim"
+      | ntp |
+      | vim |
+      | apt |
+    When I run `berks upload ntp vim`
+    Then the output should contain "Uploading ntp"
+    And the output should contain "Uploading vim"
+    And the output should not contain "Uploading apt"
     And the Chef server should have the cookbooks:
-      | build_essential |
-      | chef-client     |
-      | database        |
+      | ntp |
+      | vim |
     And the Chef server should not have the cookbooks:
-      | editor           |
-      | git              |
-      | known_host       |
-      | networking_basic |
-      | vim              |
+      | apt |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: Running the upload command with the :only option
+  Scenario: uploading a single group of cookbooks with the --only flag
     Given I write to "Berksfile" with:
       """
       group :core do
-        cookbook "build-essential"
-        cookbook "chef-client"
+        cookbook "ntp"
       end
 
       group :system do
-        cookbook "database"
-        cookbook "editor"
+        cookbook "vim"
       end
       """
     And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | build-essential  |
-      | chef-client      |
-      | database         |
-      | editor           |
+      | ntp |
+      | vim |
     When I run `berks upload --only core`
-    Then the output should contain "Uploading build-essential"
-    And the output should contain "Uploading chef-client"
-    And the output should not contain "Uploading database"
-    And the output should not contain "Uploading editor"
+    Then the output should contain "Uploading ntp"
+    And the output should not contain "Uploading vim"
     And the Chef server should have the cookbooks:
-      | build_essential |
-      | chef-client     |
+      | ntp |
     And the Chef server should not have the cookbooks:
-      | database |
-      | editor   |
+      | vim |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: Running the upload command with the :only option multiple
+  Scenario: uploading multiple groups of cookbooks with the --only flag
     Given I write to "Berksfile" with:
       """
       group :core do
-        cookbook "build-essential"
-        cookbook "chef-client"
+        cookbook "ntp"
       end
 
       group :system do
-        cookbook "database"
-        cookbook "editor"
+        cookbook "vim"
       end
       """
     And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | build-essential  |
-      | chef-client      |
-      | database         |
-      | editor           |
+      | ntp |
+      | vim |
     When I run `berks upload --only core system`
-    Then the output should contain "Uploading build-essential"
-    And the output should contain "Uploading chef-client"
-    And the output should contain "Uploading database"
-    And the output should contain "Uploading editor"
+    Then the output should contain "Uploading ntp"
+    And the output should contain "Uploading vim"
     And the Chef server should have the cookbooks:
-      | build_essential |
-      | chef-client     |
-      | database        |
-      | editor          |
+      | ntp |
+      | vim |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: Running the upload command with the :except option
+  Scenario: skip uploading one group of cookbooks with the --except flag
     Given I write to "Berksfile" with:
       """
       group :core do
-        cookbook "build-essential"
-        cookbook "chef-client"
+        cookbook "ntp"
       end
 
       group :system do
-        cookbook "database"
-        cookbook "editor"
+        cookbook "vim"
       end
       """
     And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | build-essential  |
-      | chef-client      |
-      | database         |
-      | editor           |
+      | ntp |
+      | vim |
     When I run `berks upload --except core`
-    Then the output should not contain "Uploading build-essential"
-    And the output should not contain "Uploading chef-client"
-    And the output should contain "Uploading database"
-    And the output should contain "Uploading editor"
+    Then the output should not contain "Uploading ntp"
+    And the output should contain "Uploading vim"
     And the Chef server should not have the cookbooks:
-      | build_essential |
-      | chef-client     |
+      | ntp |
     And the Chef server should have the cookbooks:
-      | database |
-      | editor   |
+      | vim |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: Running the upload command with the :except option multiple
+  Scenario: skip uploading multiple groups of cookbooks with the --except flag
     Given I write to "Berksfile" with:
       """
       group :core do
-        cookbook "build-essential"
-        cookbook "chef-client"
+        cookbook "ntp"
       end
 
       group :system do
-        cookbook "database"
-        cookbook "editor"
+        cookbook "vim"
       end
       """
     And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | build-essential  |
-      | chef-client      |
-      | database         |
-      | editor           |
+      | ntp |
+      | vim |
     When I run `berks upload --except core system`
-    Then the output should not contain "Uploading build-essential"
-    And the output should not contain "Uploading chef-client"
-    And the output should not contain "Uploading database"
-    And the output should not contain "Uploading editor"
+    Then the output should not contain "Uploading ntp"
+    And the output should not contain "Uploading vim"
     And the Chef server should not have the cookbooks:
-      | build_essential |
-      | chef-client     |
-      | database        |
-      | editor          |
+      | ntp |
+      | vim |
     And the exit status should be 0

data/generator_files/Vagrantfile.erb

@@ -9,7 +9,7 @@ Vagrant::Config.run do |config|
   # config.berkshelf.berksfile_path = "./Berksfile"
 
   # An array of symbols representing groups of cookbook described in the Vagrantfile
-  # to skip installing and copying to Vagrant's shelf.
+  # to exclusively install and copy to Vagrant's shelf.
   # config.berkshelf.only = []
 
   # An array of symbols representing groups of cookbook described in the Vagrantfile

data/generator_files/gitignore.erb

@@ -1,6 +1,5 @@
 .vagrant
 Berksfile.lock
-Gemfile.lock
 *~
 *#
 .#*
@@ -8,6 +7,12 @@ Gemfile.lock
 .*.sw[a-z]
 *.un~
 /cookbooks
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
 <% if options[:scmversion] -%>
 VERSION
 <% end -%>

data/lib/berkshelf.rb

@@ -1,17 +1,20 @@
-require 'yajl'
-require 'chef/platform'
-require 'chef/cookbook/metadata'
-require 'chef/cookbook_version'
-require 'chef/knife'
+require 'multi_json'
+
+# Fix for Facter < 1.7.0 changing LANG to C
+# https://github.com/puppetlabs/facter/commit/f77584f4
+begin
+  old_lang = ENV['LANG']
+  require 'ridley'
+ensure
+  ENV['LANG'] = old_lang
+end
 
 require 'chozo/core_ext'
-
 require 'active_support/core_ext'
 require 'archive/tar/minitar'
 require 'forwardable'
 require 'hashie'
 require 'pathname'
-require 'ridley'
 require 'solve'
 require 'thor'
 require 'tmpdir'
@@ -23,16 +26,17 @@ require 'berkshelf/core_ext'
 require 'berkshelf/errors'
 require 'thor/monkies'
 
-Chef::Config[:cache_options][:path] = Dir.mktmpdir
+JSON.create_id = nil
 
 module Berkshelf
-  DEFAULT_STORE_PATH = File.expand_path("~/.berkshelf").freeze
   DEFAULT_FILENAME = 'Berksfile'.freeze
 
   autoload :BaseGenerator, 'berkshelf/base_generator'
   autoload :Berksfile, 'berkshelf/berksfile'
   autoload :CachedCookbook, 'berkshelf/cached_cookbook'
+  autoload :Chef, 'berkshelf/chef'
   autoload :Cli, 'berkshelf/cli'
+  autoload :CommunityREST, 'berkshelf/community_rest'
   autoload :Config, 'berkshelf/config'
   autoload :CookbookGenerator, 'berkshelf/cookbook_generator'
   autoload :CookbookSource, 'berkshelf/cookbook_source'
@@ -41,6 +45,7 @@ module Berkshelf
   autoload :Git, 'berkshelf/git'
   autoload :InitGenerator, 'berkshelf/init_generator'
   autoload :Lockfile, 'berkshelf/lockfile'
+  autoload :Mixin, 'berkshelf/mixin'
   autoload :Resolver, 'berkshelf/resolver'
   autoload :UI, 'berkshelf/ui'
   autoload :Uploader, 'berkshelf/uploader'
@@ -57,9 +62,9 @@ module Berkshelf
       @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
     end
 
-    # @return [Berkshelf::UI]
+    # @return [::Thor::Shell::Color]
     def ui
-      @ui ||= Berkshelf::UI.new
+      @ui ||= ::Thor::Shell::Color.new
     end
 
     # Returns the filepath to the location Berskhelf will use for
@@ -70,21 +75,7 @@ module Berkshelf
     #
     # @return [String]
     def berkshelf_path
-      ENV["BERKSHELF_PATH"] || DEFAULT_STORE_PATH
-    end
-
-    # Check if we're running a version of Chef that is in the 11.x line
-    #
-    # @return [Boolean]
-    def chef_11?
-      chef_version >= Solve::Version.new("11.0.0") && chef_version <= Solve::Version.new("12.0.0")
-    end
-
-    # Return the loaded version of Chef
-    #
-    # @return [Solve::Version]
-    def chef_version
-      @chef_version ||= Solve::Version.new(::Chef::VERSION)
+      ENV["BERKSHELF_PATH"] || File.expand_path("~/.berkshelf")
     end
 
     # @return [String]

data/lib/berkshelf/base_generator.rb

@@ -1,7 +1,7 @@
 require 'thor/group'
 
 module Berkshelf
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class BaseGenerator < Thor::Group
     class << self
       def source_root
@@ -9,15 +9,16 @@ module Berkshelf
       end
     end
 
-    include Thor::Actions
+    shell = Berkshelf.ui
 
-    def initialize(*args)
-      super(*args)
-      self.shell = Berkshelf.ui
-    end
+    argument :path,
+      type: :string,
+      required: true
 
-    private
+    include Thor::Actions
 
+    private
+    
       def target
         @target ||= Pathname.new(File.expand_path(path))
       end

data/lib/berkshelf/berksfile.rb

@@ -1,7 +1,5 @@
-require 'chef/cookbook/chefignore'
-
 module Berkshelf
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Berksfile
     extend Forwardable
 
@@ -30,11 +28,11 @@ module Berkshelf
       #   expanded filepath to the vendor directory
       def vendor(cookbooks, path)
         chefignore_file = [
-          File.join(Dir.pwd, 'chefignore'),
-          File.join(Dir.pwd, 'cookbooks', 'chefignore')
+          File.join(Dir.pwd, Berkshelf::Chef::Cookbook::Chefignore::FILENAME),
+          File.join(Dir.pwd, 'cookbooks', Berkshelf::Chef::Cookbook::Chefignore::FILENAME)
         ].find { |f| File.exists?(f) }
 
-        chefignore = chefignore_file && ::Chef::Cookbook::Chefignore.new(chefignore_file)
+        chefignore = chefignore_file && Berkshelf::Chef::Cookbook::Chefignore.new(chefignore_file)
         path       = File.expand_path(path)
         FileUtils.mkdir_p(path)
 
@@ -185,8 +183,7 @@ module Berkshelf
         raise CookbookNotFound, "No 'metadata.rb' found at #{path}"
       end
 
-      metadata = Chef::Cookbook::Metadata.new
-      metadata.from_file(metadata_file.to_s)
+      metadata = Berkshelf::Chef::Cookbook::Metadata.from_file(metadata_file.to_s)
 
       name = if metadata.name.empty? || metadata.name.nil?
         File.basename(File.dirname(metadata_file))
@@ -435,7 +432,7 @@ module Berkshelf
         location = cookbook.location || Location.init(cookbook.name, cookbook.version_constraint)
 
         if location.is_a?(SiteLocation)
-          latest_version = SiteLocation.new(cookbook.name, cookbook.version_constraint).latest_version[0]
+          latest_version = location.latest_version
 
           unless cookbook.version_constraint.satisfies?(latest_version)
             outdated[cookbook] = latest_version
@@ -483,12 +480,18 @@ module Berkshelf
     def upload(options = {})
       uploader = Uploader.new(options)
       solution = resolve(options)
-
       solution.each do |cb|
         Berkshelf.formatter.upload cb.cookbook_name, cb.version, options[:server_url]
         uploader.upload(cb, options)
       end
-
+      if options[:skip_dependencies]
+        missing_cookbooks = options.fetch(:cookbooks, nil) - solution.map(&:cookbook_name)
+        unless missing_cookbooks.empty?
+          msg = "Unable to upload cookbooks: #{missing_cookbooks.sort.join(', ')}\n"
+          msg << "Specified cookbooks must be defined within the Berkshelf file when using the `--skip-dependencies` option"
+          raise ExplicitCookbookNotFound.new(msg)
+        end
+      end
     rescue Ridley::Errors::ClientKeyFileNotFound => e
       msg = "Could not upload cookbooks: Missing Chef client key: '#{Berkshelf::Config.instance.chef.client_key}'."
       msg << " Generate or update your Berkshelf configuration that contains a valid path to a Chef client key."
@@ -508,10 +511,27 @@ module Berkshelf
     #
     # @return [Array<Berkshelf::CachedCookbooks]
     def resolve(options = {})
+      resolver(options).resolve
+    end
+
+    # Builds a Resolver instance
+    #
+    # @option options [Symbol, Array] :except
+    #   Group(s) to exclude which will cause any sources marked as a member of the
+    #   group to not be installed
+    # @option options [Symbol, Array] :only
+    #   Group(s) to include which will cause any sources marked as a member of the
+    #   group to be installed and all others to be ignored
+    # @option cookbooks [String, Array] :cookbooks
+    #   Names of the cookbooks to retrieve sources for
+    #
+    # @return <Berkshelf::Resolver>
+    def resolver(options={})
       Resolver.new(
         self.downloader,
-        sources: sources(options)
-      ).resolve
+        sources: sources(options),
+        skip_dependencies: options[:skip_dependencies]
+      )
     end
 
     # Reload this instance of Berksfile with the given content. The content