capstrap 0.4.0 → 0.4.1

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 0.4.1
+
+  * Add hostname task and --domainname flag.
+  * Fix bug where rvm default@global is checked for chef gem.
 # 0.4.0
 
   * Tweak RVM ubuntu package dependencies.

data/Gemfile.lock

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

data/README.markdown

@@ -75,9 +75,9 @@ 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:
+To set the remote hostname and domain name, use the --hostname and --domainname flags:
 
-    capstrap solo root@zland --hostname=zland
+    capstrap solo root@zland --hostname=zland --hostname=example.com
 
 To get more help:
 

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

@@ -83,7 +83,7 @@ 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
+  cmd_if %{rvm use #{ruby} >/dev/null && gem list --no-versions | grep -q "^chef$" >/dev/null}, true
 end
 
 
@@ -109,6 +109,35 @@ def hostname_correct?(host_name)
   host_name == capture(%{hostname}).chomp
 end
 
+##
+# Checks if the full qualified domain name is current and correct.
+#
+# @param [String] ip address of host
+# @param [String] desired host name
+# @param [String] desired domain name
+def fqdn_correct?(host_name, domain_name, ip_addr)
+  cmd_if %{egrep -q '^#{ip_addr}[[:space:]]+#{host_name}.#{domain_name}' /etc/hosts >/dev/null}
+end
+
+##
+# Retrieve the primary IP address of the host.
+#
+def fetch_primary_ip_address
+  capture(<<-GETADDR, :shell => "bash").chomp
+    _if="$(netstat -nr | grep ^0\.0\.0\.0 | awk '{print $8}')";
+    _ip="$(/sbin/ifconfig $_if | \
+      grep '^[[:space:]]*inet ' | awk '{print $2}' | \
+      awk -F':' '{print $2}')";
+
+    if [ -z "$_ip" -o "$_ip" == "" ] ; then
+      echo "";
+      return 10;
+    else
+      echo $_ip;
+    fi
+  GETADDR
+end
+
 def update_cmd
   if cookbooks_rake_update
     %{rake update}

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

@@ -8,9 +8,15 @@ module Capstrap
 
           desc "Sets the hostname."
           task :set_hostname do
-            unless hostname_correct?(host_name)
+            if exists?(:host_name)
+              hname = fetch(:host_name)
+            else
+              hname = capture(%{hostname}).chomp
+            end
+
+            unless hostname_correct?(hname)
               cmd = [
-                %{echo "#{host_name}" > /etc/hostname},
+                %{echo "#{hname}" > /etc/hostname},
                 %{chown root:root /etc/hostname},
                 %{chmod 0644 /etc/hostname},
                 %{start hostname}
@@ -18,6 +24,37 @@ module Capstrap
               run cmd.join(" && ")
             end
           end
+
+          desc "Sets the full qualified domain name."
+          task :set_fqdn do
+            begin
+              current_fqdn = capture(%{hostname -f}).chomp
+            rescue
+              current_fqdn = "fubarname.fubardomain"
+            end
+
+            if exists?(:host_name)
+              hname = fetch(:host_name)
+            else
+              hname = current_fqdn.split('.').shift
+            end
+
+            if exists?(:domain_name)
+              dname = fetch(:domain_name)
+            else
+              dname = current_fqdn.split('.').drop(1).join('.')
+            end
+
+            unless fqdn_correct?(hname, dname, "127.0.1.1")
+              run <<-UPDATE_HOSTS
+                if egrep -q '^127.0.1.1[[:space:]]' /etc/hosts >/dev/null ; then
+                  perl -pi -e 's|^(127.0.1.1[[:space:]]+).*$|\$1#{hname}.#{dname} #{hname}|' /etc/hosts;
+                else
+                  perl -pi -e 's|^(127\.0\.0\.1[[:space:]]+.*)$|\$1\n127.0.1.1 #{hname}.#{dname} #{hname}|' /etc/hosts;
+                fi;
+              UPDATE_HOSTS
+            end
+          end
         end
       end
     end

data/lib/capstrap/cli.rb

@@ -12,6 +12,15 @@ module Capstrap
       puts "capstrap v#{Capstrap::VERSION}"
     end
     
+    desc "hostname HOST", "Sets the FQDN on remote SSH host HOST"
+    def hostname(ssh_host)
+      track_time do
+        @ssh_host = ssh_host
+        setup_config options
+        exec_hostname
+      end
+    end
+
     desc "ruby HOST", "Install an RVM ruby on remote SSH host HOST"
     def ruby(ssh_host)
       track_time do
@@ -59,7 +68,15 @@ module Capstrap
       end
     end
 
-    [:ruby, :chef, :solo, :execute, :update].each do |task|
+    [:hostname, :ruby, :chef, :solo, :execute, :update].each do |task|
+      method_option "hostname", :for => task, :type => :string,
+        :desc => "Desired name of host.",
+        :aliases => "-h"
+
+      method_option "domainname", :for => task, :type => :string,
+        :desc => "Desired domain name of host.",
+        :aliases => "-d"
+
       method_option "config", :for => task, :type => :string, 
         :desc => "Read from alternative configuration.",
         :default => File.join(ENV['HOME'], ".capstraprc"),
@@ -68,10 +85,6 @@ 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|
@@ -148,12 +161,15 @@ module Capstrap
     end
 
     def exec_hostname
-      if config.exists?(:host_name)
-        config.find_and_execute_task "hostname:set_hostname"
-      end
+      exec_fqdn
+      config.find_and_execute_task "hostname:set_hostname"
       @ran_exec_hostname = true
     end
   
+    def exec_fqdn
+      config.find_and_execute_task "hostname:set_fqdn"
+    end
+  
     def config
       @config ||= prep_config
     end
@@ -188,7 +204,8 @@ module Capstrap
         {:sym => :cookbooks_path,         :opt => "cookbooks-path"},
         {:sym => :config_repo,            :opt => "config-repo"},
         {:sym => :config_path,            :opt => "config-path"},
-        {:sym => :host_name,              :opt => "hostname"}
+        {:sym => :host_name,              :opt => "hostname"},
+        {:sym => :domain_name,            :opt => "domainname"}
       ].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.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capstrap
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Fletcher Nichol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -07:00
+date: 2011-01-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency