ansible_make_role 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a22c1c0e2cf8ffbf1acb934620f80e2d9393364d0de685476e9ca3ef5bf9969
-  data.tar.gz: def88d2a7e22f7f434dd0cf317dbfb9270a6a2f2b887c92a2c513d56bc57b90c
+  metadata.gz: 8fe8e24d4a2a257d19e11b2ca0758a63a13b0508fb30275c3a070d5f69ba156b
+  data.tar.gz: 76624736cd47411c67168b84f2557097f7bad6e32b709ceb887f80e3ba5e8181
 SHA512:
-  metadata.gz: b62ac0ca21d319b957048bcbfd829681613500eb2a5efca56b2e1f35c6b350a0dc28823e499288a77394b80ac4fecfd605cf02e25b6ee5a6e11eab3e1ab7e0d4
-  data.tar.gz: 0b2828173981eaa825a5103ff6ff36536ce653e0c4c767fd55dfbf256c3dd5b1977c20b86d0abcae05360d1ab9dcf7f64eb0d2eead533fe8a064266d350df8a1
+  metadata.gz: b79115eb6a4a34d75f4fc949d29ac1a3b2f32d822b218e280390a7d88429cf925c4e7f30c1173d9212686e6d61b1eae3a5b1233b2284e3cbddaf125e0a25ea91
+  data.tar.gz: '018970b8bd8de8cfe0840cc7a49cc413b6564b4e0d52232137a3385da7f5fb2640733fd2bd73669b4287446015674751ecb708d675dee971983a31af3610f634'

data/lib/ansible_make_role.rb

@@ -19,22 +19,19 @@ module AnsibleMakeRole
   def self.git=(value) @git = value end
 
   def self.make(role_dir)
+    changed = false
     wrap_system_call_error {
       role_file = "#{role_dir}/#{ROLE_FILE_NAME}"
       meta_file = "#{role_dir}/meta/main.yml"
+      git_file = "#{role_dir}/.gitignore"
       if force || !File.exist?(meta_file) || File.mtime(role_file) > File.mtime(meta_file)
-        files = compile_role(role_file, role_dir)
-        if git
-          git_file = "#{role_dir}/.gitignore"
-          FileUtils.rm_f(git_file)
-          if !files.empty?
-            lines = files.map { |f| "./" + f.split("/")[-2..-1].join("/") + "\n" }.join
-            IO.write(git_file, lines)
-          end
+        if !compile_role(role_file, role_dir).empty?
+          IO.write(git_file, "*/main.yml\n") if git
+          changed = true
         end
-        true
       end
     }
+    return changed
   end
 
   def self.clean(role_dir)
@@ -94,21 +91,21 @@ private
       end
     }
 
-    generated_files = []
-    (sections.to_a + [["meta", meta]]).each { |section, lines|
-      next if lines.empty? && section != "meta"
+    if meta.all? { |l| l =~ /^\s*$/ }
+      meta = ["dependencies: []"]
+    end
+
+    (sections.to_a + [["meta", meta]]).map { |section, lines|
       next if lines.all? { |l| l =~ /^\s*$/ }
       dir = "#{target}/#{section}"
       file = "#{dir}/main.yml"
-      generated_files << file
-
       FileUtils.mkdir_p(dir)
       File.open(file, "w") { |f|
         f.puts "---" if section != "meta"
         unindent(lines).each { |l| f.puts l }
       }
-    }
-    generated_files
+      file
+    }.compact
   end
 
   # Unindent lines by the indentation of the first non-comment and non-blank

data/lib/ansible_make_role/version.rb

@@ -1,3 +1,3 @@
 module AnsibleMakeRole
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible_make_role
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Claus Rasmussen