ansible_spec 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d457c5cbf7de2872b6567b14f4743c967a05f9f3
-  data.tar.gz: 9a4af4588ffd83f2249fbba3ee13f69f250ad012
+  metadata.gz: 39b483b0e6e4712c41e9785d82a8a7f04c0bdaea
+  data.tar.gz: c4f559f6ffa278fc2c50f553fff48af455cd6431
 SHA512:
-  metadata.gz: 2351376f83753be73282de06c2af2f2b7a821cc221fbc86a3b9f29fbf5b571dfe75b8f8a0e6a0d3cc8fe82439bfff0936b4ded73e3d9f95eb8450206b6267225
-  data.tar.gz: 5162d04115f849d6b9a04431eccfbc837ea16d5fbf3ea8b572f045105fd0bf9c90d312735f65eb50eb30085fe5d0f59389b349411767429c924dda859db29b34
+  metadata.gz: d4d2724571d72783076e2ce0f27cdd4f9516720015cb2977f796353e92ac7aae9e93e40e62c7a2e6929c456a1b284e1544e1d088ffd642161df6dcbbfa3ef499
+  data.tar.gz: 0807543a869a4bfe97ef9ed716f223840975c419f76d964dda4eacc88d4d533061b97b614bf44f1d51b2f24a1184c40ffe4535c83cb6917d4480a06f36932e0b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.10
+- Merge [support group and host variables without yml extention.](https://github.com/volanja/ansible_spec/pull/66) by [okamototk](https://github.com/okamototk)
+
 # v0.2.9
 - Merge [#65 return an empty array when the group has no hosts in it](https://github.com/volanja/ansible_spec/pull/65) by [franmrl](https://github.com/franmrl)
 

data/lib/ansible_spec/load_ansible.rb

@@ -268,6 +268,27 @@ module AnsibleSpec
     end
   end
 
+  # param: hash
+  # param: variable file
+  def self.load_vars_file(vars, path)
+    vars_file = path
+    if File.exist?(vars_file)
+      yaml = YAML.load_file(vars_file)
+      if yaml.kind_of?(Hash)
+        vars.merge!(yaml)
+      end
+    else
+      vars_file = path+".yml"
+      if File.exist?(vars_file)
+        yaml = YAML.load_file(vars_file)
+        if yaml.kind_of?(Hash)
+          vars.merge!(yaml)
+        end
+      end
+    end
+    return vars
+  end
+
   # return: json
   # {"name"=>"Ansible-Sample-TDD", "hosts"=>["192.168.0.103"], "user"=>"root", "roles"=>["nginx", "mariadb"]}
   def self.get_properties()
@@ -306,33 +327,15 @@ module AnsibleSpec
     end
 
     # all group
-    vars_file = 'group_vars/all.yml'
-    if File.exist?(vars_file)
-      yaml = YAML.load_file(vars_file)
-      if yaml.kind_of?(Hash)
-        vars.merge!(yaml)
-      end
-    end
+    vars = load_vars_file(vars ,'group_vars/all')
 
     # each group vars
     if p[group_idx].has_key?('group')
-      vars_file = "group_vars/#{p[group_idx]['group']}.yml"
-      if File.exist?(vars_file)
-        yaml = YAML.load_file(vars_file)
-        if yaml.kind_of?(Hash)
-          vars.merge!(yaml)
-        end
-      end
+      vars = load_vars_file(vars ,"group_vars/#{p[group_idx]['group']}")
     end
 
     # each host vars
-    vars_file = "host_vars/#{host}.yml"
-    if File.exist?(vars_file)
-      yaml = YAML.load_file(vars_file)
-      if yaml.kind_of?(Hash)
-        vars.merge!(yaml)
-      end
-    end
+    vars = load_vars_file(vars ,"host_vars/#{host}")
 
     # site vars
     if p[group_idx].has_key?('vars')

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/case/load_vars_file/group_all/group_vars/all

@@ -0,0 +1,2 @@
+---
+role_var:  "without .yml extension"

data/spec/case/load_vars_file/group_all/group_vars/all.yml

@@ -0,0 +1,6 @@
+---
+role_var:  "group all"
+site_var:  "group all"
+host_var:  "group all"
+group_var: "group all"
+group_all_var: "group all"

data/spec/get_variable_spec.rb

@@ -225,3 +225,33 @@ describe "get_variablesの実行" do
     end
   end
 end
+
+describe "load_vars_fileの実行" do
+  context 'Correct operation : without .yml extension' do
+  # https://github.com/volanja/ansible_spec/pull/66
+  # group_vars/xxx priority is higher than group_vars/xxx.yml.
+    before do
+      @current_dir = Dir.pwd()
+      Dir.chdir('spec/case/load_vars_file/group_all/')
+      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 1
+    end
+
+    it 'exist each pair' do
+      expect(@res).to include({'role_var' => 'without .yml extension'})
+    end
+
+    after do
+      Dir.chdir(@current_dir)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,6 +163,8 @@ files:
 - 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
+- spec/case/load_vars_file/group_all/group_vars/all
+- spec/case/load_vars_file/group_all/group_vars/all.yml
 - spec/commands_spec.rb
 - spec/dependency_spec.rb
 - spec/dynamic_inventory_spec.rb
@@ -228,6 +230,8 @@ test_files:
 - 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
+- spec/case/load_vars_file/group_all/group_vars/all
+- spec/case/load_vars_file/group_all/group_vars/all.yml
 - spec/commands_spec.rb
 - spec/dependency_spec.rb
 - spec/dynamic_inventory_spec.rb