ansible_make_role 0.7.6 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99111d82efeeebbbfc1e737f21c142b8d032c24e32ac41d91b66d47c80a2201c
-  data.tar.gz: e542a73b031675176749476dd06d9cc7a94ac5e5b31989321f9b5f94ad027710
+  metadata.gz: a44cb786491c3627ecfb6d10983b1bdd75267524637b6fefe75d464d520c3f2e
+  data.tar.gz: 67510561106ad65ecc8cd476bff271fee1cfc944761bb09588edba6bdbd22efd
 SHA512:
-  metadata.gz: 0b667cfc048d8fc7e5fd661db7efbb19c21df2bf4c21e7c6e70041df2ec8045c7ae26fdd3d1beb5e09ab8a8efd1aaf30c259009940ba27498c9f99e1f560507a
-  data.tar.gz: 2a50d6c9f5aea2dac0374580603fb55785e944097fcac765fadbd940b9a69e7242c308693600a0abf68f991c75ae23f5a70e4b188fa6e3ac73d951601f7ccade
+  metadata.gz: b7131df4601d7268a08bc4533878565e3b0c2ca8482cbaea46385098a0fcad878654b11f6aa22d884f4e977dc3eb8c605a5b1fe28cb73c9f65858b073c61cc26
+  data.tar.gz: 813f605397086790abcb97ee31158dd24b492d58734b7bc62b1477edf3ba9c937fee7ef4441620cb843d0caa0c4699bf7c4b035cb59612c56a079f5a1e415983

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.0
+ruby-2.7.1

data/README.md

@@ -1,21 +1,21 @@
 # ansible-make-role
 
 Pre-compiler that turns a single-file role definition into Ansible role files.
-The `role.yml` file combines the Ansible `main.yml` where each `main.yml` file
-is represented by a section (`defaults:`, `vars:`, `tasks:` etc.)
+The single-file `role.yml` file combines the Ansible `main.yml` files from the
+`defaults`, `vars`, `tasks`, and `meta` subdirectories with a YAML top-level
+section for each file (`defaults:`, `vars:`, `tasks:` etc.)
 
 ## Usage
 
-```shell
+```
     ansible-make-role -c|--clean -f|--force -g|--git -r|--roles=DIR -v|--verbose --version DIR...
 ```
 
 `ansible-make-role` expects a `role.yml` file in each of the given directories
 and generates an Ansible role in it. Existing `main.yml` files will be
-overwritten or removed but other files won't be touched
-
-`ansible-make-role` only generates up-to-date files unless the --force option
-is used
+overwritten or removed but other files won't be touched. `ansible-make-role`
+search subdirectories of `./roles` if no dirctories was given on the command
+line
 
 ## Description
 
@@ -59,10 +59,12 @@ handlers: # Goes to handlers/main.yml"
         Clean the project by removing autogenerated files
 
 `-f, --force`
-        Re-generate all files even if not needed
+        Re-generate all files even if not needed. Useful if you forgot a
+        `--git` option
 
 `-g, --git`
-        Also handle per-role .gitignore files. Note that the .gitignore file will be overwritten
+        Also handle per-role .gitignore files. Note that existing .gitignore
+        files are overwritten
 
 `-r, --roles=DIR`
         Use DIR instead of default `./roles`

data/ansible_make_role.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.2.10" 
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 

data/exe/ansible-make-role

@@ -44,7 +44,7 @@ end
 
 role_dirs = args
 for roles_dir in roles_dirs
-  role_dirs += Dir["#{roles_dir}/*"].select { |d| File.directory?(d) }
+  role_dirs += Dir["#{roles_dir}/**/role.yml"].map { |f| File.dirname(f) }
 end
 
 if role_dirs.empty?

data/lib/ansible_make_role.rb

@@ -19,28 +19,25 @@ 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)
     changed = false
     wrap_system_call_error {
-      File.exists?("#{role_dir}/#{ROLE_FILE_NAME}") or raise Error "Not a role directory: #{role_dir}"
+      File.exists?("#{role_dir}/#{ROLE_FILE_NAME}") or raise Error.new("Not a role directory: #{role_dir}")
       for file in Dir["#{role_dir}/*/main.yml"]
         FileUtils.rm(file)
         dir = File.dirname(file)
@@ -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.6"
+  VERSION = "0.7.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_make_role
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.10
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Make Ansible role from make.yml file