ansible_spec 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baff775dd82d3fa1555008475cbbb7ea8a939b11
-  data.tar.gz: bd4eb48292c5c2353d23f58afd5d68eb37fd9007
+  metadata.gz: ab3d19e55721a01afceeab9daea2095ecf7db535
+  data.tar.gz: 8ff233d19dd55ea99e7e42a312f9332d7e0afa9d
 SHA512:
-  metadata.gz: ddaefbc6f737b5595eaa7d421aa8c296f2c9daaa233c5b858ef6994a87b2c643612a31baccd6ff2ff3ed6143d3e911c459ff859b670ce9d449b770d0562ab09b
-  data.tar.gz: 73c7d5967c18f2ae82bddc6fda33a256ea8e76d287e88d3d84eeeb6c810e7582654600f96ddbb946afbbd1585c0fc1267758bbe25e505b0184b9deec75816642
+  metadata.gz: 0cbb81807e2721fb1d241e9aeb4b1f642ecac773c5a334abe1f7f343b2344cd1f50b9c95bfc8d02091c1f6b02398ff8e4bf9483dd602b629a32bba664ba6ee1d
+  data.tar.gz: 0d33e6b56cd6968726e37203ff53d62b49ca03cb4e447acbae03c0394a1a88226a96846e929cf4062c7b96a8a6d2c2f0b5744ce80b2521cbae4d8b0c1ddd6cc4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.18
+- Merge [#96 Handle roles_path for role dependencies as well](https://github.com/volanja/ansible_spec/pull/96) by [agx](https://github.com/agx)
+
 # v0.2.17
 - Merge [#90 Check if all array elements have a name](https://github.com/volanja/ansible_spec/pull/90) by [agx](https://github.com/agx)
 - Merge [#91 Parse roledirs from ansible.cfg](https://github.com/volanja/ansible_spec/pull/91) by [agx](https://github.com/agx)

data/lib/ansible_spec/load_ansible.rb

@@ -196,12 +196,12 @@ module AnsibleSpec
 
   # param: role
   # return: ["role1", "role2"]
-  def self.load_dependencies(role)
+  def self.load_dependencies(role, rolepath='roles')
     role_queue = [role]
     deps = []
     until role_queue.empty?
       role = role_queue.pop()
-      path = File.join("./", "roles", role, "meta", "main.yml")
+      path = File.join(rolepath, role, "meta", "main.yml")
 
       if File.exist?(path)
         dependencies = YAML.load_file(path).fetch("dependencies", [])

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.17"
+  VERSION = "0.2.18"
 end

data/lib/src/Rakefile

@@ -34,8 +34,13 @@ namespace :serverspec do
 
         roles = property["roles"]
         for role in property["roles"]
-          deps = AnsibleSpec.load_dependencies(role)
-          roles += deps
+          for rolepath in cfg.roles_path
+            deps = AnsibleSpec.load_dependencies(role, rolepath)
+            if deps != []
+              roles += deps
+              break
+            end
+          end
         end
         t.pattern = '{' + cfg.roles_path.join(',') + '}/{' + roles.join(',') + '}/spec/*_spec.rb'
       end

data/spec/dependency_spec.rb

@@ -87,3 +87,26 @@ EOF
     File.delete(tmp_webapp_meta)
   end
 end
+
+describe "load_dependencies from alternative dir" do
+  tmp_webapp_meta = 'more_roles/webapp/meta/main.yml'
+
+  webapp_meta_content = <<'EOF'
+---
+dependencies:
+ - foo
+EOF
+
+  before do
+    create_file(tmp_webapp_meta, webapp_meta_content)
+    @deps = AnsibleSpec.load_dependencies("webapp", "more_roles")
+  end
+
+  it 'should correctly resolve deps in additional role dirs' do
+    expect(@deps).to eq ["foo"]
+  end
+
+  after do
+    File.delete(tmp_webapp_meta)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler