ansible_spec 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d87ec24d89e985e499037877255f902b7eb7345a4fd4d4af1d262c55287ef9a
-  data.tar.gz: 819cc6ef8696ac2dbd09026e00ef05ffea63ccb6ca59a54cea75bb54dce0981d
+  metadata.gz: d77ce9fa38453ab6f652cc6c20a79509c722d615790cb49b59ec8e37154aad7b
+  data.tar.gz: 27384622e2d91ad928ee5b37fa061efa3b80af5baad5b887823ec3df7e83dded
 SHA512:
-  metadata.gz: 7f59e840375f84b5df3df071cc1e9687734038556c3a6a888c7f8529f710130f337db4161dad2234ef787f0c493bbc88ce2256c19e95cd8e6052d37be478dc8b
-  data.tar.gz: 01d38a3d50b2f704351ae2c9f0e33c18d101b85f5c049d6126d66f485e6132634ef6936a3ca7059d7ff53f371cf8296b85f3d4cd2c4d916574850b785c1b445a
+  metadata.gz: 2591637e35a8fa5fe8f2add17e24d5f32844030d9fd1f268ec4a0e607bb4f2500ef8a75c166c337d20c8e97c8db979dc1bdf317f64f5f93095493699bef37665
+  data.tar.gz: e1124d4328dc3430545f94a87306fc9148f3b91bc5074d84180edac293966115b15794e5ecd142335a2c972415143f7893bf6516d951bfb4b4ffd1f2855d561d

data/.travis.yml

@@ -7,9 +7,9 @@ rvm:
   - 2.1.10
   - 2.2.10
   - 2.3.8
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 script:
     - rspec spec

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.3.2
+- Merge [#135 Fix wrong index by empty group](https://github.com/volanja/ansible_spec/pull/135) by [mamiya312](https://github.com/mamiya312)
+
 # v0.3.1
 - Fix [#126 no implicit conversion of nil into Array Error when process get_parent](https://github.com/volanja/ansible_spec/issues/126) by [shogos3](https://github.com/shogos3)
 

data/lib/ansible_spec/load_ansible.rb

@@ -516,7 +516,7 @@ module AnsibleSpec
 
   def self.get_variables(host, group_idx, hosts=nil)
     vars = {}
-    p = self.get_properties
+    p = self.get_properties.compact.reject{|e| e["hosts"].length == 0}
 
     # roles default
     p[group_idx]['roles'].each do |role|

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/case/get_variable/empty_group/group_vars/group_a.yml

@@ -0,0 +1,2 @@
+---
+group_a_var: hoge

data/spec/case/get_variable/empty_group/group_vars/group_b.yml

@@ -0,0 +1,2 @@
+---
+group_b_var: fuga

data/spec/case/get_variable/empty_group/hosts

@@ -0,0 +1,3 @@
+[group_a]
+[group_b]
+localhost.localdomain ansible_ssh_private_key_file=~/.ssh/id_rsa

data/spec/case/get_variable/empty_group/site.yml

@@ -0,0 +1,9 @@
+---
+- name: playbook_a
+  hosts: group_a
+  roles:
+    - role_a
+- name: playbook_b
+  hosts: group_b
+  roles:
+    - role_b

data/spec/get_variable_spec.rb

@@ -362,6 +362,45 @@ describe "get_variablesの実行" do
     end
   end
 
+  # Fixed a problem that there is a gap between Index passed from Rakefile when empty group exists. by #135
+  # cat hosts
+  # [group_a]  #no host
+  # [group_b]
+  # localhost.localdomain ansible_ssh_private_key_file=~/.ssh/id_rsa
+
+  context 'Correct operation : empty group PR #135 ' do
+    before do
+      @current_dir = Dir.pwd()
+      Dir.chdir('spec/case/get_variable/empty_group')
+      ENV["PLAYBOOK"] = 'site.yml'
+      ENV["INVENTORY"] = 'hosts'
+      ENV["VARS_DIRS_PATH"] = ''
+      @res = AnsibleSpec.get_variables("localhost.localdomain", 0)
+    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 1
+    end
+
+    it 'get correct variable' do
+      expect(@res).to eq("group_b_var" => "fuga")
+    end
+
+    it 'not get incorrect variables' do
+      expect(@res).not_to eq("group_a_var" => "hoge")
+    end
+
+    after do
+      ENV.delete('PLAYBOOK')
+      ENV.delete('INVENTORY')
+      ENV.delete('VARS_DIRS_PATH')
+      Dir.chdir(@current_dir)
+    end
+  end
 end
 
 describe "get_hash_behaviourの実行" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,6 +190,10 @@ files:
 - spec/case/get_variable/deep_merge/hosts
 - spec/case/get_variable/deep_merge/roles/test/defaults/main.yml
 - spec/case/get_variable/deep_merge/site.yml
+- spec/case/get_variable/empty_group/group_vars/group_a.yml
+- spec/case/get_variable/empty_group/group_vars/group_b.yml
+- spec/case/get_variable/empty_group/hosts
+- spec/case/get_variable/empty_group/site.yml
 - spec/case/get_variable/group_all/group_vars/all.yml
 - spec/case/get_variable/group_all/hosts
 - spec/case/get_variable/group_all/roles/test/defaults/main.yml
@@ -379,6 +383,10 @@ test_files:
 - spec/case/get_variable/deep_merge/hosts
 - spec/case/get_variable/deep_merge/roles/test/defaults/main.yml
 - spec/case/get_variable/deep_merge/site.yml
+- spec/case/get_variable/empty_group/group_vars/group_a.yml
+- spec/case/get_variable/empty_group/group_vars/group_b.yml
+- spec/case/get_variable/empty_group/hosts
+- spec/case/get_variable/empty_group/site.yml
 - spec/case/get_variable/group_all/group_vars/all.yml
 - spec/case/get_variable/group_all/hosts
 - spec/case/get_variable/group_all/roles/test/defaults/main.yml