capstrap 0.3.3 → 0.4.0

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 0.4.0
+
+  * Tweak RVM ubuntu package dependencies.
+  * Add --hostname flag to set remote hostname (duh).
+
 # 0.3.3
 
   * Add call to apt-get update pre-package install

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capstrap (0.3.2)
+    capstrap (0.3.3)
       capistrano (~> 2.5.19)
       thor (~> 0.14.3)
 

data/README.markdown

@@ -75,6 +75,10 @@ To save config options to a yaml file to be read by capstrap:
     config-rake-update: true
     END_OF_CAPSTRAPRC
 
+To set the remote hostname, use the --hostname flag:
+
+    capstrap solo root@zland --hostname=zland
+
 To get more help:
 
     capstrap help

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

@@ -3,9 +3,10 @@ module Capstrap
 
     APT_RVM_PKGS = %w{sed grep tar gzip bzip2 bash curl git-core}
     
-    APT_MRI_AND_REE_PKGS = %w{build-essential bison openssl libreadline5 
-      libreadline-dev zlib1g zlib1g-dev libssl-dev vim libsqlite3-0 
-      libsqlite3-dev sqlite3 libxml2-dev subversion autoconf ssl-cert}
+    APT_MRI_AND_REE_PKGS = %w{build-essential bison openssl libreadline6 
+      libreadline6-dev zlib1g zlib1g-dev libssl-dev libsqlite3-0 
+      libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev subversion autoconf
+      ssl-cert}
 
     def self.load_into(configuration)
       configuration.load do

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

@@ -101,6 +101,14 @@ def config_repo_installed?
   cmd_test %{-d "#{config_path}"}
 end
 
+##
+# Checks if the hostname is current and correct.
+#
+# @param [String] desired hostname
+def hostname_correct?(host_name)
+  host_name == capture(%{hostname}).chomp
+end
+
 def update_cmd
   if cookbooks_rake_update
     %{rake update}

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

@@ -0,0 +1,29 @@
+module Capstrap
+  module Hostname
+
+    def self.load_into(configuration)
+      configuration.load do
+
+        namespace :hostname do
+
+          desc "Sets the hostname."
+          task :set_hostname do
+            unless hostname_correct?(host_name)
+              cmd = [
+                %{echo "#{host_name}" > /etc/hostname},
+                %{chown root:root /etc/hostname},
+                %{chmod 0644 /etc/hostname},
+                %{start hostname}
+              ]
+              run cmd.join(" && ")
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+if Capistrano::Configuration.instance
+  Capstrap::Hostname.load_into(Capistrano::Configuration.instance)
+end

data/lib/capstrap/cli.rb

@@ -68,6 +68,10 @@ module Capstrap
       method_option "ruby", :for => task, :type => :string, 
         :desc => "Version of ruby to install.", 
         :default => "ree-1.8.7"
+
+      method_option "hostname", :for => task, :type => :string,
+        :desc => "Desired name of host.",
+        :aliases => "-h"
     end
 
     [:chef, :solo, :execute, :update].each do |task|
@@ -114,29 +118,41 @@ module Capstrap
     end
 
     def exec_ruby
+      exec_hostname unless @ran_exec_hostname
       config.find_and_execute_task "rvm:install:#{config.fetch(:ruby)}"
       config.find_and_execute_task "rvm:default:#{config.fetch(:ruby)}"
     end
 
     def exec_chef
+      exec_hostname unless @ran_exec_hostname
       exec_ruby
       config.find_and_execute_task "chef:install:lib"
     end
 
     def exec_solo
+      exec_hostname unless @ran_exec_hostname
       exec_chef
       config.find_and_execute_task "chef:install:cookbooks"
       config.find_and_execute_task "chef:install:config"
     end
 
     def exec_execute
+      exec_hostname unless @ran_exec_hostname
       exec_solo
       config.find_and_execute_task "chef:execute:solo"
     end
 
     def exec_update
+      exec_hostname unless @ran_exec_hostname
       config.find_and_execute_task "chef:execute:update"
     end
+
+    def exec_hostname
+      if config.exists?(:host_name)
+        config.find_and_execute_task "hostname:set_hostname"
+      end
+      @ran_exec_hostname = true
+    end
   
     def config
       @config ||= prep_config
@@ -147,6 +163,7 @@ module Capstrap
       config.logger.level = Capistrano::Logger::TRACE
       config.role(:remote_host, @ssh_host)
       
+      Capstrap::Hostname.load_into(config)
       Capstrap::Apt.load_into(config)
       Capstrap::Core.load_into(config)
       Capstrap::RVM.load_into(config)
@@ -158,6 +175,7 @@ module Capstrap
     def setup_config(cli_options)
       abort ">> HOST must be set" unless @ssh_host
 
+      @ran_exec_hostname = false
       options = Hash.new
       options.merge!(cli_options)
       if File.exists?(options["config"])
@@ -169,7 +187,8 @@ module Capstrap
         {: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 => :config_path,            :opt => "config-path"},
+        {:sym => :host_name,              :opt => "hostname"}
       ].each do |var|
         config.set(var[:sym], options[var[:opt]]) if options[var[:opt]]
       end

data/lib/capstrap/version.rb

@@ -1,3 +1,3 @@
 module Capstrap
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/lib/capstrap.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'capistrano'
 require 'capistrano/cli'
 
+require 'capistrano/ext/capstrap/hostname'
 require 'capistrano/ext/capstrap/apt'
 require 'capistrano/ext/capstrap/core'
 require 'capistrano/ext/capstrap/rvm'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capstrap
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Fletcher Nichol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -07:00
+date: 2011-01-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
 - lib/capistrano/ext/capstrap/apt.rb
 - lib/capistrano/ext/capstrap/chef.rb
 - lib/capistrano/ext/capstrap/core.rb
+- lib/capistrano/ext/capstrap/hostname.rb
 - lib/capistrano/ext/capstrap/rvm.rb
 - lib/capstrap.rb
 - lib/capstrap/cli.rb