ansible_spec 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4883e779389ae7096bdce09a7e572a699f86f1c
-  data.tar.gz: 144e14d67f8d46b48fb0f80b29bb79ea32510d27
+  metadata.gz: 4e5c10ea9ab4741a2c8f99e20261cbbad47af7fe
+  data.tar.gz: 572f3ddf20328f19eccd4e1107162b00cf881c3b
 SHA512:
-  metadata.gz: 8f91185a22486befc9314296258734fad2848e2ee533ffe4800eb3147eeca70524e4bbbcc513f02429a16bbb9436e8545311f4289759a418f9af79fdba84dae1
-  data.tar.gz: ec415b24ec8dd9c9f97e0c3c89a88382c223b3f0754c224ef92b692bf329fc643710435111a2559ba1c77c094ba91cb17d48fb0945a7d5b158c8b62f537a075e
+  metadata.gz: b266c6100fac87326945d7c1c6c0f49a9dd45092b5bb6d6d02e619088a6f278d29a43078250c9a998393a94b5a644b8f4f8ac9f5e183660fdda70816bbe87d99
+  data.tar.gz: 34fc3ec00c8d71de98c10eb6328d0cac4607c2fa82782c612d0e115e873584ae722aa0d4c68a1a7b878eef6a02e782572e79d117a5759ef1d3b595833aa1f43e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.5
+- Fix [#51 Handle hosts which are not assigned to any group] by [Gerrrr](https://github.com/Gerrrr)
+
 # v0.2.4
 - Fix [#50 do not fail on no hosts matched](https://github.com/volanja/ansible_spec/pull/50) by [phiche](https://github.com/phiche)
 

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ansible_spec.gemspec
 gemspec
+
+if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  # net-ssh 3.x dropped Ruby 1.8 and 1.9 support.
+  gem 'net-ssh', '~> 2.7'
+end

data/lib/ansible_spec/load_ansible.rb

@@ -11,8 +11,10 @@ module AnsibleSpec
       return get_dynamic_inventory(file)
     end
     f = File.open(file).read
-    res = Hash.new
+    groups = Hash.new
     group = ''
+    hosts = Hash.new
+    hosts.default = Hash.new
     f.each_line{|line|
       line = line.chomp
       # skip
@@ -22,45 +24,56 @@ module AnsibleSpec
       # get group
       if line.start_with?('[') && line.end_with?(']')
         group = line.gsub('[','').gsub(']','')
-        res["#{group}"] = Array.new
+        groups["#{group}"] = Array.new
         next
       end
 
-      #get host
+      # get host
+      host_name = line.split[0]
       if group.empty? == false
-        host = Hash.new
-        # 1つのみ、かつ:を含まない場合
-        if line.split.count == 1 && !line.include?(":")
-          # 192.168.0.1
-          res["#{group}"] << line
+        if groups.has_key?(line)
+          groups["#{group}"] << line
           next
-        elsif line.split.count == 1 && line.include?("[") && line.include?("]")
+        elsif host_name.include?("[") && host_name.include?("]")
           # www[01:50].example.com
           # db-[a:f].example.com
           hostlist_expression(line,":").each{|h|
-            res["#{group}"] << h
+            host = hosts[h.split[0]]
+            groups["#{group}"] << get_inventory_param(h).merge(host)
           }
           next
         else
-          res["#{group}"] << get_inventory_param(line)
+          # 1つのみ、かつ:を含まない場合
+          # 192.168.0.1
+          # 192.168.0.1 ansible_ssh_host=127.0.0.1 ...
+          host = hosts[host_name]
+          groups["#{group}"] << get_inventory_param(line).merge(host)
           next
         end
+      else
+        if host_name.include?("[") && host_name.include?("]")
+          hostlist_expression(line, ":").each{|h|
+            hosts[h.split[0]] = get_inventory_param(h)
+          }
+        else
+          hosts[host_name] = get_inventory_param(line)
+        end
       end
     }
 
     # parse children [group:children]
     search = Regexp.new(":children".to_s)
-    res.keys.each{|k|
+    groups.keys.each{|k|
       unless (k =~ search).nil?
         # get group parent & merge parent
-        res.merge!(get_parent(res,search,k))
+        groups.merge!(get_parent(groups,search,k))
         # delete group children
-        if res.has_key?("#{k}") && res.has_key?("#{k.gsub(search,'')}")
-          res.delete("#{k}")
+        if groups.has_key?("#{k}") && groups.has_key?("#{k.gsub(search,'')}")
+          groups.delete("#{k}")
         end
       end
     }
-    return res
+    return groups
   end
 
   # param  hash   {"server"=>["192.168.0.103"], "databases"=>["192.168.0.104"], "pg:children"=>["server", "databases"]}

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/src/Rakefile

@@ -13,18 +13,12 @@ namespace :serverspec do
       desc "Run serverspec for #{property["name"]}"
       RSpec::Core::RakeTask.new(property["name"].to_sym) do |t|
         puts "Run serverspec for #{property["name"]} to #{host}"
-        if host.instance_of?(Hash)
-          ENV['TARGET_HOST'] = host["uri"]
-          ENV['TARGET_PORT'] = host["port"].to_s
-          ENV['TARGET_PRIVATE_KEY'] = host["private_key"]
-          unless host["user"].nil?
-            ENV['TARGET_USER'] = host["user"]
-          else
-            ENV['TARGET_USER'] = property["user"]
-          end
+        ENV['TARGET_HOST'] = host["uri"]
+        ENV['TARGET_PORT'] = host["port"].to_s
+        ENV['TARGET_PRIVATE_KEY'] = host["private_key"]
+        unless host["user"].nil?
+          ENV['TARGET_USER'] = host["user"]
         else
-          ENV['TARGET_HOST'] = host
-          ENV['TARGET_PRIVATE_KEY'] = '~/.ssh/id_rsa'
           ENV['TARGET_USER'] = property["user"]
         end
         t.pattern = 'roles/{' + property["roles"].join(',') + '}/spec/*_spec.rb'

data/spec/inventory_parameters_spec.rb

@@ -29,6 +29,8 @@ EOF
 EOF
 
   content_h = <<'EOF'
+node ansible_ssh_port=4444 ansible_ssh_host=192.168.1.55
+
 [normal]
 192.168.0.1
 192.168.0.2 ansible_ssh_port=22
@@ -36,8 +38,9 @@ EOF
 192.168.0.4 ansible_ssh_private_key_file=~/.ssh/id_rsa
 192.168.0.5 ansible_ssh_user=git
 jumper ansible_ssh_port=5555 ansible_ssh_host=192.168.1.50
-
+node
 EOF
+
   create_file(tmp_ansiblespec,content)
   create_file(tmp_playbook,content_p)
   create_file(tmp_hosts,content_h)
@@ -65,8 +68,9 @@ describe "load_targetsの実行" do
 
     it 'normal 192.168.0.1' do
       obj = @res['normal'][0]
-      expect(obj.instance_of?(String)).to be_truthy
-      expect(obj).to eq '192.168.0.1'
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj['uri']).to eq '192.168.0.1'
+      expect(obj['port']).to eq 22
     end
     it 'normal 192.168.0.2 ansible_ssh_port=22' do
       obj = @res['normal'][1]
@@ -104,6 +108,14 @@ describe "load_targetsの実行" do
       expect(obj['port']).to eq 5555
     end
 
+    it 'node ansible_ssh_port=4444 ansible_ssh_host=192.168.1.55' do
+      obj = @res['normal'][6]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj['name']).to eq 'node ansible_ssh_port=4444 ansible_ssh_host=192.168.1.55'
+      expect(obj['uri']).to eq '192.168.1.55'
+      expect(obj['port']).to eq 4444
+    end
+
     after do
       File.delete(tmp_hosts)
     end
@@ -141,7 +153,9 @@ describe "get_propertiesの実行" do
 
     it 'normal 192.168.0.1' do
       expect(@res[0]['hosts'].instance_of?(Array)).to be_truthy
-      expect(@res[0]['hosts'][0]).to eq '192.168.0.1'
+      expect(@res[0]['hosts'][0]).to include({'name' => '192.168.0.1',
+                                              'uri' => '192.168.0.1',
+                                              'port' => 22})
     end
 
     it 'normal 192.168.0.2 ansible_ssh_port=22' do

data/spec/load_ansible_spec.rb

@@ -35,13 +35,19 @@ EOF
     end
 
     it 'exist 1st server' do
-      expect(@res['server'][0]).to eq '192.168.0.1'
+      expect(@res['server'][0]).to include({'uri' => '192.168.0.1',
+                                            'name' => '192.168.0.1',
+                                            'port' => 22})
     end
     it 'exist 2nd server' do
-      expect(@res['server'][1]).to eq '192.168.0.2'
+      expect(@res['server'][1]).to include({'uri' => '192.168.0.2',
+                                            'name' => '192.168.0.2',
+                                            'port' => 22})
     end
     it 'exist 3rd server' do
-      expect(@res['server'][2]).to eq 'example.com'
+      expect(@res['server'][2]).to include({'uri' => 'example.com',
+                                            'name' => 'example.com',
+                                            'port' => 22})
     end
     it 'not exist 4th server' do
       expect(@res['server'][3]).to eq nil
@@ -82,10 +88,14 @@ EOF
       expect(@res.key?('web')).to be_truthy
     end
     it 'exist 1st web' do
-      expect(@res['web'][0]).to eq '192.168.0.3'
+      expect(@res['web'][0]).to include({'name' => '192.168.0.3',
+                                         'uri' => '192.168.0.3',
+                                         'port' => 22})
     end
     it 'exist 2nd web' do
-      expect(@res['web'][1]).to eq '192.168.0.4'
+      expect(@res['web'][1]).to include({'name' => '192.168.0.4',
+                                         'uri' => '192.168.0.4',
+                                         'port' => 22})
     end
     it 'not exist 3rd web' do
       expect(@res['web'][2]).to eq nil
@@ -96,10 +106,14 @@ EOF
       expect(@res.key?('db')).to be_truthy
     end
     it 'exist 1st db' do
-      expect(@res['db'][0]).to eq '192.168.0.5'
+      expect(@res['db'][0]).to include({'name' => '192.168.0.5',
+                                        'uri' => '192.168.0.5',
+                                        'port' => 22})
     end
     it 'exist 2nd db' do
-      expect(@res['db'][1]).to eq '192.168.0.6'
+      expect(@res['db'][1]).to include({'name' => '192.168.0.6',
+                                        'uri' => '192.168.0.6',
+                                        'port' => 22})
     end
     it 'not exist 3rd db' do
       expect(@res['db'][2]).to eq nil
@@ -114,10 +128,14 @@ EOF
     tmp_hosts = 'hosts'
     before do
       content = <<'EOF'
+node[01:20] ansible_ssh_port=2222
+
 [web]
 www[01:50].example.com
 [databases]
 db-[a:f].example.com
+[nodes]
+node[01:20]
 EOF
       create_file(tmp_hosts,content)
       @res = AnsibleSpec.load_targets(tmp_hosts)
@@ -128,7 +146,7 @@ EOF
     end
 
     it 'check 1 group' do
-      expect(@res.length).to eq 2
+      expect(@res.length).to eq 3
     end
 
     it 'check group name' do
@@ -139,14 +157,27 @@ EOF
     it 'www[01:50].example.com' do
       1.upto(50){|n|
         leading_zero = n.to_s.rjust(2, '0')
-        expect(@res['web']["#{n - 1}".to_i]).to eq "www#{leading_zero}.example.com"
+        expect(@res['web']["#{n - 1}".to_i]).to include({'name' => "www#{leading_zero}.example.com",
+                                                         'uri' => "www#{leading_zero}.example.com",
+                                                         'port' => 22})
       }
     end
 
     it 'db-[a:f].example.com' do
       alphabet = [*'a'..'f'] # Array splat
       alphabet.each_with_index {|word, i|
-        expect(@res['databases'][i]).to eq "db-#{word}.example.com"
+        expect(@res['databases'][i]).to include ({'name' => "db-#{word}.example.com",
+                                                  'uri' => "db-#{word}.example.com",
+                                                  'port' => 22})
+      }
+    end
+
+    it 'node[01:20]' do
+      1.upto(20){|n|
+        leading_zero = n.to_s.rjust(2, '0')
+        expect(@res['nodes']["#{n - 1}".to_i]).to include({'name' => "node#{leading_zero} ansible_ssh_port=2222",
+                                                           'uri' => "node#{leading_zero}",
+                                                           'port' => 2222})
       }
     end
 
@@ -241,7 +272,9 @@ EOF
       expect(@res['server'][0]).not_to eq '192.168.0.10'
     end
     it 'exist 2nd server' do
-      expect(@res['server'][0]).to eq '192.168.0.11'
+      expect(@res['server'][0]).to include({'name' => '192.168.0.11',
+                                            'uri' => '192.168.0.11',
+                                            'port' => 22})
     end
 
     after do
@@ -275,10 +308,14 @@ EOF
       expect(@res.key?('web')).to be_truthy
     end
     it 'exist 1st web' do
-      expect(@res['web'][0]).to eq '192.168.0.3'
+      expect(@res['web'][0]).to include ({'name' => '192.168.0.3',
+                                          'uri' => '192.168.0.3',
+                                          'port' => 22})
     end
     it 'exist 2nd web' do
-      expect(@res['web'][1]).to eq '192.168.0.4'
+      expect(@res['web'][1]).to include ({'name' => '192.168.0.4',
+                                          'uri' => '192.168.0.4',
+                                          'port' => 22})
     end
 
     after do
@@ -323,8 +360,10 @@ EOF
 
     it 'pg 192.168.0.103' do
       obj = @res['pg'][0]
-      expect(obj.instance_of?(String)).to be_truthy
-      expect(obj).to eq '192.168.0.103'
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'name' => '192.168.0.103',
+                              'uri' => '192.168.0.103',
+                              'port' => 22})
     end
 
     it 'pg 192.168.0.104 ansible_ssh_port=22' do
@@ -337,8 +376,10 @@ EOF
 
     it 'pg 192.168.0.105' do
       obj = @res['pg'][2]
-      expect(obj.instance_of?(String)).to be_truthy
-      expect(obj).to eq '192.168.0.105'
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'name' => '192.168.0.105',
+                              'uri' => '192.168.0.105',
+                              'port' => 22})
     end
 
     it 'pg 192.168.0.106 ansible_ssh_port=5555' do
@@ -1156,8 +1197,12 @@ EOF
 
     it 'exist hosts' do
       expect(@res[0]['hosts'].instance_of?(Array)).to be_truthy
-      expect(@res[0]['hosts'][0]).to eq '192.168.0.103'
-      expect(@res[0]['hosts'][1]).to eq '192.168.0.104'
+      expect(@res[0]['hosts'][0]).to include({'name' => '192.168.0.103',
+                                              'uri' => '192.168.0.103',
+                                              'port' => 22})
+      expect(@res[0]['hosts'][1]).to include({'name' => '192.168.0.104',
+                                              'uri' => '192.168.0.104',
+                                              'port' => 22})
     end
 
     it 'exist user' do
@@ -1237,7 +1282,18 @@ EOF
 
     it 'exist hosts' do
       expect(@res[0]['hosts'].instance_of?(Array)).to be_truthy
-      expect(['192.168.0.103','192.168.0.104','192.168.0.105','192.168.0.106']).to match_array(@res[0]['hosts'])
+      expect([{'name' => '192.168.0.103',
+               'uri' => '192.168.0.103',
+               'port' => 22},
+              {'name' => '192.168.0.104',
+               'uri' => '192.168.0.104',
+               'port' => 22},
+              {'name' => '192.168.0.105',
+               'uri' => '192.168.0.105',
+               'port' => 22},
+              {'name' => '192.168.0.106',
+               'uri' => '192.168.0.106',
+               'port' => 22}]).to match_array(@res[0]['hosts'])
     end
 
     it 'exist user' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler