berkshelf 1.3.0.rc1 → 1.3.1

data/berkshelf.gemspec

@@ -27,12 +27,13 @@ Gem::Specification.new do |s|
   s.version               = Berkshelf::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
+  s.add_dependency 'celluloid', '>= 0.13.0'
   s.add_dependency 'yajl-ruby'
-  s.add_dependency 'activesupport', '~> 3.2'
-  s.add_dependency 'mixlib-shellout'
-  s.add_dependency 'mixlib-config'
+  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.8.5'
+  s.add_dependency 'ridley', '>= 0.8.6'
   s.add_dependency 'chozo', '>= 0.6.1'
   s.add_dependency 'hashie', '>= 2.0.2'
   s.add_dependency 'minitar'

data/features/config.feature

@@ -34,9 +34,9 @@ Feature: cookbook creation with a config file
     Then the resulting "sparkle_motion" Vagrantfile should contain:
       | config.vm.box = "my_box" |
       | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
-      | config.vm.forward_port 12345, 54321 |
-      | config.vm.network :hostonly, "12.34.56.78" |
-      | config.vm.network :bridged |
+      | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
+      | config.vm.network :private_network, ip: "12.34.56.78" |
+      | config.vm.network :public_network |
     And the exit status should be 0
 
   Scenario: creating a new cookbook using a partial Berkshelf config
@@ -54,7 +54,7 @@ Feature: cookbook creation with a config file
     """
     When I run the cookbook command to create "sparkle_motion"
     Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.vm.forward_port 12345, 54321 |
+      | 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
@@ -91,8 +91,8 @@ Feature: cookbook creation with a config file
     """
     When I run the cookbook command to create "sparkle_motion"
     Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.vm.provision :chef_client |
-      | chef.chef_server_url = "localhost:4000" |
+      | config.vm.provision :chef_client                    |
+      | chef.chef_server_url        = "localhost:4000"      |
       | chef.validation_client_name = "my_client-validator" |
-      | chef.validation_key_path = "/a/b/c/my_client-validator.pem" |
+      | chef.validation_key_path    = "/a/b/c/my_client-validator.pem" |
     Then the exit status should be 0

data/lib/berkshelf.rb

@@ -20,6 +20,7 @@ require 'thor'
 require 'tmpdir'
 require 'uri'
 require 'zlib'
+require 'celluloid'
 
 require 'berkshelf/version'
 require 'berkshelf/core_ext'
@@ -77,6 +78,11 @@ module Berkshelf
       ENV["BERKSHELF_PATH"] || File.expand_path("~/.berkshelf")
     end
 
+    # @return [Logger]
+    def log
+      Celluloid.logger
+    end
+
     # @return [String]
     def tmp_dir
       File.join(berkshelf_path, "tmp")

data/lib/berkshelf/cli.rb

@@ -30,6 +30,10 @@ module Berkshelf
         Berkshelf::Config.path = @options[:config]
       end
 
+      if @options[:debug]
+        Berkshelf.log.level = ::Logger::DEBUG
+      end
+
       if @options[:quiet]
         Berkshelf.ui.mute!
       end
@@ -65,6 +69,11 @@ module Berkshelf
       desc: "Silence all informational output.",
       aliases: "-q",
       default: false
+    class_option :debug,
+      type: :boolean,
+      desc: "Output debug information",
+      aliases: "-d",
+      default: false
 
     method_option :force,
       type: :boolean,

data/lib/berkshelf/errors.rb

@@ -149,4 +149,5 @@ module Berkshelf
   class InvalidVersionConstraint < BerkshelfError; status_code(122); end
   class CommunitySiteError < BerkshelfError; status_code(123); end
   class CookbookValidationFailure < BerkshelfError; status_code(124); end
+  class ClientKeyFileNotFound < BerkshelfError; status_code(125); end
 end

data/lib/berkshelf/locations/chef_api_location.rb

@@ -84,7 +84,14 @@ module Berkshelf
     #   the name of the client to use to communicate with the Chef API.
     # @option options [String] :client_key (Berkshelf::Config.instance.chef.client_key)
     #   the filepath to the authentication key for the client
-    # @option options [Boolean] :verify_ssl (Berkshelf::Config.instance.chef.ssl.verify) 
+    # @option options [Boolean] :verify_ssl (Berkshelf::Config.instance.chef.ssl.verify)
+    #
+    # @raise [ClientKeyFileNotFound] if the value for :client_key does not contain a filepath
+    #   pointing to a readable file containing a Chef client key.
+    #
+    #   If the :chef_api option is given the symbol :config and your Berkshelf config does not
+    #   have a value for chef.client_key which points to a readable file containing a Chef
+    #   client key.
     def initialize(name, version_constraint, options = {})
       options = options.reverse_merge(
         client_key: Berkshelf::Config.instance.chef.client_key,
@@ -134,6 +141,8 @@ module Berkshelf
       # Why do we use a class function for defining our finalizer?
       # http://www.mikeperham.com/2010/02/24/the-trouble-with-ruby-finalizers/
       ObjectSpace.define_finalizer(self, self.class.finalizer)
+    rescue Ridley::Errors::ClientKeyFileNotFound => ex
+      raise ClientKeyFileNotFound, ex
     end
 
     # @param [#to_s] destination
@@ -159,10 +168,14 @@ module Berkshelf
     def target_cookbook
       return @target_cookbook unless @target_cookbook.nil?
 
-      @target_cookbook = if version_constraint
-        conn.cookbook.satisfy(name, version_constraint)
-      else
-        conn.cookbook.latest_version(name)
+      begin
+        @target_cookbook = if version_constraint
+          conn.cookbook.satisfy(name, version_constraint)
+        else
+          conn.cookbook.latest_version(name)
+        end
+      rescue Ridley::Errors::HTTPNotFound
+        @target_cookbook = nil
       end
 
       if @target_cookbook.nil?

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.3.0.rc1"
+  VERSION = "1.3.1"
 end

data/spec/spec_helper.rb

@@ -10,8 +10,8 @@ Spork.prefork do
   require 'vcr'
 
   APP_ROOT = File.expand_path('../../', __FILE__)
-  ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "tmp", "berkshelf")
-  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "tmp", "knife.rb")
+  ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "spec", "tmp", "berkshelf")
+  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "spec", "tmp", "knife.rb")
 
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 

data/spec/unit/berkshelf/locations/chef_api_location_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Berkshelf::ChefAPILocation, :chef_server do
   let(:test_chef_api) { "https://chefserver:8081" }
+  let(:node_name) { "reset" }
+  let(:client_key) { fixtures_path.join("reset.pem").to_s }
 
   describe "ClassMethods" do
     subject { described_class }
@@ -11,9 +13,6 @@ describe Berkshelf::ChefAPILocation, :chef_server do
     let(:constraint) { double('constraint') }
 
     describe "::initialize" do
-      let(:node_name) { "reset" }
-      let(:client_key) { fixtures_path.join("reset.pem").to_s }
-
       before(:each) do
         @location = subject.new("nginx",
           constraint,
@@ -104,7 +103,7 @@ describe Berkshelf::ChefAPILocation, :chef_server do
   end
 
   subject do
-    described_class.new('nginx', nil, chef_api: :config)
+    described_class.new('nginx', nil, chef_api: test_chef_api, node_name: node_name, client_key: client_key)
   end
 
   describe "#target_cookbook" do
@@ -133,7 +132,7 @@ describe Berkshelf::ChefAPILocation, :chef_server do
 
   describe "#to_s" do
     it "returns a string containing the location key and the Chef API URI" do
-      subject.to_s.should eql("chef_api: '#{Berkshelf::Config.instance.chef.chef_server_url}'")
+      subject.to_s.should eql("chef_api: '#{test_chef_api}'")
     end
   end
 end

data/spec/unit/berkshelf_spec.rb

@@ -52,5 +52,11 @@ describe Berkshelf do
         end
       end
     end
+
+    describe "::log" do
+      it "returns an instance of Logger" do
+        subject.log.should be_a(::Logger)
+      end
+    end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc1
-  prerelease: 6
+  version: 1.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
@@ -14,6 +14,22 @@ bindir: bin
 cert_chain: []
 date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -35,49 +51,49 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +117,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +125,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: chozo
   requirement: !ruby/object:Gem::Requirement
@@ -591,9 +607,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1990198724109386499
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24