vagrant-cookbook-fetcher 0.0.4 → 0.0.5

data/lib/vagrant_cookbook_fetcher.rb

@@ -92,15 +92,46 @@ class CookbookFetcher
             # pull
             Dir.chdir(info[:dir]) do
               # TODO ignores git creds
-              cmd = "git checkout #{info[:branch]}"
+              cmd = "git remote set-url origin #{info[:repo]}"
               unless system cmd then raise "Could not '#{cmd}'" end
-              cmd = "git pull"
+              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`
+              # 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 checkout -b #{info[:branch]} origin/#{info[:branch]}"
+                unless system cmd then raise "Could not '#{cmd}'" end
+              # no branch
+              elsif local_branch.empty? then
+                cmd = "git checkout #{info[:branch]}"
+                unless system cmd then raise "Could not '#{cmd}'" end
+              # local branch already exists
+              else
+                cmd = "git checkout #{info[:branch]}"
+                unless system cmd then raise "Could not '#{cmd}'" end
+                cmd = "git merge origin/#{info[:branch]}"
+                unless system cmd then raise "Could not '#{cmd}'" end
+              end
             end
           else
             # clone
-            cmd = "git clone -b #{info[:branch]} #{info[:repo]} #{info[:dir]}"
+            # can't use --branch because it won't work with commit ids
+            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`
+              # branch
+              if $?.success? then
+                cmd = "git checkout -B #{info[:branch]} origin/#{info[:branch]}"
+                unless system cmd then raise "Could not '#{cmd}'" end
+              #commit
+              else
+                cmd = "git checkout #{info[:branch]}"
+                unless system cmd then raise "Could not '#{cmd}'" end
+              end
+            end
           end
         else
           raise "Unsupported VCS '#{info[:vcs]}' in checkout list for entry '#{dir}'"
@@ -119,8 +150,16 @@ class CookbookFetcher
       # Create/clear the subdirs
       things_to_link.each do |thing|
         if !Dir.exists?(thing) then Dir.mkdir(thing) end
-        Dir.foreach(thing) do |file|
-          if FileTest.symlink?(file) then File.delete(file) end
+        if (thing == "data_bags") then
+          Dir.foreach(thing) do |dbag_dir|
+            Dir.foreach(thing + '/' + dbag_dir) do |file|
+              if FileTest.symlink?(file) then File.delete(file) end
+            end
+          end
+        else
+          Dir.foreach(thing) do |file|
+            if FileTest.symlink?(file) then File.delete(file) end
+          end
         end
       end
     end
@@ -132,11 +171,26 @@ class CookbookFetcher
         co_thing_dir = "checkouts/#{checkout_dir}/#{thing}"
         combined_dir = "combined/#{thing}"
         if Dir.exists?(co_thing_dir) then
-          Dir.entries(co_thing_dir).grep(/\.(rb|json)$/).each do |file|
-            # Under vagrant, we see this directory as /vagrant/checkouts/foo/role/bar.rb
-            # Use -f so later checkouts can override earlier ones
-            cmd = "ln -sf /vagrant/#{co_thing_dir}/#{file} combined/#{thing}/#{file}"
-            unless system cmd then raise "Could not '#{cmd}'" end
+          if (thing == "data_bags") then
+            Dir.foreach(co_thing_dir) do |co_dbag_dir|
+              next unless File.directory?(co_thing_dir + '/' + co_dbag_dir)
+              next if co_dbag_dir.start_with?('.')
+              combined_dbag_dir = combined_dir + '/' + co_dbag_dir
+              if !Dir.exists?(combined_dbag_dir) then Dir.mkdir(combined_dbag_dir) end
+              Dir.entries(co_thing_dir + '/' + co_dbag_dir).grep(/\.(rb|json)$/).each do |file|
+                # Under vagrant, we see this directory as /vagrant/checkouts/<checkout>/data_bags/<dbag>/<dbag_entry.json>
+                # Use -f so later checkouts can override earlier ones
+                cmd = "ln -sf /vagrant/#{co_thing_dir + '/' + co_dbag_dir}/#{file} combined/#{thing}/#{co_dbag_dir}/#{file}"
+                unless system cmd then raise "Could not '#{cmd}'" end
+              end
+            end
+          else
+            Dir.entries(co_thing_dir).grep(/\.(rb|json)$/).each do |file|
+              # Under vagrant, we see this directory as /vagrant/checkouts/foo/role/bar.rb
+              # Use -f so later checkouts can override earlier ones
+              cmd = "ln -sf /vagrant/#{co_thing_dir}/#{file} combined/#{thing}/#{file}"
+              unless system cmd then raise "Could not '#{cmd}'" end
+            end
           end
         end
       end

metadata

@@ -1,50 +1,69 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vagrant-cookbook-fetcher
-version: !ruby/object:Gem::Version
-  version: 0.0.4
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
-authors:
+authors: 
 - Clinton Wolfe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+
+date: 2012-09-21 00:00:00 Z
 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.
+
+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.
 email: clinton@NOSPAM.omniti.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - LICENSE
 - README.md
 - lib/vagrant_init.rb
 - lib/vagrant_cookbook_fetcher.rb
 homepage: https://github.com/clintoncwolfe/vagrant-cookbook-fetcher
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Fetch your Chef cookbooks whenever you provision
 test_files: []
+
+has_rdoc: