yyuu-capistrano-chef-solo 0.1.0 → 0.1.1

data/README.md

@@ -32,6 +32,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, "11.4.0")
+set(:rbenv_ruby_version, "1.9.3-p392")
 ```
 
 And then, now you can start using `chef-solo` via Capistrano.
@@ -76,7 +77,7 @@ After the bootstrap, you can deploy application normaly with `deploy` user.
 
 ### Using cookbooks
 
-#### Using cookbooks from local path
+#### Using cookbooks in local path
 
 By default, `capistrano-chef-solo` searches cookbooks from local path of `config/cookbooks`.
 You can specify the cookbooks directory with using `chef_solo_cookbooks_subdir`.
@@ -86,7 +87,7 @@ set(:chef_solo_cookbooks_scm, :none)
 set(:chef_solo_cookbooks_subdir, "config/cookbooks")
 ```
 
-#### Using cookbooks from remote repository
+#### Using cookbooks in remote repository
 
 You can use cookbooks in remote repository.
 
@@ -158,7 +159,7 @@ set(:chef_solo_role_run_list) {
 }
 ```
 
-#### Setting individual attributes per host
+#### Setting individual attributes per hosts
 
 In some cases, you may want to apply individual `attributes` per hosts.
 (Something like `server_id` of mysqld or VRRP priority of keepalived)
@@ -186,7 +187,7 @@ set(:chef_solo_host_attributes) {
 
 You can check generated attributes with using `chef-solo:attributes` task.
 
-    % cap HOST=foo.example.com chef-solo:attributes
+    % cap HOST=foo1.example.com chef-solo:attributes
 
 
 ## Reference

data/capistrano-chef-solo.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Capistrano::ChefSolo::VERSION
 
-  gem.add_dependency("capistrano")
-  gem.add_dependency("capistrano-rbenv", "~> 1.0.0")
+  gem.add_dependency("capistrano", ">= 2.10.0")
+  gem.add_dependency("capistrano-rbenv", ">= 1.0.0")
   gem.add_development_dependency("net-scp", "~> 1.0.4")
   gem.add_development_dependency("net-ssh", "~> 2.2.2")
   gem.add_development_dependency("vagrant", "~> 1.0.6")

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

@@ -1,5 +1,5 @@
 module Capistrano
   module ChefSolo
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/capistrano-chef-solo.rb

@@ -59,52 +59,74 @@ module Capistrano
             auth_methods = ssh_options.fetch(:auth_methods, []).map { |m| m.to_sym }
             auth_methods.include?(:password) or auth_methods.empty?
           }
-          def _bootstrap_settings(&block)
-            if fetch(:_chef_solo_bootstrapped, false)
-              yield
+
+          _cset(:_chef_solo_bootstrapped, false)
+          def _activate_settings(servers=[])
+            if _chef_solo_bootstrapped
+              false
             else
               # preserve original :user and :ssh_options
               set(:_chef_solo_bootstrap_user, fetch(:user))
               set(:_chef_solo_bootstrap_password, fetch(:password)) if chef_solo_use_password
               set(:_chef_solo_bootstrap_ssh_options, fetch(:ssh_options))
-              servers = find_servers
-              begin
-                # we have to establish connections before teardown.
-                # https://github.com/capistrano/capistrano/pull/416
-                establish_connections_to(servers)
-                logger.info("entering chef-solo bootstrap mode. reconnect to servers as `#{chef_solo_bootstrap_user}'.")
-                # drop connection which is connected as standard :user.
-                teardown_connections_to(servers)
-                set(:user, chef_solo_bootstrap_user)
-                set(:password, chef_solo_bootstrap_password) if chef_solo_use_password
-                set(:ssh_options, chef_solo_bootstrap_ssh_options)
-                set(:_chef_solo_bootstrapped, true)
-                yield
-              ensure
-                set(:user, _chef_solo_bootstrap_user)
-                set(:password, _chef_solo_bootstrap_password) if chef_solo_use_password
-                set(:ssh_options, _chef_solo_bootstrap_ssh_options)
-                set(:_chef_solo_bootstrapped, false)
-                # we have to establish connections before teardown.
-                # https://github.com/capistrano/capistrano/pull/416
-                establish_connections_to(servers)
-                logger.info("leaving chef-solo bootstrap mode. reconnect to servers as `#{user}'.")
-                # drop connection which is connected as bootstrap :user.
-                teardown_connections_to(servers)
-              end
+              # we have to establish connections before teardown.
+              # https://github.com/capistrano/capistrano/pull/416
+              establish_connections_to(servers)
+              logger.info("entering chef-solo bootstrap mode. reconnect to servers as `#{chef_solo_bootstrap_user}'.")
+              # drop connection which is connected as standard :user.
+              teardown_connections_to(servers)
+              set(:user, chef_solo_bootstrap_user)
+              set(:password, chef_solo_bootstrap_password) if chef_solo_use_password
+              set(:ssh_options, chef_solo_bootstrap_ssh_options)
+              set(:_chef_solo_bootstrapped, true)
+              true
+            end
+          end
+
+          def _deactivate_settings(servers=[])
+            if _chef_solo_bootstrapped
+              set(:user, _chef_solo_bootstrap_user)
+              set(:password, _chef_solo_bootstrap_password) if chef_solo_use_password
+              set(:ssh_options, _chef_solo_bootstrap_ssh_options)
+              set(:_chef_solo_bootstrapped, false)
+              # we have to establish connections before teardown.
+              # https://github.com/capistrano/capistrano/pull/416
+              establish_connections_to(servers)
+              logger.info("leaving chef-solo bootstrap mode. reconnect to servers as `#{user}'.")
+              # drop connection which is connected as bootstrap :user.
+              teardown_connections_to(servers)
+              true
+            else
+              false
             end
           end
+
           _cset(:chef_solo_bootstrap, false)
           def connect_with_settings(&block)
             if chef_solo_bootstrap
-              _bootstrap_settings do
-                yield
+              servers = find_servers
+              if block_given?
+                begin
+                  activated = _activate_settings(servers)
+                  yield
+                ensure
+                  _deactivate_settings(servers) if activated
+                end
+              else
+                _activate_settings(servers)
               end
             else
-              yield
+              yield if block_given?
             end
           end
 
+          # FIXME:
+          # Some variables (such like :default_environment set by capistrano-rbenv) may be
+          # initialized without bootstrap settings during `on :start`.
+          # Is there any way to avoid this without setting `:rbenv_setup_default_environment`
+          # as false?
+          set(:rbenv_setup_default_environment, false)
+
           desc("Setup chef-solo.")
           task(:setup, :except => { :no_release => true }) {
             connect_with_settings do
@@ -136,10 +158,12 @@ module Capistrano
             end
           end
 
+          _cset(:chef_solo_cmd, "chef-solo")
+
           desc("Show chef-solo version.")
           task(:version, :except => { :no_release => true }) {
             connect_with_settings do
-              run("cd #{chef_solo_path.dump} && #{bundle_cmd} exec chef-solo --version")
+              run("cd #{chef_solo_path.dump} && #{bundle_cmd} exec #{chef_solo_cmd} --version")
             end
           }
 
@@ -170,7 +194,7 @@ module Capistrano
           }
           task(:install_chef, :except => { :no_release => true }) {
             begin
-              version = capture("cd #{chef_solo_path.dump} && #{bundle_cmd} exec chef-solo --version")
+              version = capture("cd #{chef_solo_path.dump} && #{bundle_cmd} exec #{chef_solo_cmd} --version")
               installed = Regexp.new(Regexp.escape(chef_solo_version)) =~ version
             rescue
               installed = false
@@ -402,11 +426,10 @@ module Capistrano
           end
 
           def invoke(options={})
-            bin = fetch(:chef_solo_executable, "chef-solo")
             args = fetch(:chef_solo_options, [])
             args << "-c #{chef_solo_config_file.dump}"
             args << "-j #{chef_solo_attributes_file.dump}"
-            run("cd #{chef_solo_path.dump} && #{sudo} #{bundle_cmd} exec #{bin.dump} #{args.join(" ")}", options)
+            run("cd #{chef_solo_path.dump} && #{sudo} #{bundle_cmd} exec #{chef_solo_cmd} #{args.join(" ")}", options)
           end
         }
       }

data/test/centos6-64/run.sh

@@ -2,6 +2,6 @@
 
 bundle exec vagrant up
 bundle exec cap test_all
-bundle exec vagrant destroy -f
+bundle exec vagrant halt
 
 # vim:set ft=sh :

data/test/precise64/run.sh

@@ -2,6 +2,6 @@
 
 bundle exec vagrant up
 bundle exec cap test_all
-bundle exec vagrant destroy -f
+bundle exec vagrant halt
 
 # vim:set ft=sh :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yyuu-capistrano-chef-solo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,13 +26,13 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: capistrano-rbenv
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency