hubcap 0.0.2 → 0.0.3

data/.gitignore

@@ -0,0 +1 @@
+.screenrc

data/lib/hubcap/ext/full_server_names.rb

@@ -0,0 +1,11 @@
+require 'capistrano'
+
+class Capistrano::ServerDefinition
+
+  alias base_to_s to_s
+
+  def to_s
+    @to_s ||= options[:full_name] || base_to_s
+  end
+
+end

data/lib/hubcap/group.rb

@@ -18,6 +18,7 @@ class Hubcap::Group
     @cap_roles = []
     @puppet_roles = []
     @params = {}
+    @hosts = {}
     @children = []
     instance_eval(&blk)  if blk && processable?
   end
@@ -180,6 +181,27 @@ class Hubcap::Group
   end
 
 
+  # Defines hostnames that point to IP addresses. Eg,
+  #
+  #   host('staging-1' => '192.168.1.20')
+  #
+  # This is solely used as a look-up table for resolv(). If the hostname can't
+  # be found in this list, resolv() will fall back to a normal DNS look-up.
+  # It's a neat way to define your infrastructure with names, rather than
+  # hard-coding IPs, without needing a shared DNS server for everyone
+  # (and without having to wait for DNS to propagate). Think of it as a
+  # built-in /etc/hosts file.
+  #
+  # You can define multiple hostname/ip pairs in a single call.
+  #
+  # A group inherits a clone of its parent's hosts. So if you want to change
+  # the IP of a hostname just for a child-group, you can (but: caveat emptor).
+  #
+  def host(hash)
+    @hosts = hash
+  end
+
+
   def cap_attributes
     @parent ? @parent.cap_attributes.merge(@cap_attributes) : @cap_attributes
   end
@@ -200,6 +222,23 @@ class Hubcap::Group
   end
 
 
+  def hosts
+    @parent ? @parent.hosts.merge(@hosts) : @hosts
+  end
+
+
+  # Takes a name and returns an IP address. It looks at the @hosts table first,
+  # then falls back to a normal DNS look-up.
+  #
+  def resolv(*hnames)
+    if hnames.size == 1
+      hosts[hnames.first] || Resolv.getaddress(hnames.first)
+    else
+      hnames.collect { |hname| resolv(hname) }
+    end
+  end
+
+
   # Instantiate an application as a child of this group.
   #
   def application(name, options = {}, &blk)
@@ -258,14 +297,6 @@ class Hubcap::Group
     end
 
 
-    def resolv(*names)
-      require 'resolv'
-      if names.size == 1
-        Resolv.getaddress(names.first)
-      else
-        names.collect { |name| Resolv.getaddress(name) }
-      end
-    end
 
 
   class Hubcap::GroupWithoutParent < StandardError; end

data/lib/hubcap/hub.rb

@@ -56,8 +56,12 @@ class Hubcap::Hub < Hubcap::Group
     }
 
     # Declare the servers.
-    servers.each { |s|
-      cap.server(s.address, *(s.cap_roles + [s.cap_attributes]))
+    servers.each { |svr|
+      opts = {
+        :name => svr.name,
+        :full_name => svr.history.join('.')
+      }.merge(svr.cap_attributes)
+      cap.server(svr.address, *(svr.cap_roles + [opts]))
     }
 
     configure_application_mode(cap)  unless capistrano_is_agnostic?(cap)

data/lib/hubcap/recipes/puppet.rb

@@ -55,7 +55,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           'echo "Ruby 1.9 verified";',
         'else',
           "#{apt_cmd} update;",
-          "#{apt_cmd} install ruby1.9.1 git-core;",
+          "#{apt_cmd} install ruby1.9.1 ruby1.9.1-dev git-core;",
         'fi'
       ].join(' '))
 
@@ -88,8 +88,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     DESC
     task(:update) do
       handle_data = lambda { |channel, stream, text|
-        host = channel[:host]
-        logger.info "[#{host} :: #{stream}] #{text}"
+        host = channel[:server]
+        logger.info "[#{stream} :: #{host}] #{text}"
         out = case text
         when /\bpassword.*:/i, /passphrase/i  # Git password or SSH passphrase.
           "#{puppet_git_password}\n"

data/lib/hubcap/version.rb

@@ -1,5 +1,5 @@
 module Hubcap
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
 end

data/lib/hubcap.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'resolv'
 
 module Hubcap
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubcap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies: []
 description: Create a hub for your server configuration. Use it with Capistrano, Puppet
   and others.
@@ -20,6 +20,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Capfile.example
 - README.md
 - Rakefile
@@ -27,6 +28,7 @@ files:
 - hubcap.gemspec
 - lib/hubcap.rb
 - lib/hubcap/application.rb
+- lib/hubcap/ext/full_server_names.rb
 - lib/hubcap/group.rb
 - lib/hubcap/hub.rb
 - lib/hubcap/recipes/puppet.rb