prick 0.40.0 → 0.40.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f8ea8c479a4482f6b26e33c9e83a0f61ab6078d715a014124c34d11b0ff66a
-  data.tar.gz: a4fbc9c66bee4866dc51c99068f835ded7c53dbceb4eedc6d5c4df61d3709c2b
+  metadata.gz: d80ed9e4a9e952293015fa4bbdf82e6032433c9c588a403b1da37d80dffd04a3
+  data.tar.gz: 7395791928b6a93006f7dcca640340dcc5311e696d3d29fec7935d1eab5bf08b
 SHA512:
-  metadata.gz: 4d3a33f458512e93fc42bf28abf4fff87fbb82c648b657207546a24962f0c9f27356cafd988a7411ab4a969c228155ed6992de781827ee16e7d70e9b711b4574
-  data.tar.gz: a38e125d8ca682a03a712fd911e89bf9190e5709dfdd5d449607b572e3e1e15e8f1bac3f903d6b8deeae715176203a6265201cd840aaac124c0e1043a991766d
+  metadata.gz: 6871aa71a977fc72ec39b55369217de688eb0d6db93617435fb467c3b696729e7a9b58f4f9645a2850ff71f6d0be25cd9d9322b07c8022b5b66c715b37509b78
+  data.tar.gz: 88be83c01859557aae5a9b47d0ed49e7b69e3a819f49b80d316ffdfab8c428dff152c2267a7a25a8e46a9a4e1b624c3f374355b8be2bcd5e2af2a374d02abf73

data/lib/prick/builder/node.rb

@@ -169,7 +169,7 @@ module Prick
 
       def execute_system
         begin
-          yield
+          Command.command(Prick.state.bash_environment, command)
         rescue Command::Error => ex
           message = "Error executing '#{command}'\n" + ex.stderr.map { |l| "   #{l}" }.join("\n")
           Prick.error message
@@ -216,29 +216,6 @@ module Prick
       alias_method :execute, :execute_system
     end
 
-    class RequireNode < ExecutableNode
-      def read_source
-        sql = execute_command
-        @source_lines = 1 + 1 + sql.count("\n")
-        ["set search_path to #{schema}, pg_temp", sql.join("\n")]
-      end
-
-      def execute_command
-        execute {
-          Command.inline(Prick.state.bash_environment, path, argv: args)
-        }
-      end
-    end
-
-    class CommandNode < ExecutableNode
-    protected
-      def execute_command
-        execute {
-          Command.command(Prick.state.bash_environment, command)
-        }
-      end
-    end
-
     # EvalNode executes the command and feeds the output into the database
     class SysEvalNode < SystemCommandNode
       alias_method :read_source, :read_cmd

data/lib/prick/builder/parser.rb

@@ -130,9 +130,6 @@ module Prick
               command = args.shift
               klass && command or raise "Illegal number of arguments: #{value}"
               ModuleNode.new(unit, phase, path, klass, command, args)
-            when "require"
-              (path, args = parse_file_entry(unit, dir, value)) or return nil
-              RequireNode.new(unit, phase, path, args)
             when "eval"
               (path, args = parse_file_entry(unit, dir, value)) or return nil
               EvalNode.new(unit, phase, path, args)

data/lib/prick/version.rb

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

metadata

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