prick 0.20.18 → 0.20.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e1bed1482431efd5f5e449ba9d2b3d5cccfef223398e51879aeda7374fd6e1
-  data.tar.gz: 99984a969cb456c6efbf4943f56433d1c207246dfc615956fbd550511c30bfee
+  metadata.gz: 523f3f63b46850833fd679103f6a2ed389fee673376be4ffd54ab85ed76e9dfb
+  data.tar.gz: 58d881d1e9a5ebaea7b16caf35fc7d34670a6fa7f1a404357463f3dbbb73e81c
 SHA512:
-  metadata.gz: 7359ccc4a5da931531579431375e94007d7b7c66dc128c1a15c26fce5aa8b206b2ed89b33e9d15054c49f4dc64b61a31ea5647e387c219f5fdd1f0a7eed1fe25
-  data.tar.gz: 3713cb328f4aea15e7ac67d0e40dd7d1ae07e31528368aaf24d634fcd6ffbb91c2b512764a2c82cd01abe7c9aa191c784332196ba9b0f8232c5f4fe5a2b56fff
+  metadata.gz: c5f95a314a5dbaddef93d4e184ed5c10c35118b6e29f8ac8111589e4e79031dc83f254345853da84591edb9b511c5eab299dfa6716dc8db91b70361fe56ada12
+  data.tar.gz: '08eef7aaeea483bd45956898d290d69bb2859d41caafcc2ea64ce45bd9c2edd348a0cb003ba76054192e078fae3cf325c009ddb271d5d9e863915eb8eed95fe7'

data/lib/builder/parser.rb

@@ -76,31 +76,39 @@ module Prick
         unit
       end
 
+      def parse_file_entry(dir, entry)
+        name = entry.dup
+        name.sub!(/\$ENVIRONMENT/, Prick.state.environment.to_s)
+        name.sub!(/\/$/, "")
+        if name =~ /^(\S+)\s+(.*)$/ # exe
+          file = $1
+          args = $2
+        else
+          file = name
+        end
+        path = "#{dir}/#{file}"
+        [path, name, file, args]
+      end
+
       def parse_entry(unit, phase, dir, entry)
         if entry.is_a?(Hash)
           entry.size == 1 or raise Error, "sql and module are single-line values"
           key, value = entry.first
           case key
             when "sql"; InlineNode.new(unit, phase, unit.path, value)
-            when "call"; 
+            when "call" 
               args = value.split(/\s+/)
               args.size >= 3 or raise "Illegal number of arguments: #{value}"
               file, klass, command, args = *args
               ModuleNode.new(unit, phase, "#{dir}/#{file}", klass, command, args)
+            when "exec"
+              path, name, file, args = parse_file_entry(dir, value)
+              ExeNode.new(unit, phase, path, args)
           else
             raise Error, "Illegal key: #{key}"
           end
         else
-          name = entry
-          name.sub!(/\$ENVIRONMENT/, Prick.state.environment.to_s)
-          name.sub!(/\/$/, "")
-          if name =~ /^(\S+)\s+(.*)$/ # exe
-            file = $1
-            args = $2
-          else
-            file = name
-          end
-          path = "#{dir}/#{file}"
+          path, name, file, args = parse_file_entry(dir, entry)
           if File.directory? path
             parse_directory(unit, path)
           elsif File.executable? path

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.20.18"
+  VERSION = "0.20.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.18
+  version: 0.20.19
 platform: ruby
 authors:
 - Claus Rasmussen