vagrant-cookbook-fetcher 0.0.5 → 0.0.6

data/ChangeLog

@@ -0,0 +1,13 @@
+
+2012-09-25 0.0.6 Clinton Wolfe <clintoncwolfe at gmail dot com> 
+
+   * Add changelog
+
+   * Fix broken initial checkout bug introduced in 0.0.5 (Graham Knop)
+
+2012-09-21 0.0.5 Clinton Wolfe <clintoncwolfe at gmail dot com>
+
+   * Add ability to specify a commit, not just a branch, in checkout lists (Graham Knop)
+   
+   * Make databag combined symlinks properly descend one directory down (Clinton Wolfe)
+   

data/lib/vagrant_cookbook_fetcher.rb

@@ -96,11 +96,11 @@ class CookbookFetcher
               unless system cmd then raise "Could not '#{cmd}'" end
               cmd = "git fetch origin"
               unless system cmd then raise "Could not '#{cmd}'" end
-              local_branch = `git rev-parse --verify --symbolic-full-name #{info[:branch]} 2> /dev/null`
+              local_branch = `git rev-parse --verify --symbolic-full-name #{info[:branch]} 2> /dev/null`.rstrip
               # no local branch
               if ! $?.success? then
-                remote_branch = `git rev-parse --verify --symbolic-full-name origin/#{info[:branch]} 2> /dev/null`
-                unless $?.success? then raise "Unable to find branch or commit #{info[:branch]}" end
+                cmd = "git rev-parse --verify -q --symbolic-full-name origin/#{info[:branch]}"
+                unless system cmd then raise "Could not find branch or commit #{info[:branch]}" end
                 cmd = "git checkout -b #{info[:branch]} origin/#{info[:branch]}"
                 unless system cmd then raise "Could not '#{cmd}'" end
               # no branch
@@ -121,11 +121,17 @@ class CookbookFetcher
             cmd = "git clone --no-checkout #{info[:repo]} #{info[:dir]}"
             unless system cmd then raise "Could not '#{cmd}'" end
             Dir.chdir(info[:dir]) do
-              remote_branch=`git rev-parse --verify -q origin/#{info[:branch]} 2> /dev/null`
+              cmd = "git rev-parse --verify -q origin/#{info[:branch]}"
               # branch
-              if $?.success? then
-                cmd = "git checkout -B #{info[:branch]} origin/#{info[:branch]}"
-                unless system cmd then raise "Could not '#{cmd}'" end
+              if system cmd then
+                current_branch=`git symbolic-ref HEAD 2> /dev/null`.rstrip
+                if $?.success? && current_branch == "refs/heads/#{info[:branch]}" then
+                  cmd = "git checkout #{info[:branch]}"
+                  unless system cmd then raise "Could not '#{cmd}'" end
+                else
+                  cmd = "git checkout -B #{info[:branch]} origin/#{info[:branch]}"
+                  unless system cmd then raise "Could not '#{cmd}'" end
+                end
               #commit
               else
                 cmd = "git checkout #{info[:branch]}"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-cookbook-fetcher
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Clinton Wolfe
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-21 00:00:00 Z
+date: 2012-09-25 00:00:00 -04:00
+default_executable: 
 dependencies: []
 
 description: Whenever you run start, up, or provision, this plugin will dynamically fetch a list of checkouts from a URL; checkout each one; then create a combined roles directory, with symlinks.
@@ -27,10 +27,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- ChangeLog
 - LICENSE
 - README.md
 - lib/vagrant_init.rb
 - lib/vagrant_cookbook_fetcher.rb
+has_rdoc: true
 homepage: https://github.com/clintoncwolfe/vagrant-cookbook-fetcher
 licenses: []
 
@@ -44,7 +46,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -53,17 +54,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fetch your Chef cookbooks whenever you provision
 test_files: []
 
-has_rdoc: