ansible_spec 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f02d25f38bddb84adcadc813fcb9514ae27d4437
-  data.tar.gz: 989c684e643e740430e6e14cb0af8ef99d0c27a9
+  metadata.gz: b23a5303fd8abc86840d5450d162dbb43d6e5e34
+  data.tar.gz: 1440c45d801dceaf4b0c745a4f10b46160adade8
 SHA512:
-  metadata.gz: 3ae7e44a33c88d4a851aa9350dec1f209ea48454c19a0549464958cb6f3bb8808afd1cd0681643d1e8d4f07272c5c57c569ce230833485842bd773d17b85b51a
-  data.tar.gz: 383afd4c8708a09c756c90eb0d8acd1737bd5138e41f49dd0f022f140cec0b5b0776e6ba1f39bec38996e2405c783c1768bb5f1beef23aa85f9f761eea6236b0
+  metadata.gz: 7f3b1574d6a15feb18ccb8ca038172ce8196407135a4647aad90c3ad08a4fc7bc235e1fe3e1ae0cb16649546aa4e9bae45260a16d8eae0c29e02e19bf85a66e6
+  data.tar.gz: 059a9313c114296ba18db37d96a7d9a0b7a0f71adad091cd76abe76266d9275b5f6fd2882d9f9170e8f4e7dc7927ed5df2ed6ce980a0c6a51cf1a2fe7117e2bc

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.4
-  - 2.3.0
+  - 2.2.5
+  - 2.3.1
 script:
     - rspec spec

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v0.2.16
+- Merge [#88 fix nil dependencies](https://github.com/volanja/ansible_spec/pull/88) by [developerinlondon](https://github.com/developerinlondon)
+- Merge [#87 added .DS_Store to gitignore](https://github.com/volanja/ansible_spec/pull/87) by [developerinlondon](https://github.com/developerinlondon)
+- Merge [#85 #84 modify variable expansion](https://github.com/volanja/ansible_spec/pull/85) by volanja
+- Merge [#84 On errors print the playbook name](https://github.com/volanja/ansible_spec/pull/84) by [agx](https://github.com/agx)
+- Merge [#83 Handle "simple" role dependencies](https://github.com/volanja/ansible_spec/pull/83) by [agx](https://github.com/agx)
+- Merge [#82 Handle directories with vars as well](https://github.com/volanja/ansible_spec/pull/82) by [agx](https://github.com/agx)
+- Merge [#78 should use json v1.8.3 at ruby 1.9.3](https://github.com/volanja/ansible_spec/pull/78) by volanja
+- Merge [#77 support ansible_host, ansible_user, ansible_port](https://github.com/volanja/ansible_spec/pull/77) by volanja
+
 # v0.2.15
 - Merge [Add .rspec when run `ansiblespec-init`](https://github.com/volanja/ansible_spec/pull/76) by volanja
 

data/Gemfile

@@ -7,3 +7,7 @@ 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
+
+if Gem::Version.new(RUBY_VERSION.dup) <= Gem::Version.new('1.9.3')
+  gem 'json', '~> 1.8.3'
+end

data/README.md

@@ -1,4 +1,4 @@
-# AnsibleSpec
+# ansible_spec
 
 [![Gem Version](https://badge.fury.io/rb/ansible_spec.svg)](http://badge.fury.io/rb/ansible_spec)
 [![Build Status](https://travis-ci.org/volanja/ansible_spec.svg?branch=master)](https://travis-ci.org/volanja/ansible_spec)
@@ -11,9 +11,9 @@ and playbooks. You can test multiple roles and multiple hosts.
 
 - Supports [Serverspec](http://serverspec.org/) v2
 - Supports special host variables
-  - `ansible_ssh_port`
-  - `ansible_ssh_user`
-  - `ansible_ssh_host`
+  - `ansible_ssh_port` or `ansible_port`
+  - `ansible_ssh_user` or `ansible_user`
+  - `ansible_ssh_host` or `ansible_host`
   - `ansible_ssh_private_key_file`
 - Supports [host patterns/ranges](http://docs.ansible.com/intro_inventory.html#hosts-and-groups) -- e.g.: `www[01:50].example.com`
 - Supports Ansible [dynamic inventory sources](http://docs.ansible.com/ansible/intro_dynamic_inventory.html)
@@ -81,10 +81,10 @@ See http://docs.ansible.com/ansible/intro_configuration.html#hash-behaviour.
 Inventory files can:
 
 - use standard ansible parameters
-  - `ansible_ssh_port`
-  - `ansible_ssh_user`
-  - `ansible_ssh_private_key`
-  - `ansible_ssh_host`
+  - `ansible_ssh_port` or `ansible_port`
+  - `ansible_ssh_user` or `ansible_user`
+  - `ansible_ssh_host` or `ansible_host`
+  - `ansible_ssh_private_key_file`
 - define hosts as expressions. `host-[1:3]` would expand into `host-1`,`host-2`,`host-3`
 - Group Children
 - Use [dynamic inventory sources](http://docs.ansible.com/intro_dynamic_inventory.html)
@@ -106,6 +106,10 @@ Inventory files can:
 192.168.0.5 ansible_ssh_user=git
 # use port 5555 & host 192.168.1.50
 jumper ansible_ssh_port=5555 ansible_ssh_host=192.168.1.50
+# Ansible 2.0
+192.168.10.2 ansible_port=2222
+192.168.10.5 ansible_user=git
+jumper2 ansible_port=5555 ansible_host=192.168.10.50
 
 [web]
 # www1.example.com to www99.example.com

data/lib/ansible_spec/load_ansible.rb

@@ -150,10 +150,10 @@ module AnsibleSpec
         host['uri'] = v
       else
         key,value = v.split("=")
-        host['port'] = value.to_i if key == "ansible_ssh_port"
+        host['port'] = value.to_i if key == "ansible_ssh_port" or key == "ansible_port"
         host['private_key'] = value if key == "ansible_ssh_private_key_file"
-        host['user'] = value if key == "ansible_ssh_user"
-        host['uri'] = value if key == "ansible_ssh_host"
+        host['user'] = value if key == "ansible_ssh_user" or key == "ansible_user"
+        host['uri'] = value if key == "ansible_ssh_host" or key == "ansible_host"
         host['pass'] = value if key == "ansible_ssh_pass"
         host['connection'] = value if key == "ansible_connection"
       end
@@ -203,11 +203,14 @@ module AnsibleSpec
       path = File.join("./", "roles", role, "meta", "main.yml")
 
       if File.exist?(path)
-        new_deps = YAML.load_file(path).fetch("dependencies", []).map { |h|
-          h["role"]
-        }
-        role_queue.concat(new_deps)
-        deps.concat(new_deps)
+        dependencies = YAML.load_file(path).fetch("dependencies", [])
+        unless dependencies.nil? 
+          new_deps = dependencies.map { |h|
+            h["role"] || h
+          }
+          role_queue.concat(new_deps)
+          deps.concat(new_deps)
+        end
       end
     end
     return deps
@@ -221,7 +224,7 @@ module AnsibleSpec
 
     # e.g. comment-out
     if playbook === false
-      puts 'Error: No data in site.yml'
+      puts "Error: No data in #{f}"
       exit
     end
     properties = Array.new
@@ -307,8 +310,14 @@ module AnsibleSpec
       vars_file = path+".yml"
     end
     if File.exist?(vars_file)
-      yaml = YAML.load_file(vars_file)
-      vars = merge_variables(vars, yaml)
+      if File.directory?(vars_file)
+        Dir.glob(File.join(vars_file, '*')).each { |f|
+          vars = load_vars_file(vars, f)
+	}
+      else
+        yaml = YAML.load_file(vars_file)
+        vars = merge_variables(vars, yaml)
+      end
     end
     return vars
   end

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.15"
+  VERSION = "0.2.16"
 end

data/spec/case/load_vars_file/vars_dir/group_vars/all/file1

@@ -0,0 +1 @@
+var1: "val1"

data/spec/case/load_vars_file/vars_dir/group_vars/all/file2

@@ -0,0 +1 @@
+var2: "val2"

data/spec/dependency_spec.rb

@@ -35,7 +35,7 @@ EOF
 ---
 dependencies:
 - { role: dep1 }
-- { role: dep2 }
+- dep2
 EOF
 
   dep1_meta_content = <<'EOF'
@@ -65,3 +65,25 @@ EOF
     File.delete(tmp_dep1_meta)
   end
 end
+
+describe "load_dependencies (nil dependencies)" do
+  tmp_webapp_meta = 'roles/webapp/meta/main.yml'
+
+  webapp_meta_content = <<'EOF'
+---
+dependencies:
+EOF
+
+  before do
+    create_file(tmp_webapp_meta, webapp_meta_content)
+    @deps = AnsibleSpec.load_dependencies("webapp")
+  end
+
+  it 'should correctly resolve nested dependencies' do
+    expect(@deps).to eq []
+  end
+
+  after do
+    File.delete(tmp_webapp_meta)
+  end
+end

data/spec/get_variable_spec.rb

@@ -465,4 +465,31 @@ describe "load_vars_fileの実行" do
       Dir.chdir(@current_dir)
     end
   end
+
+  context 'Correct operation : vars in directory' do
+    before do
+      @current_dir = Dir.pwd()
+      Dir.chdir('spec/case/load_vars_file/vars_dir/')
+      vars = Hash.new
+      file = 'group_vars/all'
+      @res = AnsibleSpec.load_vars_file(vars, file)
+    end
+
+    it 'res is hash' do
+      expect(@res.instance_of?(Hash)).to be_truthy
+    end
+
+    it 'exist 1 pair in Hash' do
+      expect(@res.length).to eq 2
+    end
+
+    it 'exist each pair' do
+      expect(@res).to include({'var1' => 'val1'})
+      expect(@res).to include({'var2' => 'val2'})
+    end
+
+    after do
+      Dir.chdir(@current_dir)
+    end
+  end
 end

data/spec/inventory_parameters_spec.rb

@@ -30,6 +30,7 @@ EOF
 
   content_h = <<'EOF'
 node ansible_ssh_port=4444 ansible_ssh_host=192.168.1.55
+node1 ansible_port=4444 ansible_host=192.168.1.55
 
 [normal]
 192.168.0.1
@@ -39,6 +40,11 @@ node ansible_ssh_port=4444 ansible_ssh_host=192.168.1.55
 192.168.0.5 ansible_ssh_user=git
 jumper ansible_ssh_port=5555 ansible_ssh_host=192.168.1.50
 node
+# Ansible 2.0
+192.168.10.2 ansible_port=2222
+192.168.10.5 ansible_user=git
+jumper2 ansible_port=5555 ansible_host=192.168.10.50
+node1
 EOF
 
   create_file(tmp_ansiblespec,content)
@@ -116,6 +122,35 @@ describe "load_targetsの実行" do
       expect(obj['port']).to eq 4444
     end
 
+    it '192.168.10.2 ansible_port=2222' do
+      obj = @res['normal'][7]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj['uri']).to eq '192.168.10.2'
+      expect(obj['port']).to eq 2222
+    end
+
+    it '192.168.10.5 ansible_user=git' do
+      obj = @res['normal'][8]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj['uri']).to eq '192.168.10.5'
+      expect(obj['user']).to eq 'git'
+    end
+
+    it 'jumper2 ansible_port=5555 ansible_host=192.168.10.50' do
+      obj = @res['normal'][9]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj['name']).to eq 'jumper2 ansible_port=5555 ansible_host=192.168.10.50'
+      expect(obj['uri']).to eq '192.168.10.50'
+      expect(obj['port']).to eq 5555
+    end
+
+    it 'node1 ansible_port=4444 ansible_host=192.168.1.55' do
+      obj = @res['normal'][10]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj['name']).to eq 'node1 ansible_port=4444 ansible_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

data/spec/ssh_spec.rb

@@ -91,6 +91,27 @@ describe 'ssh' do
       expect(v.port).to eq '5985'
     end
 
+    it '192.168.10.2 ansible_port=2222' do
+      v = @h["task_11"]
+      expect(v.user).to eq 'root'
+      expect(v.host).to eq '192.168.10.2'
+      expect(v.port).to eq '2222'
+    end
+
+    it '192.168.10.5 ansible_user=git' do
+      v = @h["task_12"]
+      expect(v.user).to eq 'git'
+      expect(v.host).to eq '192.168.10.5'
+      expect(v.port).to eq '22'
+    end
+
+    it 'jumper2 ansible_port=5555 ansible_host=192.168.10.50' do
+      v = @h["task_13"]
+      expect(v.user).to eq 'root'
+      expect(v.host).to eq '192.168.10.50'
+      expect(v.port).to eq '5555'
+    end
+
     after do
       delete_normality
     end
@@ -178,6 +199,10 @@ jumper ansible_ssh_port=5555 ansible_ssh_host=192.168.1.50
 www[01:02].example.com
 db-[a:b].example.com
 192.168.1.3 ansible_connection=winrm ansible_ssh_port=5985 ansible_ssh_user=administrator ansible_ssh_pass=Passw0rd
+# Ansible 2.0
+192.168.10.2 ansible_port=2222
+192.168.10.5 ansible_user=git
+jumper2 ansible_port=5555 ansible_host=192.168.10.50
 EOF
 
   File.open(tmp_ansiblespec, 'w') do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -254,6 +254,8 @@ files:
 - spec/case/load_vars_file/group_all/group_vars/all.yml
 - spec/case/load_vars_file/group_all_deep_merge/.ansiblespec
 - spec/case/load_vars_file/group_all_deep_merge/group_vars/all.yml
+- spec/case/load_vars_file/vars_dir/group_vars/all/file1
+- spec/case/load_vars_file/vars_dir/group_vars/all/file2
 - spec/commands_spec.rb
 - spec/dependency_spec.rb
 - spec/dynamic_inventory_hosts_childrens_spec.rb
@@ -395,6 +397,8 @@ test_files:
 - spec/case/load_vars_file/group_all/group_vars/all.yml
 - spec/case/load_vars_file/group_all_deep_merge/.ansiblespec
 - spec/case/load_vars_file/group_all_deep_merge/group_vars/all.yml
+- spec/case/load_vars_file/vars_dir/group_vars/all/file1
+- spec/case/load_vars_file/vars_dir/group_vars/all/file2
 - spec/commands_spec.rb
 - spec/dependency_spec.rb
 - spec/dynamic_inventory_hosts_childrens_spec.rb