ansible_make_role 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 323dcdb66550dda4f21397b66c21524a16da617d120d05cd9382607cbe20e5d1
-  data.tar.gz: d9332ca69d757e758f4ec996c2eb86a4676586bf24e457b47d6a6edbcaa0d8c3
+  metadata.gz: 29ff2c2883c8a8b4d51a218cd24759b9c30800cf3026da0baf6810ff7b277e46
+  data.tar.gz: af5a5ff7ba52f8738d90ae5933c98e31d315596eced5ad283611444867bc2708
 SHA512:
-  metadata.gz: b461800f749cee4148bc39ee1221403830d31e4b0894d8b27c9dbd89b9297c9fc4bdaf0ad16e4ad998a3e7d231299b9fba42fb52dc3a14bdd58dedf9dab29abd
-  data.tar.gz: 480a4a450cb337cb7272a300fb37eb69784e454b54600cef8a618da8e9f58251f2e57e5d88fa19db241f1158a549476141d123b69a6c3e703714f68a709431b6
+  metadata.gz: ef8c02faa05b9151e13d431a9d85ab96460a19cb2b898bc46f022a860cf57a7d82e83b7dc7974118cbb9364d7d5ecad09ffb2a142abdc6c998373435f72e0bac
+  data.tar.gz: 167cf5397c44fb3d961fb6a63ea0242956dcd7542d92af86f1d6c97449a8a0454c4fe62fc3a087a88bec529f2fedf02d2eec8bc6cd950d028aafcf7b9911fc2d

data/README.md

@@ -5,7 +5,7 @@ Pre-compiler that turns `make.yml` files into Ansible roles
 ## Usage
 
 ```shell
-    ansible-make-role -f|--force -t|--target-dir=DIR -v|--verbose DIR...
+    ansible-make-role -f|--force -v|--verbose --version DIR...
 ```
 
 `ansible-make-role` expects a `make.yml` file in each of the given directories
@@ -51,9 +51,23 @@ handlers: # Goes to handlers/main.yml"
   ...
 ```
 
+## Options
+
+
+`-f, --force`
+        Re-generate all files even if not needed
+
+`-v, --verbose`
+        Report progress
+
+`--version`
+        Print version
+
+
 ## Installation
 
 Install it for the current ruby using:
 
     $ gem install ansible_make_role
 
+Please note that the gem name uses underscores but the command uses dashes ('ansible-make-role')

data/exe/ansible-make-role

@@ -3,26 +3,21 @@
 require 'ansible_make_role.rb'
 require "shellopts"
 
-USAGE = "f,force t,target-dir=DIR v,verbose -- DIRECTORY..."
+USAGE = "f,force v,verbose version -- DIRECTORY..."
 
 force = false
-target_dir = nil
 verbose = false
 
 args = ShellOpts.process(USAGE, ARGV) { |opt, arg|
   case opt
     when '-f', '--force'; force = true
-    when '-t', '--target-dir'; target_dir = arg
     when '-v', '--verbose'; verbose = true
+    when '--version'; puts "ansible-make-role #{AnsibleMakeRole::VERSION}"; exit
   end
 }
 args.size > 0 or args << "."
 
-include AnsibleMakeRole
 for source in args
   File.directory?(source) or ShellOpts.error "Not a directory: #{source.inspect}"
-  target = target_dir || File.dirname(source)
-  puts "Source: #{source}"
-  puts "Target: #{target}"
-  make_role(source, target, verbose: verbose, force: force)
+  AnsibleMakeRole.make(source, verbose: verbose, force: force)
 end

data/lib/ansible_make_role.rb

@@ -1,22 +1,37 @@
 require "ansible_make_role/version"
 
+require "shellopts" 
+
 require "fileutils"
 
 module AnsibleMakeRole
-  class Error < StandardError; end
-  # Your code goes here...
+  def self.make(source_dir, verbose: false, force: false)
+    source = "#{source_dir}/make.yml"
+    target_dir = source_dir
+    # TODO: Doesn't belong at this level - catch exceptions in exe instead
+    File.file?(source) or ShellOpts::error "Can't read file #{source.inspect}"
+    File.directory?(target_dir) or ShellOpts::error "Can't find directory #{target_dir}"
 
+    meta_yml = "#{target_dir}/meta/main.yml"
+    if force || !File.exist?(meta_yml) || File.mtime(source) > File.mtime(meta_yml)
+      compile_role(source, target_dir, verbose: verbose)
+    else
+      puts "#{target_dir} is up to date" if verbose
+    end
+  end
+
+private
   # source is a file, target is a directory. Target can be nil and defaults to
   # dirname of source
-  def compile_role(source, target = File.dirname(source), verbose: false)
+  def self.compile_role(source, target, verbose: false)
+    meta = []
     sections = {
-      "meta" => [],
       "defaults" => [],
       "vars" => [],
       "tasks" => [],
       "handlers" => []
     }
-    lines = sections["meta"]
+    current_section = meta
 
     puts "Parsing #{source}" if verbose
     File.readlines(source).each { |line|
@@ -25,17 +40,17 @@ module AnsibleMakeRole
       if line =~ /^(\w+)\s*:/
         section = $1
         if sections.key?(section) # Built-in section?
-          lines = sections[section]
+          current_section = sections[section]
         else # Everything else goes to the meta file incl. section header
-          lines = sections["meta"]
-          lines << line
+          current_section = meta
+          current_section << line
         end
       else
-        lines << line
+        current_section << line
       end
     }
 
-    sections.each { |section, lines|
+    (sections.to_a + [["meta", meta]]).each { |section, lines|
       next if lines.empty? && section != "meta"
       dir = "#{target}/#{section}"
       file = "#{dir}/main.yml"
@@ -49,29 +64,13 @@ module AnsibleMakeRole
     }
   end
 
-  def make_role(source_dir, target_dir = source_dir, verbose: false, force: false)
-    source = "#{source_dir}/make.yml"
-    target = "#{target_dir}/#{File.basename(source_dir)}"
-    File.file?(source) or ShellOpts::error "Can't read file #{source.inspect}"
-    File.directory?(target_dir) or ShellOpts::error "Can't find directory #{target_dir}"
-
-    meta_yml = "#{target}/meta/main.yml"
-    if force || !File.exist?(meta_yml) || File.mtime(source) > File.mtime(meta_yml)
-      compile_role(source, target, verbose: verbose)
-    else
-      puts "#{target} is up to date" if verbose
-    end
-  end
-
-private
   # Unindent lines by the indentation of the first non-comment and non-blank
   # line
-  def unindent(lines)
+  def self.unindent(lines)
     line = lines.find { |l| l !~ /^\s*#/ && l !~ /^\s*$/ }
     return lines if line.nil?
     line =~ /^(\s*)/
     prefix = $1.dup
     lines.map { |l| l.sub(/^#{prefix}/, "") }
   end  
-
 end

data/lib/ansible_make_role/version.rb

@@ -1,3 +1,3 @@
 module AnsibleMakeRole
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_make_role
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler