berkshelf 1.4.5 → 1.4.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.4.6
+
+- Backport bug fixes from 2.0.2
+
 # 1.4.4
 
 - Bump Ridley dependency to 0.12, bringing in many bugfixes.
@@ -29,7 +33,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

@@ -1,9 +1,8 @@
 source 'https://rubygems.org'
-
 gemspec
 
 group :development do
-  gem 'chef-zero', '>= 0.9.9'
+  gem 'chef-zero', '~> 1.1'
   gem 'coolline'
   gem 'guard', '>= 1.5.0'
   gem 'guard-cane'
@@ -34,12 +33,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/Thorfile

@@ -46,9 +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") && run_quality
-        exit 1
-      end
+      all
     end
 
     desc "unit", "Run unit tests"

data/berkshelf.gemspec

@@ -3,30 +3,30 @@ 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'
   ]
   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'
   ]
 
   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 'yajl-ruby'
@@ -45,14 +45,23 @@ Gem::Specification.new do |s|
   s.add_dependency 'retryable'
   s.add_dependency 'addressable'
 
-  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 '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.0'
+  s.add_development_dependency 'fuubar',        '~> 1.1'
+  s.add_development_dependency 'json_spec',     '~> 1.1'
+  s.add_development_dependency 'rake',          '~> 0.9'
+  s.add_development_dependency 'rspec',         '~> 2.13'
+  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 '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/default_locations.feature

@@ -9,59 +9,59 @@ Feature: Berksfile default locations
     Given I write to "Berksfile" with:
       """
       chef_api :config
-      site 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      site :opscode
 
-      cookbook "artifact", "= 0.10.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     And the Chef server has cookbooks:
-      | artifact | 0.10.0 |
-    When I run the install command
+      | berkshelf-cookbook-fixture | 1.0.0 |
+    When I successfully run `berks install`
     Then the output should contain:
       """
-      Installing artifact (0.10.0) from chef_api:
+      Installing berkshelf-cookbook-fixture (1.0.0) from chef_api:
       """
     And the cookbook store should have the cookbooks:
-      | artifact | 0.10.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     And the exit status should be 0
 
-  @chef_server
+  @chef_server @focus
   Scenario: with a default chef_api(1) and site(2) location with a cookbook source that is not satisfied by the chef_api(1) location
     Given I write to "Berksfile" with:
       """
-      chef_api :config
-      site 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      # chef_api :config
+      site :opscode
 
-      cookbook "artifact", "= 0.10.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     And the Chef server does not have the cookbooks:
-      | artifact | 0.10.0 |
-    When I run the install command
+      | berkshelf-cookbook-fixture | 1.0.0 |
+    When I successfully run `berks install`
     Then the output should contain:
       """
-      Installing artifact (0.10.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
     And the cookbook store should have the cookbooks:
-      | artifact | 0.10.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     And the exit status should be 0
 
   @chef_server
   Scenario: with a default site(1) and chef_api(2) location with a cookbook source that is satisfied by the site(1) location
     Given I write to "Berksfile" with:
       """
-      site 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      site :opscode
       chef_api :config
 
-      cookbook "artifact", "= 0.10.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     And the Chef server has cookbooks:
-      | artifact | 0.10.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     When I run the install command
     Then the output should contain:
       """
-      Installing artifact (0.10.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
     And the cookbook store should have the cookbooks:
-      | artifact | 0.10.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     And the exit status should be 0
 
   @chef_server
@@ -70,17 +70,17 @@ Feature: Berksfile default locations
       """
       chef_api :config
 
-      cookbook 'artifact', '= 0.10.0', site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0', site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
     And the Chef server has cookbooks:
-      | artifact | 0.10.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     When I run the install command
     Then the output should contain:
       """
-      Installing artifact (0.10.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
     And the cookbook store should have the cookbooks:
-      | artifact | 0.10.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     And the exit status should be 0
 
   @chef_server
@@ -89,14 +89,14 @@ Feature: Berksfile default locations
       """
       chef_api :config
 
-      cookbook 'artifact', '= 0.10.0'
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     And the Chef server does not have the cookbooks:
-      | artifact | 0.10.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     When I run the install command
     Then the output should contain:
       """
-      Cookbook 'artifact' not found in any of the default locations
+      Cookbook 'berkshelf-cookbook-fixture' not found in any of the default locations
       """
     And the CLI should exit with the status code for error "CookbookNotFound"
 
@@ -106,7 +106,7 @@ Feature: Berksfile default locations
       site 'http://cookbooks.opscode.com/api/v1/cookbooks'
       site 'http://cookbooks.opscode.com/api/v1/cookbooks'
 
-      cookbook 'artifact', '= 0.10.0'
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     When I run the install command
     Then the output should contain:
@@ -121,7 +121,7 @@ Feature: Berksfile default locations
       site 'http://cookbooks.opscode.com/api/v1/cookbooks'
       site 'http://cookbooks.opscode.com/api/v2/cookbooks'
 
-      cookbook 'artifact', '= 0.10.0'
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     When I run the install command
     Then the exit status should be 0

data/features/install_command.feature

@@ -90,14 +90,13 @@ Feature: install cookbooks from a Berksfile
       """
     When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
-      | artifact | 1.5.0 | master |
+      | artifact | 1.7.0 | master |
     And the output should contain:
       """
-      Installing artifact (1.5.0) from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: 'master'
+      Installing artifact (1.7.0) from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: 'master'
       """
     And the exit status should be 0
 
-
   Scenario: installing a Berksfile that contains a Git location with a ref
     Given I write to "Berksfile" with:
       """
@@ -306,6 +305,20 @@ Feature: install cookbooks from a Berksfile
       | cuke-test | 1.0.0 |
     And the exit status should be 0
 
+  Scenario: when the :site is not defined
+    Given I write to "Berksfile" with:
+      """
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0', site: nil
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Installing berkshelf-cookbook-fixture (1.0.0) from site:
+      """
+    And the cookbook store should have the cookbooks:
+      | berkshelf-cookbook-fixture | 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
     Given I write to "Berksfile" with:
       """

data/features/outdated_command.feature

@@ -3,9 +3,11 @@ Feature: outdated command
   I want to know what cookbooks are outdated before I run update
   So that I can decide whether to update everything at once
 
+  @slow_process
   Scenario: Running berks outdated with no version constraints
     Given I write to "Berksfile" with:
       """
+      site :opscode
       cookbook "artifact"
       cookbook "build-essential"
       """
@@ -19,9 +21,11 @@ Feature: outdated command
       All cookbooks up to date
       """
 
+  @slow_process
   Scenario: Running berks outdated with satisfied version constraints
     Given I write to "Berksfile" with:
       """
+      site :opscode
       cookbook "artifact", ">= 0.11.0"
       cookbook "build-essential", ">= 1.0.0"
       """
@@ -35,9 +39,11 @@ Feature: outdated command
       All cookbooks up to date
       """
 
+  @slow_process
   Scenario: Running berks outdated with unsatisfied version constraints
     Given I write to "Berksfile" with:
       """
+      site :opscode
       cookbook "artifact", "~> 0.9.0"
       cookbook "build-essential", "~> 0.7.0"
       """

data/features/show_command.feature

@@ -6,6 +6,7 @@ Feature: show command
   Scenario: Running the show command with an installed cookbook name
     Given I write to "Berksfile" with:
       """
+      site :opscode
       cookbook "build-essential", "1.2.0"
       cookbook "chef-client", "1.2.0"
       cookbook "mysql", "1.2.4"

data/features/support/env.rb

@@ -11,8 +11,8 @@ Spork.prefork do
   APP_ROOT = File.expand_path('../../../', __FILE__)
 
   ENV['RUBY_ENV'] = 'test'
-  ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "tmp", "berkshelf")
-  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "spec", "knife.rb")
+  ENV['BERKSHELF_PATH'] = File.join(APP_ROOT, 'tmp', 'berkshelf')
+  ENV['BERKSHELF_CHEF_CONFIG'] = File.join(APP_ROOT, 'spec', 'config', 'knife.rb')
 
   # Workaround for RSA Fingerprint prompt in Travis CI
   git_ssh_path = '/tmp/git_ssh.sh'
@@ -35,7 +35,7 @@ Spork.prefork do
     clean_cookbook_store
     generate_berks_config(File.join(ENV["BERKSHELF_PATH"], 'config.json'))
     @aruba_io_wait_seconds = 5
-    @aruba_timeout_seconds = 16
+    @aruba_timeout_seconds = 30
   end
 
   Before('@slow_process') do
@@ -43,6 +43,15 @@ Spork.prefork do
     @aruba_io_wait_seconds = 10
   end
 
+  # Chef Zero
+  require 'chef_zero/server'
+  @server = ChefZero::Server.new(port: 4000, generate_real_keys: false)
+  @server.start_background
+
+  at_exit do
+    @server.stop if @server && @server.running?
+  end
+
   def cookbook_store
     Pathname.new(File.join(ENV["BERKSHELF_PATH"], "cookbooks"))
   end
@@ -71,7 +80,5 @@ Spork.prefork do
 end
 
 Spork.each_run do
-  Berkshelf::RSpec::Knife.load_knife_config(File.join(APP_ROOT, 'spec/knife.rb'))
-
   require 'berkshelf'
 end

data/features/upload_command.feature

@@ -216,3 +216,17 @@ Feature: upload command
       | ntp |
       | vim |
     And the exit status should be 0
+
+  Scenario: Raise exception uploading an invalid cookbook
+    Given a cookbook named "cookbook with spaces"
+    And I write to "Berksfile" with:
+      """
+      cookbook 'cookbook with spaces', path: './cookbook with spaces'
+      """
+    When I run `berks upload`
+    Then the output should contain:
+      """
+      The cookbook 'cookbook with spaces' has invalid filenames:
+      """
+    And the CLI should exit with the status code for error "InvalidCookbookFiles"
+

data/features/vendor_install.feature

@@ -7,7 +7,6 @@ Feature: install cookbooks to a given vendor path
     Given I write to "Berksfile" with:
       """
       site :opscode
-
       cookbook "artifact", "0.10.0"
       """
     When I run the install command with flags:

data/lib/berkshelf/berksfile.rb

@@ -506,6 +506,8 @@ module Berkshelf
       solution.each do |cb|
         Berkshelf.formatter.upload(cb.cookbook_name, cb.version, conn.server_url)
 
+        validate_files!(cb)
+
         begin
           conn.cookbook.upload(cb.path, upload_opts.merge(name: cb.cookbook_name))
         rescue Ridley::Errors::FrozenCookbook => ex
@@ -602,5 +604,20 @@ module Berkshelf
       def update_lockfile(sources)
         Berkshelf::Lockfile.update!(sources)
       end
+
+      # Validate that the given cookbook does not have "bad" files. Currently
+      # this means including spaces in filenames (such as recipes)
+      #
+      # @param [Berkshelf::CachedCookbook] cookbook
+      #  the Cookbook to validate
+      def validate_files!(cookbook)
+        path = cookbook.path.to_s
+
+        files = Dir.glob(File.join(path, '**', '*.rb')).select do |f|
+          f =~ /[[:space:]]/
+        end
+
+        raise Berkshelf::InvalidCookbookFiles.new(cookbook, files) unless files.empty?
+      end
   end
 end