yyuu-capistrano-chef-solo 0.1.1 → 0.1.2

data/README.md

@@ -107,14 +107,14 @@ set(:chef_solo_cookbooks) {{
   # use cookbooks in ./config/cookbooks.
   "local" => {
     :scm => :none,
-    :cookbooks => "config/cookbooks",
+    :deploy_subdir => "config/cookbooks",
   },
   # use cookbooks in git repository.
   "repository" => {
     :scm => :git,
     :repository => "git://example.com/example.git",
     :revision => "master",
-    :cookbooks => "/",
+    :deploy_subdir => "/",
   }
 }}
 ```

data/capistrano-chef-solo.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.version       = Capistrano::ChefSolo::VERSION
 
   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")

data/lib/capistrano-chef-solo.rb

@@ -122,7 +122,7 @@ module Capistrano
 
           # FIXME:
           # Some variables (such like :default_environment set by capistrano-rbenv) may be
-          # initialized without bootstrap settings during `on :start`.
+          # 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)
@@ -217,19 +217,15 @@ module Capistrano
           end
 
           def update_cookbooks(options={})
-            tmpdir = run_locally("mktemp -d /tmp/chef-solo.XXXXXXXXXX").strip
-            remote_tmpdir = capture("mktemp -d /tmp/chef-solo.XXXXXXXXXX").strip
-            destination = File.join(tmpdir, "cookbooks")
-            remote_destination = File.join(chef_solo_path, "cookbooks")
-            filename = File.join(tmpdir, "cookbooks.tar.gz")
-            remote_filename = File.join(remote_tmpdir, "cookbooks.tar.gz")
-            begin
-              bundle_cookbooks(filename, destination)
-              run("mkdir -p #{remote_tmpdir.dump}")
-              distribute_cookbooks(filename, remote_filename, remote_destination)
-            ensure
-              run("rm -rf #{remote_tmpdir.dump}") rescue nil
-              run_locally("rm -rf #{tmpdir.dump}") rescue nil
+            _normalize_cookbooks(chef_solo_cookbooks).each do |name, variables|
+              begin
+                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)
+              ensure
+                run("rm -rf #{tmpdir.dump}", options)
+              end
             end
           end
 
@@ -238,84 +234,78 @@ module Capistrano
           # By default, load cookbooks from local path of "config/cookbooks".
           #
           _cset(:chef_solo_cookbooks_name) { application }
-          _cset(:chef_solo_cookbooks_scm, :none)
+          _cset(:chef_solo_cookbooks_exclude, %w(.hg .git .svn))
+          _cset(:chef_solo_cookbooks_default_variables) {{
+            :scm => :none,
+            :deploy_via => :copy_subdir,
+            :deploy_subdir => nil,
+            :repository => ".",
+            :cookbooks_exclude => chef_solo_cookbooks_exclude,
+            :copy_cache => nil,
+          }}
           _cset(:chef_solo_cookbooks) {
-            cookbooks = {}
-            cookbooks[chef_solo_cookbooks_name] = {}
-            cookbooks[chef_solo_cookbooks_name][:cookbooks] = fetch(:chef_solo_cookbooks_subdir, "config/cookbooks")
-            cookbooks[chef_solo_cookbooks_name][:repository] = fetch(:chef_solo_cookbooks_repository) if exists?(:chef_solo_cookbooks_repository)
-            cookbooks[chef_solo_cookbooks_name][:revision] = fetch(:chef_solo_cookbooks_revision) if exists?(:chef_solo_cookbooks_revision)
-            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)
+            { chef_solo_cookbooks_name => variables }
           }
 
-          _cset(:chef_solo_cookbooks_exclude, %w(.hg .git .svn))
+          _cset(:chef_solo_repository_cache) { File.expand_path("tmp/cookbooks-cache") }
           def _normalize_cookbooks(cookbooks)
-            xs = cookbooks.map { |name, options|
-              options[:scm] ||= chef_solo_cookbooks_scm
-              options[:cookbooks_exclude] ||= chef_solo_cookbooks_exclude
-              [name, options]
+            xs = cookbooks.map { |name, variables|
+              variables = chef_solo_cookbooks_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)
+              end
+              [name, variables]
             }
             Hash[xs]
           end
 
-          _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.map { |x| x.dump }.join(" ")}")
-            cookbooks = _normalize_cookbooks(chef_solo_cookbooks)
-            cookbooks.each do |name, options|
-              case options[:scm].to_sym
-              when :none
-                fetch_cookbooks_none(name, destination, options)
-              else
-                fetch_cookbooks_repository(name, destination, options)
+          def deploy_cookbooks(name, destination, variables={}, options={})
+            logger.debug("retrieving cookbooks `#{name}' from #{variables[:repository]} via #{variables[:deploy_via]}.")
+            begin
+              releases_path = capture("mktemp -d /tmp/releases.XXXXXXXXXX", options).strip
+              release_path = File.join(releases_path, release_name)
+              run("rm -rf #{releases_path.dump} && mkdir -p #{releases_path.dump}", options)
+              c = _middle_copy(top) # create new configuration with separated @variables
+              c.instance_eval do
+                set(:deploy_to, File.dirname(releases_path))
+                set(:releases_path, releases_path)
+                set(:release_path, release_path)
+                set(:revision) { source.head }
+                set(:source) { ::Capistrano::Deploy::SCM.new(scm, self) }
+                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)
+                end
+                strategy.deploy!
               end
-            end
-            run_locally("cd #{File.dirname(destination).dump} && tar chzf #{filename.dump} #{File.basename(destination).dump}")
-          end
-
-          def _fetch_cookbook(source, destination, options)
-            exclusions = options.fetch(:cookbooks_exclude, []).map { |e| "--exclude=#{e.dump}" }.join(" ")
-            run_locally("rsync -lrpt #{exclusions} #{source}/ #{destination}")
-          end
-
-          def _fetch_cookbooks(source, destination, options)
-            cookbooks = [ options.fetch(:cookbooks, "/") ].flatten.compact
-            cookbooks.each do |cookbook|
-              _fetch_cookbook(File.join(source, cookbook), destination, options)
+              run("rsync -lrpt #{(release_path + "/").dump} #{destination.dump}", options)
+            ensure
+              run("rm -rf #{releases_path.dump}", options)
             end
           end
 
-          def fetch_cookbooks_none(name, destination, options={})
-            _fetch_cookbooks(options.fetch(:repository, "."), destination, options)
-          end
-
-          def fetch_cookbooks_repository(name, destination, options={})
-            configuration = Capistrano::Configuration.new
-            # refreshing just :source, :revision and :real_revision is enough?
-            options = {
-              :source => lambda { Capistrano::Deploy::SCM.new(configuration[:scm], configuration) },
-              :revision => lambda { configuration[:source].head },
-              :real_revision => lambda {
-                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))
-            else
-              run_locally(configuration[:source].checkout(configuration[:real_revision], repository_cache))
+          def _middle_copy(object)
+            o = object.clone
+            object.instance_variables.each do |k|
+              v = object.instance_variable_get(k)
+              o.instance_variable_set(k, v ? v.clone : v)
             end
-            _fetch_cookbooks(repository_cache, destination, options)
+            o
           end
 
-          def distribute_cookbooks(filename, remote_filename, remote_destination)
-            upload(filename, remote_filename)
-            run("rm -rf #{remote_destination.dump}")
-            run("cd #{File.dirname(remote_destination).dump} && tar xzf #{remote_filename.dump}")
+          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) {
@@ -420,12 +410,14 @@ module Capistrano
             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)
               top.put(_json_attributes(attributes), chef_solo_attributes_file, options.merge(:hosts => server.host))
             end
           end
 
           def invoke(options={})
+            logger.debug("invoking chef-solo.")
             args = fetch(:chef_solo_options, [])
             args << "-c #{chef_solo_config_file.dump}"
             args << "-j #{chef_solo_attributes_file.dump}"

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

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

data/test/config/deploy.rb

@@ -59,13 +59,16 @@ def check_applied_recipes!(expected)
   end
 end
 
-def flush_attributes!()
+def reset_chef_solo!()
   set(:chef_solo_attributes, {})
   set(:chef_solo_role_attributes, {})
   set(:chef_solo_host_attributes, {})
   set(:chef_solo_run_list, [])
   set(:chef_solo_role_run_list, {})
   set(:chef_solo_host_run_list, {})
+  variables.each_key do |key|
+    reset!(key) if /^chef_solo/ =~ key
+  end
 end
 
 namespace(:test_default) {
@@ -78,7 +81,7 @@ namespace(:test_default) {
   after "test_default", "test_default:teardown"
 
   task(:setup) {
-    flush_attributes!
+    reset_chef_solo!
     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"}})
@@ -116,12 +119,11 @@ namespace(:test_with_local_cookbooks) {
   after "test_with_local_cookbooks", "test_with_local_cookbooks:teardown"
 
   task(:setup) {
-    flush_attributes!
+    reset_chef_solo!
     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")
-    reset!(:chef_solo_cookbooks)
   }
 
   task(:teardown) {
@@ -152,13 +154,12 @@ namespace(:test_with_remote_cookbooks) {
   after "test_with_remote_cookbooks", "test_with_remote_cookbooks:teardown"
 
   task(:setup) {
-    flush_attributes!
+    reset_chef_solo!
     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")
-    reset!(:chef_solo_cookbooks)
   }
 
   task(:teardown) {
@@ -189,7 +190,7 @@ namespace(:test_with_multiple_cookbooks) {
   after "test_with_multiple_cookbooks", "test_with_multiple_cookbooks:teardown"
 
   task(:setup) {
-    flush_attributes!
+    reset_chef_solo!
     set(:chef_solo_run_list, %w(recipe[bar] recipe[baz] recipe[two] recipe[three]))
     set(:chef_solo_cookbooks) {{
       "local" => {
@@ -204,7 +205,6 @@ namespace(:test_with_multiple_cookbooks) {
         :cookbooks => "test/config/cookbooks-ext",
       },
     }}
-#   reset!(:chef_solo_cookbooks)
   }
 
   task(:teardown) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yyuu-capistrano-chef-solo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.10.0
+- !ruby/object:Gem::Dependency
+  name: capistrano-copy-subdir
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: capistrano-rbenv
   requirement: !ruby/object:Gem::Requirement