yyuu-capistrano-chef-solo 0.1.3 → 0.1.4

data/README.md

@@ -35,8 +35,12 @@ 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.
-This task will deploy cookbooks from `./config/cookbooks`, and then invoke `chef-solo`.
+Then, create directories for your cookbooks and data bags. By default, `capistrano-chef-solo` searches them from `./config`.
+(see examples of [cookbooks](#using-cookbooks) and [data bags](#using-data-bags) for details)
+
+    $ mkdir -p config/cookbooks config/data_bags
+
+Now you can start using `chef-solo` via Capistrano.
 
     $ cap chef-solo
 
@@ -137,6 +141,21 @@ set(:chef_solo_cookbooks) {{
 ```
 
 
+### Using data bags
+
+#### Using data bags in local path
+
+You can manage your data bags as similar as [cookbooks](#using-cookbooks).
+
+By default, `capistrano-chef-solo` searches data bags from local path of `config/data_bags`.
+You can specify the data bags directory with using `chef_solo_data_bags_subdir`.
+
+```ruby
+set(:chef_solo_data_bags_scm, :none)
+set(:chef_solo_data_bags_subdir, "config/data_bags")
+```
+
+
 ### Attributes configuration
 
 By default, the Chef attributes will be generated by following order.
@@ -211,17 +230,19 @@ You can check generated attributes with using `chef-solo:attributes` task.
 
 Following options are available to manage your `chef-solo`.
 
- * `:chef_solo_version` - the version of chef.
- * `:chef_solo_cookbooks` - the definition of cookbooks. by default, copy cookbooks from `./config/cookbooks`.
- * `: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_role_attributes` - the per-roles `attributes` of chef-solo. must be a `Hash<Symbol,Hash<String,String>>`.
- * `:chef_solo_role_run_list` - the per-roles `run_list` of chef-solo. must be a `Hash<Symbol,Array<String>>`.
- * `:chef_solo_host_attributes` - the per-hosts `attributes` of chef-solo. must be a `Hash<String,Hash<String,String>>`.
- * `:chef_solo_host_run_list` - the per-hosts `run_list` of chef-solo. must be a `Hash<String,Array<String>>`.
- * `:chef_solo_capistrano_attributes` - the Capistrano variables to use as Chef attributes.
- * `:chef_solo_capistrano_attributes_exclude` - the black list for `:chef_solo_capistrano_attributes`
- * `:chef_solo_capistrano_attributes_include` - the white list for `:chef_solo_capistrano_attributes`
+ * `:chef_solo_version` - The version of Chef.
+ * `:chef_solo_use_bunler` - Use bundler to install Chef. Set `true` by default.
+ * `:chef_solo_cookbooks` - The definition of cookbooks. By default, use cookbooks in `./config/cookbooks`.
+ * `:chef_solo_data_bags` - The definition of data bags. By default, use data bags in `./config/data_bags`.
+ * `:chef_solo_attributes` - The `attributes` of chef-solo. must be a `Hash<String,String>`. This will be converted into JSON.
+ * `:chef_solo_run_list` - The `run_list` of chef-solo. must be an `Array<String>`. This will be merged into `:chef_solo_attributes`.
+ * `:chef_solo_role_attributes` - The per-roles `attributes` of chef-solo. This must be a `Hash<Symbol,Hash<String,String>>`.
+ * `:chef_solo_role_run_list` - The per-roles `run_list` of chef-solo. This must be a `Hash<Symbol,Array<String>>`.
+ * `:chef_solo_host_attributes` - The per-hosts `attributes` of chef-solo. This must be a `Hash<String,Hash<String,String>>`.
+ * `:chef_solo_host_run_list` - The per-hosts `run_list` of chef-solo. This must be a `Hash<String,Array<String>>`.
+ * `:chef_solo_capistrano_attributes` - The Capistrano variables to use as Chef attributes.
+ * `:chef_solo_capistrano_attributes_exclude` - The black list for `:chef_solo_capistrano_attributes`
+ * `:chef_solo_capistrano_attributes_include` - The white list for `:chef_solo_capistrano_attributes`
 
 
 ## Contributing

data/capistrano-chef-solo.gemspec

@@ -18,8 +18,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("capistrano", ">= 2.10.0")
   gem.add_dependency("capistrano-copy-subdir", ">= 0.1.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")
+  gem.add_dependency("capistrano-rbenv", ">= 1.0.1")
 end

data/lib/capistrano-chef-solo.rb

@@ -15,6 +15,11 @@ module Capistrano
             find_and_execute_task("chef_solo:setup")
           }
 
+          desc("Uninstall chef-solo. (an alias of chef_solo:purge)")
+          task(:purge, :except => { :no_release => true }) {
+            find_and_execute_task("chef_solo:purge")
+          }
+
           desc("Run chef-solo. (an alias of chef_solo)")
           task(:default, :except => { :no_release => true }) {
             find_and_execute_task("chef_solo:default")
@@ -32,11 +37,13 @@ module Capistrano
         }
 
         namespace(:chef_solo) {
+          _cset(:chef_solo_use_bundler, true)
           _cset(:chef_solo_version, "11.4.0")
           _cset(:chef_solo_path) { capture("echo $HOME/chef").strip }
           _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_data_bags_path) { File.join(chef_solo_path, "data_bags") }
           _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") }
 
@@ -130,7 +137,11 @@ module Capistrano
           # initialized without bootstrap settings during `on :load`.
           # Is there any way to avoid this without setting `:rbenv_setup_default_environment`
           # as false?
-          set(:rbenv_setup_default_environment, false)
+          on(:load) do
+            before("rbenv:setup_default_environment") do
+              set(:rbenv_setup_default_environment, false) if chef_solo_bootstrap
+            end
+          end
 
           desc("Setup chef-solo.")
           task(:setup, :except => { :no_release => true }) {
@@ -141,6 +152,15 @@ module Capistrano
             end
           }
 
+          desc("Uninstall chef-solo.")
+          task(:purge, :except => { :no_release => true }) {
+            connect_with_settings do
+              transaction do
+                uninstall
+              end
+            end
+          }
+
           desc("Run chef-solo.")
           task(:default, :except => { :no_release => true }) {
             connect_with_settings do
@@ -157,8 +177,8 @@ module Capistrano
             connect_with_settings do
               setup
               transaction do
-                update(:run_list => recipes)
-                invoke
+                update
+                invoke(:run_list => recipes)
               end
             end
           end
@@ -168,7 +188,7 @@ module Capistrano
           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_cmd} --version")
+              execute("--version")
             end
           }
 
@@ -181,106 +201,182 @@ module Capistrano
             STDOUT.puts(_json_attributes(attributes))
           }
 
-          task(:install, :except => { :no_release => true }) {
-            install_ruby
-            install_chef
-          }
-
-          task(:install_ruby, :except => { :no_release => true }) {
-            set(:rbenv_install_bundler, true)
-            find_and_execute_task("rbenv:setup")
-          }
-
+          _cset(:chef_solo_gem_dependencies) {{
+            fetch(:chef_solo_gem, "chef") => chef_solo_version,
+          }}
           _cset(:chef_solo_gemfile) {
-            (<<-EOS).gsub(/^\s*/, "")
-              source "https://rubygems.org"
-              gem "chef", #{chef_solo_version.to_s.dump}
-            EOS
+            gemfile = []
+            gemfile << %{source "https://rubygems.org"}
+            chef_solo_gem_dependencies.each do |name, options|
+              if options.nil?
+                gemfile << %{gem #{name.dump}}
+              else
+                gemfile << %{gem #{name.dump}, #{options.inspect}}
+              end
+            end
+            gemfile.join("\n")
           }
-          task(:install_chef, :except => { :no_release => true }) {
+          task(:install, :except => { :no_release => true }) {
+            set(:rbenv_install_bundler, true) if chef_solo_use_bundler
+            find_and_execute_task("rbenv:setup")
             begin
-              version = capture("cd #{chef_solo_path.dump} && #{bundle_cmd} exec #{chef_solo_cmd} --version")
+              version = execute("--version", :via => :capture)
               installed = Regexp.new(Regexp.escape(chef_solo_version)) =~ version
             rescue
               installed = false
             end
             unless installed
-              dirs = [ chef_solo_path, chef_solo_cache_path, chef_solo_config_path, chef_solo_cookbooks_path ].uniq
+              dirs = [ chef_solo_path, chef_solo_cache_path, chef_solo_config_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, [])
-              args << "--path=#{File.join(chef_solo_path, "bundle").dump}"
-              args << "--quiet"
-              run("cd #{chef_solo_path.dump} && #{bundle_cmd} install #{args.join(" ")}")
+              if chef_solo_use_bundler
+                top.put(chef_solo_gemfile, File.join(chef_solo_path, "Gemfile"))
+                args = fetch(:chef_solo_bundle_options, [])
+                args << "--path=#{File.join(chef_solo_path, "bundle").dump}"
+                args << "--quiet"
+                run("cd #{chef_solo_path.dump} && #{bundle_cmd} install #{args.join(" ")}")
+              else
+                chef_solo_gem_dependencies.each do |name, options|
+                  args = String === options ? "-v #{options.dump}" : "" # options must be a version string
+                  rbenv.exec("gem install #{args} #{name.dump}", :path => chef_solo_path)
+                end
+                rbenv.rehash
+              end
             end
           }
  
+          task(:uninstall, :except => { :no_release => true }) {
+            if chef_solo_use_bundler
+              run("rm -f #{File.join(chef_solo_path, "Gemfile").dump} #{File.join(chef_solo_path, "Gemfile.lock").dump}")
+              run("rm -rf #{File.join(chef_solo_path, "bundle").dump}")
+            else
+              chef_solo_gem_dependencies.each do |name, options|
+                args = String === options ? "-v #{options.dump}" : "" # options must be a version string
+                rbenv.exec("gem uninstall -I -x #{args} #{name.dump}", :path => chef_solo_path)
+              end
+            end
+          }
+
           def update(options={})
             update_cookbooks(options)
+            update_data_bags(options)
             update_attributes(options)
             update_config(options)
           end
 
           def update_cookbooks(options={})
-            _normalize_cookbooks(chef_solo_cookbooks).each do |name, variables|
+            repos = _normalize_cookbooks(chef_solo_cookbooks)
+            _install_repos(:cookbooks, repos, chef_solo_cookbooks_path, options) do |name, tmpdir, variables|
+              deploy_cookbooks(name, tmpdir, variables, options)
+            end
+          end
+
+          def update_data_bags(options={})
+            repos = _normalize_data_bags(chef_solo_data_bags)
+            _install_repos(:data_bags, repos, chef_solo_data_bags_path, options) do |name, tmpdir, variables|
+              deploy_data_bags(name, tmpdir, variables, options)
+            end
+          end
+
+          def _install_repos(t, repos, destination, options={}, &block)
+            # (0) remove existing old data
+            run("rm -rf #{destination.dump} && mkdir -p #{destination.dump}", options)
+            repos.each do |name, variables|
               begin
-                tmpdir = capture("mktemp -d /tmp/cookbooks.XXXXXXXXXX", options).strip
+                tmpdir = capture("mktemp -d #{File.join("/tmp", "#{t}.XXXXXXXXXX").dump}", options).strip
                 run("rm -rf #{tmpdir.dump} && mkdir -p #{tmpdir.dump}", options)
-                deploy_cookbooks(name, tmpdir, variables, options)
-                install_cookbooks(name, tmpdir, chef_solo_cookbooks_path, options)
+                # (1) caller deploys the repository to tmpdir
+                yield name, tmpdir, variables
+                # (2) then deploy it to actual destination
+                logger.debug("installing #{t} `#{name}' from #{tmpdir} to #{destination}.")
+                run("rsync -lrpt #{(tmpdir + "/").dump} #{destination.dump}", options)
               ensure
                 run("rm -rf #{tmpdir.dump}", options)
               end
             end
           end
 
-          #
-          # The definition of cookbooks.
-          # By default, load cookbooks from local path of "config/cookbooks".
-          #
-          _cset(:chef_solo_cookbooks_exclude, %w(.hg .git .svn))
-          _cset(:chef_solo_cookbooks_default_variables) {{
+          _cset(:chef_solo_repository_cache) { File.expand_path("tmp") }
+          _cset(:chef_solo_repository_exclude, %w(.hg .git .svn))
+          _cset(:chef_solo_repository_variables) {{
             :scm => :none,
             :deploy_via => :copy_subdir,
             :deploy_subdir => nil,
             :repository => ".",
-            :cookbooks_exclude => chef_solo_cookbooks_exclude,
             :copy_cache => nil,
           }}
-          _cset(:chef_solo_cookbooks) {
-            variables = chef_solo_cookbooks_default_variables.dup
-            variables[:scm] = fetch(:chef_solo_cookbooks_scm) if exists?(:chef_solo_cookbooks_scm)
-            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)
-            if exists?(:chef_solo_cookbook_name)
-              # deploy as single cookbook
-              name = fetch(:chef_solo_cookbook_name)
-              { name => variables.merge(:cookbook_name => name) }
+
+          #
+          # The definition of cookbooks.
+          # By default, load cookbooks from local path of "config/cookbooks".
+          #
+          _cset(:chef_solo_cookbooks_exclude) { chef_solo_repository_exclude }
+          _cset(:chef_solo_cookbooks_variables) { chef_solo_repository_variables.merge(:copy_exclude => chef_solo_cookbooks_exclude) }
+          _cset(:chef_solo_cookbooks) { _default_repos(:cookbook, chef_solo_cookbooks_variables) }
+          _cset(:chef_solo_cookbooks_cache) { File.join(chef_solo_repository_cache, "cookbooks-cache") }
+          def _normalize_cookbooks(repos)
+            _normalize_repos(repos, chef_solo_cookbooks_cache, chef_solo_cookbooks_variables) { |name, variables|
+              variables[:deploy_subdir] ||= variables[:cookbooks] # use :cookbooks as :deploy_subdir for backward compatibility with prior than 0.1.2
+              variables[:copy_exclude] ||= variables[:cookbooks_exclude]
+            }
+          end
+
+          #
+          # The definition of data_bags.
+          # By default, load data_bags from local path of "config/data_bags".
+          #
+          _cset(:chef_solo_data_bags_exclude) { chef_solo_repository_exclude }
+          _cset(:chef_solo_data_bags_variables) { chef_solo_repository_variables.merge(:copy_exclude => chef_solo_data_bags_exclude) }
+          _cset(:chef_solo_data_bags) { _default_repos(:data_bag, chef_solo_data_bags_variables) }
+          _cset(:chef_solo_data_bags_cache) { File.join(chef_solo_repository_cache, "data_bags-cache") }
+          def _normalize_data_bags(repos)
+            _normalize_repos(repos, chef_solo_data_bags_cache, chef_solo_data_bags_variables) { |name, variables|
+              variables[:deploy_subdir] ||= variables[:data_bags] # use :data_bags as :deploy_subdir for backward compatibility with prior than 0.1.2
+              variables[:copy_exclude] ||= variables[:data_bags_exclude]
+            }
+          end
+
+          def _default_repos(singular, variables={}, &block)
+            plural = "#{singular}s"
+            variables = variables.dup
+            variables[:scm] = fetch("chef_solo_#{plural}_scm".to_sym) if exists?("chef_solo_#{plural}_scm".to_sym)
+            variables[:deploy_subdir] = fetch("chef_solo_#{plural}_subdir".to_sym, File.join("config", plural))
+            variables[:repository] = fetch("chef_solo_#{plural}_repository".to_sym) if exists?("chef_solo_#{plural}_repository".to_sym)
+            variables[:revision] = fetch("chef_solo_#{plural}_revision".to_sym) if exists?("chef_solo_#{plural}_revision".to_sym)
+            if exists?("chef_solo_#{singular}_name".to_sym)
+              name = fetch("chef_solo_#{singular}_name".to_sym) # deploy as single cookbook
+              variables["#{singular}_name".to_sym] = name
             else
-              # deploy as multiple cookbooks
-              name = fetch(:chef_solo_cookbooks_name, application)
-              { name => variables }
+              name = fetch("chef_solo_#{plural}_name".to_sym, application) # deploy as multiple cookbooks
             end
-          }
+            { name => variables }
+          end
 
-          _cset(:chef_solo_repository_cache) { File.expand_path("tmp/cookbooks-cache") }
-          def _normalize_cookbooks(cookbooks)
-            xs = cookbooks.map { |name, variables|
-              variables = chef_solo_cookbooks_default_variables.merge(variables)
+          def _normalize_repos(repos, cache_path, default_variables={}, &block)
+            normalized = repos.map { |name, variables|
+              variables = default_variables.merge(variables)
               variables[:application] ||= name
-              # use :cookbooks as :deploy_subdir for backward compatibility with prior than 0.1.2
-              variables[:deploy_subdir] ||= variables[:cookbooks]
               if variables[:scm] != :none
-                variables[:copy_cache] ||= File.expand_path(name, chef_solo_repository_cache)
+                variables[:copy_cache] ||= File.expand_path(name, cache_path)
               end
+              yield name, variables
               [name, variables]
             }
-            Hash[xs]
+            Hash[normalized]
           end
 
           def deploy_cookbooks(name, destination, variables={}, options={})
-            logger.debug("retrieving cookbooks `#{name}' from #{variables[:repository]} via #{variables[:deploy_via]}.")
+            # deploy as single cookbook, or deploy as multiple cookbooks
+            final_destination = variables.key?(:cookbook_name) ? File.join(destination, variables[:cookbook_name]) : destination
+            _deploy_repo(:cookbooks, name, final_destination, variables, options)
+          end
+
+          def deploy_data_bags(name, destination, variables={}, options={})
+            # deploy as single data_bag, or deploy as multiple data_bags
+            final_destination = variables.key?(:data_bag_name) ? File.join(destination, variables[:data_bag_name]) : destination
+            _deploy_repo(:data_bags, name, final_destination, variables, options)
+          end
+
+          def _deploy_repo(t, name, destination, variables={}, options={})
             begin
               releases_path = capture("mktemp -d /tmp/releases.XXXXXXXXXX", options).strip
               release_path = File.join(releases_path, release_name)
@@ -295,18 +391,18 @@ module Capistrano
                 set(:real_revision) { source.local.query_revision(revision) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } } }
                 set(:strategy) { ::Capistrano::Deploy::Strategy.new(deploy_via, self) }
                 variables.each do |key, val|
-                  set(key, val)
+                  if val.nil?
+                    unset(key)
+                  else
+                    set(key, val)
+                  end
                 end
+                from = File.join(repository, fetch(:deploy_subdir, "/"))
+                to = destination
+                logger.debug("retrieving #{t} `#{name}' from #{from} (scm=#{scm}, via=#{deploy_via}) to #{to}.")
                 strategy.deploy!
               end
-              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)
+              run("rsync -lrpt #{(release_path + "/").dump} #{destination.dump}", options)
             ensure
               run("rm -rf #{releases_path.dump}", options)
             end
@@ -321,16 +417,11 @@ module Capistrano
             o
           end
 
-          def install_cookbooks(name, source, destination, options={})
-            logger.debug("installing cookbooks `#{name}' to #{destination}.")
-            run("mkdir -p #{source.dump} #{destination.dump}", options)
-            run("rsync -lrpt #{(source + "/").dump} #{destination.dump}", options)
-          end
-
           _cset(:chef_solo_config) {
             (<<-EOS).gsub(/^\s*/, "")
               file_cache_path #{chef_solo_cache_path.dump}
               cookbook_path #{chef_solo_cookbooks_path.dump}
+              data_bag_path #{chef_solo_data_bags_path.dump}
             EOS
           }
           def update_config(options={})
@@ -386,7 +477,6 @@ module Capistrano
           def _generate_attributes(options={})
             hosts = [ options.delete(:hosts) ].flatten.compact.uniq
             roles = [ options.delete(:roles) ].flatten.compact.uniq
-            run_list = [ options.delete(:run_list) ].flatten.compact.uniq
             #
             # By default, the Chef attributes will be generated by following order.
             # 
@@ -404,43 +494,46 @@ module Capistrano
               _merge_attributes!(attributes, chef_solo_host_attributes.fetch(host, {}))
             end
             #
-            # The Chef `run_list` will be generated by following rules.
+            # The Chef `run_list` will be generated from `:chef_solo_role_run_list` and
+            # `:chef_solo_host_run_list`.
             #
-            # * If `:run_list` was given as argument, just use it.
-            # * Otherwise, generate it from `:chef_solo_role_run_list`, `:chef_solo_role_run_list`
-            #   and `:chef_solo_host_run_list`.
-            #
-            if run_list.empty?
-              _merge_attributes!(attributes, {"run_list" => chef_solo_run_list})
-              roles.each do |role|
-                _merge_attributes!(attributes, {"run_list" => chef_solo_role_run_list.fetch(role, [])})
-              end
-              hosts.each do |host|
-                _merge_attributes!(attributes, {"run_list" => chef_solo_host_run_list.fetch(host, [])})
-              end
-            else
-              attributes["run_list"] = [] # ignore run_list not from argument
-              _merge_attributes!(attributes, {"run_list" => run_list})
+            _merge_attributes!(attributes, {"run_list" => chef_solo_run_list})
+            roles.each do |role|
+              _merge_attributes!(attributes, {"run_list" => chef_solo_role_run_list.fetch(role, [])})
+            end
+            hosts.each do |host|
+              _merge_attributes!(attributes, {"run_list" => chef_solo_host_run_list.fetch(host, [])})
             end
             attributes
           end
 
           def update_attributes(options={})
-            run_list = options.delete(:run_list)
             servers = find_servers_for_task(current_task)
             servers.each do |server|
               logger.debug("updating chef-solo attributes for #{server.host}.")
-              attributes = _generate_attributes(:hosts => server.host, :roles => role_names_for_host(server), :run_list => run_list)
+              attributes = _generate_attributes(:hosts => server.host, :roles => role_names_for_host(server))
               top.put(_json_attributes(attributes), chef_solo_attributes_file, options.merge(:hosts => server.host))
             end
           end
 
           def invoke(options={})
+            options = options.dup
+            run_list = [ options.delete(:run_list) ].flatten.compact
             logger.debug("invoking 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 #{chef_solo_cmd} #{args.join(" ")}", options)
+            args += ["-c", chef_solo_config_file]
+            args += ["-j", chef_solo_attributes_file]
+            args += ["-o", run_list.join(",")] unless run_list.empty?
+            execute(args, options.merge(:via => :sudo))
+          end
+
+          def execute(args, options={})
+            if chef_solo_use_bundler
+              command = "bundle exec #{chef_solo_cmd}"
+            else
+              command = chef_solo_cmd
+            end
+            rbenv.exec("#{command} #{[ args ].flatten.compact.map { |x| x.dump }.join(" ")}", options.merge(:path => chef_solo_path))
           end
         }
       }

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

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

data/test/centos6-64/.gitignore

@@ -1,5 +1,5 @@
 /.bundle
-/.vagrant
+/.vagrant*
 /known_hosts
 /tmp
 /vendor

data/test/centos6-64/run.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-bundle exec vagrant up
+vagrant up
 bundle exec cap test_all
-bundle exec vagrant halt
+vagrant halt
 
 # vim:set ft=sh :

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

@@ -2,6 +2,7 @@ file "/tmp/single" do
   owner "root"
   group "root"
   mode "0644"
+  content data_bag_item("single", "data")["value"]
 end
 
 # vim:set ft=ruby sw=2 ts=2 :

data/test/config/cookbooks-ext/one/recipes/default.rb

@@ -2,6 +2,7 @@ file "/tmp/one" do
   owner "root"
   group "root"
   mode "0644"
+  content data_bag_item("one", "data")["value"]
 end
 
 # vim:set ft=ruby sw=2 ts=2 :

data/test/config/cookbooks-ext/three/recipes/default.rb

@@ -2,6 +2,7 @@ file "/tmp/three" do
   owner "root"
   group "root"
   mode "0644"
+  content data_bag_item("three", "data")["value"]
 end
 
 # vim:set ft=ruby sw=2 ts=2 :

data/test/config/cookbooks-ext/two/recipes/default.rb

@@ -2,6 +2,7 @@ file "/tmp/two" do
   owner "root"
   group "root"
   mode "0644"
+  content data_bag_item("two", "data")["value"]
 end
 
 # vim:set ft=ruby sw=2 ts=2 :

data/test/config/cookbooks/bar/recipes/default.rb

@@ -2,6 +2,7 @@ file "/tmp/bar" do
   owner "root"
   group "root"
   mode "0644"
+  content data_bag_item("bar", "data")["value"]
 end
 
 # vim:set ft=ruby sw=2 ts=2 :

data/test/config/cookbooks/baz/recipes/default.rb

@@ -2,6 +2,7 @@ file "/tmp/baz" do
   owner "root"
   group "root"
   mode "0644"
+  content data_bag_item("baz", "data")["value"]
 end
 
 # vim:set ft=ruby sw=2 ts=2 :

data/test/config/cookbooks/foo/recipes/default.rb

@@ -2,6 +2,7 @@ file "/tmp/foo" do
   owner "root"
   group "root"
   mode "0644"
+  content data_bag_item("foo", "data")["value"]
 end
 
 # vim:set ft=ruby sw=2 ts=2 :

data/test/config/data_bag/single.json

@@ -0,0 +1 @@
+{"id": "data", "value": "SINGLE"}

data/test/config/data_bags-ext/one/one.json

@@ -0,0 +1 @@
+{"id": "data", "value": "ONE"}

data/test/config/data_bags-ext/three/three.json

@@ -0,0 +1 @@
+{"id": "data", "value": "THREE"}

data/test/config/data_bags-ext/two/two.json

@@ -0,0 +1 @@
+{"id": "data", "value": "TWO"}

data/test/config/data_bags/bar/bar.json

@@ -0,0 +1 @@
+{"id": "data", "value": "BAR"}

data/test/config/data_bags/baz/baz.json

@@ -0,0 +1 @@
+{"id": "data", "value": "BAZ"}

data/test/config/data_bags/foo/foo.json

@@ -0,0 +1 @@
+{"id": "data", "value": "FOO"}

data/test/config/deploy.rb

@@ -25,6 +25,7 @@ require "tempfile"
 
 task(:test_all) {
   find_and_execute_task("test_default")
+  find_and_execute_task("test_without_bundler")
   find_and_execute_task("test_with_local_cookbooks")
   find_and_execute_task("test_with_remote_cookbooks")
   find_and_execute_task("test_with_multiple_cookbooks")
@@ -32,14 +33,18 @@ task(:test_all) {
   find_and_execute_task("test_without_bootstrap")
 }
 
-def download_attributes()
-  tempfile = Tempfile.new("attributes")
-  download(chef_solo_attributes_file, tempfile.path)
-  JSON.load(tempfile.read)
+def get_file(file, options={})
+  tempfile = Tempfile.new("capistrano-chef-solo")
+  top.get(file, tempfile.path, options)
+  tempfile.read
 end
 
-def assert_attributes(expected)
-  found = download_attributes
+def get_attributes(options={})
+  JSON.load(get_file(chef_solo_attributes_file, options))
+end
+
+def assert_attributes(expected, options={})
+  found = get_attributes(options)
   expected.each do |key, value|
     if found[key] != value
       abort("invalid attribute: #{key.inspect} (expected:#{value.inspect} != found:#{found[key].inspect})")
@@ -47,19 +52,48 @@ def assert_attributes(expected)
   end
 end
 
-def assert_run_list(expected)
-  found = download_attributes["run_list"]
+def assert_run_list(expected, options={})
+  found = get_attributes(options)["run_list"]
   abort("invalid run_list (expected:#{expected.inspect} != found:#{found.inspect})") if found != expected
 end
 
-def check_applied_recipes!(expected)
-  files = expected.map { |recipe| /^recipe\[(\w+)\]$/ =~ recipe; File.join("/tmp", $1) }
-  begin
-    files.each do |file|
-      run("test -f #{file.dump}")
+def assert_file_exists(file, options={})
+  run("test -f #{file.dump}", options)
+rescue
+  abort("assert_file_exists(#{file}) failed.")
+end
+
+def assert_file_content(file, content, options={})
+  remote_content = get_file(file, options)
+  abort("assert_file_content(#{file}) failed. (expected=#{content.inspect}, got=#{remote_content.inspect})") if content != remote_content
+end
+
+def recipe_name(recipe)
+  if /^recipe\[(\w+)\]$/ =~ recipe
+    $1
+  else
+    abort("not a recipe: #{recipe}")
+  end
+end
+
+def recipe_filename(recipe)
+  File.join("/tmp", recipe_name(recipe))
+end
+
+def recipe_content(recipe)
+  recipe_name(recipe).upcase
+end
+
+def _test_recipes(recipes, options={})
+  recipes.each do |recipe|
+    file = recipe_filename(recipe)
+    body = recipe_content(recipe)
+    begin
+      assert_file_exists(file, options)
+      assert_file_content(file, body, options)
+    ensure
+      sudo("rm -f #{file.dump}", options) rescue nil
     end
-  ensure
-    sudo("rm -f #{files.map { |x| x.dump }.join(" ")}") rescue nil
   end
 end
 
@@ -86,6 +120,7 @@ namespace(:test_default) {
 
   task(:setup) {
     reset_chef_solo!
+    set(:chef_solo_use_bundler, true)
     set(:chef_solo_attributes, {"aaa" => "AAA"})
     set(:chef_solo_role_attributes, {:app => {"bbb" => "BBB"}})
     set(:chef_solo_host_attributes, {"192.168.33.10" => {"ccc" => "CCC"}})
@@ -93,6 +128,12 @@ namespace(:test_default) {
     set(:chef_solo_role_run_list, {:app => %w(recipe[bar])})
     set(:chef_solo_host_run_list, {"192.168.33.10" => %w(recipe[baz])})
     set(:chef_solo_capistrano_attributes_include, [:application, :deploy_to])
+    set(:chef_solo_cookbooks_scm, :none)
+    set(:chef_solo_cookbooks_repository, File.expand_path("..", File.dirname(__FILE__)))
+    set(:chef_solo_cookbooks_subdir, "config/cookbooks")
+    set(:chef_solo_data_bags_scm, :none)
+    set(:chef_solo_data_bags_repository, File.expand_path("..", File.dirname(__FILE__)))
+    set(:chef_solo_data_bags_subdir, "config/data_bags")
   }
 
   task(:teardown) {
@@ -113,6 +154,53 @@ namespace(:test_default) {
   }
 }
 
+namespace(:test_without_bundler) {
+  task(:default) {
+    methods.grep(/^test_/).each do |m|
+      send(m)
+    end
+  }
+  before "test_without_bundler", "test_without_bundler:setup"
+  after "test_without_bundler", "test_without_bundler:teardown"
+
+  task(:setup) {
+    reset_chef_solo!
+    set(:chef_solo_use_bundler, false)
+    set(:chef_solo_run_list, %w(recipe[foo] recipe[bar]))
+    set(:chef_solo_cookbooks_scm, :none)
+    set(:chef_solo_cookbooks_repository, File.expand_path("..", File.dirname(__FILE__)))
+    set(:chef_solo_cookbooks_subdir, "config/cookbooks")
+    set(:chef_solo_data_bags_scm, :none)
+    set(:chef_solo_data_bags_repository, File.expand_path("..", File.dirname(__FILE__)))
+    set(:chef_solo_data_bags_subdir, "config/data_bags")
+  }
+
+  task(:teardown) {
+  }
+
+  task(:test_setup) {
+    find_and_execute_task("chef-solo:setup")
+  }
+
+  task(:test_version) {
+    find_and_execute_task("chef-solo:version")
+  }
+
+  task(:test_invoke) {
+    expected = chef_solo_run_list
+    find_and_execute_task("chef-solo")
+    assert_run_list(expected)
+    _test_recipes(expected)
+  }
+
+  task(:test_run_list) {
+    expected = %w(recipe[baz])
+    chef_solo.run_list expected
+#   assert_run_list(expected) # arguments of chef_solo.run_list will not be written to attributes file
+    _test_recipes(expected)
+  }
+}
+
 namespace(:test_with_local_cookbooks) {
   task(:default) {
     methods.grep(/^test_/).each do |m|
@@ -124,10 +212,14 @@ namespace(:test_with_local_cookbooks) {
 
   task(:setup) {
     reset_chef_solo!
+    set(:chef_solo_use_bundler, true)
     set(:chef_solo_run_list, %w(recipe[foo] recipe[bar]))
     set(:chef_solo_cookbooks_scm, :none)
     set(:chef_solo_cookbooks_repository, File.expand_path("..", File.dirname(__FILE__)))
     set(:chef_solo_cookbooks_subdir, "config/cookbooks")
+    set(:chef_solo_data_bags_scm, :none)
+    set(:chef_solo_data_bags_repository, File.expand_path("..", File.dirname(__FILE__)))
+    set(:chef_solo_data_bags_subdir, "config/data_bags")
   }
 
   task(:teardown) {
@@ -137,14 +229,14 @@ namespace(:test_with_local_cookbooks) {
     expected = chef_solo_run_list
     find_and_execute_task("chef-solo")
     assert_run_list(expected)
-    check_applied_recipes!(expected)
+    _test_recipes(expected)
   }
 
   task(:test_run_list) {
     expected = %w(recipe[baz])
     chef_solo.run_list expected
-    assert_run_list(expected)
-    check_applied_recipes!(expected)
+#   assert_run_list(expected) # arguments of chef_solo.run_list will not be written to attributes file
+    _test_recipes(expected)
   }
 }
 
@@ -159,11 +251,16 @@ namespace(:test_with_remote_cookbooks) {
 
   task(:setup) {
     reset_chef_solo!
+    set(:chef_solo_use_bundler, true)
     set(:chef_solo_run_list, %w(recipe[one] recipe[two]))
     set(:chef_solo_cookbooks_scm, :git)
     set(:chef_solo_cookbooks_repository, "git://github.com/yyuu/capistrano-chef-solo.git")
     set(:chef_solo_cookbooks_revision, "develop")
     set(:chef_solo_cookbooks_subdir, "test/config/cookbooks-ext")
+    set(:chef_solo_data_bags_scm, :git)
+    set(:chef_solo_data_bags_repository, "git://github.com/yyuu/capistrano-chef-solo.git")
+    set(:chef_solo_data_bags_revision, "develop")
+    set(:chef_solo_data_bags_subdir, "test/config/data_bags-ext")
   }
 
   task(:teardown) {
@@ -173,14 +270,14 @@ namespace(:test_with_remote_cookbooks) {
     expected = chef_solo_run_list
     find_and_execute_task("chef-solo")
     assert_run_list(expected)
-    check_applied_recipes!(expected)
+    _test_recipes(expected)
   }
 
   task(:test_run_list) {
     expected = %w(recipe[three])
     chef_solo.run_list expected
-    assert_run_list(expected)
-    check_applied_recipes!(expected)
+#   assert_run_list(expected) # arguments of chef_solo.run_list will not be written to attributes file
+    _test_recipes(expected)
   }
 }
 
@@ -195,6 +292,7 @@ namespace(:test_with_multiple_cookbooks) {
 
   task(:setup) {
     reset_chef_solo!
+    set(:chef_solo_use_bundler, true)
     set(:chef_solo_run_list, %w(recipe[bar] recipe[baz] recipe[two] recipe[three]))
     set(:chef_solo_cookbooks) {{
       "local" => {
@@ -215,6 +313,25 @@ namespace(:test_with_multiple_cookbooks) {
         :cookbooks => "test/config/cookbooks-ext",
       },
     }}
+    set(:chef_solo_data_bags) {{
+      "local" => {
+        :scm => :none,
+        :repository => File.expand_path("..", File.dirname(__FILE__)),
+        :data_bags => "config/data_bags",
+      },
+      "single" => {
+        :data_bag_name => "single",
+        :scm => :none,
+        :repository => File.expand_path("..", File.dirname(__FILE__)),
+        :data_bags => "config/data_bag",
+      },
+      application => {
+        :scm => :git,
+        :repository => "git://github.com/yyuu/capistrano-chef-solo.git",
+        :revision => "develop",
+        :data_bags => "test/config/data_bags-ext",
+      },
+    }}
   }
 
   task(:teardown) {
@@ -224,14 +341,14 @@ namespace(:test_with_multiple_cookbooks) {
     expected = chef_solo_run_list
     find_and_execute_task("chef-solo")
     assert_run_list(expected)
-    check_applied_recipes!(expected)
+    _test_recipes(expected)
   }
 
   task(:test_run_list) {
     expected = %w(recipe[foo] recipe[single] recipe[one])
     chef_solo.run_list expected
-    assert_run_list(expected)
-    check_applied_recipes!(expected)
+#   assert_run_list(expected) # arguments of chef_solo.run_list will not be written to attributes file
+    _test_recipes(expected)
   }
 }
 
@@ -245,11 +362,12 @@ namespace(:test_with_bootstrap) {
   after "test_with_bootstrap", "test_with_bootstrap:teardown"
 
   task(:setup) {
+    set(:chef_solo_use_bundler, true)
     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?)
+#     :auth_methods => %w(password), #==> FIXME: setting :auth_methods throws Net::SSH::AuthenticationFailed (capistrano bug?)
       :user_known_hosts_file => "/dev/null",
     })
     run("getent passwd #{chef_solo_bootstrap_user.dump} || " +
@@ -292,6 +410,7 @@ namespace(:test_without_bootstrap) {
   after "test_without_bootstrap", "test_without_bootstrap:teardown"
 
   task(:setup) {
+    set(:chef_solo_use_bundler, true)
     set(:chef_solo_bootstrap, false)
     set(:chef_solo_bootstrap_user, "bootstrap")
     set(:chef_solo_bootstrap_password, "bootstrap")

data/test/precise64/.gitignore

@@ -1,5 +1,5 @@
 /.bundle
-/.vagrant
+/.vagrant*
 /known_hosts
 /tmp
 /vendor

data/test/precise64/run.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-bundle exec vagrant up
+vagrant up
 bundle exec cap test_all
-bundle exec vagrant halt
+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.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,55 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.1
 description: a capistrano recipe to invoke chef-solo.
 email:
 - yamashita@geishatokyo.com
@@ -141,6 +93,13 @@ files:
 - test/config/cookbooks/baz/recipes/default.rb
 - test/config/cookbooks/foo/metadata.rb
 - test/config/cookbooks/foo/recipes/default.rb
+- test/config/data_bag/single.json
+- test/config/data_bags-ext/one/one.json
+- test/config/data_bags-ext/three/three.json
+- test/config/data_bags-ext/two/two.json
+- test/config/data_bags/bar/bar.json
+- test/config/data_bags/baz/baz.json
+- test/config/data_bags/foo/foo.json
 - test/config/deploy.rb
 - test/precise64/.gitignore
 - test/precise64/Capfile
@@ -191,6 +150,13 @@ test_files:
 - test/config/cookbooks/baz/recipes/default.rb
 - test/config/cookbooks/foo/metadata.rb
 - test/config/cookbooks/foo/recipes/default.rb
+- test/config/data_bag/single.json
+- test/config/data_bags-ext/one/one.json
+- test/config/data_bags-ext/three/three.json
+- test/config/data_bags-ext/two/two.json
+- test/config/data_bags/bar/bar.json
+- test/config/data_bags/baz/baz.json
+- test/config/data_bags/foo/foo.json
 - test/config/deploy.rb
 - test/precise64/.gitignore
 - test/precise64/Capfile