capstrap 0.2.1 → 0.2.2

data/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+# 0.2.2
+
+  * Add task method options for overriding git init/update behavior
+  * Add version task
+  * Update method_option from :banner to :desc (oops)
+  * Handle git submodule init/update or rake update strategies
+
 # 0.2.1
 
   * Add `update` task to pull new cookbook and configuration updates and re-run chef

data/README.markdown

@@ -54,6 +54,10 @@ To set some other crazy configuration (the full monty with cheese):
       --config-repo=git://github.com/fnichol/chef-dna-spike.git \
       --config-path=/opt/chef/config
 
+To pull new cookbook/configuration updates and run chef-solo:
+
+    capstrap update root@zland
+
 To get more help:
 
     capstrap help

data/lib/capistrano/ext/capstrap/chef.rb

@@ -22,12 +22,12 @@ module Capstrap
             task :cookbooks do
               unless cookbooks_repo_installed?
                 cmd = [
+                  %{use #{ruby}},
                   %{git clone #{cookbooks_repo} #{cookbooks_path}},
                   %{cd #{cookbooks_path}},
-                  %{git submodule init},
-                  %{git submodule update}
+                  update_cmd
                 ]
-                run cmd.join(" && ")
+                rvm_run cmd.join(" && ")
               end
             end
 
@@ -35,12 +35,12 @@ module Capstrap
             task :config do
               unless config_repo_installed?
                 cmd = [
+                  %{use #{ruby}},
                   %{git clone #{config_repo} #{config_path}},
                   %{cd #{config_path}},
-                  %{git submodule init},
-                  %{git submodule update}
+                  update_cmd
                 ]
-                run cmd.join(" && ")
+                rvm_run cmd.join(" && ")
               end
             end
           end
@@ -62,11 +62,9 @@ module Capstrap
                 %{use #{ruby}},
                 %{cd #{cookbooks_path}},
                 %{git pull},
-                %{git submodule init},
-                %{git submodule update},
+                update_cmd,
                 %{cd #{config_path}},
-                %{git submodule init},
-                %{git submodule update},
+                update_cmd,
                 %{cd},
                 %{chef-solo}
               ]

data/lib/capistrano/ext/capstrap/core.rb

@@ -95,6 +95,14 @@ def config_repo_installed?
   cmd_test %{-d "#{config_path}"}
 end
 
+def update_cmd
+  if cookbooks_rake_update
+    %{rake update}
+  else
+    %{git submodule init && git submodule update}
+  end
+end
+
 ##
 # Prints an information message.
 #

data/lib/capstrap/cli.rb

@@ -6,11 +6,16 @@ module Capstrap
     end
     
     default_task :help
+
+    desc "version", "Version of capstrap"
+    def version
+      puts "capstrap v#{Capstrap::VERSION}"
+    end
     
     desc "ruby HOST", "Install an RVM ruby on remote SSH host HOST"
-    method_option "ruby", :type => :string, :banner => 
+    method_option "ruby", :type => :string, :desc => 
       "Version of ruby to install.", :default => "ree-1.8.7"
-    method_option "default", :type => :boolean, :banner => 
+    method_option "default", :type => :boolean, :desc => 
       "Set this ruby to be RVM default."
     def ruby(ssh_host)
       @ssh_host = ssh_host
@@ -25,7 +30,7 @@ module Capstrap
     end
 
     desc "chef HOST", "Install chef gem on remote SSH host HOST"
-    method_option "ruby", :type => :string, :banner => 
+    method_option "ruby", :type => :string, :desc => 
       "Version of ruby to install.", :default => "ree-1.8.7"
     def chef(ssh_host)
       @ssh_host = ssh_host
@@ -38,18 +43,32 @@ module Capstrap
     end
 
     desc "solo HOST", "Install chef cookbooks & config on remote SSH host HOST"
-    method_option "ruby", :type => :string, :banner => 
-      "Version of ruby to install.", :default => "ree-1.8.7"
-    method_option "cookbooks-repo", :type => :string, :banner => 
-      "Chef cookbooks git repository URL."
+    method_option "ruby", :type => :string, 
+      :desc => "Version of ruby to install.",
+      :default => "ree-1.8.7",
+      :aliases => "-r"
+    method_option "cookbooks-repo", :type => :string,
+      :desc => "Chef cookbooks git repository URL.",
+      :aliases => "-c"
     method_option "cookbooks-path", :type => :string,
-      :banner => "Install path to chef cookbooks git repository.",
-      :default => "/var/chef-solo"
-    method_option "config-repo", :type => :string, :banner => 
-      "Chef configuration git repository URL."
+      :desc => "Install path to chef cookbooks git repository.",
+      :default => "/var/chef-solo",
+      :aliases => "-p"
+    method_option "cookbooks-rake-update", :type => :boolean, :desc =>
+      "Run rake update vs. git submodule init/update when updating cookbooks repo",
+      :default => false,
+      :aliases => "-u"
+    method_option "config-repo", :type => :string,
+      :desc => "Chef configuration git repository URL.",
+      :aliases => "-C"
     method_option "config-path", :type => :string,
-      :banner => "Install path to chef configuration git repository.",
-      :default => "/etc/chef"
+      :desc => "Install path to chef configuration git repository.",
+      :default => "/etc/chef",
+      :aliases => "-P"
+    method_option "config-rake-update", :type => :boolean, :desc =>
+      "Run rake update vs. git submodule init/update when updating config repo",
+      :default => false,
+      :aliases => "-U"
     def solo(ssh_host)
       @ssh_host = ssh_host
       abort ">> HOST must be set" unless @ssh_host
@@ -69,18 +88,32 @@ module Capstrap
     end
 
     desc "execute HOST", "Executes chef solo config on remote SSH host HOST"
-    method_option "ruby", :type => :string, :banner => 
-      "Version of ruby to install.", :default => "ree-1.8.7"
-    method_option "cookbooks-repo", :type => :string, :banner => 
-      "Chef cookbooks git repository URL."
+    method_option "ruby", :type => :string, 
+      :desc => "Version of ruby to install.",
+      :default => "ree-1.8.7",
+      :aliases => "-r"
+    method_option "cookbooks-repo", :type => :string,
+      :desc => "Chef cookbooks git repository URL.",
+      :aliases => "-c"
     method_option "cookbooks-path", :type => :string,
-      :banner => "Install path to chef cookbooks git repository.",
-      :default => "/var/chef-solo"
-    method_option "config-repo", :type => :string, :banner => 
-      "Chef configuration git repository URL."
+      :desc => "Install path to chef cookbooks git repository.",
+      :default => "/var/chef-solo",
+      :aliases => "-p"
+    method_option "cookbooks-rake-update", :type => :boolean, :desc =>
+      "Run rake update vs. git submodule init/update when updating cookbooks repo",
+      :default => false,
+      :aliases => "-u"
+    method_option "config-repo", :type => :string,
+      :desc => "Chef configuration git repository URL.",
+      :aliases => "-C"
     method_option "config-path", :type => :string,
-      :banner => "Install path to chef configuration git repository.",
-      :default => "/etc/chef"
+      :desc => "Install path to chef configuration git repository.",
+      :default => "/etc/chef",
+      :aliases => "-P"
+    method_option "config-rake-update", :type => :boolean, :desc =>
+      "Run rake update vs. git submodule init/update when updating config repo",
+      :default => false,
+      :aliases => "-U"
     def execute(ssh_host)
       @ssh_host = ssh_host
       abort ">> HOST must be set" unless @ssh_host
@@ -103,14 +136,26 @@ module Capstrap
     end
 
     desc "update HOST", "Updates and executes chef solo on remote SSH host HOST"
-    method_option "ruby", :type => :string, :banner => 
-      "Version of ruby to install.", :default => "ree-1.8.7"
+    method_option "ruby", :type => :string,
+      :desc => "Version of ruby to install.",
+      :default => "ree-1.8.7",
+      :aliases => "-r"
     method_option "cookbooks-path", :type => :string,
-      :banner => "Install path to chef cookbooks git repository.",
-      :default => "/var/chef-solo"
+      :desc => "Install path to chef cookbooks git repository.",
+      :default => "/var/chef-solo",
+      :aliases => "-p"
+    method_option "cookbooks-rake-update", :type => :boolean, :desc =>
+      "Run rake update vs. git submodule init/update when updating cookbooks repo",
+      :default => false,
+      :aliases => "-u"
     method_option "config-path", :type => :string,
-      :banner => "Install path to chef configuration git repository.",
-      :default => "/etc/chef"
+      :desc => "Install path to chef configuration git repository.",
+      :default => "/etc/chef",
+      :aliases => "-P"
+    method_option "config-rake-update", :type => :boolean, :desc =>
+      "Run rake update vs. git submodule init/update when updating config repo",
+      :default => false,
+      :aliases => "-U"
     def update(ssh_host)
       @ssh_host = ssh_host
       abort ">> HOST must be set" unless @ssh_host
@@ -141,14 +186,22 @@ module Capstrap
 
     def setup_config(options)
       [
-        {:sym => :ruby,           :opt => "ruby"},
-        {:sym => :cookbooks_repo, :opt => "cookbooks-repo"},
-        {:sym => :cookbooks_path, :opt => "cookbooks-path"},
-        {:sym => :config_repo,    :opt => "config-repo"},
-        {:sym => :config_path,    :opt => "config-path"}
+        {:sym => :ruby,                   :opt => "ruby"},
+        {:sym => :cookbooks_repo,         :opt => "cookbooks-repo"},
+        {:sym => :cookbooks_path,         :opt => "cookbooks-path"},
+        {:sym => :config_repo,            :opt => "config-repo"},
+        {:sym => :config_path,            :opt => "config-path"}
       ].each do |var|
         config.set(var[:sym], options[var[:opt]]) if options[var[:opt]]
       end
+
+      # booleans
+      [
+        {:sym => :cookbooks_rake_update,  :opt => "cookbooks-rake-update"},
+        {:sym => :config_rake_update,     :opt => "config-rake-update"}
+      ].each do |var|
+        config.set(var[:sym], options[var[:opt]])
+      end
     end
   end
 end

data/lib/capstrap/version.rb

@@ -1,3 +1,3 @@
 module Capstrap
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/capstrap.rb

@@ -7,4 +7,5 @@ require 'capistrano/ext/capstrap/core'
 require 'capistrano/ext/capstrap/rvm'
 require 'capistrano/ext/capstrap/chef'
 
+require 'capstrap/version'
 require 'capstrap/cli'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capstrap
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Fletcher Nichol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -06:00
+date: 2010-11-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency