ansible_spec 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5c10ea9ab4741a2c8f99e20261cbbad47af7fe
-  data.tar.gz: 572f3ddf20328f19eccd4e1107162b00cf881c3b
+  metadata.gz: 5f3f3fdce96a604720925a233a0b2cf0f11caf0b
+  data.tar.gz: aa92bf9f29d175293cb755145fb8e4b6123e6f63
 SHA512:
-  metadata.gz: b266c6100fac87326945d7c1c6c0f49a9dd45092b5bb6d6d02e619088a6f278d29a43078250c9a998393a94b5a644b8f4f8ac9f5e183660fdda70816bbe87d99
-  data.tar.gz: 34fc3ec00c8d71de98c10eb6328d0cac4607c2fa82782c612d0e115e873584ae722aa0d4c68a1a7b878eef6a02e782572e79d117a5759ef1d3b595833aa1f43e
+  metadata.gz: 39a6ec70aaf382a4bd991536b02a56d767401477ce9def30cf71ec3320fb857880a7b9386f15f661e0300a1796b827f54cb0b2dc5dfafc8022d50799bc8dd819
+  data.tar.gz: 9b78e44c7fcad0d64324465311a6126ff911e931dd0b8e0af599d23a66d150dace9a4a16a76ff4287cfd8bb5263c305f89611daa6bbef1e99314fe5ad2186843

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+# v0.2.6
+- Merge [#53 Execute tests for dependent roles](https://github.com/volanja/ansible_spec/pull/53) by [Gerrrr](https://github.com/Gerrrr)
+
 # v0.2.5
-- Fix [#51 Handle hosts which are not assigned to any group] by [Gerrrr](https://github.com/Gerrrr)
+- Merge [#51 Handle hosts which are not assigned to any group](https://github.com/volanja/ansible_spec/pull/51) by [Gerrrr](https://github.com/Gerrrr)
 
 # v0.2.4
 - Fix [#50 do not fail on no hosts matched](https://github.com/volanja/ansible_spec/pull/50) by [phiche](https://github.com/phiche)

data/lib/ansible_spec/load_ansible.rb

@@ -175,6 +175,26 @@ module AnsibleSpec
     return playbook, inventoryfile
   end
 
+  # param: role
+  # return: ["role1", "role2"]
+  def self.load_dependencies(role)
+    role_queue = [role]
+    deps = []
+    until role_queue.empty?
+      role = role_queue.pop()
+      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)
+      end
+    end
+    return deps
+  end
+
   # param: playbook
   # return: json
   #         {"name"=>"Ansible-Sample-TDD", "hosts"=>"server", "user"=>"root", "roles"=>["nginx", "mariadb"]}

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/src/Rakefile

@@ -21,9 +21,14 @@ namespace :serverspec do
         else
           ENV['TARGET_USER'] = property["user"]
         end
-        t.pattern = 'roles/{' + property["roles"].join(',') + '}/spec/*_spec.rb'
+
+        roles = property["roles"]
+        for role in property["roles"]
+          deps = AnsibleSpec.load_dependencies(role)
+          roles += deps
+        end
+        t.pattern = 'roles/{' + roles.join(',') + '}/spec/*_spec.rb'
       end
     end
   end
 end
-

data/spec/dependency_spec.rb

@@ -0,0 +1,67 @@
+# coding: utf-8
+require 'ansible_spec'
+
+
+describe "load_dependencies" do
+  tmp_hosts = 'hosts'
+  tmp_ansiblespec = '.ansiblespec'
+  tmp_playbook = 'site.yml'
+  tmp_webapp_meta = 'roles/webapp/meta/main.yml'
+  tmp_dep1_meta = 'roles/dep1/meta/main.yml'
+
+  spec_content = <<'EOF'
+---
+-
+playbook: site.yml
+inventory: hosts
+EOF
+
+  hosts_content = <<'EOF'
+[normal]
+192.168.0.1
+192.168.0.2
+192.168.0.3
+EOF
+
+  playbook_content = <<'EOF'
+- name: Ansible-Sample-TDD
+hosts: normal
+user: root
+roles:
+  - webapp
+EOF
+
+  webapp_meta_content = <<'EOF'
+---
+dependencies:
+- { role: dep1 }
+- { role: dep2 }
+EOF
+
+  dep1_meta_content = <<'EOF'
+---
+dependencies:
+- { role: dep3 }
+EOF
+
+  before do
+    create_file(tmp_hosts, hosts_content)
+    create_file(tmp_ansiblespec, spec_content)
+    create_file(tmp_playbook, playbook_content)
+    create_file(tmp_webapp_meta, webapp_meta_content)
+    create_file(tmp_dep1_meta, dep1_meta_content)
+    @deps = AnsibleSpec.load_dependencies("webapp")
+  end
+
+  it 'should correctly resolve nested dependencies' do
+    expect(@deps).to eq ["dep1", "dep2", "dep3"]
+  end
+
+  after do
+    File.delete(tmp_hosts)
+    File.delete(tmp_ansiblespec)
+    File.delete(tmp_playbook)
+    File.delete(tmp_webapp_meta)
+    File.delete(tmp_dep1_meta)
+  end
+end

data/spec/load_ansible_spec.rb

@@ -1,7 +1,12 @@
 # coding: utf-8
+require 'fileutils'
 require 'ansible_spec'
 
 def create_file(name,content)
+  dir = File.dirname(name)
+  unless File.directory?(dir)
+    FileUtils.mkdir_p(dir)
+  end
   File.open(name, 'w') do |f|
     f.puts content
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ files:
 - lib/src/Rakefile
 - lib/src/spec/spec_helper.rb
 - spec/commands_spec.rb
+- spec/dependency_spec.rb
 - spec/dynamic_inventory_spec.rb
 - spec/ec2_dynamic_inventory_spec.rb
 - spec/inventory_parameters_spec.rb
@@ -167,6 +168,7 @@ summary: Ansible Config Parser for Serverspec. Run test Multi Role and Multi Hos
   by Ansible Configuration
 test_files:
 - spec/commands_spec.rb
+- spec/dependency_spec.rb
 - spec/dynamic_inventory_spec.rb
 - spec/ec2_dynamic_inventory_spec.rb
 - spec/inventory_parameters_spec.rb