molder 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 416984ac32edc7ff37f6d1e6af4452d6e76c06a067ef47d224f06d98e77e4f7b
-  data.tar.gz: 12793070ad5336d858f8ebe2059088c382f83419e5dfd49ee6378df7c0cc2770
+  metadata.gz: 578955563ff2b10bc32a0b3bd32ee0c7b31d72b8808262548ccc46fa10b9cc98
+  data.tar.gz: a93de7301be71a8e0313a54a333b536f7029d27e09c79518151af5acbeab50d4
 SHA512:
-  metadata.gz: ed68c853eb5586055bea4674204af94018d6e0e4816d63fbd924a90cce11cb5b2899ea451397e6557b1a099ceaa2218d3c3519c6f3a026fca3619f8246cad57b
-  data.tar.gz: c77e6d30a6e960ace71885e7e804b8c0924cafae972d30fbd54844e4c3f1afe4ddba1a569efa10a6c25bce8442219cdc6804364df2a899937fc344cfea8cbf67
+  metadata.gz: be4f718a26b806627ba2ef00a01f1c44df635dbb03ea1a007e4aaedaffb38a243d94593e84bd0d5a652f46b8e600da04da168b704708acc1f7e316f4b5b24b3a
+  data.tar.gz: 5abe1844e966d7c0581ef58ba4597e861c5b4a9f9a3ae9a6b148d8796cd43adafe07d92b722572172eb06652109aa599b9578fe1014c4fc9d40d042872b79b92

data/README.md

@@ -169,7 +169,7 @@ Let's understand this command:
  
    * multiple template names can be separated by a slash, as seen here.
    
- * next we pass `-a environment=production` — notice that our provision command defined in the template uses `{{ environment }}` token, even though no such attribute is defined in any of the templates. if we do not supply this argument, the value of environment in the command line would be blank.
+ * next we pass `-a environment=production` — notice that our provision command defined in the template uses `{{ environment }}` token, even though no such attribute is defined in any of the templates. if we do not supply this argument, molder will thrown an exception, because blank attributes are not allowed.
  
    * Note that you can pass multiple attributes, separated by a slash, like so: `-a environment=production/flavor=c5.4xlarge`
 

data/lib/molder/app.rb

@@ -64,6 +64,7 @@ module Molder
             attributes = attrs.dup
             attributes.merge!(options.override) if options.override
             self.templates << ::Molder::Template.new(config:     config,
+                                                     options:    options,
                                                      name:       name,
                                                      indexes:    indexes,
                                                      command:    command,

data/lib/molder/cli.rb

@@ -132,20 +132,30 @@ module Molder
                 'The default is the number of CPU cores', ' '
                 ) { |value| options[:max_processes] = value.to_i }
 
+        opts.on('-b', '--allow-blanks',
+                'Instead of throwing error when attribute',
+                'is nil, replace it with a blank', ' ') { |_value| options[:blank] = true }
+
         opts.on('-l', '--log-dir [dir]',
                 'Folder where STDOUT of the commands is saved') { |value| options[:log_dir] = value }
 
         opts.on('-n', '--dry-run',
-                'Don\'t actually run commands, just print them') { |_value| options[:dry_run] = true }
+                'Don\'t actually run commands, just print') { |_value| options[:dry_run] = true }
 
         opts.on('-v', '--verbose',
-                'Print more output') { |_value| options[:verbose] = true }
+                'More verbose output') { |_value| options[:verbose] = true }
 
-        opts.on('-b', '--backtrace',
+        opts.on('-d', '--debug',
                 'Show error stack trace if available') { |_value| options[:backtrace] = true }
 
+        opts.on('-V', '--version',
+                'Show version') do
+          @stdout.puts Molder::VERSION
+          options[:help] = true
+        end
+
         opts.on('-h', '--help',
-                'Show help') do
+                'Show help', ' ') do
           @stdout.puts opts
           options[:help] = true
         end
@@ -163,10 +173,10 @@ module Molder
 
 #{'USAGE'.bold.yellow}
     #{'# shorthand usage - combine multiple templates with a slash:'.bold.black}
-    #{'molder [-c config.yml] command template1[n1..n2]/...  [options]'.bold.blue}
+    #{'molder [-c config.yml] command template1[n1..n2]/...  [options]'.bold.green}
 
     #{'# alternatively, use -t and -i CLI options:'.bold.black}
-    #{'molder [-c config.yml] command -t template -i index   [options]'.blue.bold}
+    #{'molder [-c config.yml] command -t template -i index   [options]'.green.bold}
 
 #{'EXAMPLES'.bold.yellow}
     #{'# The following commands assume YAML file is in the default location:'.bold.black}
@@ -187,8 +197,8 @@ module Molder
       if options[:backtrace] && exception.backtrace
         @stderr.puts exception.backtrace.reverse.join("\n").yellow.italic
       end
-      @stderr.puts "Error: #{exception.to_s.bold.red}" if exception
-      @stderr.puts "Error: #{message.bold.red}" if message
+      @stderr.puts ' • ERROR • '.white.on.red + " #{exception.to_s.bold.red}" if exception
+      @stderr.puts ' • ERROR • '.white.on.red + " #{message.bold.red}" if message
       @kernel.exit(1)
     end
 

data/lib/molder/renderer.rb

@@ -63,18 +63,24 @@ module Molder
 
     MAX_RECURSIONS = 100
 
-    attr_accessor :template
+    attr_accessor :template, :render_opts
 
     # Create Renderer object, while storing and auto-expanding params.
-    def initialize(template)
-      self.template = template
+    def initialize(template_string, options = {})
+      self.template    = template_string
+      self.render_opts = if options[:blank]
+                           {}
+                         else
+                           { strict_variables: true }
+                         end
     end
 
     # Render given content using expanded params.
     def render(params)
       attributes      = expand_arguments(Hashie.stringify_keys(params.to_h))
       liquid_template = Liquid::Template.parse(template)
-      liquid_template.render(attributes, { strict_variables: true }).tap do
+
+      liquid_template.render(attributes, **render_opts).tap do
         unless liquid_template.errors.empty?
           raise LiquidTemplateError, "#{liquid_template.errors.map(&:message).join("\n")}"
         end

data/lib/molder/template.rb

@@ -1,13 +1,14 @@
 require 'molder/renderer'
 module Molder
   class Template
-    attr_accessor :config, :name, :attributes, :indexes, :command
+    attr_accessor :config, :name, :attributes, :indexes, :command, :options
 
-    def initialize(config:, name:, indexes:, attributes: {}, command:)
+    def initialize(config:, name:, indexes:, attributes: {}, command:, options: {})
       self.config     = config
       self.name       = name
       self.indexes    = indexes
       self.command    = command
+      self.options    = options
       self.attributes = self.class.normalize(attributes)
     end
 
@@ -15,7 +16,7 @@ module Molder
       indexes.map do |i|
         self.attributes[:number] = i
         self.attributes[:formatted_number] = sprintf(config.global.index_format, i)
-        ::Molder::Renderer.new(command.args).render(attributes.dup).tap do |cmd|
+        ::Molder::Renderer.new(command.args, options).render(attributes.dup).tap do |cmd|
           yield(cmd) if block_given?
         end
       end

data/lib/molder/version.rb

@@ -1,5 +1,5 @@
 module Molder
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
   DESCRIPTION = <<-eof
  Molder is a handy command line tool for generating and running (in parallel, 
 using a pool of processes with a configurable size) a set of related and yet

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: molder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Konstantin Gredeskoul