yyuu-capistrano-chef-solo 0.0.2 → 0.0.3

data/README.md

@@ -29,7 +29,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_cookbook_repository, "git@example.com:foo/bar.git")
+    set(:chef_solo_cookbooks_repository, "git@example.com:foo/bar.git")
 
 And then, now you can start `chef-solo` via capistrano.
 
@@ -41,8 +41,10 @@ Following options are available to manage your `chef-solo`.
  * `:chef_solo_user` - special user to invoke `chef-solo`. use `user` by default.
  * `:chef_solo_ssh_options` - special ssh options for `chef_solo_user`. use `ssh_options` by default.
  * `:chef_solo_ruby_version` - ruby version to launch `chef-solo`.
- * `:chef_solo_cookbook_repository` - the URL of your cookbook repository.
- * `:chef_solo_cookbook_revision` - the `branch` in the repository.
+ * `:chef_solo_cookbooks_repository` - the URL of your cookbook repository. use `repository` by default.
+ * `: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_run_list` - the `run_list` to apply to `chef-solo`.
 

data/lib/capistrano-chef-solo.rb

@@ -1,7 +1,10 @@
-require "capistrano-chef-solo/version"
+require 'capistrano-chef-solo/version'
 require 'capistrano-rbenv'
+require 'capistrano/configuration'
+require 'capistrano/recipes/deploy/scm'
 require 'json'
 require 'tmpdir'
+require 'uri'
 
 module Capistrano
   module ChefSolo
@@ -55,55 +58,101 @@ module Capistrano
           }
  
           task(:update) {
-            update_cookbook
+            update_cookbooks
             update_config
             update_attributes
             invoke
           }
 
-          _cset(:chef_solo_cookbook_repository) {
-            abort("chef_solo_cookbook_repository not set")
-          }
-          _cset(:chef_solo_cookbook_revision, 'HEAD')
-          _cset(:chef_solo_cookbooks_exclude, [])
-          task(:update_cookbook) { # TODO: refactor
-            git = fetch(:chef_solo_git, 'git')
-            tar = fetch(:chef_solo_tar, 'tar')
-            copy_dir = Dir.mktmpdir()
-            destination = File.join(copy_dir, 'cookbooks')
-            filename = "#{destination}.tar.gz"
+          task(:update_cookbooks) {
+            tmpdir = Dir.mktmpdir()
+            remote_tmpdir = Dir.mktmpdir()
+            destination = File.join(tmpdir, 'cookbooks')
             remote_destination = File.join(chef_solo_path, 'cookbooks')
-            remote_filename = File.join('/tmp', File.basename(filename))
-
-            repository_cache = File.join(copy_dir, 'cached-copy')
-            if fetch(:chef_solo_cookbook_subdir, nil)
-              repository_cache_subdir = File.join(repository_cache, chef_solo_cookbook_subdir)
-            else
-              repository_cache_subdir = repository_cache
+            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}")
+              distribute_cookbooks(filename, remote_filename, remote_destination)
+            ensure
+              run("rm -rf #{remote_tmpdir}")
+              run_locally("rm -rf #{tmpdir}")
             end
+          }
 
-            begin
-              checkout = []
-              checkout << "#{git} clone -q #{chef_solo_cookbook_repository} #{repository_cache}"
-              checkout << "cd #{repository_cache} && #{git} checkout -q -b deploy #{chef_solo_cookbook_revision}"
-              if chef_solo_cookbooks_exclude.empty?
-                checkout << "cp -RPp #{repository_cache_subdir} #{destination}"
+          _cset(:chef_solo_cookbook_repository) { abort("chef_solo_cookbook_repository not set") }
+          _cset(:chef_solo_cookbooks_repository) {
+            logger.info("WARNING: `chef_solo_cookbook_repository' has been deprecated. use `chef_solo_cookbooks_repository' instead.")
+            chef_solo_cookbook_repository
+          }
+          _cset(:chef_solo_cookbook_revision, 'HEAD')
+          _cset(:chef_solo_cookbooks_revision) {
+            logger.info("WARNING: `chef_solo_cookbook_revision' has been deprecated. use `chef_solo_cookbooks_revision' instead.")
+            chef_solo_cookbook_revision
+          }
+          _cset(:chef_solo_cookbook_subdir, '/')
+          _cset(:chef_solo_cookbooks_subdir) {
+            logger.info("WARNING: `chef_solo_cookbook_subdir' has been deprecated. use `chef_solo_cookbooks_subdir' instead.")
+            chef_solo_cookbook_subdir
+          }
+          _cset(:chef_solo_cookbooks_exclude, %w(.hg .git .svn))
+
+          # special variable to set multiple cookbooks repositories.
+          # by default, it will build from :chef_solo_cookbooks_* variables.
+          _cset(:chef_solo_cookbooks) {
+            name = File.basename(chef_solo_cookbooks_repository, File.extname(chef_solo_cookbooks_repository))
+            {
+              name => {
+                :repository => chef_solo_cookbooks_repository,
+                :revision => chef_solo_cookbooks_revision,
+                :cookbooks => chef_solo_cookbooks_subdir,
+                :cookbooks_exclude => chef_solo_cookbooks_exclude,
+              }
+            }
+          }
+
+          _cset(:chef_solo_configuration, configuration)
+          _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.join(' ')}")
+            chef_solo_cookbooks.each do |name, options|
+              configuration = Capistrano::Configuration.new()
+              chef_solo_configuration.variables.merge(options).each { |key, val|
+                configuration.set(key, val)
+              }
+              # refreshing just :source, :revision and :real_revision is enough?
+              configuration.set(:source) { Capistrano::Deploy::SCM.new(configuration[:scm], configuration) }
+              configuration.set(:revision) { configuration[:source].head }
+              configuration.set(:real_revision) {
+                configuration[:source].local.query_revision(configuration[:revision]) { |cmd|
+                  with_env("LC_ALL", "C") { run_locally(cmd) }
+                }
+              }
+              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
-                exclusions = chef_solo_cookbooks_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
-                checkout << "rsync -lrpt #{exclusions} #{repository_cache_subdir} #{destination}"
+                run_locally(configuration[:source].checkout(configuration[:real_revision], repository_cache))
               end
-              run_locally(checkout.join(' && '))
-
-              copy = []
-              copy << "cd #{File.dirname(destination)} && #{tar} chzf #{filename}  #{File.basename(destination)}"
-              run_locally(copy.join(' && '))
 
-              upload(filename, remote_filename)
-              run("cd #{File.dirname(remote_destination)} && #{tar} xzf #{remote_filename} && rm -f #{remote_filename}")
-            ensure
-              run_locally("rm -rf #{copy_dir}")
+              cookbooks = [ options.fetch(:cookbooks, '/') ].flatten.compact
+              execute = cookbooks.map { |c|
+                repository_cache_subdir = File.join(repository_cache, c)
+                exclusions = options.fetch(:cookbooks_exclude, []).map { |e| "--exclude=\"#{e}\"" }.join(' ')
+                "rsync -lrpt #{exclusions} #{repository_cache_subdir}/ #{destination}"
+              }
+              run_locally(execute.join(' && '))
             end
-          }
+            run_locally("cd #{File.dirname(destination)} && tar chzf #{filename} #{File.basename(destination)}")
+          end
+
+          def distribute_cookbooks(filename, remote_filename, remote_destination)
+            upload(filename, remote_filename)
+            run("rm -rf #{remote_destination}")
+            run("cd #{File.dirname(remote_destination)} && tar xzf #{remote_filename}")
+          end
 
           _cset(:chef_solo_config) {
             (<<-EOS).gsub(/^\s*/, '')

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

@@ -1,5 +1,5 @@
 module Capistrano
   module ChefSolo
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yyuu-capistrano-chef-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano