yyuu-capistrano-chef-solo 0.1.2 → 0.1.3

data/README.md

@@ -93,7 +93,19 @@ You can use cookbooks in remote repository.
 
 ```ruby
 set(:chef_solo_cookbooks_scm, :git)
-set(:chef_solo_cookbooks_repository, "git://example.com/example.git")
+set(:chef_solo_cookbooks_repository, "git://github.com/opscode/cookbooks.git")
+set(:chef_solo_cookbooks_revision, "master")
+set(:chef_solo_cookbooks_subdir, "/")
+```
+
+#### Using single cookbook in remote repository
+
+Also you can use single cookbook in remote repository.
+
+```ruby
+set(:chef_solo_cookbook_name, "python")
+set(:chef_solo_cookbooks_scm, :git)
+set(:chef_solo_cookbooks_repository, "git://github.com/opscode-cookbooks/python.git")
 set(:chef_solo_cookbooks_revision, "master")
 set(:chef_solo_cookbooks_subdir, "/")
 ```
@@ -105,17 +117,22 @@ You can use multiple cookbooks repositories at once.
 ```ruby
 set(:chef_solo_cookbooks) {{
   # use cookbooks in ./config/cookbooks.
-  "local" => {
+  application => {
     :scm => :none,
     :deploy_subdir => "config/cookbooks",
   },
   # use cookbooks in git repository.
-  "repository" => {
+  "cookbooks" => {
+    :scm => :git,
+    :repository => "git://github.com/opscode/cookbooks.git",
+    :revision => "master",
+  },
+  "python" => {
+    :cookbook_name => "python",
     :scm => :git,
-    :repository => "git://example.com/example.git",
+    :repository => "git://github.com/opscode-cookbooks/python.git",
     :revision => "master",
-    :deploy_subdir => "/",
-  }
+  },
 }}
 ```
 

data/lib/capistrano-chef-solo.rb

@@ -34,9 +34,11 @@ module Capistrano
         namespace(:chef_solo) {
           _cset(:chef_solo_version, "11.4.0")
           _cset(:chef_solo_path) { capture("echo $HOME/chef").strip }
-          _cset(:chef_solo_path_children, %w(bundle cache config cookbooks))
-          _cset(:chef_solo_config_file) { File.join(chef_solo_path, "config", "solo.rb") }
-          _cset(:chef_solo_attributes_file) { File.join(chef_solo_path, "config", "solo.json") }
+          _cset(:chef_solo_cache_path) { File.join(chef_solo_path, "cache") }
+          _cset(:chef_solo_config_path) { File.join(chef_solo_path, "config") }
+          _cset(:chef_solo_cookbooks_path) { File.join(chef_solo_path, "cookbooks") }
+          _cset(:chef_solo_config_file) { File.join(chef_solo_config_path, "solo.rb") }
+          _cset(:chef_solo_attributes_file) { File.join(chef_solo_config_path, "solo.json") }
 
           _cset(:chef_solo_bootstrap_user) {
             if variables.key?(:chef_solo_user)
@@ -109,6 +111,9 @@ module Capistrano
                 begin
                   activated = _activate_settings(servers)
                   yield
+                rescue => error
+                  logger.info("could not connect with bootstrap settings: #{error}")
+                  raise
                 ensure
                   _deactivate_settings(servers) if activated
                 end
@@ -200,7 +205,7 @@ module Capistrano
               installed = false
             end
             unless installed
-              dirs = chef_solo_path_children.map { |dir| File.join(chef_solo_path, dir) }
+              dirs = [ chef_solo_path, chef_solo_cache_path, chef_solo_config_path, chef_solo_cookbooks_path ].uniq
               run("mkdir -p #{dirs.map { |x| x.dump }.join(" ")}")
               top.put(chef_solo_gemfile, File.join(chef_solo_path, "Gemfile"))
               args = fetch(:chef_solo_bundle_options, [])
@@ -212,8 +217,8 @@ module Capistrano
  
           def update(options={})
             update_cookbooks(options)
-            update_config(options)
             update_attributes(options)
+            update_config(options)
           end
 
           def update_cookbooks(options={})
@@ -222,7 +227,7 @@ module Capistrano
                 tmpdir = capture("mktemp -d /tmp/cookbooks.XXXXXXXXXX", options).strip
                 run("rm -rf #{tmpdir.dump} && mkdir -p #{tmpdir.dump}", options)
                 deploy_cookbooks(name, tmpdir, variables, options)
-                install_cookbooks(name, tmpdir, File.join(chef_solo_path, "cookbooks"), options)
+                install_cookbooks(name, tmpdir, chef_solo_cookbooks_path, options)
               ensure
                 run("rm -rf #{tmpdir.dump}", options)
               end
@@ -233,7 +238,6 @@ module Capistrano
           # The definition of cookbooks.
           # By default, load cookbooks from local path of "config/cookbooks".
           #
-          _cset(:chef_solo_cookbooks_name) { application }
           _cset(:chef_solo_cookbooks_exclude, %w(.hg .git .svn))
           _cset(:chef_solo_cookbooks_default_variables) {{
             :scm => :none,
@@ -249,7 +253,15 @@ module Capistrano
             variables[:deploy_subdir] = fetch(:chef_solo_cookbooks_subdir, "config/cookbooks")
             variables[:repository] = fetch(:chef_solo_cookbooks_repository) if exists?("chef_solo_cookbooks_repository")
             variables[:revision] = fetch(:chef_solo_cookbooks_revision) if exists?(:chef_solo_cookbooks_revision)
-            { chef_solo_cookbooks_name => variables }
+            if exists?(:chef_solo_cookbook_name)
+              # deploy as single cookbook
+              name = fetch(:chef_solo_cookbook_name)
+              { name => variables.merge(:cookbook_name => name) }
+            else
+              # deploy as multiple cookbooks
+              name = fetch(:chef_solo_cookbooks_name, application)
+              { name => variables }
+            end
           }
 
           _cset(:chef_solo_repository_cache) { File.expand_path("tmp/cookbooks-cache") }
@@ -287,7 +299,14 @@ module Capistrano
                 end
                 strategy.deploy!
               end
-              run("rsync -lrpt #{(release_path + "/").dump} #{destination.dump}", options)
+              if variables.key?(:cookbook_name)
+                # deploy as single cookbook
+                final_destination = File.join(destination, variables[:cookbook_name])
+              else
+                # deploy as multiple cookbooks
+                final_destination = destination
+              end
+              run("rsync -lrpt #{(release_path + "/").dump} #{final_destination.dump}", options)
             ensure
               run("rm -rf #{releases_path.dump}", options)
             end
@@ -310,12 +329,12 @@ module Capistrano
 
           _cset(:chef_solo_config) {
             (<<-EOS).gsub(/^\s*/, "")
-              file_cache_path #{File.join(chef_solo_path, "cache").dump}
-              cookbook_path #{File.join(chef_solo_path, "cookbooks").dump}
+              file_cache_path #{chef_solo_cache_path.dump}
+              cookbook_path #{chef_solo_cookbooks_path.dump}
             EOS
           }
           def update_config(options={})
-            top.put(chef_solo_config, chef_solo_config_file)
+            top.put(chef_solo_config, chef_solo_config_file, options)
           end
 
           # merge nested hashes

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

@@ -1,5 +1,5 @@
 module Capistrano
   module ChefSolo
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/test/config/cookbook/metadata.rb

@@ -0,0 +1,5 @@
+maintainer       "Yamashita, Yuu"
+maintainer_email "yamashita@geishatokyo.com"
+description      "single"
+long_description "single"
+version          "0.0.1"

data/test/config/cookbook/recipes/default.rb

@@ -0,0 +1,7 @@
+file "/tmp/single" do
+  owner "root"
+  group "root"
+  mode "0644"
+end
+
+# vim:set ft=ruby sw=2 ts=2 :

data/test/config/deploy.rb

@@ -8,7 +8,11 @@ set :scm, :none
 set :use_sudo, false
 set :user, "vagrant"
 set :password, "vagrant"
-set :ssh_options, {:user_known_hosts_file => "/dev/null"}
+set :ssh_options, {
+  :auth_methods => %w(publickey password),
+  :keys => File.join(ENV["HOME"], ".vagrant.d", "insecure_private_key"),
+  :user_known_hosts_file => "/dev/null",
+}
 
 role :web, "192.168.33.10"
 role :app, "192.168.33.10"
@@ -198,7 +202,13 @@ namespace(:test_with_multiple_cookbooks) {
         :repository => File.expand_path("..", File.dirname(__FILE__)),
         :cookbooks => "config/cookbooks",
       },
-      chef_solo_cookbooks_name => {
+      "single" => {
+        :cookbook_name => "single",
+        :scm => :none,
+        :repository => File.expand_path("..", File.dirname(__FILE__)),
+        :cookbooks => "config/cookbook",
+      },
+      application => {
         :scm => :git,
         :repository => "git://github.com/yyuu/capistrano-chef-solo.git",
         :revision => "develop",
@@ -218,7 +228,7 @@ namespace(:test_with_multiple_cookbooks) {
   }
 
   task(:test_run_list) {
-    expected = %w(recipe[foo] recipe[one])
+    expected = %w(recipe[foo] recipe[single] recipe[one])
     chef_solo.run_list expected
     assert_run_list(expected)
     check_applied_recipes!(expected)
@@ -238,14 +248,19 @@ namespace(:test_with_bootstrap) {
     set(:chef_solo_bootstrap, true)
     set(:chef_solo_bootstrap_user, "bootstrap")
     set(:chef_solo_bootstrap_password, "bootstrap")
+    set(:chef_solo_bootstrap_ssh_options, {
+#     :auth_methods => %w(password), #==> setting :auth_methods throws Net::SSH::AuthenticationFailed (capistrano bug?)
+      :user_known_hosts_file => "/dev/null",
+    })
     run("getent passwd #{chef_solo_bootstrap_user.dump} || " +
         "#{sudo} useradd -m -p #{chef_solo_bootstrap_password.crypt(chef_solo_bootstrap_password).dump} #{chef_solo_bootstrap_user.dump}")
   }
 
   task(:teardown) {
     set(:chef_solo_bootstrap, false)
-    set(:chef_solo_bootstrap_user, nil)
-    set(:chef_solo_bootstrap_password, nil)
+    unset(:chef_solo_bootstrap_user)
+    unset(:chef_solo_bootstrap_password)
+    unset(:chef_solo_bootstrap_ssh_options)
   }
 
   task(:test_connect_with_settings) {
@@ -280,12 +295,14 @@ namespace(:test_without_bootstrap) {
     set(:chef_solo_bootstrap, false)
     set(:chef_solo_bootstrap_user, "bootstrap")
     set(:chef_solo_bootstrap_password, "bootstrap")
+    set(:chef_solo_bootstrap_ssh_options, {:user_known_hosts_file => "/dev/null"})
   }
 
   task(:teardown) {
     set(:chef_solo_bootstrap, false)
-    set(:chef_solo_bootstrap_user, nil)
-    set(:chef_solo_bootstrap_password, nil)
+    unset(:chef_solo_bootstrap_user)
+    unset(:chef_solo_bootstrap_password)
+    unset(:chef_solo_bootstrap_ssh_options)
   }
 
   task(:test_connect_with_settings) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yyuu-capistrano-chef-solo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -127,6 +127,8 @@ files:
 - test/centos6-64/Gemfile
 - test/centos6-64/Vagrantfile
 - test/centos6-64/run.sh
+- test/config/cookbook/metadata.rb
+- test/config/cookbook/recipes/default.rb
 - test/config/cookbooks-ext/one/metadata.rb
 - test/config/cookbooks-ext/one/recipes/default.rb
 - test/config/cookbooks-ext/three/metadata.rb
@@ -175,6 +177,8 @@ test_files:
 - test/centos6-64/Gemfile
 - test/centos6-64/Vagrantfile
 - test/centos6-64/run.sh
+- test/config/cookbook/metadata.rb
+- test/config/cookbook/recipes/default.rb
 - test/config/cookbooks-ext/one/metadata.rb
 - test/config/cookbooks-ext/one/recipes/default.rb
 - test/config/cookbooks-ext/three/metadata.rb