yyuu-capistrano-chef-solo 0.0.5 → 0.0.6

data/README.md

@@ -29,6 +29,7 @@ To setup your servers with `chef-solo`, add following in you `config/deploy.rb`.
 
     # in "config/deploy.rb"
     require 'capistrano-chef-solo'
+    set(:chef_solo_version, "10.12.0")
     set(:chef_solo_cookbooks_repository, "git@example.com:foo/bar.git")
 
 And then, now you can start `chef-solo` via capistrano.

data/lib/capistrano-chef-solo.rb

@@ -15,7 +15,7 @@ module Capistrano
           _cset(:chef_solo_home) {
             capture('echo $HOME').strip
           }
-          _cset(:chef_solo_version, '0.10.12')
+          _cset(:chef_solo_version, '10.16.2')
           _cset(:chef_solo_path) { File.join(chef_solo_home, 'chef') }
           _cset(:chef_solo_path_children, %w(bundle cache config cookbooks))
 
@@ -113,24 +113,23 @@ module Capistrano
             }
           }
 
-          _cset(:chef_solo_configuration, configuration)
           _cset(:chef_solo_repository_cache) { File.expand_path('./tmp/cookbooks-cache') }
           def bundle_cookbooks(filename, destination)
             dirs = [ File.dirname(filename), destination ].uniq
             run_locally("mkdir -p #{dirs.join(' ')}")
             chef_solo_cookbooks.each do |name, options|
               configuration = Capistrano::Configuration.new()
-              chef_solo_configuration.variables.merge(options).each { |key, val|
-                configuration.set(key, val)
-              }
               # refreshing just :source, :revision and :real_revision is enough?
-              configuration.set(:source) { Capistrano::Deploy::SCM.new(configuration[:scm], configuration) }
-              configuration.set(:revision) { configuration[:source].head }
-              configuration.set(:real_revision) {
-                configuration[:source].local.query_revision(configuration[:revision]) { |cmd|
-                  with_env("LC_ALL", "C") { run_locally(cmd) }
-                }
-              }
+              options = {
+                :source => proc { Capistrano::Deploy::SCM.new(configuration[:scm], configuration) },
+                :revision => proc { configuration[:source].head },
+                :real_revision => proc {
+                  configuration[:source].local.query_revision(configuration[:revision]) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } }
+                },
+              }.merge(options)
+              variables.merge(options).each do |key, val|
+                configuration.set(key, val)
+              end
               repository_cache = File.join(chef_solo_repository_cache, name)
               if File.exist?(repository_cache)
                 run_locally(configuration[:source].sync(configuration[:real_revision], repository_cache))

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

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

metadata

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