vagrant-application-cookbooks 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+# 0.1.2 (Oct 5, 2013)
+
+* Silence output of git commands
+* Fix several issues with checkout and updating of refs
+
 # 0.1.1 (Oct 5, 2013)
 
 * Fix missing berkshelf dependency

data/TODO.md

@@ -13,5 +13,5 @@
 [ ] add spec tests for the clone action
 [ ] check if url is a valid url
 [ ] use i18n
-[ ] suppress stdout / stderr when shelling out git commands
+[x] suppress stdout / stderr when shelling out git commands
 [ ] add support for more provisioners / dependency managers

data/lib/vagrant-application-cookbooks/action/clone.rb

@@ -52,20 +52,31 @@ module VagrantPlugins
         def clean_and_clone_repo
           FileUtils.rm_rf cloned_repo_path
           FileUtils.mkdir_p cloned_repo_path
-          unless system("git clone #{git_url} #{cloned_repo_path}")
+          unless system("git clone -q #{git_url} #{cloned_repo_path}")
             raise "something went wrong while cloning '#{git_url}'"
           end
         end
 
-        def update_and_checkout
-          unless system("cd #{cloned_repo_path} && git pull && git checkout #{git_ref}")
-            raise "something went wrong while updating / checking out '#{git_ref}'"
+        def checkout_and_update
+          Dir.chdir(cloned_repo_path) do
+            # retrieve all refs
+            system("git fetch -q --all")
+            # checkout ref
+            unless system("git checkout -q #{git_ref}")
+              raise "something went wrong while checking out '#{git_ref}'"
+            end
+            # update ref only if we are on a branch, i.e. not on a detached HEAD
+            unless `git symbolic-ref -q HEAD`.empty?
+              system("git pull -q")
+            end
           end
         end
 
         def install_cookbooks
-          unless system("cd #{cloned_repo_path} && berks install --path #{cookbook_install_path}")
-            raise "something went wrong while installing cookbook dependencies"
+          Dir.chdir(cloned_repo_path) do
+            unless system("berks install --path #{cookbook_install_path}")
+              raise "something went wrong while installing cookbook dependencies"
+            end
           end
         end
 
@@ -91,7 +102,7 @@ module VagrantPlugins
             end
 
             log "Ensuring application cookbook is checked out at '#{git_ref}'"
-            update_and_checkout
+            checkout_and_update
 
             log "Installing application cookbook dependencies to '#{cookbook_install_path}'"
             install_cookbooks
@@ -100,6 +111,8 @@ module VagrantPlugins
             configure_chef_solo
           end
 
+          raise "boo"
+
           # continue if ok
           @app.call(env)
         end

data/lib/vagrant-application-cookbooks/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ApplicationCookbooks
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-application-cookbooks
 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-10-04 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -664377357
+      hash: 702792593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: