berkshelf 1.1.6 → 1.2.0.rc1

data/.cane

@@ -0,0 +1,4 @@
+--doc-exclude lib/berkshelf/errors.rb
+--max-violations 100
+--style-measure 120
+--parallel

data/.gitignore

@@ -21,3 +21,4 @@ tmp
 /features/config.yml
 *.sw[op]
 \.\#*
+rerun.txt

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# 1.1.0
+## new/improved commands
+- `berks show` command: display the file path for the given cookbook's current version resolved by your Berksfile
+- `berks list` command: list all of the cookbooks and their versions that are installed by resolving your Berksfile
+- `berks outdated` command (beta): show any cookbooks which have newer versions that are installed by resolving your Berksfile
+- `berks open` command [alpha]: like `berks show` except used to open the cookbook in your configured editor
+alpha: use at your own risk
+- improved `berks upload` command: now takes an optional cookbook name, or names, which will upload the target cookbook(s) to the Chef Server
+- improved `berks update` command: now takes an optional cookbook name, or names, which will update the target cookbook(s) in the Berksfile.lock
+
+## bug fixes
+- Improved error output in Vagrant plugin
+- Stack traces will now be replaced by friendly error messages where possible
+- Fix init generator on Ruby 1.9.2
+- Honor 'chefignore' when vendoring cookbooks this will ensure that you aren't putting junk files into your cookbooks if your distributing them for use with Chef-Solo
+
+# 1.0.0
+- Windows support
+- Easier installation by dropping Gecode requirement
+- Vagrant plugin for a seamless iteration process
+- Berkshelf has it's own configuration file
+- `berks configure` command
+- Github source location
+- Improved upload/download speed of cookbooks
+- Lots of bug fixes

data/CONTRIBUTING.md

@@ -42,3 +42,12 @@ server, so be sure to configure a server safe for this task.
 
 See [here](https://github.com/tdegrunt/vagrant-chef-server-bootstrap) for a
 quick way to get a testing chef server up.
+
+### Debugging Issues
+By default, Berkshelf will only give you the top-level output from a failed command. If you're working deep inside the core, an error like:
+
+    Berkshelf Error: wrong number of arguments (2 for 1)
+
+isn't exactly helpful...
+
+Specify the `BERKSHELF_DEBUG` flag when running your command to see a full stack trace and other helpful debugging information.

data/Gemfile

@@ -5,12 +5,12 @@ gemspec
 group :development do
   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 'spork'
   gem 'yard'
 
   require 'rbconfig'
@@ -35,16 +35,10 @@ group :development do
 end
 
 group :test do
-  gem 'aruba'
   gem 'fuubar'
   gem 'json_spec'
   gem 'rake', '>= 0.9.2.2'
   gem 'rspec'
   gem 'thor'
-  gem 'vcr'
   gem 'webmock'
 end
-
-group :development, :test do
-  gem 'vagrant', '~> 1.0.6'
-end

data/Guardfile

@@ -1,5 +1,3 @@
-notification :off
-
 guard 'spork' do
   watch('Gemfile')
   watch('spec/spec_helper.rb')  { :rspec }
@@ -25,3 +23,7 @@ guard 'cucumber', cli: "--drb --format pretty --tags ~@no_run --tags ~@wip", all
 
   watch(%r{^lib/berkshelf/cli.rb})                      { 'features' }
 end
+
+guard 'cane', run_all_on_start: false do
+  watch(/.*\.rb/)
+end

data/LICENSE

@@ -1,7 +1,7 @@
-Author:: Jamie Winsor (<jamie@vialstudios.com>)
-Author:: Josiah Kiehl (<josiah@skirmisher.net>)
-Author:: Michael Ivey (<ivey@gweezlebur.com>)
-Author:: Justin Campbell (<justin@justincampbell.me>)
+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 Riot Games
 

data/README.md

@@ -1,23 +1,46 @@
-# Berkshelf
-[![Build Status](https://travis-ci.org/RiotGames/berkshelf.png)](https://travis-ci.org/RiotGames/berkshelf)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/RiotGames/berkshelf)
+Berkshelf
+=========
+[![Build Status](https://travis-ci.org/RiotGames/berkshelf.png?branch=master)](https://travis-ci.org/RiotGames/berkshelf)
+[![Code Climate](https://codeclimate.com/github/RiotGames/berkshelf.png)](https://codeclimate.com/github/RiotGames/berkshelf)
 
 Manage a Cookbook or an Application's Cookbook dependencies
 
-## Installation
+Installation
+------------
+Add Berkshelf to your repository's `Gemfile`:
 
-    $ gem install berkshelf
+```ruby
+gem 'berkshelf'
+```
 
-## Usage
+Or run it as a standalone:
 
+    gem install berkshelf
+
+Usage
+-----
 See [berkshelf.com](http://berkshelf.com) for up-to-date usage instructions.
 
-# Authors
+Bash Completion
+---------------
+There is a [berkshelf bash completion script](https://raw.github.com/RiotGames/berkshelf/master/berkshelf-complete.sh). If you're using homebrew, you can install it like this:
+
+    brew install bash-completion # if you haven't already
+
+Download the latest script
+
+    cd `brew --prefix`/etc/bash_completion && wget https://raw.github.com/RiotGames/berkshelf/master/berkshelf-complete.sh
+
+And make sure you have this in your bash/zsh profile:
+
+    [ -f `brew --prefix`/etc/bash_completion ] && source `brew --prefix`/etc/bash_completion
 
-* Jamie Winsor (<jamie@vialstudios.com>)
-* Josiah Kiehl (<josiah@skirmisher.net>)
-* Michael Ivey (<ivey@gweezlebur.com>)
-* Justin Campbell (<justin@justincampbell.me>)
+Authors
+-------
+- Jamie Winsor (<reset@riotgames.com>)
+- Josiah Kiehl (<jkiehl@riotgames.com>)
+- Michael Ivey (<michael.ivey@riotgames.com>)
+- Justin Campbell (<justin.campbell@riotgames.com>)
 
 Thank you to all of our [Contributors](https://github.com/RiotGames/berkshelf/graphs/contributors), testers, and users.
 

data/Thorfile

@@ -38,7 +38,7 @@ class Default < Thor
 
     desc "all", "Run all tests"
     def all
-      unless run_unit && run_acceptance
+      unless run_unit && run_acceptance && run_quality
         exit 1
       end
     end
@@ -46,7 +46,7 @@ class Default < Thor
     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")
+      unless run_unit("--tag ~chef_server") && run_acceptance("--tags ~@chef_server") && run_quality
         exit 1
       end
     end
@@ -65,6 +65,13 @@ class Default < Thor
       end
     end
 
+    desc "quality", "Run quality tests"
+    def quality
+      unless run_quality
+        exit 1
+      end
+    end
+
     no_tasks do
       def run_unit(*flags)
         run "rspec --color --format=documentation #{flags.join(' ')} spec"
@@ -73,16 +80,10 @@ class Default < Thor
       def run_acceptance(*flags)
         run "cucumber --color --format pretty --tags ~@no_run #{flags.join(' ')}"
       end
-    end
-  end
 
-  class VCR < Thor
-    namespace :vcr
-    default_task :clean
-
-    desc "clean", "clean VCR cassettes"
-    def clean
-      FileUtils.rm_rf("spec/fixtures/vcr_cassettes")
+      def run_quality
+        run "cane --gte coverage/.last_run.json,90"
+      end
     end
   end
 end

data/berkshelf-complete.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# Description
+#   Add tab completion for berkshelf
+#
+# Configuration:
+#   BERKSHELF_BERKSFILE (default is 'Berksfile')
+#
+# Notes:
+#   Must be added to your ~/.bashrc, ~/.zshrc, etc
+#
+# Author:
+#   Seth Vargo <sethvargo@gmail.com>
+#
+# License:
+#   Apache 2.0
+#
+
+_bundler() {
+  which bundle > /dev/null 2>&1 && [ -f "$(pwd)/Gemfile" ]
+}
+
+# Overwrite berks to use bundler if defined
+_berks() {
+  [ _bundler ] && bundle exec berks $@ || berks $@
+}
+
+_berkshelf_commands() {
+  local cachefile=~/.berkshelf/.commands
+  [ ! -f $cachefile ] && $(_berks help | grep berks | cut -d " " -f 4 > $cachefile)
+  cat $cachefile
+}
+
+_berkshelf_cookbooks() {
+  [ -z $BERKSHELF_BERKSFILE ] && BERKSHELF_BERKSFILE="Berksfile"
+  cat $BERKSHELF_BERKSFILE | grep "cookbook" | cut -d "'" -f 2
+}
+
+_local_cookbooks() {
+  ls -d cookbooks/*/ | cut -d "/" -f 2
+}
+
+_berkshelf() {
+  # local curr prev commands
+  COMPREPLY=()
+  curr="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+  # List of commands to complete
+  commands=`_berkshelf_commands`
+
+  case "${prev}" in
+    "open"|"outdated"|"show"|"update"|"upload")
+      local berkshelf_cookbooks=`_berkshelf_cookbooks`
+      local local_cookbooks=`_local_cookbooks`
+      local cookbooks=`echo $berkshelf_cookbooks $local_cookbooks | sort -n | uniq`
+      COMPREPLY=($(compgen -W "${cookbooks}" -- ${curr}))
+      return 0
+      ;;
+    *)
+      ;;
+  esac
+
+  COMPREPLY=($(compgen -W "${commands}" -- ${curr}))
+  return 0
+}
+
+complete -F _berkshelf berks

data/berkshelf.gemspec

@@ -9,10 +9,10 @@ Gem::Specification.new do |s|
     "Justin Campbell"
   ]
   s.email                 = [
-    "jamie@vialstudios.com",
-    "josiah@skirmisher.net",
-    "ivey@gweezlebur.com",
-    "justin@justincampbell.me"
+    "reset@riotgames.com",
+    "jkiehl@riotgames.com",
+    "michael.ivey@riotgames.com",
+    "justin.campbell@riotgames.com"
   ]
 
   s.description           = %q{Manages a Cookbook's, or an Application's, Cookbook dependencies}
@@ -29,17 +29,30 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'yajl-ruby'
   s.add_dependency 'activesupport'
-  # Must lock 10.16 because of Vagrant 1-0-stable JSON requirement
-  s.add_dependency 'chef', '= 10.16.2'
-  s.add_dependency 'ridley', '~> 0.6.3'
-  s.add_dependency 'chozo', '>= 0.2.3'
+  s.add_dependency 'mixlib-shellout'
+  s.add_dependency 'mixlib-config'
+  s.add_dependency 'faraday', '>= 0.8.5'
+  s.add_dependency 'ridley', '>= 0.7.0.rc4'
+  s.add_dependency 'chozo', '>= 0.5.0'
   s.add_dependency 'hashie'
   s.add_dependency 'minitar'
-  s.add_dependency 'multi_json', '>= 1.3.0'
-  s.add_dependency 'solve', '>= 0.4.0.rc1'
+  s.add_dependency 'json', '>= 1.5.0'
+  s.add_dependency 'multi_json', '~> 1.5'
+  s.add_dependency 'solve', '>= 0.4.2'
   s.add_dependency 'thor', '~> 0.16.0'
 
   # Vagrant 1-0-stable compatability locks
   s.add_dependency 'moneta', '~> 0.6.0'
   s.add_dependency 'net-ssh-gateway', '= 1.1.0'
+
+  s.add_development_dependency 'aruba'
+  s.add_development_dependency 'cane'
+  s.add_development_dependency 'json_spec'
+  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 'vagrant', '~> 1.0.6'
 end

data/bin/berks

@@ -6,8 +6,10 @@ begin
   Berkshelf::Cli.start
 rescue Berkshelf::BerkshelfError => e
   Berkshelf.ui.error e
+  Berkshelf.ui.error "\t" + e.backtrace.join("\n\t") if ENV['BERKSHELF_DEBUG']
   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']
   exit 47
 end

data/features/config.feature

@@ -61,15 +61,16 @@ Feature: cookbook creation with a config file
     Given I have a Berkshelf config file containing:
     """
     {
-      "vagrant": null
+      "vagrant": {
+        "vm": {
+          "box": 1
+        }
+      }
     }
     """
     When I run the cookbook command to create "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 output should contain "vagrant.vm.box A value is required for attribute: 'vagrant.vm.box'"
-    And the output should contain "vagrant.vm.box_url Expected attribute: 'vagrant.vm.box_url' to be a type of: 'String'"
-    And the output should contain "vagrant.vm.box_url A value is required for attribute: 'vagrant.vm.box_url'"
     And the CLI should exit with the status code for error "InvalidConfiguration"
 
   Scenario: creating a new cookbook with a chef client config

data/features/configure_command.feature

@@ -29,6 +29,7 @@ Feature: configure command
 
   Scenario: generating a config with default values
     Given I do not have a Berkshelf config file
+    And I have a default Chef config
     When I run the "configure" command interactively
     And I type ""
     And I type ""

data/features/install_command.feature

@@ -242,9 +242,9 @@ Feature: install cookbooks from a Berksfile
     When I run `berks install`
     Then the output should contain:
       """
-      A cookbook satisfying 'artifact' (= 0.9.8) not found at git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.10.0'
+      Cookbook downloaded for 'artifact' from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.10.0' does not satisfy the version constraint (= 0.9.8)
       """
-    And the CLI should exit with the status code for error "ConstraintNotSatisfied"
+    And the CLI should exit with the status code for error "CookbookValidationFailure"
 
   Scenario: when a git location source is defined and a cookbook of the same name is already cached in the cookbook store
     Given I write to "Berksfile" with:
@@ -276,17 +276,17 @@ Feature: install cookbooks from a Berksfile
   Scenario: with a cookbook definition containing a chef_api source location
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", "= 0.10.2", chef_api: :config
+      cookbook "cuke-test", "= 1.0.0", chef_api: :config
       """
     And the Chef server has cookbooks:
-      | artifact | 0.10.2 |
+      | cuke-test | 1.0.0 |
     When I successfully run `berks install`
     Then the output should contain:
       """
-      Installing artifact (0.10.2) from chef_api:
+      Installing cuke-test (1.0.0) from chef_api:
       """
     And the cookbook store should have the cookbooks:
-      | artifact | 0.10.2 |
+      | cuke-test | 1.0.0 |
     And the exit status should be 0
 
   Scenario: with a chef_api source location specifying :config when a Berkshelf config is not found at the given path
@@ -302,42 +302,6 @@ Feature: install cookbooks from a Berksfile
       """
     And the CLI should exit with the status code for error "BerksConfigNotFound"
 
-  Scenario: with a chef_api source location specifying a Chef API URL but missing a node_name option
-    Given I write to "Berksfile" with:
-      """
-      cookbook "artifact", chef_api: "https://api.opscode.com/organizations/vialstudios", client_key: "/Users/reset/.chef/knife.rb"
-      """
-    When I run `berks install`
-    Then the output should contain:
-      """
-      Source 'artifact' is a 'chef_api' location with a URL for it's value but is missing options: 'node_name'.
-      """
-    And the CLI should exit with the status code for error "InvalidChefAPILocation"
-
-  Scenario: with a chef_api source location specifying a Chef API URL but missing a client_key option
-    Given I write to "Berksfile" with:
-      """
-      cookbook "artifact", chef_api: "https://api.opscode.com/organizations/vialstudios", node_name: "reset"
-      """
-    When I run `berks install`
-    Then the output should contain:
-      """
-      Source 'artifact' is a 'chef_api' location with a URL for it's value but is missing options: 'client_key'.
-      """
-    And the CLI should exit with the status code for error "InvalidChefAPILocation"
-
-  Scenario: with a chef_api source location specifying a Chef API URL but missing a client_key option
-    Given I write to "Berksfile" with:
-      """
-      cookbook "artifact", chef_api: "https://api.opscode.com/organizations/vialstudios"
-      """
-    When I run `berks install`
-    Then the output should contain:
-      """
-      Source 'artifact' is a 'chef_api' location with a URL for it's value but is missing options: 'node_name', 'client_key'.
-      """
-    And the CLI should exit with the status code for error "InvalidChefAPILocation"
-
   Scenario: with a git error during download
     Given I write to "Berksfile" with:
       """
@@ -348,7 +312,7 @@ Feature: install cookbooks from a Berksfile
     Then the output should contain:
       """
       Installing ohai (1.1.4) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      Failed to download doesntexist from git: 'git://github.com/asdjhfkljashflkjashfakljsf'
+      Failed to download 'doesntexist' from git: 'git://github.com/asdjhfkljashflkjashfakljsf'
       An error occured during Git execution:
       """
       And the CLI should exit with the status code for error "GitError"