yyuu-capistrano-chef-solo 0.0.8 → 0.0.9

data/README.md

@@ -28,11 +28,11 @@ This recipe will try to bootstrap your servers with `chef-solo`. Following proce
 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")
+    require "capistrano-chef-solo"
+    set(:chef_solo_version, "10.16.4")
     set(:chef_solo_cookbooks_repository, "git@example.com:foo/bar.git")
 
-And then, now you can start `chef-solo` via capistrano.
+And then, now you can start using `chef-solo` via capistrano.
 
     $ cap chef-solo
 
@@ -46,9 +46,45 @@ Following options are available to manage your `chef-solo`.
  * `:chef_solo_cookbooks_revision` - the `branch` in the repository.
  * `:chef_solo_cookbooks_subdir` - the path to the `cookbooks` directory in the repository. use `config/cookbooks` by default.
  * `:chef_solo_cookbooks` - an alternative way to specify cookbooks repository. you can set multiple repositories from here.
- * `:chef_solo_attributes` - the `attributes` to apply to `chef-solo`.
- * `:chef_solo_host_attributes` - per host `attributes` to apply to `chef-solo`. the key should be the name of the targeted host.
- * `:chef_solo_run_list` - the `run_list` to apply to `chef-solo`.
+ * `:chef_solo_attributes` - the `attributes` of chef-solo. must be a `Hash<String,String>`. will be converted into JSON.
+ * `:chef_solo_run_list` - the `run_list` of chef-solo. must be an `Array<String>`. will be merged into `:chef_solo_attributes`.
+ * `:chef_solo_host_attributes` - per-host `attributes` of chef-solo. must be a `Hash<String,Hash<String,String>>`.
+ * `:chef_solo_host_run_list` - per-host `run_list` of chef-solo. must be a `Hash<String,Array<String>>`.
+
+## Examples
+
+### Setting `attributes` and `run_list`
+
+To apply some `attributes` to your hosts, set something like following in your `config/deploy.rb` or so.
+
+    set(:chef_solo_attributes) {{
+      "locales" => { "language" => "ja" },
+      "tzdata" => { "timezone" => "Asia/Tokyo" },
+    }}
+    set(:chef_solo_run_list, ["recipe[build-essential]", "recipe[locales]", "recipe[tzdata]"])
+
+### Setting individual `attributes` and `run_list` per host
+
+In some cases, you may want to apply individual `attributes` per host.
+(Something like `server_id` of mysqld or VRRP priority of keepalived)
+
+    set(:chef_solo_host_attributes) {
+      "foo1.example.com" => {
+        "keepalived" => {
+          "virtual_router_id" => 1,
+          "priority" => 100, #=> MASTER
+          "virtual_ipaddress" => "192.168.0.1/24",
+        },
+      },
+      "foo2.example.com" => {
+        "keepalived" => {
+          "virtual_router_id" => 1,
+          "priority" => 50, #=> BACKUP
+          "virtual_ipaddress" => "192.168.0.1/24",
+        },
+      },
+    }
+
 
 ## Contributing
 

data/capistrano-chef-solo.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
   gem.version       = Capistrano::ChefSolo::VERSION
 
   gem.add_dependency("capistrano")
-  gem.add_dependency("capistrano-rbenv", ">= 0.0.3")
+  gem.add_dependency("capistrano-rbenv", "~> 0.0.3")
 end

data/lib/capistrano-chef-solo.rb

@@ -1,11 +1,9 @@
-require 'capistrano-chef-solo/version'
-require 'capistrano-rbenv'
-require 'capistrano/configuration'
-require 'capistrano/recipes/deploy/scm'
-require 'capistrano/transfer'
-require 'json'
-require 'tmpdir'
-require 'uri'
+require "capistrano-chef-solo/version"
+require "capistrano-rbenv"
+require "capistrano/configuration"
+require "capistrano/recipes/deploy/scm"
+require "json"
+require "uri"
 
 module Capistrano
   module ChefSolo
@@ -15,7 +13,7 @@ module Capistrano
           _cset(:chef_solo_home) {
             capture('echo $HOME').strip
           }
-          _cset(:chef_solo_version, '10.16.4')
+          _cset(:chef_solo_version, "10.16.4")
           _cset(:chef_solo_path) { File.join(chef_solo_home, 'chef') }
           _cset(:chef_solo_path_children, %w(bundle cache config cookbooks))
 
@@ -38,6 +36,15 @@ module Capistrano
             end
           end
 
+          desc("Setup chef-solo.")
+          task(:setup) {
+            connect_with_settings {
+              transaction {
+                bootstrap
+              }
+            }
+          }
+
           desc("Run chef-solo.")
           task(:default) {
             connect_with_settings {
@@ -86,8 +93,8 @@ module Capistrano
           }
 
           task(:update_cookbooks) {
-            tmpdir = Dir.mktmpdir()
-            remote_tmpdir = capture("mktemp -d").chomp
+            tmpdir = `mktemp -d /tmp/capistrano-chef-solo.XXXXXXXXXX`.chomp
+            remote_tmpdir = capture("mktemp -d /tmp/capistrano-chef-solo.XXXXXXXXXX").chomp
             destination = File.join(tmpdir, 'cookbooks')
             remote_destination = File.join(chef_solo_path, 'cookbooks')
             filename = File.join(tmpdir, 'cookbooks.tar.gz')
@@ -184,12 +191,12 @@ module Capistrano
           }
 
           # merge nested hashes
-          def _deep_merge(a, b)
+          def deep_merge(a, b)
             f = lambda { |key, val1, val2| Hash === val1 && Hash === val2 ? val1.merge(val2, &f) : val2 }
             a.merge(b, &f)
           end
 
-          def _json(x)
+          def json(x)
             if fetch(:chef_solo_pretty_json, true)
               JSON.pretty_generate(x)
             else
@@ -197,18 +204,38 @@ module Capistrano
             end
           end
 
+          _cset(:chef_solo_capistrano_attributes) {
+            # reject lazy variables since they might have side-effects.
+            Hash[variables.reject { |key, value| value.respond_to?(:call) }]
+          }
           _cset(:chef_solo_attributes, {})
           _cset(:chef_solo_host_attributes, {})
+          _cset(:chef_solo_run_list, [])
+          _cset(:chef_solo_host_run_list, {})
+
+          def generate_attributes(options={})
+            attributes = deep_merge(chef_solo_capistrano_attributes, chef_solo_attributes)
+            attributes = deep_merge(attributes, {"run_list" => chef_solo_run_list})
+            if options.has_key?(:host)
+              attributes = deep_merge(attributes, chef_solo_host_attributes.fetch(options[:host], {}))
+              attributes = deep_merge(attributes, {"run_list" => chef_solo_host_run_list.fetch(options[:host], [])})
+            end
+            attributes
+          end
+
+          desc("Show chef-solo attributes.")
+          task(:show_attributes) {
+            STDOUT.puts(json(generate_attributes))
+          }
+
           task(:update_attributes) {
-            attributes = _deep_merge(chef_solo_attributes, {'run_list' => fetch(:chef_solo_run_list, [])})
-            to = File.join(chef_solo_path, 'config', 'solo.json')
-            if chef_solo_host_attributes.empty?
-              put(_json(attributes), to)
+            to = File.join(chef_solo_path, "config", "solo.json")
+            if chef_solo_host_attributes.empty? and chef_solo_host_run_list.empty?
+              put(json(generate_attributes), to)
             else
               execute_on_servers { |servers|
                 servers.each { |server|
-                  host_attributes = _deep_merge(attributes, chef_solo_host_attributes.fetch(server.host, {}))
-                  Capistrano::Transfer.process(:up, StringIO.new(_json(host_attributes)), to, [sessions[server]], :logger => logger)
+                  put(json(generate_attributes(:host => server.host), to, :hosts => server.host))
                 }
               }
             end

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

@@ -1,5 +1,5 @@
 module Capistrano
   module ChefSolo
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yyuu-capistrano-chef-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
 description: a capistrano recipe to invoke chef-solo.
@@ -83,4 +83,3 @@ signing_key:
 specification_version: 3
 summary: a capistrano recipe to invoke chef-solo.
 test_files: []
-has_rdoc: