cap-strap 0.0.9 → 0.1.0

data/README.md

@@ -8,7 +8,6 @@ deploy key.
 
 Currently cap-strap has only been tested on Ubuntu 10.04 and 10.10.
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -21,10 +20,13 @@ And then execute:
 
 ## Usage
 
-You will be prompted for the name of the future deploy_user, location of authorized keys and
-the deploy user's deploy_key. Deploy key isn't required, and you may skip.
+####Upload deploy_key for deploy_user
+Set the relative path to the deploy_key and run:
+ `$ cap <stage> bootstrap:upload_deploy_key`
 
-You may re-run the deploy_key task by `$ cap <stage> bootstrap:upload_deploy_key`
+####Upload authorized keys for deploy_user
+Set the relative path to the deploy_key and run:
+  `$cap <stage> bootstrap:upload_authorized_keys`
 
 In your deploy.rb, you may override the following variables:
 
@@ -32,11 +34,14 @@ You may specificy any additional packages for installation by setting the :packa
 
 Note: Paths are relative to the root
 
-* `set :deploy_user, "<name of user for future deployes>"`
-* `set :authorized_keys_file, "<location of authorized keys>"`
-* `set :deploy_key_file, "<location of deploy-key>"`
-* `set :known_hosts, "<string of known hosts">` - Default is github.com
-* `set :default_ruby, "1.9.3-p125"` - Default is 1.9.3-p125
+* `set :bootstrap_user, "<name of root user for bootstraping>"` - default: prompt for user input
+* `set :bootstrap_password, "<password associated with the root user>"` - default: prompt for user input
+* `set :deploy_user, "<name of user for future deployes>"` - default: 'deploy'
+* `set :deploy_user_password, "<password for deploy user>"` - default: skips. Recommend using authorized keys
+* `set :authorized_keys_file, "<location of authorized keys>"` - skips if not specified
+* `set :deploy_key_file, "<location of deploy-key>"` - skips if not specified
+* `set :known_hosts, "<string of known hosts">` - default: github.com
+* `set :default_ruby, "1.9.3-p125"` - default: '1.9.3-p125'
 * `set :rubies, [
                   "ree-1.8.7-2012.02",
                   {
@@ -44,13 +49,13 @@ Note: Paths are relative to the root
                     :patch => "falcon,debug --force-autoconf -j 3"
                   }
                 ]`
-* `set :gemset, "<default gemset>"` - Default is global
-* `set :global_gems, ["bundler", "other-gem"]` - Default is ["bundler"]
+* `set :gemset, "<default gemset>"` - default 'global'
+* `set :global_gems, ["bundler", "other-gem"]` - default: ["bundler"]
 * `set :packages, ["git", "vim"]` - default: []
 
 Note: Run from project root
 
-    $ cap <stage> bootstrap -s user=<root_username>
+    $ cap <stage> bootstrap
 
 ## Testing
 

data/cap-strap.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "cap-strap"
-  s.version     = "0.0.9"
+  s.version     = "0.1.0"
   s.authors     = ["Shaun Dern"]
   s.email       = ["shaun@substantial.com"]
   s.homepage    = "http://github.com/substantial/cap-strap"

data/config/deploy.rb

@@ -4,8 +4,8 @@ server "localhost", :test
 
 set :port, 2222
 
-set :user, "vagrant"
-set :password, "vagrant"
+set :bootstrap_user, "vagrant"
+set :bootstrap_password, "vagrant"
 
 set :gemset, "build-agent"
 set :rubies, [
@@ -19,6 +19,7 @@ set :rubies, [
 set :default_ruby, "1.9.3-p125-perf"
 
 set :deploy_user, "deploy"
+set :deploy_user_password, "vagrant"
 set :group, "rvm"
 set :authorized_keys_file, "config/test-authorized-keys"
 set :deploy_key_file, "config/test-deploy-key"

data/lib/cap-strap/helpers.rb

@@ -17,9 +17,12 @@ def install_packages(packages)
   end
 end
 
-def create_user(user)
+def create_user(user, password)
   unless user_exists?(user)
-    sudo "useradd -s /bin/bash -d /home/#{user} -m #{user}"
+    command = "useradd -s /bin/bash -d /home/#{user}"
+    command << " -p `perl -e 'print crypt(#{password}, salt)'`" if password
+    command << " -m #{user}"
+    sudo command
   end
 end
 
@@ -85,3 +88,10 @@ def gemrc
 gem: --no-ri --no-rdoc
 TEXT
 end
+
+def make_directory(location, opts={})
+  sudo "mkdir -p #{location}"
+  if opts[:mode]
+    sudo "chmod #{opts[:mode]} #{location}"
+  end
+end

data/lib/cap-strap/recipes/bootstrap.rb

@@ -5,63 +5,71 @@ require 'capistrano/cli'
 module Capistrano::CapStrap
   module Bootstrap
     def self.load_into(configuration)
-      configuration.load do
-        before 'rvm:install_system_wide_rvm', 'bootstrap:install_rvm_dependencies'
-
-        rvm_packages = %w( build-essential openssl libreadline6 libreadline6-dev
+      rvm_packages = %w( build-essential openssl libreadline6 libreadline6-dev
           curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev
           libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf
           libc6-dev ncurses-dev automake libtool bison subversion )
 
-          _cset(:deploy_user) { Capistrano::CLI.ui.ask("deploy user: ") }
-          _cset(:user) { Capistrano::CLI.ui.ask("bootstrap root user: ") }
-          _cset(:authorized_keys_file) { Capistrano::CLI.ui.ask("Location of authorized keys relative to root to upload: ") }
-          _cset(:deploy_key_file) { Capistrano::CLI.ui.ask("Location of deploy key for upload, press enter to skip: ") }
+      configuration.load do
+
+        namespace :bootstrap do
+          before 'rvm:install_system_wide_rvm', 'bootstrap:install_rvm_dependencies'
+
+          _cset(:deploy_user, "deploy")
+          _cset(:bootstrap_user) { Capistrano::CLI.ui.ask("bootstrap root user: ") }
+          _cset(:bootstrap_password) { Capistrano::CLI.ui.ask("bootstrap root user password: ") }
           _cset(:known_hosts) { default_known_hosts }
           _cset(:packages) { [] }
 
-          namespace :bootstrap do
-            desc "Bootstraps a fresh box. Install RVM, create the deploy user, upload keys."
-            task :default do
-              rvm.default
-              bootstrap.create_deploy_user
-              bootstrap.upload_deploy_authorized_keys
-              bootstrap.add_known_hosts
-              bootstrap.add_rvm_to_sudoers
-              bootstrap.upload_deploy_key
-              bootstrap.install_specified_packages
-            end
+          set (:user) { bootstrap_user }
+          set (:password) { bootstrap_password }
 
-            task :install_specified_packages do
-              install_packages(packages)
-            end
+          desc "Bootstraps a fresh box. Install RVM, create the deploy user, upload keys."
+          task :default do
+            set (:user) { bootstrap_user }
+            set (:password) { bootstrap_password }
+            rvm.default
+            bootstrap.create_deploy_user
+            bootstrap.upload_deploy_authorized_keys
+            bootstrap.add_known_hosts
+            bootstrap.add_rvm_to_sudoers
+            bootstrap.upload_deploy_key
+            bootstrap.install_specified_packages
+          end
 
-            task :create_deploy_user do
-              create_user(deploy_user)
-              add_user_to_group(deploy_user, "rvm")
-              add_user_to_group(deploy_user, "admin")
-            end
+          task :install_specified_packages do
+            install_packages(packages)
+          end
 
-            desc "Upload authorized keys for the deploy_user. Override by setting :authorized_keys_file. This
+          task :create_deploy_user do
+            create_user(deploy_user, deploy_user_password)
+            add_user_to_group(deploy_user, "rvm")
+            add_user_to_group(deploy_user, "admin")
+          end
+
+          desc "Upload authorized keys for the deploy_user. Override by setting :authorized_keys_file. This
           is the relative path from the project root"
           task :upload_deploy_authorized_keys do
-            begin
-              authorized_keys_path = File.join(File.expand_path(Dir.pwd), authorized_keys_file)
-              puts "************Looking for Authorized Keys at: #{authorized_keys_path}"
-              authorized_keys = File.read(authorized_keys_file)
-              put(authorized_keys, "authorized_keys", :mode => "0600")
-              sudo "mkdir -p /home/#{deploy_user}/.ssh"
-              sudo "chmod 0700 /home/#{deploy_user}/.ssh"
-              sudo "mv ~/authorized_keys /home/#{deploy_user}/.ssh/"
-              sudo "chown -R #{deploy_user}:rvm /home/#{deploy_user}/.ssh"
-            rescue Exception => e
-              puts e
+            if authorized_keys_file.empty?
+              puts "No authorized keys file, skipping"
+            else
+              begin
+                authorized_keys_path = File.join(File.expand_path(Dir.pwd), authorized_keys_file)
+                puts "************Looking for Authorized Keys at: #{authorized_keys_path}"
+                authorized_keys = File.read(authorized_keys_file)
+                put(authorized_keys, "authorized_keys", :mode => "0600")
+                make_directory("/home/#{deploy_user}/.ssh", :mode => "0700")
+                sudo "mv ~/authorized_keys /home/#{deploy_user}/.ssh/"
+                sudo "chown -R #{deploy_user}:rvm /home/#{deploy_user}/.ssh"
+              rescue Exception => e
+                puts e
+              end
             end
           end
 
           task :add_known_hosts do
+            make_directory("/home/#{deploy_user}/.ssh", :mode => "0700")
             put(known_hosts, "known_hosts", :mode => "0644")
-            sudo "mkdir -p /home/#{deploy_user}/.ssh"
             sudo "mv ~/known_hosts /home/#{deploy_user}/.ssh/known_hosts"
             sudo "chown -R #{deploy_user}:rvm /home/#{deploy_user}/.ssh"
           end
@@ -84,8 +92,7 @@ module Capistrano::CapStrap
                 puts "************Looking for Deploy key at: #{deploy_key_path}"
                 id_rsa = File.read(deploy_key_path)
                 put(id_rsa, "id_rsa", :mode => "0600")
-                sudo "mkdir -p /home/#{deploy_user}/.ssh"
-                sudo "chmod 0700 /home/#{deploy_user}/.ssh"
+                make_directory("/home/#{deploy_user}/.ssh", :mode => "0700")
                 sudo "mv ~/id_rsa /home/#{deploy_user}/.ssh/"
                 sudo "chown -R #{deploy_user}:rvm /home/#{deploy_user}/.ssh"
               rescue Exception => e
@@ -93,7 +100,7 @@ module Capistrano::CapStrap
               end
             end
           end
-          end
+        end
       end
     end
   end

data/spec/bootstrap_spec.rb

@@ -3,6 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Capistrano::CapStrap::Bootstrap do
   load_capistrano_recipe(Capistrano::CapStrap::Bootstrap)
 
+  before do
+    Capistrano::CLI.ui.stubs(:ask).returns('prompt')
+  end
+
   describe "tasks" do
    it "has a default task" do
     recipe.must_have_task "bootstrap:default"
@@ -34,44 +38,34 @@ describe Capistrano::CapStrap::Bootstrap do
   end
 
   describe "default variables" do
-    before do
-      Capistrano::CLI.ui.stubs(:ask).returns('prompt')
-    end
-
-    it "prompts for a bootstrap user" do
-      recipe.fetch(:user).must_equal 'prompt'
-    end
-
-    it "prompts for a deploy user" do
-      recipe.fetch(:deploy_user).must_equal 'prompt'
+    it "bootstrap user" do
+      recipe.fetch(:bootstrap_user).must_equal 'prompt'
     end
 
-    it 'prompts for authorized keys if no path set' do
-      recipe.fetch(:authorized_keys_file).must_equal 'prompt'
+    it "bootstrap user password" do
+      recipe.fetch(:bootstrap_password).must_equal 'prompt'
     end
 
-    it "prompts for deploy key location if not set" do
-      recipe.fetch(:deploy_key_file).must_equal 'prompt'
+    it "deploy user" do
+      recipe.fetch(:deploy_user).must_equal 'deploy'
     end
 
-    it "packages is empty" do
+    it "packages" do
       recipe.fetch(:packages).must_be_empty
     end
   end
 
   describe "variables set" do
     before do
-      recipe.set(:user, "foo")
-      recipe.set(:deploy_user, "bar")
       recipe.set(:known_hosts, "baz")
     end
 
-    it "doesn't prompt for a bootstrap user" do
-      recipe.fetch(:user).must_equal "foo"
+    it "user gets bootstrap_user" do
+      recipe.fetch(:user).must_equal recipe.fetch(:bootstrap_user)
     end
 
-    it "doesn't prompt for a deploy user" do
-      recipe.fetch(:deploy_user).must_equal "bar"
+    it "password gets bootstrap_password" do
+      recipe.fetch(:password).must_equal recipe.fetch(:bootstrap_password)
     end
 
     it "replaces known_hosts with ones that are set" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-strap
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70296715639640 !ruby/object:Gem::Requirement
+  requirement: &70359382906800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70296715639640
+  version_requirements: *70359382906800
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70296715636900 !ruby/object:Gem::Requirement
+  requirement: &70359382904140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.12.1
   type: :development
   prerelease: false
-  version_requirements: *70296715636900
+  version_requirements: *70359382904140
 - !ruby/object:Gem::Dependency
   name: minitest-capistrano
-  requirement: &70296715636080 !ruby/object:Gem::Requirement
+  requirement: &70359382903240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.8
   type: :development
   prerelease: false
-  version_requirements: *70296715636080
+  version_requirements: *70359382903240
 - !ruby/object:Gem::Dependency
   name: minitest-colorize
-  requirement: &70296715634720 !ruby/object:Gem::Requirement
+  requirement: &70359382901880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *70296715634720
+  version_requirements: *70359382901880
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70296715634040 !ruby/object:Gem::Requirement
+  requirement: &70359382901200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70296715634040
+  version_requirements: *70359382901200
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70296715633040 !ruby/object:Gem::Requirement
+  requirement: &70359382900200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.11.3
   type: :development
   prerelease: false
-  version_requirements: *70296715633040
+  version_requirements: *70359382900200
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70296715648840 !ruby/object:Gem::Requirement
+  requirement: &70359382915520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70296715648840
+  version_requirements: *70359382915520
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70296715647060 !ruby/object:Gem::Requirement
+  requirement: &70359382914200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70296715647060
+  version_requirements: *70359382914200
 description: Bootstrap a machine. Install packages, create a deploy user, upload authorized
   keys and deploy key. Uses RVM to install desired rubies, with patch support.
 email: