berkshelf 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5a7d0c79975c9b1f6c2a3407a1d649b68e9d1f
-  data.tar.gz: 409e94aa67b4fc4ca58bf3cbfc4ba394307c4bf0
+  metadata.gz: 2f602bc76f25aadd31542d00b644abe495c9a0ae
+  data.tar.gz: ab05691e2bd055675d57e3940337770571124fb5
 SHA512:
-  metadata.gz: 4f25d4557214df0297c370439d06ff22f3c8da2b94b72176cd086ad3461c441c68f7bf482e5b28be4f651731a8b9498d83c455ac050ed8b78d607bfcf1e5574f
-  data.tar.gz: c571c05d0bb93b8c85524c22a06d8fb38cf4c470c346d419908baf10db1c15922dc0dad0c74b3c2518682cdd907f4de7e5dbd3ed3cd5917b7f029418f64140a0
+  metadata.gz: cf4fd42a2f32ea879fcefc8389323cbbd293f382b884f7b65fc17aaee93e5bc27b6a4594d07c3be84346da03a50197563f3ad1f6addaae50096d8f359ee68d35
+  data.tar.gz: 51824f49578a4ce7417797e158413afe3951f65d243b48de48905af27924a0561f2c5b8aaaf533a7f0758ca3b5c67fbf002e694c07c2f3dff04240f4f4b3ffc0

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 > This is a high level digest of changes. For the complete CHANGELOG diff two tags in the project's [commit history](https://github.com/berkshelf/berkshelf/commits/master).
 
+# 3.1.3
+
+* Enhancements
+  * Updated out of date dependencies
+
+* Bug fixes
+  * Skip loading of cached cookbooks that do not have a value for metadata
+  * SSL Verify option will be respected when communicating to an API server
+  * Fixed issue where some commands were unexpectedly crashing instead of informing the user that Git is not installed
+
 # 3.1.2
 
 * Enhancements

data/Gemfile

@@ -31,5 +31,5 @@ group :guard do
 end
 
 group :test do
-  gem 'berkshelf-api', "~> 1.3"
+  gem "berkshelf-api", github: "berkshelf/berkshelf-api"
 end

data/README.md

@@ -39,15 +39,6 @@ Ruby 1.9 mode is required on all interpreters.
 
 Ruby 1.9.1 and 1.9.2 are not officially supported. If you encounter problems, please upgrade to Ruby 2.0 or 1.9.3.
 
-## Shell Completion
-
-- [Bash](https://github.com/berkshelf/berkshelf-bash-plugin)
-- [ZSH](https://github.com/berkshelf/berkshelf-zsh-plugin)
-
-## Plugins
-
-Please see [Plugins page](https://github.com/berkshelf/berkshelf/blob/master/PLUGINS.md) for more information.
-
 ## Configuration
 
 Berkshelf will search in specific locations for a configuration file. In order:
@@ -60,45 +51,19 @@ Berkshelf will search in specific locations for a configuration file. In order:
 
 You are encouraged to keep project-specific configuration in the `$PWD/.berkshelf` directory. A default configuration file is generated for you, but you can update the values to suit your needs.
 
-## Github Cookbooks
-
-With Berkshelf 3 you can query a Berkshelf-API server (a server which indexes cookbooks from various sources and
-hosts it over a REST API) in order to resolve the cookbook dependencies. When you choose to host your own Berkshelf-API
-server, you can configure it to also index cookbooks hosted in various Github and/or Github Enterprise organizations.
-
-When doing so you should also configure Berkshelf so it can download cookbooks from your indexed Github organizations:
-
-    {
-      "github":[
-        {
-          "access_token": ""
-        },
-        {
-          "access_token": "",
-          "api_endpoint": "https://github.enterprise.local/api/v3",
-          "web_endpoint": "https://github.enterprise.local",
-          "ssl_verify": true
-        }
-      ]
-    }
-
-The first subsection is used for any organization hosted on github.com. As this is the default, you do not have to set the
-endpoint info (these are known values for github.com). The second subsection is used when you also index cookbooks from
-organizations hosted on Github Enterprise. In this case you will need to specify the specific endpoint info so Berkshelf
-knows where to connect to. You can add as many subsections as you have endpoints.
-
-## 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
-      }
-    }
+## Shell Completion
+
+- [Bash](https://github.com/berkshelf/berkshelf-bash-plugin)
+- [ZSH](https://github.com/berkshelf/berkshelf-zsh-plugin)
+
+## Plugins
+
+Please see [Plugins page](https://github.com/berkshelf/berkshelf/blob/master/PLUGINS.md) for more information.
+
+## Getting Help
+
+* If you have an issue: report it on the [issue tracker](https://github.com/berkshelf/berkshelf/issues)
+* If you have a question: visit the #chef or #berkshelf channel on irc.freenode.net
 
 ## Authors
 

data/berkshelf.gemspec

@@ -32,13 +32,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'addressable',          '~> 2.3.4'
   s.add_dependency 'berkshelf-api-client', '~> 1.2'
-  s.add_dependency 'buff-config',          '~> 0.4'
-  s.add_dependency 'buff-extensions',      '~> 0.4'
+  s.add_dependency 'buff-config',          '~> 1.0'
+  s.add_dependency 'buff-extensions',      '~> 1.0'
   s.add_dependency 'buff-shell_out',       '~> 0.1'
   s.add_dependency 'faraday',              '~> 0.9.0'
   s.add_dependency 'minitar',              '~> 0.5.4'
   s.add_dependency 'retryable',            '~> 1.3.3'
-  s.add_dependency 'ridley',               '~> 3.1'
+  s.add_dependency 'ridley',               '~> 4.0'
   s.add_dependency 'solve',                '~> 1.1'
   s.add_dependency 'thor',                 '~> 0.18'
   s.add_dependency 'octokit',              '~> 3.0'

data/features/commands/install.feature

@@ -451,7 +451,7 @@ Feature: berks install
       """
       Repository not found.
       """
-      And the exit status should be "GitLocation::GitError"
+      And the exit status should be "GitError"
 
   Scenario: transitive dependencies in metadata
     Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:

data/lib/berkshelf.rb

@@ -22,6 +22,7 @@ module Berkshelf
 
   module Mixin
     autoload :DSLEval, 'berkshelf/mixin/dsl_eval'
+    autoload :Git,     'berkshelf/mixin/git'
     autoload :Logging, 'berkshelf/mixin/logging'
   end
 

data/lib/berkshelf/config.rb

@@ -91,7 +91,7 @@ module Berkshelf
       type: Array,
       default: Array.new
     attribute 'raise_license_exception',
-      type: Boolean,
+      type: Buff::Boolean,
       default: false
     attribute 'vagrant.vm.box',
       type: String,
@@ -108,13 +108,13 @@ module Berkshelf
       type: String,
       default: 'chef_solo'
     attribute 'vagrant.omnibus.enabled',
-      type: Boolean,
+      type: Buff::Boolean,
       default: true
     attribute 'vagrant.omnibus.version',
       type: String,
       default: 'latest'
     attribute 'ssl.verify',
-      type: Boolean,
+      type: Buff::Boolean,
       default: true,
       required: true
     attribute 'github',

data/lib/berkshelf/cookbook_store.rb

@@ -94,6 +94,7 @@ module Berkshelf
     #
     # @return [Array<Berkshelf::CachedCookbook>]
     def cookbooks(filter = nil)
+      skipped_cookbooks = []
       cookbooks = storage_path.children.collect do |path|
         begin
           Semverse::Version.split(File.basename(path).slice(CachedCookbook::DIRNAME_REGEXP, 2))
@@ -103,9 +104,27 @@ module Berkshelf
           next
         end
 
-        CachedCookbook.from_store_path(path)
+        begin
+          CachedCookbook.from_store_path(path)
+        rescue Ridley::Errors::MissingNameAttribute
+          # Skip cached cookbooks that do not have a name attribute.
+          skipped_cookbooks << File.basename(path)
+          next
+        end
       end.compact
 
+      if skipped_cookbooks.any?
+        msg = "Skipping cookbooks #{skipped_cookbooks}. Berkshelf can only interact "
+        msg << "with cookbooks which have defined the `name` attribute in their metadata.rb. If you "
+        msg << "are the maintainer of any of the above cookbooks, please add the name attribute to "
+        msg << "your cookbook. If you are not the maintainer, please file an issue or report the lack "
+        msg << "of a name attribute as a bug.\n\n"
+        msg << "You can remove each cookbook in #{skipped_cookbooks} from the Berkshelf shelf "
+        msg << "by using the `berks shelf uninstall` command:\n\n"
+        msg << "    $ berkshelf shelf uninstall <name>"
+        Berkshelf.log.warn msg
+      end
+
       return cookbooks unless filter
 
       cookbooks.select do |cookbook|

data/lib/berkshelf/errors.rb

@@ -479,4 +479,32 @@ module Berkshelf
       "is the standard error from the command:\n\n#{@output}"
     end
   end
+
+  # Git errors
+  # ------------------------------
+  class GitError < BerkshelfError; status_code(400); end
+
+  class GitNotInstalled < GitError
+    def initialize
+      super 'You need to install Git before you can download ' \
+        'cookbooks from git repositories. For more information, please ' \
+        'see the Git docs: http://git-scm.org. If you have git installed, ' \
+        'please make sure it is in your $PATH and accessible by the user ' \
+        'running this command.'
+    end
+  end
+
+  class GitCommandError < GitError
+    def initialize(command, path, stderr = nil)
+      out =  "Git error: command `git #{command}` failed. If this error "
+      out << "persists, try removing the cache directory at '#{path}'."
+
+      if stderr
+        out << "Output from the command:\n\n"
+        out << stderr
+      end
+
+      super(out)
+    end
+  end
 end

data/lib/berkshelf/init_generator.rb

@@ -4,6 +4,8 @@ rescue LoadError; end
 
 module Berkshelf
   class InitGenerator < BaseGenerator
+    include Mixin::Git
+
     def initialize(*args)
       super(*args)
       if @options[:cookbook_name]
@@ -75,7 +77,7 @@ module Berkshelf
 
         unless File.exists?(target.join('.git'))
           inside target do
-            run 'git init', capture: true
+            git 'init'
           end
         end
       end

data/lib/berkshelf/locations/git.rb

@@ -2,29 +2,7 @@ require 'buff/shell_out'
 
 module Berkshelf
   class GitLocation < BaseLocation
-    class GitError < BerkshelfError; status_code(400); end
-
-    class GitNotInstalled < GitError
-      def initialize
-        super 'You need to install Git before you can download ' \
-          'cookbooks from git repositories. For more information, please ' \
-          'see the Git docs: http://git-scm.org.'
-      end
-    end
-
-    class GitCommandError < GitError
-      def initialize(command, path, stderr = nil)
-        out =  "Git error: command `git #{command}` failed. If this error "
-        out << "persists, try removing the cache directory at '#{path}'."
-
-        if stderr
-          out << "Output from the command:\n\n"
-          out << stderr
-        end
-
-        super(out)
-      end
-    end
+    include Mixin::Git
 
     attr_reader :uri
     attr_reader :branch
@@ -150,29 +128,6 @@ module Berkshelf
 
     private
 
-    # Perform a git command.
-    #
-    # @param [String] command
-    #   the command to run
-    # @param [Boolean] error
-    #   whether to raise error if the command fails
-    #
-    # @raise [String]
-    #   the +$stdout+ from the command
-    def git(command, error = true)
-      unless Berkshelf.which('git') || Berkshelf.which('git.exe')
-        raise GitNotInstalled.new
-      end
-
-      response = Buff::ShellOut.shell_out(%|git #{command}|)
-
-      if error && !response.success?
-        raise GitCommandError.new(command, cache_path, stderr = response.stderr)
-      end
-
-      response.stdout.strip
-    end
-
     # Determine if this git repo has already been downloaded.
     #
     # @return [Boolean]

data/lib/berkshelf/mixin/git.rb

@@ -0,0 +1,30 @@
+require 'buff/shell_out'
+
+module Berkshelf
+  module Mixin
+    module Git
+      # Perform a git command.
+      #
+      # @param [String] command
+      #   the command to run
+      # @param [Boolean] error
+      #   whether to raise error if the command fails
+      #
+      # @raise [String]
+      #   the +$stdout+ from the command
+      def git(command, error = true)
+        unless Berkshelf.which('git') || Berkshelf.which('git.exe')
+          raise GitNotInstalled.new
+        end
+
+        response = Buff::ShellOut.shell_out(%|git #{command}|)
+
+        if error && !response.success?
+          raise GitCommandError.new(command, cache_path, response.stderr)
+        end
+
+        response.stdout.strip
+      end
+    end
+  end
+end

data/lib/berkshelf/source.rb

@@ -10,7 +10,7 @@ module Berkshelf
     # @param [String, Berkshelf::SourceURI] uri
     def initialize(uri)
       @uri        = SourceURI.parse(uri)
-      @api_client = APIClient.new(uri)
+      @api_client = APIClient.new(uri, ssl: {verify: Berkshelf::Config.instance.ssl.verify})
       @universe   = nil
     end
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = '3.1.2'
+  VERSION = "3.1.3"
 end

data/spec/spec_helper.rb

@@ -26,9 +26,11 @@ Spork.prefork do
     config.mock_with :rspec
     config.treat_symbols_as_metadata_keys_with_true_values = true
     config.filter_run focus: true
+    config.filter_run_excluding not_supported_on_windows: windows?
     config.run_all_when_everything_filtered = true
 
     config.before(:each) do
+      Berkshelf.logger = Berkshelf::Logger.new(nil)
       Berkshelf.set_format(:null)
       Berkshelf.ui.mute!
     end

data/spec/support/chef_api.rb

@@ -76,7 +76,7 @@ module Berkshelf
         end
 
         metadata = [].tap do |a|
-          a << "name     '#{name}'"
+          a << "name     '#{name}'" unless options[:without_name]
           a << "version  '#{version}'"
           a << "license  '#{options[:license]}'" if options[:license]
           a << "" # ensure newline

data/spec/unit/berkshelf/cached_cookbook_spec.rb

@@ -43,7 +43,13 @@ describe Berkshelf::CachedCookbook do
     describe '::checksum' do
       it 'returns a checksum of the given filepath' do
         path = fixtures_path.join('cookbooks', 'example_cookbook-0.5.0', 'README.md')
-        expect(described_class.checksum(path)).to eq('6e21094b7a920e374e7261f50e9c4eef')
+        expected_md5 = if IO.binread(path).include?("\r\n")
+                         # On windows, with git configured for auto crlf
+                         "2414583f86c9eb68bdbb0be391939341"
+                       else
+                         "6e21094b7a920e374e7261f50e9c4eef"
+                       end
+        expect(described_class.checksum(path)).to eq(expected_md5)
       end
 
       context 'given path does not exist' do

data/spec/unit/berkshelf/cookbook_store_spec.rb

@@ -106,6 +106,16 @@ describe Berkshelf::CookbookStore do
         expect(subject.cookbooks('mysql')).to have(1).item
       end
     end
+
+    context 'when a there is a cookbook without a name attribute' do
+      before do
+        generate_cookbook(subject.storage_path, 'foo', '3.0.1', without_name: true)
+      end
+
+      it 'omits the broken cookbook' do
+        expect(subject.cookbooks('foo')).to be_empty
+      end
+    end
   end
 
   describe "#import"

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

@@ -236,13 +236,13 @@ module Berkshelf
 
       it 'raises an error if Git is not installed' do
         Berkshelf.stub(:which).and_return(false)
-        expect { subject.git('foo') }.to raise_error(GitLocation::GitNotInstalled)
+        expect { subject.git('foo') }.to raise_error(GitNotInstalled)
       end
 
       it 'raises an error if the command fails' do
         shell_out = double('shell_out', success?: false, stderr: nil)
         Buff::ShellOut.stub(:shell_out).and_return(shell_out)
-        expect { subject.git('foo') }.to raise_error(GitLocation::GitCommandError)
+        expect { subject.git('foo') }.to raise_error(GitCommandError)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -48,28 +48,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: buff-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: buff-shell_out
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -447,6 +447,7 @@ files:
 - lib/berkshelf/lockfile.rb
 - lib/berkshelf/logger.rb
 - lib/berkshelf/mixin/dsl_eval.rb
+- lib/berkshelf/mixin/git.rb
 - lib/berkshelf/mixin/logging.rb
 - lib/berkshelf/packager.rb
 - lib/berkshelf/resolver.rb