ansible_spec 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea92ad1db5c6331ab0f51cb0cc9f8357d6fad5a1
-  data.tar.gz: 3529e094be9910fb8acb9c1e3df7661e4e21135e
+SHA256:
+  metadata.gz: '0866b7bafc7f4af084f4e132e9c3238e7618e7568b1c029fe8997cf4c511c86f'
+  data.tar.gz: 81e964b2f1751f33eb8f6805c953488b4a965d1bc3e20f4577e4b6feb2fe7dc6
 SHA512:
-  metadata.gz: 4f8121627c3ffb1b2011e8b77d2ef0704b8f64ab59075c2973e7768c7fb26a1c21606332acdb7a6faedc1d4d17be4287abf354de010fc4c72ded2d7db003aa88
-  data.tar.gz: ded735c540319da5a2443d9639390f3e0a5d915a5249e410d0295f3f32b99b09bcc6625384d2778784bf8f7484f4f199a6a5c52b6dce9eb2f0a6149927f59d3b
+  metadata.gz: c349056c633eafd1f5835e362a326ca9fef0a52e482939828081df43ab7227a8cebedcf750963984d79df67c7ccc88349afc4ac67b517df2a209c67a3225d509
+  data.tar.gz: ee0722a55e92a7c0109553ad198ae2b0aefaf3f78e3a754137f95b55873060498ff0ec7a420732520c51c740be72108aa6c65b7d47ac96ecc17b5d490e93c9b4

data/.travis.yml

@@ -4,9 +4,9 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 script:
     - rspec spec

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.24
+- Merge [#117 Feature resolve variables](https://github.com/volanja/ansible_spec/pull/117) by [RebelCodeBase](https://github.com/RebelCodeBase)
+
 # v0.2.23
 - Merge [#115 Support import_playbook](https://github.com/volanja/ansible_spec/pull/115) by [seiji](https://github.com/seiji)
 - Merge [#113 Make ENV variables override SSH config file options](https://github.com/volanja/ansible_spec/pull/113) by [Jonnymcc](https://github.com/Jonnymcc)

data/lib/ansible_spec/load_ansible.rb

@@ -347,7 +347,7 @@ module AnsibleSpec
       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)
@@ -431,6 +431,43 @@ module AnsibleSpec
       target_host.keys[0]
   end
 
+  # query replace jinja2 templates with target values 
+  # param: hash (cf. result self.get_variables)
+  # param: number of iterations if found_template
+  # return: hash
+  def self.resolve_variables(vars, max_level=100)
+    vars_yaml = vars.to_yaml
+    level = 0
+    begin
+      found_template = false
+      level += 1
+
+      # query replace jinja2 templates in yaml
+      # replace in-place (gsub!)
+      # use non-greedy regex (.*?)
+      vars_yaml.gsub!(/{{.*?}}/) do |template|
+
+        # grab target variable
+        # ignore whitespaces (\s*)
+        # use non-greedy regex (.*?)
+        target = template.gsub(/{{\s*(.*?)\s*}}/, '\1')
+        
+        # lookup value of target variable
+        value = vars[target]
+        
+        # return lookup value if it exists
+        # or leave template alone  
+        if value.nil? 
+          template
+        else 
+          found_template = true
+          value
+        end
+      end
+    end while found_template and level <= max_level
+    return YAML.load(vars_yaml)
+  end
+
   def self.get_variables(host, group_idx, hosts=nil)
     vars = {}
     p = self.get_properties
@@ -479,7 +516,7 @@ module AnsibleSpec
       end
     end
 
-    return vars
+    return resolve_variables(vars)
 
   end
 

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.23"
+  VERSION = "0.2.24"
 end

data/spec/case/get_variable/resolve_variables/group_vars/all.yml

@@ -0,0 +1,24 @@
+---
+var_nested_one_1: 'val_nested_one'
+var_nested_one_2: "{{ var_nested_one_1 }}"
+
+var_nested_two_1: 'val_nested_two'
+var_nested_two_2: "{{ var_nested_two_1 }}"
+var_nested_two_3: "{{ var_nested_two_2 }}"
+
+var_nested_hash_1: 'val_hash'
+var_nested_hash_2:
+  key: "{{ var_nested_hash_1 }}"
+
+var_nested_array_1: 'val_array'
+var_nested_array_2:
+  - "{{ var_nested_array_1 }}"
+
+var_nested_array_hash_1: 'val_array_hash'
+var_nested_array_hash_2:
+  - key: "{{ var_nested_array_hash_1 }}"
+
+var_nested_whitespace_1: val_nested_whitespace
+var_nested_whitespace_2: "{{var_nested_whitespace_1  }}"
+
+var_missingtarget_2: "{{ var_missingtarget_1 }}"

data/spec/case/get_variable/resolve_variables/hosts

@@ -0,0 +1,5 @@
+[resolve]
+192.168.1.1
+
+
+

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

@@ -0,0 +1,3 @@
+- name: resolve
+  hosts: resolve
+  connection: local

data/spec/get_variable_spec.rb

@@ -14,11 +14,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 3 pair in Hash' do
+    it 'exist three pairs in Hash' do
       expect(@res.length).to eq 3
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'role_var' => 'role_var in roles default'},
                               {'site_var' => 'site_var in roles default'},
                               {'host_var'=>'host_var in roles default'},
@@ -41,11 +41,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 5 pair in Hash' do
+    it 'exist five pairs in Hash' do
       expect(@res.length).to eq 5
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'role_var' => 'group all'},
                               {'site_var' => 'group all'},
                               {'host_var'=>'group all'},
@@ -70,11 +70,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 5 pair in Hash' do
+    it 'exist five pairs in Hash' do
       expect(@res.length).to eq 5
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'role_var' => 'group1'},
                               {'site_var' => 'group1'},
                               {'host_var'=>'group1'},
@@ -99,11 +99,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 3 pair in Hash' do
+    it 'exist three pairs in Hash' do
       expect(@res.length).to eq 3
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'role_var' => 'host role_var'},  # in host_var/192.168.1.1.yml
                               {'site_var' => 'host site_var'},  # in host_var/192.168.1.1.yml
                               {'host_var'=>'host 192.168.1.1'}, # in host_var/192.168.1.1.yml
@@ -126,11 +126,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 3 pair in Hash' do
+    it 'exist three pairs in Hash' do
       expect(@res.length).to eq 3
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'role_var' => 'host role_var'},  # in host_var/192.168.1.2.yml
                               {'site_var' => 'host site_var'},  # in host_var/192.168.1.2.yml
                               {'host_var'=>'host 192.168.1.2'}, # in host_var/192.168.1.2.yml
@@ -153,11 +153,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 2 pair in Hash' do
+    it 'exist two pairs in Hash' do
       expect(@res.length).to eq 2
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'role_var' => 'site'},
                               {'site_var' => 'site'})
     end
@@ -178,11 +178,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 5 pair in Hash' do
+    it 'exist five pairs in Hash' do
       expect(@res.length).to eq 5
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'role_var' => 'site'}, # site.yml
                               {'site_var' => 'site'}, # site.yml
                               {'host_var'=>'host 192.168.1.1'}, # in host_var/192.168.1.1.yml
@@ -207,11 +207,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 5 pair in Hash' do
+    it 'exist five pairs in Hash' do
       expect(@res.length).to eq 5
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'role_var' => 'role'}, # in roles/test/vars/main.yml
                               {'site_var' => 'site'}, # site.yml
                               {'host_var'=>'host 192.168.1.1'}, # in host_var/192.168.1.1.yml
@@ -236,11 +236,11 @@ describe "get_variablesの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 1 pair in Hash' do
+    it 'exists one pair in Hash' do
       expect(@res.length).to eq 1
     end
    
-    it 'exist each pair' do
+    it 'exists the pair' do
       expect(@res).to include({'merge_var' => {
                                 'keep'=>'role',
                                 'override'=>'site',
@@ -291,6 +291,43 @@ describe "get_hash_behaviourの実行" do
     end
   end
 
+  context 'Correct operation : resolve variables' do
+    before do
+      @current_dir = Dir.pwd()
+      Dir.chdir('spec/case/get_variable/resolve_variables/')
+      @res = AnsibleSpec.get_variables('192.168.1.1', 0)
+    end
+  
+    it 'res is hash' do
+      expect(@res.instance_of?(Hash)).to be_truthy
+    end
+  
+    it 'exist fourteen pairs in Hash' do
+      expect(@res.length).to eq 14
+    end
+  
+    it 'exist all pairs' do
+      expect(@res).to include({'var_nested_one_1' => 'val_nested_one'})
+      expect(@res).to include({'var_nested_one_2' => 'val_nested_one'})
+      expect(@res).to include({'var_nested_two_1' => 'val_nested_two'})
+      expect(@res).to include({'var_nested_two_2' => 'val_nested_two'})
+      expect(@res).to include({'var_nested_two_3' => 'val_nested_two'})
+      expect(@res).to include({'var_nested_hash_1' => 'val_hash'})
+      expect(@res).to include({'var_nested_hash_2' => {'key' => 'val_hash'}})
+      expect(@res).to include({'var_nested_array_1' => 'val_array'})
+      expect(@res).to include({'var_nested_array_2' => ['val_array']})
+      expect(@res).to include({'var_nested_array_hash_1' => 'val_array_hash'})
+      expect(@res).to include({'var_nested_array_hash_2' => [{'key' => 'val_array_hash'}]})
+      expect(@res).to include({'var_nested_whitespace_1' => 'val_nested_whitespace'})
+      expect(@res).to include({'var_nested_whitespace_2' => 'val_nested_whitespace'})
+      expect(@res).to include({'var_missingtarget_2' => '{{ var_missingtarget_1 }}'})
+    end
+  
+    after do
+      Dir.chdir(@current_dir)
+    end
+  end  
+
   context 'Correct operation : mistake word in ENV["HASH_BEHAVIOUR"]' do
     before do
       ENV["HASH_BEHAVIOUR"] = 'mistake_word'
@@ -390,7 +427,7 @@ describe 'merge_variablesの実行' do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 1 pair in Hash' do
+    it 'exists one pair in Hash' do
       expect(@res.length).to eq 1
     end
 
@@ -425,11 +462,11 @@ describe "load_vars_fileの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 1 pair in Hash' do
+    it 'exist one pair in Hash' do
       expect(@res.length).to eq 1
     end
 
-    it 'exist each pair' do
+    it 'exists the pair' do
       expect(@res).to include({'role_var' => 'without .yml extension'})
     end
 
@@ -453,11 +490,11 @@ describe "load_vars_fileの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 1 pair in Hash' do
+    it 'exists one pair in Hash' do
       expect(@res.length).to eq 1
     end
 
-    it 'exist each pair' do
+    it 'exists the pair' do
       expect(@res).to include({'role_var' => 'without .yml extension'})
     end
 
@@ -479,11 +516,11 @@ describe "load_vars_fileの実行" do
       expect(@res.instance_of?(Hash)).to be_truthy
     end
 
-    it 'exist 1 pair in Hash' do
+    it 'exist two pairs in Hash' do
       expect(@res.length).to eq 2
     end
 
-    it 'exist each pair' do
+    it 'exists each pair' do
       expect(@res).to include({'var1' => 'val1'})
       expect(@res).to include({'var2' => 'val2'})
     end
@@ -492,4 +529,5 @@ describe "load_vars_fileの実行" do
       Dir.chdir(@current_dir)
     end
   end
+
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: hostlist_expression
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ansible Config Parser for Serverspec. Run test Multi Role and Multi Host
@@ -145,9 +145,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -288,6 +288,9 @@ files:
 - spec/case/get_variable/inventories_env_host_vars/site.yml
 - spec/case/get_variable/playbook_only/hosts
 - spec/case/get_variable/playbook_only/site.yml
+- spec/case/get_variable/resolve_variables/group_vars/all.yml
+- spec/case/get_variable/resolve_variables/hosts
+- spec/case/get_variable/resolve_variables/site.yml
 - spec/case/get_variable/roles_default/hosts
 - spec/case/get_variable/roles_default/roles/test/defaults/main.yml
 - spec/case/get_variable/roles_default/site.yml
@@ -323,17 +326,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ansible Config Parser for Serverspec. Run test Multi Role and Multi Host
@@ -463,6 +466,9 @@ test_files:
 - spec/case/get_variable/inventories_env_host_vars/site.yml
 - spec/case/get_variable/playbook_only/hosts
 - spec/case/get_variable/playbook_only/site.yml
+- spec/case/get_variable/resolve_variables/group_vars/all.yml
+- spec/case/get_variable/resolve_variables/hosts
+- spec/case/get_variable/resolve_variables/site.yml
 - spec/case/get_variable/roles_default/hosts
 - spec/case/get_variable/roles_default/roles/test/defaults/main.yml
 - spec/case/get_variable/roles_default/site.yml