capstrap 0.1.0 → 0.2.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Fletcher Nichol
+Copyright (c) 2010 Fletcher Nichol
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -0,0 +1,73 @@
+# capstrap
+
+A command to remotely install git, rvm, ruby, and chef-solo using capistrano.
+
+To get started, install capstrap:
+
+    gem install capstrap
+
+capstrap assumes you are operating as *root* so you might want to drop in
+your ssh key to root's *authorized_keys*:
+
+    ssh root@zland '(if [ ! -d "${HOME}/.ssh" ]; then \
+      mkdir -m 0700 -p ${HOME}/.ssh; fi; \
+      cat - >> .ssh/authorized_keys)' < ${HOME}/.ssh/id_dsa.pub
+
+To install a baseline RVM/ruby environment (*ree-1.8.7* is default):
+
+    capstrap ruby root@zland
+
+To use a custom RVM ruby:
+
+    capstrap ruby root@zland --ruby=ruby-1.8.7
+
+To install the *chef* gem:
+
+    capstrap chef root@zland
+
+To install a chef cookbooks repository and chef configuration:
+
+    capstrap solo root@zland \
+      --cookbooks-repo=git://github.com/fnichol/chef-repo.git \
+      --config-repo=git://github.com/fnichol/chef-dna-spike.git
+
+To override the default cookbooks and configuration paths:
+
+    capstrap solo root@zland \
+      --cookbooks-repo=git://github.com/fnichol/chef-repo.git \
+      --cookbooks-path=/opt/chef \
+      --config-repo=git://github.com/fnichol/chef-dna-spike.git \
+      --config-path=/opt/chef/config
+
+To execute a chef configuration (the full monty):
+
+    capstrap execute root@zland \
+      --cookbooks-repo=git://github.com/fnichol/chef-repo.git \
+      --config-repo=git://github.com/fnichol/chef-dna-spike.git
+
+To set some other crazy configuration (the full monty with cheese):
+
+    capstrap execute root@zland \
+      --ruby=ruby-1.8.7 \
+      --cookbooks-repo=git://github.com/fnichol/chef-repo.git \
+      --cookbooks-path=/opt/chef \
+      --config-repo=git://github.com/fnichol/chef-dna-spike.git \
+      --config-path=/opt/chef/config
+
+To get more help:
+
+    capstrap help
+
+## Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+## Copyright
+
+Copyright (c) 2010 Fletcher Nichol. See LICENSE for details.

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

@@ -7,11 +7,51 @@ module Capstrap
         namespace :chef do
           namespace :install do
             
-            desc "Installs chef solo"
+            desc "Installs chef gem"
+            task :lib do
+              unless chef_installed?
+                cmd = [
+                  %{use #{ruby}@global},
+                  %{gem install chef}
+                ]
+                rvm_run cmd.join(" && ")
+              end
+            end
+
+            desc "Installs chef cookbook git repository"
+            task :cookbooks do
+              unless cookbooks_repo_installed?
+                cmd = [
+                  %{git clone #{cookbooks_repo} #{cookbooks_path}},
+                  %{cd #{cookbooks_path}},
+                  %{git submodule init},
+                  %{git submodule update}
+                ]
+                run cmd.join(" && ")
+              end
+            end
+
+            desc "Installs chef configuration git repository"
+            task :config do
+              unless config_repo_installed?
+                cmd = [
+                  %{git clone #{config_repo} #{config_path}},
+                  %{cd #{config_path}},
+                  %{git submodule init},
+                  %{git submodule update}
+                ]
+                run cmd.join(" && ")
+              end
+            end
+          end
+
+          namespace :execute do
+
+            desc "Executes chef solo configuration"
             task :solo do
               cmd = [
-                %{use default@global},
-                %{gem install chef}
+                %{use #{ruby}},
+                %{chef-solo}
               ]
               rvm_run cmd.join(" && ")
             end

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

@@ -5,8 +5,8 @@
 # @return [true, false] whether or not the conditional passes
 def cmd_if(test, rvm=false)
   load_rvm = ""
-  load_rvm = rvm_env
-  r = capture %{#{rvm_env} if #{test} ; then echo true; else echo false; fi}, 
+  load_rvm = "#{rvm_env} " if rvm
+  r = capture %{#{load_rvm}if #{test} ; then echo true; else echo false; fi}, 
     :shell => "bash"
   puts "  * Result is: #{r.to_s}"
   if r.to_s =~ /true/
@@ -73,6 +73,28 @@ def ruby_installed?(ruby)
   cmd_if %{rvm list strings | grep -q "#{ruby}" >/dev/null}, true
 end
 
+##
+# Checks if the chef gem is installed on the remote host.
+#
+def chef_installed?
+  cmd_if %{rvm use #{ruby}@global >/dev/null && gem list --no-versions | grep -q "^chef$" >/dev/null}, true
+end
+
+
+##
+# Checks if chef cookbook repo is installed on the remote host.
+#
+def cookbooks_repo_installed?
+  cmd_test %{-d "#{cookbooks_path}"}
+end
+
+##
+# Checks if chef config repo is installed on the remote host.
+#
+def config_repo_installed?
+  cmd_test %{-d "#{config_path}"}
+end
+
 ##
 # Prints an information message.
 #

data/lib/capstrap/cli.rb

@@ -16,21 +16,90 @@ module Capstrap
       @ssh_host = ssh_host
       abort ">> HOST must be set" unless @ssh_host
 
+      setup_config options
+
       config.find_and_execute_task "rvm:install:#{options[:ruby]}"
       if options[:default]
         config.find_and_execute_task "rvm:default:#{options[:ruby]}"
       end
     end
 
-    desc "chefsolo HOST", "Install chef solo on remote SSH host HOST"
+    desc "chef HOST", "Install chef gem on remote SSH host HOST"
     method_option "ruby", :type => :string, :banner => 
       "Version of ruby to install.", :default => "ree-1.8.7"
-    def chefsolo(ssh_host)
+    def chef(ssh_host)
       @ssh_host = ssh_host
       abort ">> HOST must be set" unless @ssh_host
 
+      setup_config options
+
       invoke :ruby, [ssh_host], :ruby => options[:ruby], :default => true
-      config.find_and_execute_task "chef:install:solo"
+      config.find_and_execute_task "chef:install:lib"
+    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 "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."
+    method_option "config-path", :type => :string,
+      :banner => "Install path to chef configuration git repository.",
+      :default => "/etc/chef"
+    def solo(ssh_host)
+      @ssh_host = ssh_host
+      abort ">> HOST must be set" unless @ssh_host
+
+      setup_config options
+
+      unless options["cookbooks-repo"]
+        abort ">> --cookbooks-repo=<git_url> must be set" 
+      end
+      unless options["config-repo"]
+        abort ">> --config-repo=<git_url> must be set"
+      end
+
+      invoke :chef, [ssh_host], :ruby => options[:ruby], :default => true
+      config.find_and_execute_task "chef:install:cookbooks"
+      config.find_and_execute_task "chef:install:config"
+    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 "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."
+    method_option "config-path", :type => :string,
+      :banner => "Install path to chef configuration git repository.",
+      :default => "/etc/chef"
+    def execute(ssh_host)
+      @ssh_host = ssh_host
+      abort ">> HOST must be set" unless @ssh_host
+
+      setup_config options
+
+      unless options["cookbooks-repo"]
+        abort ">> --cookbooks-repo=<git_url> must be set" 
+      end
+      unless options["config-repo"]
+        abort ">> --config-repo=<git_url> must be set"
+      end
+
+      invoke :solo, [ssh_host], :ruby => options[:ruby], :default => true,
+        :"cookbooks-repo" => options["cookbooks-repo"],
+        :"cookbooks-path" => options["cookbooks-path"],
+        :"config-repo" => options["config-repo"],
+        :"config-path" => options["config-path"]
+      config.find_and_execute_task "chef:execute:solo"
     end
 
   private
@@ -51,5 +120,17 @@ module Capstrap
 
       config
     end
+
+    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"}
+      ].each do |var|
+        config.set(var[:sym], options[var[:opt]]) if options[var[:opt]]
+      end
+    end
   end
 end

data/lib/capstrap/version.rb

@@ -1,3 +1,3 @@
 module Capstrap
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capstrap
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Fletcher Nichol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -06:00
+date: 2010-10-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - bin/capstrap
 - capstrap.gemspec

data/README.rdoc

@@ -1,17 +0,0 @@
-= capstrap
-
-Description goes here.
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Fletcher Nichol. See LICENSE for details.