berkshelf 1.1.0.rc1 → 1.1.0

data/berkshelf.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   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)/})

data/features/install_command.feature

@@ -341,13 +341,13 @@ Feature: install cookbooks from a Berksfile
   Scenario: with a git error during download
     Given I write to "Berksfile" with:
       """
-      cookbook "ohai"
+      cookbook "ohai", "1.1.4"
       cookbook "doesntexist", git: "git://github.com/asdjhfkljashflkjashfakljsf"
       """
     When I run `berks install`
     Then the output should contain:
       """
-      Installing ohai (1.1.2) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Installing ohai (1.1.4) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       Failed to download doesntexist from git: 'git://github.com/asdjhfkljashflkjashfakljsf'
       An error occured during Git execution:
       """

data/features/open_command.feature

@@ -0,0 +1,32 @@
+Feature: open command
+  As a user
+  I want to be able to view the source of a cached cookbook
+  So that I can troubleshoot bugs in my dependencies
+
+  Scenario: Running berks open with no $EDITOR
+    Given the environment variable EDITOR is nil
+    And the cookbook store has the cookbooks:
+      | mysql | 1.2.4 |
+    When I run `berks open mysql`
+    Then the output should contain "To open a cookbook, set $EDITOR or $BERKSHELF_EDITOR"
+
+  Scenario: Running berks open with an $EDITOR
+    Given the environment variable EDITOR is "ls"
+    And the cookbook store has the cookbooks:
+      | mysql | 1.2.4 |
+    When I run `berks open mysql`
+    Then the output should contain "metadata.rb"
+
+  Scenario: Running berks open with a missing EDITOR
+    Given the environment variable EDITOR is "wat"
+    And the cookbook store has the cookbooks:
+      | mysql | 1.2.4 |
+    When I run `berks open mysql`
+    Then the output should contain "Could not run `wat "
+    And the CLI should exit with the status code for error "CommandUnsuccessful"
+
+  Scenario: Running berks open when the cookbook does not exist
+    Given the environment variable EDITOR is "ls"
+    When I run `berks open mysql`
+    Then the output should contain "Cookbook 'mysql' not found in any of the sources!"
+    And the CLI should exit with the status code for error "CookbookNotFound"

data/features/step_definitions/utility_steps.rb

@@ -1,3 +1,11 @@
 Given /^pending\s+"([^\"]+)"$/ do |msg|
   pending
 end
+
+Given /^the environment variable (.+) is nil$/ do |variable|
+  set_env variable, nil
+end
+
+Given /^the environment variable (.+) is "(.+)"$/ do |variable, value|
+  set_env variable, value
+end

data/lib/berkshelf/berksfile.rb

@@ -1,3 +1,5 @@
+require 'chef/cookbook/chefignore'
+
 module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
   class Berksfile
@@ -27,7 +29,13 @@ module Berkshelf
       # @return [String]
       #   expanded filepath to the vendor directory
       def vendor(cookbooks, path)
-        path = File.expand_path(path)
+        chefignore_file = [
+          File.join(Dir.pwd, 'chefignore'),
+          File.join(Dir.pwd, 'cookbooks', 'chefignore')
+        ].find { |f| File.exists?(f) }
+
+        chefignore = chefignore_file && ::Chef::Cookbook::Chefignore.new(chefignore_file)
+        path       = File.expand_path(path)
         FileUtils.mkdir_p(path)
 
         scratch = Berkshelf.mktmpdir
@@ -37,7 +45,12 @@ module Berkshelf
 
           # Dir.glob does not support backslash as a File separator
           src = cb.path.to_s.gsub('\\', '/')
-          FileUtils.cp_r(Dir.glob(File.join(src, "*")), dest)
+          files = Dir.glob(File.join(src, "*"))
+
+          # Filter out files using chefignore
+          files = chefignore.remove_ignores_from(files) if chefignore
+
+          FileUtils.cp_r(files, dest)
         end
 
         FileUtils.remove_dir(path, force: true)
@@ -410,10 +423,10 @@ module Berkshelf
     # @return [Hash]
     #   a hash of cached cookbooks and their latest version. An empty hash is returned
     #   if there are no newer cookbooks for any of your sources
-    # 
+    #
     # @example
     #   berksfile.outdated => {
-    #     <#CachedCookbook name="artifact"> => "0.11.2"  
+    #     <#CachedCookbook name="artifact"> => "0.11.2"
     #   }
     def outdated(options = {})
       outdated = Hash.new

data/lib/berkshelf/cli.rb

@@ -92,6 +92,21 @@ module Berkshelf
       Berkshelf.formatter.msg "Config written to: '#{path}'"
     end
 
+    desc "open NAME", "Opens the source directory of an installed cookbook", hide: true
+    def open(name)
+      editor = [ENV['BERKSHELF_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
+      raise ArgumentError, "To open a cookbook, set $EDITOR or $BERKSHELF_EDITOR" unless editor
+
+      cookbook = Berkshelf.cookbook_store.cookbooks(name).last
+      raise CookbookNotFound, "Cookbook '#{name}' not found in any of the sources!" unless cookbook
+
+      Dir.chdir(cookbook.path) do
+        command = "#{editor} #{cookbook.path}"
+        success = system(command)
+        raise CommandUnsuccessful, "Could not run `#{command}`" unless success
+      end
+    end
+
     method_option :except,
       type: :array,
       desc: "Exclude cookbooks that are in these groups.",

data/lib/berkshelf/errors.rb

@@ -148,4 +148,5 @@ module Berkshelf
 
   class ConfigExists < BerkshelfError; status_code(116); end
   class ConfigurationError < BerkshelfError; status_code(117); end
+  class CommandUnsuccessful < BerkshelfError; status_code(118); end
 end

data/lib/berkshelf/version.rb

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

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -33,12 +33,31 @@ EOF
       end
 
       describe "::vendor" do
-        it "returns the expanded filepath of the vendor directory" do
-          cached_cookbooks = Array.new
-          tmpdir = Dir.mktmpdir(nil, tmp_path)
+        let(:cached_cookbooks) { [] }
+        let(:tmpdir) { Dir.mktmpdir(nil, tmp_path) }
 
+        it "returns the expanded filepath of the vendor directory" do
           subject.vendor(cached_cookbooks, tmpdir).should eql(tmpdir)
         end
+
+        context "with a chefignore" do
+          before(:each) do
+            File.stub(:exists?).and_return(true)
+            ::Chef::Cookbook::Chefignore.any_instance.stub(:remove_ignores_from).and_return(['metadata.rb'])
+          end
+
+          it "finds a chefignore file" do
+            ::Chef::Cookbook::Chefignore.should_receive(:new).with(File.expand_path('chefignore'))
+            subject.vendor(cached_cookbooks, tmpdir)
+          end
+
+          it "removes files in chefignore" do
+            cached_cookbooks = [ CachedCookbook.from_path(fixtures_path.join('cookbooks/example_cookbook')) ]
+            FileUtils.should_receive(:cp_r).with(['metadata.rb'], anything()).exactly(1).times
+            FileUtils.should_receive(:cp_r).with(anything(), anything(), anything()).once
+            subject.vendor(cached_cookbooks, tmpdir)
+          end
+        end
       end
     end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
-  prerelease: 6
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -222,6 +222,7 @@ files:
 - features/json_formatter.feature
 - features/list_command.feature
 - features/lockfile.feature
+- features/open_command.feature
 - features/outdated_command.feature
 - features/show_command.feature
 - features/step_definitions/berksfile_steps.rb
@@ -347,7 +348,8 @@ files:
 - spec/unit/berkshelf/uploader_spec.rb
 - spec/unit/berkshelf_spec.rb
 homepage: http://berkshelf.com
-licenses: []
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -361,9 +363,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: 810514310070508080
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -381,6 +386,7 @@ test_files:
 - features/json_formatter.feature
 - features/list_command.feature
 - features/lockfile.feature
+- features/open_command.feature
 - features/outdated_command.feature
 - features/show_command.feature
 - features/step_definitions/berksfile_steps.rb