berkshelf 0.4.0.rc2 → 0.4.0.rc3

data/features/install.feature

@@ -65,6 +65,21 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be 0
 
+  @wip
+  Scenario: installing a Berksfile that contains a path location which contains a broken symlink
+    Given a Berksfile with path location sources to fixtures:
+      | example_cookbook_broken_link | example_cookbook_broken_link |
+    When I run the install command with flags:
+      | --shims |
+    Then the following directories should exist:
+      | cookbooks                  |
+      | cookbooks/example_cookbook |
+    And the output should contain:
+      """
+      Shims written to: 
+      """
+    And the exit status should be 0
+
   Scenario: installing a Berksfile that contains a Git location
     Given I write to "Berksfile" with:
       """

data/{lib/berkshelf/generator_files → generator_files}/chefignore

@@ -46,4 +46,7 @@ features/*
 # Berkshelf
 Berksfile
 Berksfile.lock
-cookbooks/*
+cookbooks/*
+
+# Vagrant
+.vagrant

data/{lib/berkshelf/generator_files → generator_files}/gitignore.erb

@@ -1,3 +1,4 @@
+.vagrant
 Berksfile.lock
 Gemfile.lock
 /cookbooks

data/lib/berkshelf/base_generator.rb

@@ -5,7 +5,7 @@ module Berkshelf
   class BaseGenerator < Thor::Group
     class << self
       def source_root
-        File.expand_path(File.join(File.dirname(__FILE__), "generator_files"))
+        Berkshelf.root.join("generator_files")
       end
     end
     

data/lib/berkshelf/berksfile.rb

@@ -209,7 +209,11 @@ module Berkshelf
     #
     # @return [Berksfile]
     def load(content)
-      instance_eval(content)
+      begin
+        instance_eval(content)
+      rescue => e
+        raise BerksfileReadError.new(e), "An error occurred while reading the Berksfile: #{e.message}"
+      end
       self
     end
 

data/lib/berkshelf/core_ext/fileutils.rb

@@ -63,6 +63,8 @@ module FileUtils
     class Entry_ #:nodoc:
       def link(dest)
         case
+        when broken_symlink?
+          warn "#{path} is a broken symlink. No link created."
         when directory?
           if !File.exist?(dest) and descendant_diretory?(dest, path)
             raise ArgumentError, "cannot link directory %s to itself %s" % [path, dest]
@@ -76,5 +78,13 @@ module FileUtils
           File.link path(), dest
         end
       end
+
+      # Check if the file at path is a broken symlink
+      #
+      # @return [Boolean]
+      def broken_symlink?
+        File.symlink?(path) && !File.exists?(File.readlink(path))
+      end
+
     end
 end

data/lib/berkshelf/errors.rb

@@ -60,4 +60,5 @@ module Berkshelf
 
   class ConstraintNotSatisfied < BerkshelfError; status_code(111); end
   class InvalidChefAPILocation < BerkshelfError; status_code(112); end
+  class BerksfileReadError < BerkshelfError; status_code(113); end
 end

data/lib/berkshelf/git.rb

@@ -5,7 +5,7 @@ module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
   class Git
     GIT_REGEXP = URI.regexp(%w{ https git })
-    SSH_REGEXP = /(.+)@(.+):(.+)\/(.+)\.git/
+    SSH_REGEXP = /(.+)@(.+):(.+)\.git/
 
     class << self
       # @overload git(commands)

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.4.0.rc2"
+  VERSION = "0.4.0.rc3"
 end

data/spec/unit/berkshelf/core_ext/fileutils_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+module Berkshelf
+  describe FileUtils do
+    describe '#ln_r' do
+      it "should skip broken symlinks during traversal" do
+        Dir.mktmpdir do |dir|
+          path = Pathname.new(File.join(dir, 'ln_r_test'))
+          Dir.mkdir(path)
+          Dir.chdir(path) do
+            File.open('original', 'w') {}
+            File.symlink('original', 'link_to_original')
+            FileUtils.rm('original')
+          end
+          -> { FileUtils.ln_r(path, File.join(dir, 'link_to_dir')) }.should_not raise_error
+        end
+      end
+    end
+  end
+end

data/spec/unit/berkshelf/git_spec.rb

@@ -58,7 +58,6 @@ module Berkshelf
 
       let(:readonly_uri) { "git://github.com/reset/thor-foodcritic.git" }
       let(:https_uri) { "https://github.com/reset/solve.git" }
-      let(:ssh_uri) { "git@github.com:reset/solve.git" }
       let(:http_uri) { "http://github.com/reset/solve.git" }
       let(:invalid_uri) { "/something/on/disk" }
 
@@ -75,9 +74,15 @@ module Berkshelf
           end
         end
 
-        context "given a valid Git SSH URI" do
+        context "given a valid Github SSH URI" do
+          it "returns true" do
+            subject.validate_uri("git@github.com:reset/solve.git").should be_true
+          end
+        end
+
+        context "given a valid SSH URI without an 'organization'" do
           it "returns true" do
-            subject.validate_uri(ssh_uri).should be_true
+            subject.validate_uri("gituser@githost:solve.git").should be_true
           end
         end
 
@@ -115,7 +120,13 @@ module Berkshelf
 
         context "given a valid Git SSH URI" do
           it "returns true" do
-            subject.validate_uri!(ssh_uri).should be_true
+            subject.validate_uri!("git@github.com:reset/solve.git").should be_true
+          end
+        end
+
+        context "given a valid SSH URI without an 'organization'" do
+          it "returns true" do
+            subject.validate_uri("gituser@githost:solve.git").should be_true
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc2
+  version: 0.4.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solve
@@ -382,6 +382,20 @@ files:
 - features/update.feature
 - features/upload_command.feature
 - features/without.feature
+- generator_files/Berksfile.erb
+- generator_files/Gemfile.erb
+- generator_files/README.md.erb
+- generator_files/Thorfile.erb
+- generator_files/Vagrantfile.erb
+- generator_files/chefignore
+- generator_files/default_recipe.erb
+- generator_files/gitignore.erb
+- generator_files/licenses/apachev2.erb
+- generator_files/licenses/gplv2.erb
+- generator_files/licenses/gplv3.erb
+- generator_files/licenses/mit.erb
+- generator_files/licenses/reserved.erb
+- generator_files/metadata.rb.erb
 - lib/berkshelf.rb
 - lib/berkshelf/base_generator.rb
 - lib/berkshelf/berksfile.rb
@@ -404,20 +418,6 @@ files:
 - lib/berkshelf/downloader.rb
 - lib/berkshelf/dsl.rb
 - lib/berkshelf/errors.rb
-- lib/berkshelf/generator_files/Berksfile.erb
-- lib/berkshelf/generator_files/Gemfile.erb
-- lib/berkshelf/generator_files/README.md.erb
-- lib/berkshelf/generator_files/Thorfile.erb
-- lib/berkshelf/generator_files/Vagrantfile.erb
-- lib/berkshelf/generator_files/chefignore
-- lib/berkshelf/generator_files/default_recipe.erb
-- lib/berkshelf/generator_files/gitignore.erb
-- lib/berkshelf/generator_files/licenses/apachev2.erb
-- lib/berkshelf/generator_files/licenses/gplv2.erb
-- lib/berkshelf/generator_files/licenses/gplv3.erb
-- lib/berkshelf/generator_files/licenses/mit.erb
-- lib/berkshelf/generator_files/licenses/reserved.erb
-- lib/berkshelf/generator_files/metadata.rb.erb
 - lib/berkshelf/git.rb
 - lib/berkshelf/init_generator.rb
 - lib/berkshelf/lockfile.rb
@@ -468,6 +468,7 @@ files:
 - spec/unit/berkshelf/cookbook_source/site_location_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
+- spec/unit/berkshelf/core_ext/fileutils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/dsl_spec.rb
 - spec/unit/berkshelf/git_spec.rb
@@ -556,6 +557,7 @@ test_files:
 - spec/unit/berkshelf/cookbook_source/site_location_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
+- spec/unit/berkshelf/core_ext/fileutils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/dsl_spec.rb
 - spec/unit/berkshelf/git_spec.rb