opulent 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 400a61b79e430257b8e78d35a00168abf0b25b2a
-  data.tar.gz: f50f10dfe3f7673cf35eeb197bb06a62dfcaedb5
+  metadata.gz: e9300eb265cbd78d37b3320fa250ef12c91a2d54
+  data.tar.gz: 924c5d00c448dcf16a099273cac90dac1bfbdfdb
 SHA512:
-  metadata.gz: 14774d95d2d98deab955e1c62131e6ff6cee05c82aa79d4362aea9c2738f4e244628d05f886e08207e396d2875d43571db33ab030f68a9e6833f6d86857a6d12
-  data.tar.gz: 89f0081dd1d91648e877a6aa77efab4e3b70002f581ff739e83bc1bd5d8f51991346b5467d09affa0b2fa1fd83dbc8d7217b3d5204f4dd28cdb126c2d08323f9
+  metadata.gz: 6d94c1b6835f811ad431a1eba7c3b2c5913d2c68ed900915343c1608227386f70d90fc92dbca90e2a72ca98bdf5da4057780a08342f82f0ec116a3f41ff03f26
+  data.tar.gz: efa2e8bfc1e6a552b54cf34ba0e67af139cca11751e505d22706631a38da93810ee4e9503d831453da68730564497813844a6275f18b6d4b6ba24224df4eeb21

data/lib/opulent/exec.rb

@@ -6,30 +6,34 @@ require 'opulent/version'
 module Opulent
   # @CLI
   class CLI
-    Extension = /\.(op|opl|opulent)\Z/
+    EXTENSION = /\.(op|opl|opulent)\Z/
 
-    Keywords = %w(context layout locals version help)
+    KEYWORDS = %w(context layout locals version help)
 
     def initialize(arguments)
       i = 0
 
+      layout_error = 'Missing input or incorrect file extension for ' \
+        'layout [-l] argument. '
+      layout_error += "Found #{arguments[i + 1]} instead." if arguments[i + 1]
+
       while arguments[i]
         case arguments[i]
 
         # opulent input.op output.op
-        when Extension
+        when EXTENSION
           @input = arguments[i]
-          unless arguments[i + 1] =~ /\A\-/ || Keywords.include?(arguments[i+1])
+          is_keyword = KEYWORDS.include? arguments[i + 1]
+          unless arguments[i + 1] =~ /\A\-/ || is_keyword
             @output = arguments[(i += 1)]
           end
 
         # opulent -v
         when '-l', 'layout'
-          if arguments[i + 1] =~ Extension
+          if arguments[i + 1] =~ EXTENSION
             @layout = arguments[(i += 1)]
           else
-            error "Missing input or incorrect file extension for layout [-l] argument. " +
-            "#{"Found #{arguments[i+1]} instead." if arguments[i+1] }"
+            error layout_error
           end
 
         # opulent -v
@@ -40,14 +44,18 @@ module Opulent
         # opulent -c
         when '-c', 'context', '-lc', 'locals'
           @locals_file = arguments[(i += 1)]
-          error "Given context file #{@locals_file.inspect} does not exist or an incorrect path has been specified." unless File.file? @locals_file
+          unless File.file? @locals_file
+            error "Given context file #{@locals_file.inspect} does not exist" \
+            ' or an incorrect path has been specified.'
+          end
 
           if File.extname(@locals_file) == '.json'
             @locals = JSON.parse File.read(@locals_file), symbolize_keys: true
           elsif File.extname(@locals_file) == '.yml'
             @locals = YAML.load_file @locals_file
           else
-            error "Unknown file extension #{@locals_file.inspect} given as locals file. Please use JSON or YAML as input."
+            error "Unknown file extension #{@locals_file.inspect} given as" \
+            ' locals file. Please use JSON or YAML as input.'
           end
 
         # opulent -h
@@ -63,30 +71,34 @@ module Opulent
 
       if @input
         @locals ||= {}
-        error "Given input file #{@input.inspect} does not exist or an incorrect path has been specified." unless File.file? @input
 
-        message = ""
+        unless File.file? @input
+          error "Given input file #{@input.inspect} does not exist or " \
+          'an incorrect path has been specified.'
+        end
+
+        message = ''
         opulent = Opulent.new
         if @layout
-          output = Proc.new do
-            opulent.render_file(@layout, @locals) {
-              opulent.render_file(@input, @locals){}
-            }
+          output = proc do
+            opulent.render_file(@layout, @locals) do
+              opulent.render_file(@input, @locals) {}
+            end
           end[]
         else
-          output = Proc.new do
+          output = proc do
             opulent.render_file(@input, @locals)
           end[]
         end
 
         if @output
-          File.open @output, 'w' do |file| file.write output end
-          message += "Successfully rendered #{@input.inspect} to #{@output.inspect}."
-          #message += "Used #{@locals_file.inspect} as local context file." if @locals_file
+          File.open(@output, 'w') { |file| file.write output }
+          message += "Successfully rendered #{@input.inspect} " \
+          "to #{@output.inspect}."
         else
           message += "Successfully rendered #{@input.inspect}.\n\n"
-          #message += "Used #{@locals_file.inspect} as local context file.\n\n" if @locals_file
-          message += "No output file specified. Writing result to terminal.\n\n#{output}"
+          message += 'No output file specified. Writing result to ' \
+          "terminal.\n\n#{output}"
         end
 
         write message
@@ -95,12 +107,16 @@ module Opulent
       end
     end
 
-    def help(extra = "")
-      "#{extra}You can use the following commands with the Opulent Command Line Interface: \n\n
-opulent input.op output.op      Render an input file and write the result to the output file.\n
-opulent layout [-l] layout.op   Render an input file using given input layout file.\n
+    def help(_extra = '')
+      <<-HELP #{_extra} You can use the following commands with the Opulent
+       Command  Line Interface: \n\n
+opulent input.op output.op      Render an input file and write the result to
+the output file.\n
+opulent layout [-l] layout.op   Render an input file using given input
+layout file.\n
 opulent help [-h]               Show available command line options.\n
 opulent version [-v]            Show installed version.\n"
+      HELP
     end
 
     # Give an explicit response for the given input arguments
@@ -110,8 +126,7 @@ opulent version [-v]            Show installed version.\n"
     def write(message)
       # Reconstruct lines to display where errors occur
       puts "\nOpulent " + Logger.green('[Engine]') +
-      "\n---\n" +
-      "#{message}\n\n\n"
+        "\n---\n#{message}\n\n\n"
     end
 
     # Give an explicit error report where an unexpected sequence of tokens
@@ -122,8 +137,7 @@ opulent version [-v]            Show installed version.\n"
     def error(message)
       # Reconstruct lines to display where errors occur
       fail "\nOpulent " + Logger.red('[Engine]') +
-      "\n---\n" +
-      "#{message}\n\n#{help}\n\n\n"
+        "\n---\n#{message}\n\n#{help}\n\n\n"
     end
   end
 end

data/lib/opulent/filters.rb

@@ -39,7 +39,7 @@ module Opulent
       # Error output in case the filter does not exist
       #
       def load_filter
-        return unless gem_name.nil? || @loaded
+        return if gem_name.nil? || @loaded
 
         # Try to load the library associated to the chosen filter
         begin

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Alex Grozav