ansible_spec 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e860c7053344a34b1907264a715ae6336dd5f6ac
-  data.tar.gz: ef8fac0266f20909ec8aabb7488ff603607fdbe6
+  metadata.gz: d5c5766164945b71de78de3396370ec97e4e15b4
+  data.tar.gz: 9d492a8f97f9ca39f75c7ff5976ed50f25165ba6
 SHA512:
-  metadata.gz: cf7f29b8d481259c395eff714155b7d1280d37dd3c7c966e85c56fa26f0b7c6349ecad7c14822692c5b6643542580e5365f6ccb6c618a80c5cd25ba6e984388b
-  data.tar.gz: a11ff18b9e6dba65082e862d9470dec01e24b553f14d6d0e617d90c77502befa4486f2d9bccec3429aba6b91134403f847a22ac2e738fd08d9d6b3b519166821
+  metadata.gz: 10a085f6d9032b544180a6f63e1d016e085397b84d750787afe99aa7ae7aae769af2213120b676a0199e56dc693075104c399b6c051e8e1d61daeae343912a62
+  data.tar.gz: 612a7cc90293e939587e5c5f5f962c3409a9bc012304eff5196dd754d5a14c71bb41a54c870a2cbdd2b855f5d56aea7af0d3e8575af37bfbd293b6070b26fbed

data/CHANGELOG.md

@@ -1,5 +1,12 @@
+# v0.2.3
+- Fix [#47 NoMethodError: undefined method 'each' for nil:NilClass if inventory has "roles"=>[]](https://github.com/volanja/ansible_spec/issues/47) by [phiche](https://github.com/phiche)
+
+# v0.2.2
+- Fix [#43 Enable to set only either of `PLAYBOOK` or `INVENTORY`.](https://github.com/volanja/ansible_spec/issues/43) by [akagisho](https://github.com/akagisho)
+- Fix [#45 ansible_spec cannot use ec2.py dynamic inventory](https://github.com/volanja/ansible_spec/issues/45) by [phiche](https://github.com/phiche)
+
 # v0.2.1
-- fix #27 check name on playbook
+- fix [#27 check name on playbook](https://github.com/volanja/ansible_spec/issues/27)
 - Add Test
   - 2.1.6
   - 2.2.2
@@ -10,7 +17,7 @@
   - 2.2.1
 
 # v0.2
-- fix #24 Support ENV
+- fix [#24 Support ENV](https://github.com/volanja/ansible_spec/issues/24)
 
 ```
 Example:
@@ -19,7 +26,7 @@ $ PLAYBOOK=site.yml INVENTORY=hosts rake serverspec:Ansible-Sample-TDD
 
 # v0.1.1
 
-fix #22
+fix [#22 NameError: uninitialized constant AnsibleSpec::Open3](https://github.com/volanja/ansible_spec/issues/22)
 
 
 # v0.1

data/README.md

@@ -62,6 +62,10 @@ Example:
 
 ```
 $ PLAYBOOK=site.yml INVENTORY=hosts rake serverspec:Ansible-Sample-TDD
+or
+$ PLAYBOOK=site.yml rake serverspec:Ansible-Sample-TDD
+or
+$ INVENTORY=hosts rake serverspec:Ansible-Sample-TDD
 ```
 
 ## Inventory

data/lib/ansible_spec/load_ansible.rb

@@ -194,17 +194,19 @@ module AnsibleSpec
   # flatten roles (Issue 29)
   # param: Array
   #        e.g. ["nginx"]
-  #        e.g. [{"roles"=>"nginx"}]
+  #        e.g. [{"role"=>"nginx"}]
   #        e.g. [{"role"=>"nginx", "dir"=>"/opt/b", "port"=>5001}]
   # return: Array
   #         e.g.["nginx"]
   def self.flatten_role(roles)
     ret = Array.new
-    roles.each do |role|
-      if role.is_a?(String)
-        ret << role
-      elsif role.is_a?(Hash)
-        ret << role["role"] if role.has_key?("role")
+    if roles
+      roles.each do |role|
+        if role.is_a?(String)
+          ret << role
+        elsif role.is_a?(Hash)
+          ret << role["role"] if role.has_key?("role")
+        end
       end
     end
     return ret

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/load_ansible_spec.rb

@@ -694,6 +694,65 @@ describe "name_exist?の実行" do
   end
 end
 
+
+describe "flatten_roleの実行" do
+  context '正常系 ["nginx"]' do
+    before do
+      @res = AnsibleSpec.flatten_role(["nginx"])
+    end
+
+    it 'res is array' do
+      expect(@res.instance_of?(Array)).to be_truthy
+    end
+
+    it 'nginx' do
+      expect(@res[0]).to eq 'nginx'
+    end
+  end
+
+  context '正常系 {"role"=>"nginx"}' do
+    before do
+      @res = AnsibleSpec.flatten_role([{"role"=>"nginx"}])
+    end
+
+    it 'res is array' do
+      expect(@res.instance_of?(Array)).to be_truthy
+    end
+
+    it 'nginx' do
+      expect(@res[0]).to eq 'nginx'
+    end
+  end
+
+  context '正常系 {"role"=>"nginx", "dir"=>"/opt/b", "port"=>5001}' do
+    before do
+      @res = AnsibleSpec.flatten_role([{"role"=>"nginx", "dir"=>"/opt/b", "port"=>5001}])
+    end
+
+    it 'res is array' do
+      expect(@res.instance_of?(Array)).to be_truthy
+    end
+
+    it 'nginx' do
+      expect(@res[0]).to eq 'nginx'
+    end
+  end
+
+  context '異常系 nil' do
+    before do
+      @res = AnsibleSpec.flatten_role([])
+    end
+
+    it 'res is array' do
+      expect(@res.instance_of?(Array)).to be_truthy
+    end
+
+    it 'nil' do
+      expect(@res[0]).to eq nil
+    end
+  end
+end
+
 describe "load_ansiblespecの実行" do
   context '正常系(環境変数PLAYBOOK)' do
     require 'yaml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler