berkshelf 0.3.2 → 0.3.3

data/Guardfile

@@ -20,4 +20,6 @@ guard 'cucumber', :cli => "--drb --format pretty --tags ~@wip", :all_on_start =>
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})                      { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+
+  watch(%r{^lib/berkshelf/cli.rb})                      { 'features' }
 end

data/LICENSE

@@ -1,6 +1,7 @@
 Author:: Jamie Winsor (<jamie@vialstudios.com>)
 Author:: Josiah Kiehl (<josiah@skirmisher.net>)
 Author:: Michael Ivey (<ivey@gweezlebur.com>)
+Author:: Erik Hollensbe (<erik@hollensbe.org>)
 
 Copyright 2012 Riot Games
 

data/berkshelf.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'guard-cucumber'
   s.add_development_dependency 'guard-spork'
   s.add_development_dependency 'guard-yard'
+  s.add_development_dependency 'coolline'
 end

data/features/init_command.feature

@@ -7,8 +7,8 @@ Feature: initialize command
     Given a cookbook named "sparkle_motion"
     When I run the init command with the cookbook "sparkle_motion" as the target
     Then the cookbook "sparkle_motion" should have the following files:
-      | Berksfile |
-      | .chefignore  |
+      | Berksfile  |
+      | chefignore |
     And the file "Berksfile" in the cookbook "sparkle_motion" should contain:
       """
       metadata
@@ -22,7 +22,7 @@ Feature: initialize command
     Then the directory "not_a_cookbook" should have the following files:
       | Berksfile |
     And the directory "not_a_cookbook" should not have the following files:
-      | .chefignore  |
+      | chefignore |
     And the file "Berksfile" in the directory "not_a_cookbook" should not contain:
       """
       metadata
@@ -36,5 +36,5 @@ Feature: initialize command
     And the current directory should have the following files:
       | Berksfile |
     And the current directory should not have the following files:
-      | .chefignore  |
+      | chefignore |
     And the exit status should be 0

data/features/step_definitions/cli_steps.rb

@@ -39,7 +39,7 @@ When /^I run the init command with no value for the target$/ do
 end
 
 When /^I run the install command$/ do
-  run_simple(unescape("berks install"), true)
+  run_simple(unescape("berks install"), false)
 end
 
 When /^I run the install command with flags:$/ do |flags|

data/features/step_definitions/filesystem_steps.rb

@@ -50,7 +50,7 @@ Then /^the file "(.*?)" in the cookbook "(.*?)" should contain:$/ do |file_name,
     file "Berksfile" do
       contains content
     end
-    file ".chefignore"
+    file "chefignore"
   }
 end
 

data/features/without.feature

@@ -17,7 +17,8 @@ Feature: --without block
         cookbook "ntp", "= 1.1.8"
       end
       """
-    When I run `knife berks install --without notme`
+    When I run the install command with flags:
+      | --without notme |
     Then the cookbook store should have the cookbooks:
       | mysql | 1.2.4 |
       | ntp   | 1.1.8 |

data/lib/berkshelf/berksfile.rb

@@ -185,8 +185,13 @@ module Berkshelf
     def write_shims(path, cached_cookbooks)
       FileUtils.mkdir_p(path)
       cached_cookbooks.each do |cached_cookbook|
-        destination = File.join(path, cached_cookbook.cookbook_name)
-        FileUtils.ln_r(cached_cookbook.path, destination, force: true)
+        destination = File.expand_path(File.join(path, cached_cookbook.cookbook_name))
+        begin
+          FileUtils.ln_r(cached_cookbook.path, destination, force: true)
+        rescue ArgumentError
+          Berkshelf.ui.warn "Skipping shim for #{cached_cookbook}."
+          Berkshelf.ui.warn "Cannot write a shim for a path location source into a subdirectory of itself."
+        end
       end
     end
 

data/lib/berkshelf/cli.rb

@@ -32,6 +32,7 @@ module Berkshelf
     method_option :shims,
       type: :string,
       default: nil,
+      lazy_default: File.join(Dir.pwd, "cookbooks"),
       desc: "Create a directory of shims pointing to Cookbook Versions.",
       banner: "PATH"
     method_option :without,
@@ -47,10 +48,6 @@ module Berkshelf
       banner: "PATH"
     desc "install", "Install the Cookbooks specified by a Berksfile or a Berskfile.lock."
     def install
-      if options[:shims] == "shims" # This means 'no value given'.
-        options[:shims] = default_shims_path
-      end
-
       berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
       berksfile.install(options)
     rescue BerkshelfError => e
@@ -144,9 +141,5 @@ module Berkshelf
       rescue Errno::ENOENT
         raise KnifeConfigNotFound, "Unable to find a Knife config at #{options[:config]}. Specify a different path with --config."
       end
-
-      def default_shims_path
-        File.join(Dir.pwd, "cookbooks")
-      end
   end
 end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -15,12 +15,12 @@ module Berkshelf
       specify do
         target_root.should have_structure {
           file "Berksfile"
-          no_file ".chefignore"
+          no_file "chefignore"
         }
       end
     end
 
-    context "with a .chefignore" do
+    context "with a chefignore" do
       before do
         generator = subject.new([target_root], chefignore: true)
         capture(:stdout) { generator.invoke_all }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dep_selector
@@ -334,6 +334,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coolline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - josiah@skirmisher.net
@@ -458,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2415493654956634358
+      hash: -3981898465681112327
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23