berkshelf 2.0.0.beta → 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 2.0.0
+
+* Huge improvements to the Lockfile
+  - They actually work!
+  - Now in JSON format
+  - Old lockfiles will automatically be converted to the new format
+* Add `berks shelf` command. Any operations on the already installed cookbooks now reside here
+  - `berks shelf list` to list all cookbooks in the Berkshelf
+  - `berks shelf show` to display information about a specific cookbook in the Berkshelf
+  - `berks shelf uninstall` to remove an installed cookbook from the Berkshelf
+* Add `berks package` command. Will package any cookbooks and dependencies defined in your Berksfile into a tar.
+* Add `berks apply` command. Take the locked constraints of your lockfile and apply them directly to the an environment's locked cookbook versions.
+* Test-Kitchen integration (beta)
+  - Add `berks test` command. This is a delegator to `bin/kitchen`
+  - Berkshelf's Cookbook generators will by default generate Test-Kitchen files for you
+* Remove `berks open` command
+* Rename `berks info` command to `berks show`
+
 # 1.4.4
 
 - Bump Ridley dependency to 0.12, bringing in many bugfixes.
@@ -29,7 +47,7 @@
 
 # 1.3.1
 - Support for Vagrant 1.1.x
-- Move Berkshelf Vagrant plugin into it's [own repository](https://github.com/RiotGames/berkshelf-vagrant)
+- Move Berkshelf Vagrant plugin into it's [own repository](https://github.com/RiotGames/vagrant-berkshelf)
 - Added -d flag to output debug information in berks command
 - Various bug fixes in uploading cookbooks
 

data/CONTRIBUTING.md

@@ -34,9 +34,7 @@ Bundler will install all gems and their dependencies required for testing and de
 
 ### Running unit (RSpec) and acceptance (Cucumber) tests
 
-Simply copy the `spec/knife.rb.sample` to `spec/knife.rb`, and point it at a
-chef server. Berkshelf tests may upload and destroy cookbooks on your chef
-server, so be sure to configure a server safe for this task.
+We use Chef Zero - an in-memory Chef Server for running tests. It is automatically managed by the Specs and Cukes. Simply run:
 
     $ bundle exec guard start
 

data/Gemfile

@@ -3,17 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'chef-zero', '>= 0.9.9'
-  gem 'coolline'
-  gem 'guard', '>= 1.5.0'
-  gem 'guard-cane'
-  gem 'guard-cucumber'
-  gem 'guard-rspec'
-  gem 'guard-spork'
-  gem 'guard-yard'
-  gem 'redcarpet'
-  gem 'yard'
-
   require 'rbconfig'
 
   if RbConfig::CONFIG['target_os'] =~ /darwin/i
@@ -34,12 +23,3 @@ group :development do
     gem 'win32console', require: false
   end
 end
-
-group :test do
-  gem 'fuubar'
-  gem 'json_spec'
-  gem 'rake', '>= 0.9.2.2'
-  gem 'rspec'
-  gem 'thor'
-  gem 'webmock'
-end

data/Guardfile

@@ -10,13 +10,13 @@ guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
   watch(%r{ext/.+\.c})
 end
 
-guard 'rspec', cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
+guard 'rspec', cli: '--color --drb --format Fuubar', all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')       { "spec" }
+  watch('spec/spec_helper.rb')       { 'spec' }
 end
 
-guard 'cucumber', cli: "--drb --format pretty --tags ~@no_run --tags ~@wip", all_on_start: false, all_after_pass: false do
+guard 'cucumber', cli: '--drb --format pretty --tags ~@no_run --tags ~@wip', all_on_start: false, all_after_pass: false do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})                      { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/LICENSE

@@ -1,9 +1,10 @@
-Author:: Jamie Winsor (<reset@riotgames.com>)
-Author:: Josiah Kiehl (<jkiehl@riotgames.com>)
-Author:: Michael Ivey (<michael.ivey@riotgames.com>)
-Author:: Justin Campbell (<justin.campbell@riotgames.com>)
+Copyright 2012-2013 Riot Games
 
-Copyright 2012 Riot Games
+    Jamie Winsor (<reset@riotgames.com>)
+    Josiah Kiehl (<jkiehl@riotgames.com>)
+    Michael Ivey (<michael.ivey@riotgames.com>)
+    Justin Campbell (<justin.campbell@riotgames.com>)
+    Seth Vargo (<sethvargo@gmail.com>)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -79,6 +79,7 @@ Authors
 - Josiah Kiehl (<jkiehl@riotgames.com>)
 - Michael Ivey (<michael.ivey@riotgames.com>)
 - Justin Campbell (<justin.campbell@riotgames.com>)
+- Seth Vargo (<sethvargo@gmail.com>)
 
 Thank you to all of our [Contributors](https://github.com/RiotGames/berkshelf/graphs/contributors), testers, and users.
 

data/Thorfile

@@ -1,89 +1,70 @@
 # encoding: utf-8
-$:.push File.expand_path("../lib", __FILE__)
+$:.unshift File.expand_path('../lib', __FILE__)
 
 require 'bundler'
-require 'bundler/setup'
-
-require 'berkshelf'
 require 'thor/rake_compat'
 
-class Default < Thor
-  class Gem < Thor
-    include Thor::RakeCompat
-    Bundler::GemHelper.install_tasks
-
-    namespace :gem
+class Gem < Thor
+  include Thor::RakeCompat
+  Bundler::GemHelper.install_tasks
 
-    desc "build", "Build berkshelf-#{Berkshelf::VERSION}.gem into the pkg directory"
-    def build
-      Rake::Task["build"].execute
-    end
+  desc 'build', "Build berkshelf-#{Berkshelf::VERSION}.gem into the pkg directory"
+  def build
+    Rake::Task['build'].execute
+  end
 
-    desc "release", "Create tag v#{Berkshelf::VERSION} and build and push berkshelf-#{Berkshelf::VERSION}.gem to Rubygems"
-    def release
-      Rake::Task["release"].execute
-    end
+  desc 'install', "Build and install berkshelf-#{Berkshelf::VERSION}.gem into system gems"
+  def install
+    Rake::Task['install'].execute
+  end
 
-    desc "install", "Build and install berkshelf-#{Berkshelf::VERSION}.gem into system gems"
-    def install
-      Rake::Task["install"].execute
-    end
+  desc 'release', "Create tag v#{Berkshelf::VERSION} and build and push berkshelf-#{Berkshelf::VERSION}.gem to Rubygems"
+  def release
+    Rake::Task['release'].execute
   end
+end
 
-  class Spec < Thor
-    include Thor::Actions
+class Spec < Thor
+  include Thor::Actions
+  default_task :all
 
-    namespace :spec
-    default_task :all
+  desc 'all', 'Run all specs and features'
+  def all
+    exit(units_command && acceptance_command && quality_command)
+  end
 
-    desc "all", "Run all tests"
-    def all
-      unless run_unit && run_acceptance && run_quality
-        exit 1
-      end
-    end
+  desc 'ci', 'Run tests on Travis'
+  def ci
+    ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
+    all
+  end
 
-    desc "ci", "Run all possible tests on Travis-CI"
-    def ci
-      ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
-      unless run_unit("--tag ~chef_server") && run_acceptance("--tags ~@chef_server") && run_quality
-        exit 1
-      end
-    end
+  desc 'unit', 'Run unit tests'
+  def unit
+    exit(units_command)
+  end
 
-    desc "unit", "Run unit tests"
-    def unit
-      unless run_unit
-        exit 1
-      end
-    end
+  desc 'acceptance', 'Run acceptance tests'
+  def acceptance
+    exit(acceptance_command)
+  end
 
-    desc "acceptance", "Run acceptance tests"
-    def acceptance
-      unless run_acceptance
-        exit 1
-      end
-    end
+  desc 'quality', 'Run code quality tests'
+  def quality
+    exit(quality_command)
+  end
 
-    desc "quality", "Run quality tests"
-    def quality
-      unless run_quality
-        exit 1
-      end
+  no_tasks do
+    def units_command
+      run('rspec --color --format=documentation spec/unit')
     end
 
-    no_tasks do
-      def run_unit(*flags)
-        run "rspec --color --format=documentation #{flags.join(' ')} spec"
-      end
-
-      def run_acceptance(*flags)
-        run "cucumber --color --format pretty --tags ~@no_run #{flags.join(' ')}"
-      end
+    def acceptance_command
+      run('cucumber --color --format pretty --tags ~@no_run')
+    end
 
-      def run_quality
-        run "cane --gte coverage/.last_run.json,90"
-      end
+    def quality_command
+      run('cane --gte coverage/.last_run.json,90')
     end
   end
 end

data/berkshelf.gemspec

@@ -3,53 +3,64 @@ require File.expand_path('../lib/berkshelf/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.authors               = [
-    "Jamie Winsor",
-    "Josiah Kiehl",
-    "Michael Ivey",
-    "Justin Campbell"
+    'Jamie Winsor',
+    'Josiah Kiehl',
+    'Michael Ivey',
+    'Justin Campbell',
+    'Seth Vargo'
   ]
   s.email                 = [
-    "reset@riotgames.com",
-    "jkiehl@riotgames.com",
-    "michael.ivey@riotgames.com",
-    "justin.campbell@riotgames.com"
+    'reset@riotgames.com',
+    'jkiehl@riotgames.com',
+    'michael.ivey@riotgames.com',
+    'justin.campbell@riotgames.com',
+    'sethvargo@gmail.com'
   ]
 
   s.description               = %q{Manages a Cookbook's, or an Application's, Cookbook dependencies}
   s.summary                   = s.description
-  s.homepage                  = "http://berkshelf.com"
-  s.license                   = "Apache 2.0"
+  s.homepage                  = 'http://berkshelf.com'
+  s.license                   = 'Apache 2.0'
   s.files                     = `git ls-files`.split($\)
   s.executables               = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files                = s.files.grep(%r{^(test|spec|features)/})
-  s.name                      = "berkshelf"
-  s.require_paths             = ["lib"]
+  s.name                      = 'berkshelf'
+  s.require_paths             = ['lib']
   s.version                   = Berkshelf::VERSION
-  s.required_ruby_version     = ">= 1.9.1"
-  s.required_rubygems_version = ">= 1.8.0"
+  s.required_ruby_version     = '>= 1.9.1'
+  s.required_rubygems_version = '>= 1.8.0'
 
-  s.add_dependency 'celluloid', '>= 0.14.0'
-  s.add_dependency 'test-kitchen', '>= 1.0.0.alpha6'
-  s.add_dependency 'activesupport', '>= 3.2.0'
-  s.add_dependency 'mixlib-shellout', '~> 1.1'
-  s.add_dependency 'mixlib-config', '~> 1.1'
-  s.add_dependency 'faraday', '>= 0.8.5'
-  s.add_dependency 'ridley', '~> 0.12.1'
-  s.add_dependency 'chozo', '>= 0.6.1'
-  s.add_dependency 'hashie', '>= 2.0.2'
-  s.add_dependency 'minitar'
-  s.add_dependency 'solve', '>= 0.4.4'
-  s.add_dependency 'thor', '~> 0.18.0'
-  s.add_dependency 'retryable'
-  s.add_dependency 'addressable'
+  s.add_dependency 'activesupport',     '>= 3.2.0'
+  s.add_dependency 'addressable',       '~> 2.3.4'
+  s.add_dependency 'celluloid',         '>= 0.14.0'
+  s.add_dependency 'chozo',             '>= 0.6.1'
+  s.add_dependency 'faraday',           '>= 0.8.5'
+  s.add_dependency 'hashie',            '>= 2.0.2'
+  s.add_dependency 'minitar',           '~> 0.5.4'
+  s.add_dependency 'retryable',         '~> 1.3.3'
+  s.add_dependency 'ridley',            '~> 1.0.0'
+  s.add_dependency 'solve',             '>= 0.4.4'
+  s.add_dependency 'test-kitchen',      '>= 1.0.0.alpha7'
+  s.add_dependency 'thor',              '~> 0.18.0'
 
-  s.add_development_dependency 'aruba'
-  s.add_development_dependency 'cane'
-  s.add_development_dependency 'rake', '>= 0.9.2.2'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'spork'
-  s.add_development_dependency 'thor'
-  s.add_development_dependency 'webmock'
-  s.add_development_dependency 'vcr', '~> 2.4.0'
+  s.add_development_dependency 'aruba',         '~> 0.5'
+  s.add_development_dependency 'cane',          '~> 2.5'
+  s.add_development_dependency 'chef-zero',     '~> 1.1'
+  s.add_development_dependency 'fuubar',        '~> 1.1'
+  s.add_development_dependency 'rake',          '~> 0.9'
+  s.add_development_dependency 'rspec',         '~> 2.13'
+  s.add_development_dependency 'simplecov',     '~> 0.7'
+  s.add_development_dependency 'spork',         '~> 0.9'
+  s.add_development_dependency 'vcr',           '~> 2.4'
+  s.add_development_dependency 'webmock',       '~> 1.11'
+  s.add_development_dependency 'yard',          '~> 0.8'
+
+  # Guard extensions for development
+  s.add_development_dependency 'coolline',      '~> 0.4.2' # readline for guard on MRI
+  s.add_development_dependency 'guard',         '~> 1.8'
+  s.add_development_dependency 'guard-cane'
+  s.add_development_dependency 'guard-cucumber'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'guard-spork'
+  s.add_development_dependency 'guard-yard'
 end

data/features/apply_command.feature

@@ -1,32 +1,38 @@
-Feature: lock cookbook versions on the server
+Feature: Applying cookbook versions to a Chef Environment
   As a berks user
   I want to push my berks resolved cookbook versions to my environment
   So that I can avoid manual configuration of my environments
 
   @chef_server
-  Scenario: locking cookbook versions
-    Given I have an environment named "berkshelf_lock_test"
+  Scenario: Locking a cookbook version with dependencies
+    Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
+      | dependency | 2.0.0 |
+    And the cookbook store has the cookbooks:
+      | dependency | 2.0.0 |
+    And I have an environment named "berkshelf_lock_test"
     And I write to "Berksfile" with:
       """
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'deps'
+      cookbook 'fake', '1.0.0'
       """
-    When I successfully run the apply command on "berkshelf_lock_test"
+    When I successfully run `berks apply berkshelf_lock_test`
     Then the version locks in "berkshelf_lock_test" should be:
-    | cookbook                     | version_lock |
-    | berkshelf-cookbook-fixture   |        1.0.0 |
-    | hostsfile                    |        1.0.1 |
+      | cookbook   | version_lock |
+      | fake       | 1.0.0 |
+      | dependency | 2.0.0 |
     And the exit status should be 0
 
   @chef_server
-  Scenario: locking cookbook versions to an environment that does not exist
+  Scenario: Locking cookbook versions to a non-existent Chef Environment
     Given I do not have an environment named "berkshelf_lock_test"
+    And the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      cookbook 'berkshelf-cookbook-fixture'
+      cookbook 'fake', '1.0.0'
       """
     When I run the apply command on "berkshelf_lock_test"
     Then the output should contain:
       """
-      The environment "berkshelf_lock_test" does not exist.
+      The environment 'berkshelf_lock_test' does not exist
       """
     And the CLI should exit with the status code for error "EnvironmentNotFound"

data/features/config.feature

@@ -1,17 +1,17 @@
-Feature: cookbook creation with a config file
+Feature: Reading a Berkshelf configuration file
   As a Cookbook author
   I want to quickly generate a cookbook with my own customizations
   So that I don't have to spend time modifying the default generated output each time
 
-  Scenario: creating a new cookbook when no Berkshelf config exists
+  Scenario: Missing a Berkshelf configuration file
     Given I do not have a Berkshelf config file
-    When I run the cookbook command to create "sparkle_motion"
+    When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
       | config.vm.box = "Berkshelf-CentOS-6.3-x86_64-minimal" |
       | config.vm.box_url = "https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box" |
     And the exit status should be 0
 
-  Scenario: creating a new cookbook using a Berkshelf config
+  Scenario: Using a Berkshelf configuration file
     Given I have a Berkshelf config file containing:
     """
     {
@@ -30,7 +30,7 @@ Feature: cookbook creation with a config file
       }
     }
     """
-    When I run the cookbook command to create "sparkle_motion"
+    When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
       | config.vm.box = "my_box" |
       | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
@@ -39,7 +39,7 @@ Feature: cookbook creation with a config file
       | config.vm.network :public_network |
     And the exit status should be 0
 
-  Scenario: creating a new cookbook using a partial Berkshelf config
+  Scenario: Using a partial Berkshelf configuration file
     Given I have a Berkshelf config file containing:
     """
     {
@@ -52,12 +52,12 @@ Feature: cookbook creation with a config file
       }
     }
     """
-    When I run the cookbook command to create "sparkle_motion"
+    When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
       | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
     And the exit status should be 0
 
-  Scenario: creating a new cookbook using an invalid Berkshelf config
+  Scenario: Using an invalid Berkshelf configuration file
     Given I have a Berkshelf config file containing:
     """
     {
@@ -68,12 +68,12 @@ Feature: cookbook creation with a config file
       }
     }
     """
-    When I run the cookbook command to create "sparkle_motion"
+    When I run `berks cookbook sparkle_motion`
     Then the output should contain "Invalid configuration"
     And the output should contain "vagrant.vm.box Expected attribute: 'vagrant.vm.box' to be a type of: 'String'"
     And the CLI should exit with the status code for error "InvalidConfiguration"
 
-  Scenario: creating a new cookbook with a chef client config
+  Scenario: Using a Berkshelf configuration file with Chef configuration information
     Given I have a Berkshelf config file containing:
     """
     {
@@ -89,7 +89,7 @@ Feature: cookbook creation with a config file
       }
     }
     """
-    When I run the cookbook command to create "sparkle_motion"
+    When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
       | config.vm.provision :chef_client                    |
       | chef.chef_server_url        = "localhost:4000"      |