berkshelf-shims 0.1.1 → 0.1.2

data/README.md

@@ -30,10 +30,9 @@ Put the following into spec/spec_helper.rb.
 ```ruby
 require 'berkshelf-shims'
 
-root_dir = File.join(File.dirname(__FILE__), '..')
 RSpec.configure do |config|
   config.before(:suite) do
-    BerkshelfShims::create_shims(root_dir)
+    BerkshelfShims::create_shims(File.join(File.dirname(__FILE__), '..'))
   end
 end
 ```

data/lib/berkshelf-shims.rb

@@ -37,6 +37,9 @@ module BerkshelfShims
 
     def create_links(cookbook_dir, berkshelf_path)
       FileUtils.mkdir_p(cookbook_dir)
+      Dir["#{cookbook_dir}/*"].each do |f|
+        File.delete(f)
+      end
       cookbooks.each do |name, options|
         if options[:path]
           target = options[:path]
@@ -46,7 +49,7 @@ module BerkshelfShims
           target = "#{berkshelf_path}/cookbooks/#{name}-#{options[:ref]}"
         end
         if target
-          FileUtils.ln_s(target, "#{cookbook_dir}/#{name}", :force => true)
+          FileUtils.ln_s(target, "#{cookbook_dir}/#{name}")
         else
           raise UnknownCookbookReferenceError.new(name, options)
         end

data/lib/berkshelf-shims/version.rb

@@ -1,5 +1,5 @@
 module WP
   module Cookbook
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/berkshelf_shims_spec.rb

@@ -22,7 +22,7 @@ describe BerkshelfShims do
     let(:test_dir) {'tmp'}
     let(:lock_file) {"#{test_dir}/Berksfile.lock"}
     let(:cookbooks_dir) {"#{test_dir}/cookbooks"}
-    let(:relative_target_dir) {'/Some/Directory'}
+    let(:relative_target_dir) {File.expand_path("#{test_dir}/relative")}
 
     before do
       FileUtils.rm_rf(test_dir)
@@ -35,22 +35,37 @@ describe BerkshelfShims do
     end
     context 'with a normal input' do
       let(:cookbook_entries) {[
-          "cookbook 'relative', :path => '#{relative_target_dir}'",
-          "cookbook 'versioned', :locked_version => '0.0.1'",
-          "cookbook 'somegitrepo', :git => 'http://github.com/someuser/somegitrepo.git', :ref => '6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a'"
-        ]}
+                               "cookbook 'relative', :path => '#{relative_target_dir}'",
+                               "cookbook 'versioned', :locked_version => '0.0.1'",
+                               "cookbook 'somegitrepo', :git => 'http://github.com/someuser/somegitrepo.git', :ref => '6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a'"
+                              ]}
 
       context 'with the default berkshelf path' do
         before do
+          Dir.mkdir(relative_target_dir)
           BerkshelfShims::create_shims('tmp')
         end
         it 'creates the links' do
           Dir.exists?(cookbooks_dir).should == true
           Dir["#{cookbooks_dir}/*"].sort.should == ["#{cookbooks_dir}/relative", "#{cookbooks_dir}/somegitrepo", "#{cookbooks_dir}/versioned"]
-          File.readlink("#{cookbooks_dir}/relative").should == '/Some/Directory'
+          File.readlink("#{cookbooks_dir}/relative").should == relative_target_dir
           File.readlink("#{cookbooks_dir}/versioned").should == "#{BerkshelfShims.berkshelf_path}/cookbooks/versioned-0.0.1"
           File.readlink("#{cookbooks_dir}/somegitrepo").should == "#{BerkshelfShims.berkshelf_path}/cookbooks/somegitrepo-6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a"
+          Dir["#{relative_target_dir}/*"].should == []
         end
+        context 'run a second time' do
+          before do
+            BerkshelfShims::create_shims('tmp')
+          end
+          it 'creates the links' do
+            Dir.exists?(cookbooks_dir).should == true
+            Dir["#{cookbooks_dir}/*"].sort.should == ["#{cookbooks_dir}/relative", "#{cookbooks_dir}/somegitrepo", "#{cookbooks_dir}/versioned"]
+            File.readlink("#{cookbooks_dir}/relative").should == relative_target_dir
+            File.readlink("#{cookbooks_dir}/versioned").should == "#{BerkshelfShims.berkshelf_path}/cookbooks/versioned-0.0.1"
+            File.readlink("#{cookbooks_dir}/somegitrepo").should == "#{BerkshelfShims.berkshelf_path}/cookbooks/somegitrepo-6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a"
+            Dir["#{relative_target_dir}/*"].should == []
+          end
+      end
       end
 
       context 'with an explicit berkshelf path' do
@@ -60,7 +75,7 @@ describe BerkshelfShims do
         it 'creates the links' do
           Dir.exists?(cookbooks_dir).should == true
           Dir["#{cookbooks_dir}/*"].sort.should == ["#{cookbooks_dir}/relative", "#{cookbooks_dir}/somegitrepo", "#{cookbooks_dir}/versioned"]
-          File.readlink("#{cookbooks_dir}/relative").should == '/Some/Directory'
+          File.readlink("#{cookbooks_dir}/relative").should == relative_target_dir
           File.readlink("#{cookbooks_dir}/versioned").should == "berkshelf/cookbooks/versioned-0.0.1"
           File.readlink("#{cookbooks_dir}/somegitrepo").should == "berkshelf/cookbooks/somegitrepo-6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a"
         end
@@ -74,7 +89,7 @@ describe BerkshelfShims do
         it 'creates the links' do
           Dir.exists?(cookbooks_dir).should == true
           Dir["#{cookbooks_dir}/*"].sort.should == ["#{cookbooks_dir}/relative", "#{cookbooks_dir}/somegitrepo", "#{cookbooks_dir}/versioned"]
-          File.readlink("#{cookbooks_dir}/relative").should == '/Some/Directory'
+          File.readlink("#{cookbooks_dir}/relative").should == relative_target_dir
           File.readlink("#{cookbooks_dir}/versioned").should == "/berkshelf_env/cookbooks/versioned-0.0.1"
           File.readlink("#{cookbooks_dir}/somegitrepo").should == "/berkshelf_env/cookbooks/somegitrepo-6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a"
         end
@@ -83,8 +98,8 @@ describe BerkshelfShims do
 
     context 'with an unknown cookbook reference' do
       let(:cookbook_entries) {[
-          "cookbook 'relative'"
-        ]}
+                               "cookbook 'relative'"
+                              ]}
       it 'throws an error' do
         expect {BerkshelfShims::create_shims('tmp')}.to raise_error BerkshelfShims::UnknownCookbookReferenceError
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-shims
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies: []
 description: Shim functionality for Berkshelf
 email:
@@ -43,18 +43,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4057482081012609309
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4057482081012609309
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23