hubcap 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ec9cecf4b71e69d8361217640dca39aef5135028
+  data.tar.gz: 42e2d26f932995b23e2b63c8c3cfc0d6d6e1632a
+SHA512:
+  metadata.gz: b91df5081cd0693c3ee1f056c1e50d8c01cce07d7e6caa66916cd06ecfd18a989ef6050bce2720794906e6cc0ae1532bfd84b5463de1cefbe36375374c13f172
+  data.tar.gz: ac8cb0c8e22b6544f34de9b46e7f0d6142846e011392d57186e5ac997884d8412d5f94973003a1edb09366bf9d9daf40caa62cffaddf9d8ad4c22a9ec66cce3f

data/Gemfile.lock

@@ -1,29 +1,27 @@
 PATH
   remote: .
   specs:
-    hubcap (1.0.0)
-      capistrano
+    hubcap (1.1.0)
+      capistrano (~> 2.13)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    capistrano (2.13.4)
+    capistrano (2.15.5)
       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)
+    highline (1.6.21)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    rake (10.3.2)
 
 PLATFORMS
   ruby

data/hubcap.gemspec

@@ -7,14 +7,14 @@ Gem::Specification.new do |gem|
   gem.description = 'Create a hub for your server configuration. '+
     'Use it with Capistrano, Puppet and others.'
   gem.summary = 'Hubcap Capistrano/Puppet extension'
-  gem.homepage = ''
-
+  gem.homepage = 'https://github.com/joseph/hubcap'
+  gem.licenses = 'MIT'
   gem.files = `git ls-files`.split($\)
   gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.name = 'hubcap'
   gem.require_paths = ['lib']
   gem.version = Hubcap::VERSION
-  gem.add_dependency('capistrano')
+  gem.add_dependency('capistrano', '~> 2.13')
   gem.add_development_dependency('rake')
 end

data/lib/hubcap/group.rb

@@ -324,6 +324,7 @@ class Hubcap::Group
     def update_with_stringified_keys(dest, src)
       src.each_pair { |k, v|
         v = update_with_stringified_keys({}, v)  if v.is_a?(Hash)
+        v = v.to_s if v.kind_of?(Symbol) # ensure strings not symbols
         dest.update(k.to_s => v)
       }
       dest

data/lib/hubcap/recipes/puppet.rb

@@ -6,6 +6,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       set(:puppet_repository) { raise "Required variable: puppet_repository" }
     end
     set(:puppet_branch, 'master')
+    set(:puppet_version, '3.6.2')
     set(:puppet_path, '/var/www/provision/puppet')
     set(:puppet_git_password) { Capistrano::CLI.password_prompt }
     set(:puppet_manifest_path) { "#{puppet_path}/puppet/host.pp" }
@@ -59,13 +60,11 @@ Capistrano::Configuration.instance(:must_exist).load do
         'fi'
       ].join(' '))
 
-      # 3.0.0-rc5 is the last version that a) runs on Ruby 1.9 and b) works.
-      ppt_ver = '3.0.0.rc5'
       sudo_bash([
-        "if [[ `gem q -i -n \"^puppet$\" -v #{ppt_ver}` =~ \"true\" ]]; then",
+        "if [[ `gem q -i -n \"^puppet$\" -v #{puppet_version}` =~ \"true\" ]]; then",
           'echo "Puppet verified";',
         'else',
-          "gem install puppet -v #{ppt_ver} --pre --no-rdoc --no-ri;",
+          "gem install puppet -v #{puppet_version} --no-rdoc --no-ri;",
         'fi'
       ].join(' '))
 

data/lib/hubcap/version.rb

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

data/test/unit/test_server.rb

@@ -66,6 +66,21 @@ class Hubcap::TestServer < Test::Unit::TestCase
     assert_equal(['1', '2', 'everything.test'], hash['parameters'].values.sort)
   end
 
+  def test_param_converts_symbols_to_strings
+    hub = Hubcap.hub {
+      server('test') {
+        param(:foo => 1, 'bar' => '2', :baz => :baz)
+      }
+    }
+    hash = YAML.load(hub.servers.first.yaml)
+    %w(foo bar baz).each { |i|
+      assert(hash['parameters'].keys.include?(i), "expected keys to include #{i}")
+    }
+    [1, '2', 'baz'].each { |i|
+      assert(hash['parameters'].values.include?(i), "expected values to include #{i}")
+    }
+  end
+
   def test_yaml_server_name
     hub = Hubcap.hub {
       group('everything') {
@@ -143,7 +158,7 @@ class Hubcap::TestServer < Test::Unit::TestCase
 
   def test_host_lookup_handle_circular_reference
     assert_raises(Hubcap::HostCircularReference) {
-      hub = Hubcap.hub {
+      Hubcap.hub {
         host('some.other.thing' => 'g1.t1')
         group('g1') {
           host('g1.t1' => 'some.other.thing')

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: hubcap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Joseph Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &7042900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :runtime
   prerelease: false
-  version_requirements: *7042900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7042480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7042480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create a hub for your server configuration. Use it with Capistrano, Puppet
   and others.
 email:
@@ -70,29 +75,29 @@ files:
 - test/unit/test_hub.rb
 - test/unit/test_hubcap.rb
 - test/unit/test_server.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/joseph/hubcap
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hubcap Capistrano/Puppet extension
 test_files:
 - test/data/example.rb