hubcap 0.0.4 → 0.0.5

data/lib/hubcap/application.rb

@@ -13,11 +13,6 @@ class Hubcap::Application < Hubcap::Group
   end
 
 
-  def extend_tree(outs)
-    outs << "Load: #{@recipe_paths.inspect}"  if @recipe_paths.any?
-  end
-
-
   class Hubcap::NestedApplicationDisallowed < StandardError; end
 
 end

data/lib/hubcap/group.rb

@@ -235,7 +235,11 @@ class Hubcap::Group
   def resolv(*hnames)
     if hnames.size == 1
       result = lookup(hnames.first)
-      result.match(IP_PATTERN) ? result : Resolv.getaddress(result)
+      begin
+        result.match(IP_PATTERN) ? result : Resolv.getaddress(result)
+      rescue Resolv::ResolvError => e
+        raise(Hubcap::ServerAddressUnknown, hnames.first)
+      end
     else
       hnames.collect { |hname| resolv(hname) }
     end
@@ -281,28 +285,6 @@ class Hubcap::Group
   end
 
 
-  # Returns a formatted string of all the key details for this group, and
-  # recurses into each child.
-  #
-  def tree(indent = "  ")
-    outs = [self.class.name.split('::').last.upcase, "Name: #{@name}"]
-    outs << "Atts: #{@cap_attributes.inspect}"  if @cap_attributes.any?
-    if @cap_roles == @puppet_roles
-      outs << "Role: #{@cap_roles.inspect}"  if @cap_roles.any?
-    else
-      cr = @cap_roles.any? ? 'Cap - '+@cap_roles.inspect : nil
-      pr = @puppet_roles.any? ? 'Puppet - '+@puppet_roles.inspect : nil
-      outs << "Role: #{[cr,pr].compact.join(' ')}"  if cr || pr
-    end
-    outs << "Pram: #{@params.inspect}"  if @params.any?
-    extend_tree(outs)  if respond_to?(:extend_tree)
-    if @children.any?
-      @children.each { |child| outs << child.tree(indent+"  ") }
-    end
-    outs.join("\n#{indent}")
-  end
-
-
   private
 
     def add_child(category, child)
@@ -323,5 +305,6 @@ class Hubcap::Group
   class Hubcap::GroupWithoutParent < StandardError; end
   class Hubcap::InvalidParamKeyType < StandardError; end
   class Hubcap::HostCircularReference < StandardError; end
+  class Hubcap::ServerAddressUnknown < StandardError; end
 
 end

data/lib/hubcap/hub.rb

@@ -28,11 +28,6 @@ class Hubcap::Hub < Hubcap::Group
   end
 
 
-  def extend_tree(outs)
-    outs << "Sets: #{@cap_sets.inspect}"
-  end
-
-
   # Does a few things:
   #
   # * Sets the :hubcap variable in the Capistrano instance.
@@ -52,11 +47,14 @@ class Hubcap::Hub < Hubcap::Group
 
     cap.instance_eval {
       require('hubcap/recipes/servers')
+      require('hubcap/recipes/ssh')
       require('hubcap/recipes/puppet')
     }
 
     # Declare the servers.
     servers.each { |svr|
+      # Raises an error if we cannot resolve the resulting address with DNS.
+      resolv(svr.address)  unless svr.address.match(Hubcap::Group::IP_PATTERN)
       opts = {
         :name => svr.name,
         :full_name => svr.history.join('.')

data/lib/hubcap/recipes/servers.rb

@@ -5,24 +5,78 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc <<-DESC
       Lists all the servers that match the filter used when Hubcap was loaded.
     DESC
+    task(:default) do
+      outs = hubcap.servers.collect { |s|
+        out = ["#{s.name}#{"(#{s.address})"  if s.name != s.address}"]
+        if app = s.application_parent
+          out << "  Appli: #{app.name}"
+        end
+        out << ["  Attrs: "+s.cap_attributes.inspect]  if s.cap_attributes.any?
+        if s.cap_roles == s.puppet_roles
+          out << "  Roles: #{s.cap_roles}"
+        else
+          cr = s.cap_roles.any? ? 'Cap - '+s.cap_roles.inspect : nil
+          pr = s.puppet_roles.any? ? 'Puppet - '+s.puppet_roles.inspect : nil
+          out << "  Roles: #{[cr,pr].compact.join(" | ")}"  if cr || pr
+        end
+        out << "  Parms: #{s.params.inspect}"  if s.params.any?
+        out.join("\n")
+      }
+      puts(outs.join("\n\n"))
+    end
+
+
     task(:list) do
-      puts(hubcap.servers.collect(&:tree))
+      outs = hubcap.servers.collect { |s|
+        out = []
+        out << s.history.join('.')
+        out << s.address
+        out << "App[#{s.application_parent.name}]"  if s.application_parent
+        if s.cap_roles == s.puppet_roles
+          out << "Role#{s.cap_roles}"
+        else
+          out << "Cap#{s.cap_roles}"  if s.cap_roles.any?
+          out << "Pup#{s.puppet_roles}"  if s.puppet_roles.any?
+        end
+        out.join(', ')
+      }
+      puts(outs.join("\n"))
     end
 
+
     desc <<-DESC
       Show the entire Hubcap configuration tree for the given filter.
     DESC
     task(:tree) do
-      puts(hubcap.tree)
+      tree = lambda { |obj, indent|
+        outs = [obj.class.name.split('::').last.upcase+': '+obj.name]
+        atts = obj.instance_variable_get(:@cap_attributes)
+        croles = obj.instance_variable_get(:@cap_roles)
+        proles = obj.instance_variable_get(:@puppet_roles)
+        prams = obj.instance_variable_get(:@params)
+        outs << "Atts: #{atts.inspect}"  if atts.any?
+        if croles == proles
+          outs << "Role: #{croles.inspect}"  if croles.any?
+        else
+          cr = croles.any? ? 'Cap - '+croles.inspect : nil
+          pr = proles.any? ? 'Puppet - '+proles.inspect : nil
+          outs << "Role: #{[cr,pr].compact.join(' ')}"  if cr || pr
+        end
+        outs << "Parm: #{prams.inspect}"  if prams.any?
+        if obj.is_a?(Hubcap::Hub)
+          outs << "Sets: #{obj.instance_variable_get(:@cap_sets).inspect}"
+        elsif obj.is_a?(Hubcap::Application)
+          recipes = obj.instance_variable_get(:@recipe_paths)
+          outs << "Load: #{recipes.inspect}"  if recipes.any?
+        end
+        if obj.children.any?
+          obj.children.each { |child| outs << tree.call(child, indent+"  ") }
+        end
+        outs.join("\n#{indent}")
+      }
+      puts(tree.call(hubcap, '  '))
     end
 
   end
 
-
-  task(:ssh) do
-    host = hubcap.servers.first.address
-    puts("SSH connect to: #{user}@#{host}")
-    system("ssh -A #{user}@#{host}")
-  end
-
 end

data/lib/hubcap/recipes/ssh.rb

@@ -0,0 +1,15 @@
+Capistrano::Configuration.instance(:must_exist).load do
+
+  namespace(:ssh) do
+
+    desc("Shells out to SSH for the first server that matches the filter.")
+    task(:default) do
+      host = hubcap.servers.first.address
+      puts("SSH connect to: #{user}@#{host}")
+      system("ssh -A #{user}@#{host}")
+    end
+
+  end
+
+end
+

data/lib/hubcap/server.rb

@@ -36,6 +36,7 @@ class Hubcap::Server < Hubcap::Group
       return p  if p.kind_of?(Hubcap::Application)
       p = p.instance_variable_get(:@parent)
     end
+    nil
   end
 
 

data/lib/hubcap/version.rb

@@ -1,5 +1,5 @@
 module Hubcap
 
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
 end

data/test/data/example.rb

@@ -52,16 +52,16 @@ application('example', :recipes => 'deploy') {
     group('app') {
       role(:app)
       param('env' => prod_env.merge('FORCE_SSL' => '1'))
-      server('app-1.example.com')
-      server('app-2.example.com')
-      server('app-3.example.com')
+      server('example.com')
+      server('example.org')
+      server('example.net')
     }
     group('db') {
       role(:db)
-      server('db-1.example.com')
-      server('db-2.example.com')
+      server('example.com')
+      server('example.net')
     }
-    server('queue-1.example.com') {
+    server('example.com') {
       role(:queue)
     }
   }

data/test/data/readme.rb

@@ -10,7 +10,7 @@ application('readme', :recipes => 'deploy') {
     # Puppet will have a $::exception_subject_prefix variable on these servers.
     param('exception_subject_prefix' => '[STAGING] ')
     # For simple staging, just one server that does everything.
-    server('readme.stage') {
+    server('readme.stage', :address => '0.0.0.0') {
       role(:cap => [:web, :app, :db], :puppet => ['proxy', 'app', 'db'])
     }
   }

data/test/unit/test_hub.rb

@@ -21,7 +21,7 @@ class Hubcap::TestHub < Test::Unit::TestCase
       application('a') {
         group('g') {
           role(:baseline)
-          server('s') { role(:everything) }
+          server('s', :address => '0.0.0.0') { role(:everything) }
         }
       }
     }
@@ -34,8 +34,8 @@ class Hubcap::TestHub < Test::Unit::TestCase
     assert_not_nil(cap.find_task('servers:list'))
     assert_not_nil(cap.find_task('puppet:check'))
     assert_nil(cap.find_task('deploy:setup'))
-    assert_equal('s', cap.roles[:baseline].servers.first.host)
-    assert_equal('s', cap.roles[:everything].servers.first.host)
+    assert_equal('0.0.0.0', cap.roles[:baseline].servers.first.host)
+    assert_equal('0.0.0.0', cap.roles[:everything].servers.first.host)
   end
 
 
@@ -45,7 +45,7 @@ class Hubcap::TestHub < Test::Unit::TestCase
         group('g') {
           cap_set(:branch, 'deploy')
           role(:baseline)
-          server('s') { role(:everything) }
+          server('s', :address => '0.0.0.0') { role(:everything) }
         }
       }
     }
@@ -62,8 +62,8 @@ class Hubcap::TestHub < Test::Unit::TestCase
   def test_configure_capistrano_in_application_mode_with_two_applications
     hub = Hubcap.hub {
       role(:baseline)
-      application('a1') { server('s1') }
-      application('a2') { server('s2') }
+      application('a1') { server('s1', :address => '1.1.1.1') }
+      application('a2') { server('s2', :address => '2.2.2.2') }
     }
 
     cap = Capistrano::Configuration.new
@@ -75,7 +75,9 @@ class Hubcap::TestHub < Test::Unit::TestCase
 
 
   def test_configure_capistrano_in_application_mode_with_no_applications
-    hub = Hubcap.hub { server('s1') { role(:baseline) } }
+    hub = Hubcap.hub {
+      server('s', :address => '0.0.0.0') { role(:baseline) }
+    }
 
     cap = Capistrano::Configuration.new
     cap.set(:hubcap_agnostic, false)
@@ -88,7 +90,7 @@ class Hubcap::TestHub < Test::Unit::TestCase
   def test_configure_capistrano_in_application_mode_with_no_applications
     hub = Hubcap.hub {
       cap_set(:foo => 'bar')
-      server('s1') {
+      server('s', :address => '0.0.0.0') {
         cap_set(:foo => 'baz')
         role(:baseline)
       }
@@ -101,4 +103,14 @@ class Hubcap::TestHub < Test::Unit::TestCase
     }
   end
 
+
+  def test_server_address_resolution
+    hub = Hubcap.hub {
+      server('s')
+    }
+    assert_raises(Hubcap::ServerAddressUnknown) {
+      hub.configure_capistrano(Capistrano::Configuration.new)
+    }
+  end
+
 end

metadata

@@ -1,25 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hubcap
-version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
-authors:
+authors: 
 - Joseph Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+
+date: 2012-10-01 00:00:00 +10:00
+default_executable: 
 dependencies: []
-description: Create a hub for your server configuration. Use it with Capistrano, Puppet
-  and others.
-email:
+
+description: Create a hub for your server configuration. Use it with Capistrano, Puppet and others.
+email: 
 - joseph@booki.sh
-executables:
+executables: 
 - hubcap
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Capfile.example
 - README.md
@@ -33,6 +41,7 @@ files:
 - lib/hubcap/hub.rb
 - lib/hubcap/recipes/puppet.rb
 - lib/hubcap/recipes/servers.rb
+- lib/hubcap/recipes/ssh.rb
 - lib/hubcap/server.rb
 - lib/hubcap/version.rb
 - test/data/example.rb
@@ -45,31 +54,37 @@ files:
 - test/unit/test_hub.rb
 - test/unit/test_hubcap.rb
 - test/unit/test_server.rb
-homepage: ''
+has_rdoc: true
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Hubcap Capistrano/Puppet extension
-test_files:
+test_files: 
 - test/data/example.rb
 - test/data/parts/foo_param.rb
 - test/data/readme.rb