ansible_make_role 0.7.8 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe8e24d4a2a257d19e11b2ca0758a63a13b0508fb30275c3a070d5f69ba156b
-  data.tar.gz: 76624736cd47411c67168b84f2557097f7bad6e32b709ceb887f80e3ba5e8181
+  metadata.gz: b4bf6a49779b5b627fed22a87359414134d4db0ddb2f5f163c8bf7a753ea367e
+  data.tar.gz: 8afaa7ac4516b29048f03d6a091435d6575c0e10e6513998adff5a386b4c28ff
 SHA512:
-  metadata.gz: b79115eb6a4a34d75f4fc949d29ac1a3b2f32d822b218e280390a7d88429cf925c4e7f30c1173d9212686e6d61b1eae3a5b1233b2284e3cbddaf125e0a25ea91
-  data.tar.gz: '018970b8bd8de8cfe0840cc7a49cc413b6564b4e0d52232137a3385da7f5fb2640733fd2bd73669b4287446015674751ecb708d675dee971983a31af3610f634'
+  metadata.gz: 3d09989652d8432d72bc5c4f256b005d441b13517d20c5f3ed91919871bcc1d4efcdd2e8113d665a01f8e1e7c6d9bea1ea4b3c27fd95f8fa3892b84ed1480b04
+  data.tar.gz: 4106a49adc35a71113bbc860d7d5cf26df64bbc3b569d370af4e2d3014cfcd5dce650330724d6cbfb3f29cc432b10c5234745456b146e61b08c85d9349a2ee2a

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.0
+ruby-3.1.2

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,9 +38,9 @@ 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 "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 
   spec.add_dependency "shellopts", "0.9.3"
   spec.add_dependency "indented_io"

data/exe/ansible-make-role

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

data/lib/ansible_make_role/version.rb

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

data/lib/ansible_make_role.rb

@@ -55,7 +55,7 @@ module AnsibleMakeRole
 
 private
   # Turn a SystemCallError into a AnsibleMakeRole::Error exception and remove
-  # Ruby reference from message (eg. "@ rb_sysopen")
+  # Ruby reference from message (eg. the "@ rb_sysopen" part)
   def self.wrap_system_call_error(&block)
     begin
       yield
@@ -64,7 +64,8 @@ private
     end
   end
 
-  # source is a single-file role and target is the role directory. Returns list generated files
+  # source is a single-file role and target is the role directory. Returns list
+  # of generated files
   def self.compile_role(source, target)
     meta = []
     sections = {
@@ -96,15 +97,20 @@ private
     end
 
     (sections.to_a + [["meta", meta]]).map { |section, lines|
-      next if lines.all? { |l| l =~ /^\s*$/ }
       dir = "#{target}/#{section}"
       file = "#{dir}/main.yml"
-      FileUtils.mkdir_p(dir)
-      File.open(file, "w") { |f|
-        f.puts "---" if section != "meta"
-        unindent(lines).each { |l| f.puts l }
-      }
-      file
+      if lines.all? { |l| l =~ /^\s*$/ }
+        FileUtils.rm_f(file)
+        FileUtils.rmdir(dir) if Dir.exist?(dir)
+        nil
+      else
+        FileUtils.mkdir_p(dir)
+        File.open(file, "w") { |f|
+          f.puts "---" if section != "meta"
+          unindent(lines).each { |l| f.puts l }
+        }
+        file
+      end
     }.compact
   end
 

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ansible_make_role
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - Claus Rasmussen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shellopts
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ homepage: http://github.com/clrgit/ansible_make_role
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.3.18
+signing_key:
 specification_version: 4
 summary: Make Ansible role from make.yml file
 test_files: []