hubcap 0.0.6 → 1.0.0

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify dependencies in hubcap.gemspec!
+gemspec

data/Gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: .
+  specs:
+    hubcap (1.0.0)
+      capistrano
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    capistrano (2.13.4)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    highline (1.6.15)
+    jruby-pageant (1.1.1)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.6.0)
+      jruby-pageant (>= 1.1.1)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hubcap!
+  rake

data/hubcap.gemspec

@@ -15,4 +15,6 @@ Gem::Specification.new do |gem|
   gem.name = 'hubcap'
   gem.require_paths = ['lib']
   gem.version = Hubcap::VERSION
+  gem.add_dependency('capistrano')
+  gem.add_development_dependency('rake')
 end

data/lib/hubcap/group.rb

@@ -34,7 +34,7 @@ class Hubcap::Group
     p += '.rb'  unless File.exists?(p)
     raise("File not found: #{path}")  unless File.exists?(p)
     code = IO.read(p)
-    eval(code)
+    eval(code, binding, p)
   end
 
 

data/lib/hubcap/server.rb

@@ -5,10 +5,14 @@ class Hubcap::Server < Hubcap::Group
 
   def initialize(parent, name, options = {}, &blk)
     super(parent, name, &blk)
+    hist = history.join('.')
+
+    # only set the server_name if it's not already set
+    param('server_name' => hist) if params['server_name'].nil?
+
     # If name is an IP, or is not in hosts hash, use name as address
     # Otherwise, dereference it from the hash and assign it
     unless @address = options[:address]
-      hist = history.join('.')
       @address = lookup(hist)
       @address = lookup(name)  if @address == hist
     end

data/lib/hubcap/version.rb

@@ -1,5 +1,5 @@
 module Hubcap
 
-  VERSION = '0.0.6'
+  VERSION = '1.0.0'
 
 end

data/test/unit/test_server.rb

@@ -55,15 +55,28 @@ class Hubcap::TestServer < Test::Unit::TestCase
         role('baseline')
         server('test') {
           role('test::server')
-          param('foo' => 1, 'bar' => 2)
+          param('foo' => '1', 'bar' => '2')
         }
       }
     }
     hash = YAML.load(hub.servers.first.yaml)
     assert_equal({ 'baseline' => nil, 'test::server' => nil }, hash['classes'])
     assert_equal(['classes', 'parameters'], hash.keys.sort)
-    assert_equal(['bar', 'foo'], hash['parameters'].keys.sort)
-    assert_equal([1, 2], hash['parameters'].values.sort)
+    assert_equal(['bar', 'foo', 'server_name'], hash['parameters'].keys.sort)
+    assert_equal(['1', '2', 'everything.test'], hash['parameters'].values.sort)
+  end
+
+  def test_yaml_server_name
+    hub = Hubcap.hub {
+      group('everything') {
+        role('baseline')
+        param('server_name' => 'do not overwrite')
+        server('test')
+      }
+    }
+    hash = YAML.load(hub.servers.first.yaml)
+    assert_equal(['server_name'], hash['parameters'].keys)
+    assert_equal(['do not overwrite'], hash['parameters'].values)
   end
 
 

metadata

@@ -1,35 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hubcap
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Joseph Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-01 00:00:00 +11:00
-default_executable: 
-dependencies: []
-
-description: Create a hub for your server configuration. Use it with Capistrano, Puppet and others.
-email: 
+date: 2013-06-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &7042900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *7042900
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &7042480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *7042480
+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
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/hubcap
@@ -54,37 +70,31 @@ files:
 - test/unit/test_hub.rb
 - test/unit/test_hubcap.rb
 - test/unit/test_server.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-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"
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 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