yyuu-capistrano-chef-solo 0.0.6 → 0.0.7

data/lib/capistrano-chef-solo/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module ChefSolo
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/capistrano-chef-solo.rb

@@ -21,14 +21,24 @@ module Capistrano
 
           desc("Run chef-solo.")
           task(:default) {
-            # login as chef user if specified
-            set(:user, fetch(:chef_solo_user, user))
-            set(:ssh_options, fetch(:chef_solo_ssh_options, ssh_options))
+            # preserve original :user and :ssh_options
+            set(:chef_solo_original_user, user)
+            set(:chef_solo_original_ssh_options, ssh_options)
 
-            transaction {
-              bootstrap
-              update
-            }
+            begin
+              # login as chef user if specified
+              set(:user, fetch(:chef_solo_user, user))
+              set(:ssh_options, fetch(:chef_solo_ssh_options, ssh_options))
+
+              transaction {
+                bootstrap
+                update
+              }
+            ensure
+              # restore original :user and :ssh_options
+              set(:user, chef_solo_original_user)
+              set(:ssh_options, chef_solo_original_ssh_options)
+            end
           }
 
           task(:bootstrap) {
@@ -101,16 +111,15 @@ module Capistrano
           # special variable to set multiple cookbooks repositories.
           # by default, it will build from :chef_solo_cookbooks_* variables.
           _cset(:chef_solo_cookbooks) {
-            repository = fetch(:chef_solo_cookbooks_repository, fetch(:chef_solo_cookbook_repository, nil))
+            repository = fetch(:chef_solo_cookbooks_repository, nil)
+            repository = fetch(:chef_solo_cookbook_repository, nil) unless repository # for backward compatibility
             name = File.basename(repository, File.extname(repository))
-            {
-              name => {
-                :repository => repository,
-                :revision => fetch(:chef_solo_cookbooks_revision, fetch(:chef_solo_cookbook_revision, nil)),
-                :cookbooks => fetch(:chef_solo_cookbooks_subdir, fetch(:chef_solo_cookbook_subdir, nil)),
-                :cookbooks_exclude => chef_solo_cookbooks_exclude,
-              }
-            }
+            options = { :repository => repository, :cookbooks_exclude => chef_solo_cookbooks_exclude }
+            options[:revision] = fetch(:chef_solo_cookbooks_revision, nil)
+            options[:revision] = fetch(:chef_solo_cookbook_revision, nil) unless options[:revision] # for backward compatibility
+            options[:cookbooks] = fetch(:chef_solo_cookbooks_subdir, nil)
+            options[:cookbooks] = fetch(:chef_solo_cookbook_subdir, nil) unless options[:cookbooks] # for backward compatibility
+            { name => options }
           }
 
           _cset(:chef_solo_repository_cache) { File.expand_path('./tmp/cookbooks-cache') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yyuu-capistrano-chef-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano