berkshelf 1.4.0 → 1.4.1

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 1.4.1
+
+- Berksfile#upload will now honor the given server_url option
+- Add validation to shortnames of 'site' in Berksfile
+- Fix init generator issue by locking to the appropriate version of Rubygems
+
+# 1.4.0
+
+- Add ability to freeze cookbooks. Cookbooks are frozen on upload by default
+- Add ability to forcefully upload cookbooks even if they are frozen with the `--force` option
+- Add `berks info` command for displaying information about cookbooks in your Berkshelf
+- Add `berks contingent` command for displaying a list of cookbooks which are dependent upon one another
+- Cookbook generator now has the option of generating chef minispec files (false by default)
+- Fix bug in downloading cookbooks which were packaged as plain tars instead of tar.gzs
+- Path locations will now be relative to the Berksfile they are defined in
+
 # 1.3.1
 - Support for Vagrant 1.1.x
 - Move Berkshelf Vagrant plugin into it's [own repository](https://github.com/RiotGames/berkshelf-vagrant)

data/PLUGINS.md

@@ -0,0 +1,24 @@
+Berkshelf Plugins
+=================
+This is a list of community-contributed plugins for Berkshelf. A few notes:
+
+- Please do not open issues regarding a community plugin on Berkshelf. Create the issue on the plugin first please.
+- Plugins are listed in alphabetical order for consistency.
+
+Plugins
+-------
+- [berkshelf-shims](https://github.com/JeffBellegarde/berkshelf-shims) - Provide shims functionality for Berkshelf.
+- [vagrant-berkshelf](https://github.com/RiotGames/vagrant-berkshelf) - A Vagrant plugin to add Berkshelf integration to the Chef provisioners.
+
+I want to add my plugin!
+------------------------
+1. Plugins should be prefixed with `berkshelf-` for consistency.
+1. Create your plugin on github - be sure to include tests. We will most likely not list a plugin that is untested.
+1. Fork the Berkshelf project on github.
+1. Edit this file, adding your plugin. All plugins must be on github. The format for a plugin is:
+
+        [Linked Project Name](#) - A short description of the plugin, what it does, why it exists, etc. ([Optional Link to Plugin Website](#))
+
+  For example:
+
+  [berkshelf-myface](https://github.com/RiotGames/berkshelf-myface) - A plugin to add myface support to Berkshelf.

data/README.md

@@ -37,6 +37,26 @@ And make sure you have this in your bash/zsh profile:
 
     [ -f `brew --prefix`/etc/bash_completion ] && source `brew --prefix`/etc/bash_completion
 
+Plugins
+-------
+Please see [Plugins page](https://github.com/RiotGames/berkshelf/blob/master/PLUGINS.md) for more information.
+
+SSL Errors
+----------
+
+If you have trouble getting Berkshelf to successfully talk to an SSL Chef server, you can try making sure you
+have a certificate bundle available to your shell. `export SSL_CERT_FILE=...path/to/cert/file...`
+
+If you need to disable SSL, you can in `~/.berkshelf/config.json` like so:
+
+```
+{
+  "ssl": {
+    "verify": false
+  }
+}
+```
+
 Authors
 -------
 - Jamie Winsor (<reset@riotgames.com>)

data/berkshelf.gemspec

@@ -15,17 +15,18 @@ Gem::Specification.new do |s|
     "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.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.version               = Berkshelf::VERSION
-  s.required_ruby_version = ">= 1.9.1"
+  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.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.version                   = Berkshelf::VERSION
+  s.required_ruby_version     = ">= 1.9.1"
+  s.required_rubygems_version = ">= 1.8.0"
 
   s.add_dependency 'celluloid', '>= 0.13.0'
   s.add_dependency 'yajl-ruby'

data/features/install_command.feature

@@ -318,3 +318,15 @@ Feature: install cookbooks from a Berksfile
       An error occured during Git execution:
       """
       And the CLI should exit with the status code for error "GitError"
+
+  Scenario: invalid site symbol
+    Given I write to "Berksfile" with:
+      """
+      site :somethingabsurd
+      cookbook "ohai"
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      Unknown site shortname: :somethingabsurd. Supported shortnames are: :opscode
+      """

data/features/support/env.rb

@@ -1,5 +1,3 @@
-ENV['RUBY_ENV'] == 'test'
-
 require 'rubygems'
 require 'bundler'
 require 'spork'
@@ -12,6 +10,7 @@ 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")
 
@@ -32,6 +31,7 @@ Spork.prefork do
   World(Berkshelf::TestGenerators)
 
   Before do
+    set_env 'RUBY_ENV', 'test'
     clean_cookbook_store
     generate_berks_config(File.join(ENV["BERKSHELF_PATH"], 'config.json'))
     @aruba_io_wait_seconds = 5

data/lib/berkshelf/berksfile.rb

@@ -465,6 +465,8 @@ module Berkshelf
     # @option options [Boolean] :halt_on_frozen (false)
     #   Raise a FrozenCookbook error if one of the cookbooks being uploaded is already located
     #   on the remote Chef Server and frozen.
+    # @option options [String] :server_url
+    #   An overriding Chef Server to upload the cookbooks to
     #
     # @raise [UploadFailure] if you are uploading cookbooks with an invalid or not-specified client key
     # @raise [Berkshelf::FrozenCookbook]
@@ -480,7 +482,7 @@ module Berkshelf
       )
 
       ridley_options               = options.slice(:ssl)
-      ridley_options[:server_url]  = Berkshelf::Config.instance.chef.chef_server_url
+      ridley_options[:server_url]  = options[:server_url] || Berkshelf::Config.instance.chef.chef_server_url
       ridley_options[:client_name] = Berkshelf::Config.instance.chef.node_name
       ridley_options[:client_key]  = Berkshelf::Config.instance.chef.client_key
       ridley_options[:ssl]         = { verify: options[:ssl_verify] }

data/lib/berkshelf/cookbook_source.rb

@@ -68,32 +68,37 @@ module Berkshelf
 
     extend Forwardable
 
+    # @return [Berkshelf::Berksfile]
     attr_reader :berksfile
+    # @return [String]
     attr_reader :name
-    attr_reader :options
+    # @return [Solve::Constraint]
     attr_reader :version_constraint
+    # @return [Berkshelf::CachedCookbook]
     attr_accessor :cached_cookbook
 
-    #  @param [String] name
-    #  @param [Hash] options
+    # @param [Berkshelf::Berksfile] berksfile
+    #   the berksfile this source belongs to
+    # @param [String] name
+    #   the name of source
     #
-    #  @option options [String, Solve::Constraint] constraint
-    #    version constraint to resolve for this source
-    #  @option options [String] :git
-    #    the Git URL to clone
-    #  @option options [String] :site
-    #    a URL pointing to a community API endpoint
-    #  @option options [String] :path
-    #    a filepath to the cookbook on your local disk
-    #  @option options [Symbol, Array] :group
-    #    the group or groups that the cookbook belongs to
-    #  @option options [String] :ref
-    #    the commit hash or an alias to a commit hash to clone
-    #  @option options [String] :branch
-    #    same as ref
-    #  @option options [String] :tag
-    #    same as tag
-    #  @option options [String] :locked_version
+    # @option options [String, Solve::Constraint] :constraint
+    #   version constraint to resolve for this source
+    # @option options [String] :git
+    #   the Git URL to clone
+    # @option options [String] :site
+    #   a URL pointing to a community API endpoint
+    # @option options [String] :path
+    #   a filepath to the cookbook on your local disk
+    # @option options [Symbol, Array] :group
+    #   the group or groups that the cookbook belongs to
+    # @option options [String] :ref
+    #   the commit hash or an alias to a commit hash to clone
+    # @option options [String] :branch
+    #   same as ref
+    # @option options [String] :tag
+    #   same as tag
+    # @option options [String] :locked_version
     def initialize(berksfile, name, options = {})
       self.class.validate_options(options)
 

data/lib/berkshelf/errors.rb

@@ -152,4 +152,15 @@ module Berkshelf
 
   class UploadFailure < BerkshelfError; end
   class FrozenCookbook < UploadFailure; status_code(126); end
+  class InvalidSiteShortnameError < BerkshelfError
+    status_code(127)
+
+    def initialize(shortname)
+      @shortname = shortname
+    end
+
+    def to_s
+      "Unknown site shortname: #{@shortname.inspect}. Supported shortnames are: #{SiteLocation::SHORTNAMES.keys.map(&:inspect).join(',')}"
+    end
+  end
 end

data/lib/berkshelf/locations/site_location.rb

@@ -9,6 +9,8 @@ module Berkshelf
     def_delegator :conn, :api_uri
     attr_accessor :version_constraint
 
+    SHORTNAMES = {opscode: CommunityREST::V1_API}.freeze
+
     # @param [#to_s] name
     # @param [Solve::Constraint] version_constraint
     # @param [Hash] options
@@ -20,8 +22,10 @@ module Berkshelf
       @name               = name
       @version_constraint = version_constraint
 
-      api_uri = if options[:site].nil? || options[:site] == :opscode
-        CommunityREST::V1_API
+      api_uri = if options[:site].nil? || SHORTNAMES.has_key?(options[:site])
+        SHORTNAMES[options[:site]]
+      elsif options[:site].kind_of?(Symbol)
+        raise InvalidSiteShortnameError.new(options[:site])
       else
         options[:site]
       end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -402,6 +402,104 @@ EOF
   end
 
   describe "#upload" do
-    pending
+    let(:upload) { subject.upload(options) }
+    let(:options) { Hash.new }
+    let(:ssl) { double('ssl', verify: true) }
+    let(:chef) {
+      double('chef',
+        node_name: "fake-client",
+        client_key: "client-key",
+        chef_server_url: "http://configured-chef-server/")
+    }
+    let(:berkshelf_config) { double('berks', ssl: ssl, chef: chef) }
+    let(:default_ridley_options) {
+      {
+        client_name: "fake-client",
+        client_key: "client-key",
+        ssl: {
+          verify: true
+        }
+      }
+    }
+
+    before do
+      Berkshelf::Config.stub(:instance).and_return(berkshelf_config)
+      subject.stub(:resolve).and_return([])
+    end
+
+    context "when there is no :server_url" do
+      let(:chef) {
+        double('chef',
+          node_name: "fake-client",
+          client_key: "client-key",
+          chef_server_url: nil)
+      }
+      let(:message) { "Missing required attribute in your Berkshelf configuration: chef.server_url" }
+
+      it "raises an error" do
+        expect {
+          upload
+        }.to raise_error(Berkshelf::UploadFailure, message)
+      end
+    end
+
+    context "when there is no :client_name" do
+      let(:chef) {
+        double('chef',
+          node_name: nil,
+          client_key: "client-key",
+          chef_server_url: "http://configured-chef-server/")
+      }
+      let(:message) { "Missing required attribute in your Berkshelf configuration: chef.node_name" }
+
+      it "raises an error" do
+        expect {
+          upload
+        }.to raise_error(Berkshelf::UploadFailure, message)
+      end
+    end
+
+    context "when there is no :client_key" do
+      let(:chef) {
+        double('chef',
+          node_name: "fake-client",
+          client_key: nil,
+          chef_server_url: "http://configured-chef-server/")
+      }
+      let(:message) { "Missing required attribute in your Berkshelf configuration: chef.client_key" }
+
+      it "raises an error" do
+        expect {
+          upload
+        }.to raise_error(Berkshelf::UploadFailure, message)
+      end
+    end
+
+    context "when a Chef Server url is not passed as an option" do
+      let(:ridley_options) do
+        {server_url: "http://configured-chef-server/"}.merge(default_ridley_options)
+      end
+
+      it "uses Berkshelf::Config configured server_url" do
+        Ridley.should_receive(:new).with(ridley_options)
+        upload
+      end
+    end
+
+    context "when a Chef Server url is passed as an option" do
+      let(:options) {
+        {
+          server_url: "http://fake-chef-server.com/"
+        }
+      }
+      let(:ridley_options) {
+        {server_url: "http://fake-chef-server.com/"}.merge(default_ridley_options)
+      }
+
+      it "uses the passed in :server_url" do
+        Ridley.should_receive(:new).with(ridley_options)
+        upload
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -450,6 +450,7 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE
+- PLUGINS.md
 - README.md
 - Thorfile
 - berkshelf-complete.sh
@@ -635,10 +636,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3407693517536282074
+      version: 1.8.0
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23