raka 0.7.3 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6918188c64614bab203408d4dcac9a7dc48fc1234452ffd5dc481f1fa48b3be5
-  data.tar.gz: dab15a870d3891b96e28800cd412787c1b794101923b042c896a0b4ad0bf533f
+  metadata.gz: 42db0891e95e6b4506cac41e2754df5387cc456559a174299a28da2b4066705e
+  data.tar.gz: 01b935c926560fd2b1f106aee4548bb9a303c386105a756e45c29db50b1f2ad1
 SHA512:
-  metadata.gz: 7202488f6e5d0c06ebea878d963ef30d4f143db323832ef8cfb6df4741d99cdafed65ef7564e302d589b50fb8896fbc3077a80e93e8c1ce4c58f4921103d91b6
-  data.tar.gz: fb07a9052a869639c4a2ae8d3a93810ce8d7c622f543b1549d21a50bea17f24ab87d84dcaf6283ca75c9f816f4860c368e413a830a5804ec248621584335a15e
+  metadata.gz: a7cc42e54f408a69cfb124a0c4072f0669a19138e931a3a3413490fee1beadfee6d371c18021124fbd35345ef77308f7410876a8a7b3c151c58b5fabe319a53d
+  data.tar.gz: e1269029d10dcdc410430b99117651c8c54bc72723af9df21f11db09c76c3cfdcbbb27473da49507997ba6daab37e192b8136575e9332670c8b6ae71d5c063f5

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.8.1

data/lib/raka/compile.rb

@@ -130,6 +130,45 @@ class DSLCompiler
     end
   end
 
+  # extract typed components from rhs array and return filtered array + components
+  def extract_typed_components(rhs)
+    deps = []
+    posts = []
+    filtered_rhs = []
+    
+    rhs.each do |item|
+      if item.is_a?(Hash)
+        # Handle hash with multiple key-value pairs like [dep: dep3, post: post1]
+        item.each do |key, value|
+          case key
+          when :dep, 'dep'
+            # Handle both single values and arrays, but don't convert Token objects
+            if value.is_a?(Array)
+              deps.concat(value)
+            else
+              deps << value
+            end
+          when :post, 'post'  
+            # Handle both single values and arrays, but don't convert Token objects
+            if value.is_a?(Array)
+              posts.concat(value)
+            else
+              posts << value
+            end
+          else
+            # Unknown typed component - raise error
+            raise "Unknown typed component: #{key}. Supported components are 'dep' and 'post'"
+          end
+        end
+      else
+        # Regular item (dependency, action, or post-task)
+        filtered_rhs << item
+      end
+    end
+    
+    { deps: deps, posts: posts, filtered_rhs: filtered_rhs }
+  end
+
   # compile token = rhs to rake rule
   # rubocop:disable Style/MethodLength
   # rubocop:disable Style/PerceivedComplexity
@@ -138,34 +177,44 @@ class DSLCompiler
       raise "DSL compile error: seems not a valid @env of rake with class #{@env.class}"
     end
 
+    # Extract typed components first
+    components = extract_typed_components(rhs)
+    typed_deps = components[:deps]
+    typed_posts = components[:posts]  
+    filtered_rhs = components[:filtered_rhs]
+
     # the format is [dep, ...] | [action, ...] | [post, ...], where the posts
     # are those will be raked after the actions
-    actions_start = rhs.find_index { |item| item.respond_to?(:call) }
+    actions_start = filtered_rhs.find_index { |item| item.respond_to?(:call) }
 
     # case 1: has action
     if actions_start
-      extra_deps = rhs[0, actions_start]
-      actions_end = rhs[actions_start, rhs.length].find_index do |item|
+      extra_deps = filtered_rhs[0, actions_start]
+      actions_end = filtered_rhs[actions_start, filtered_rhs.length].find_index do |item|
         !item.respond_to?(:call)
       end
 
       # case 1.1: has post
       if actions_end
         actions_end += actions_start
-        actions = rhs[actions_start, actions_end]
-        extra_tasks = rhs[actions_end, rhs.length]
+        actions = filtered_rhs[actions_start, actions_end]
+        extra_tasks = filtered_rhs[actions_end, filtered_rhs.length]
       # case 1.2: no post
       else
-        actions = rhs[actions_start, rhs.length]
+        actions = filtered_rhs[actions_start, filtered_rhs.length]
         extra_tasks = []
       end
     # case 2: no action
     else
-      extra_deps = rhs
+      extra_deps = filtered_rhs
       actions = []
       extra_tasks = []
     end
 
+    # Merge typed components with extracted components
+    extra_deps = extra_deps + typed_deps
+    extra_tasks = extra_tasks + typed_posts
+
     unless lhs._input_?
       create_rule lhs, proc { [] }, actions, extra_deps, extra_tasks
       return

data/lib/raka/lang/duckdb/impl.rb

@@ -77,12 +77,12 @@ class Duckdb
       # Split the SQL into separate statements and execute them individually
       bash env, %(
       # Execute the combined SQL script with proper variable replacement
-      cat #{fname} | sed 's|:_name_|#{task.output_stem}|g' | #{duckdb_cmd} | tee #{fname}.log
+      cat #{fname} | sed 's|:_name_|#{task.output_stem}|g' | #{duckdb_cmd} | { cat; echo; } | sed '$ { /^$/ d; }' | tee #{fname}.log
       echo "#{@database}" > #{task.name}
       )
     when :adhoc
       bash env, %(
-      cat #{fname} | sed 's|:output:|#{task.name}|g' | #{duckdb_cmd} | tee #{fname}.log
+      cat #{fname} | sed 's|:output:|#{task.name}|g' | #{duckdb_cmd} | { cat; echo; } | sed '$ { /^$/ d; }' | tee #{fname}.log
       )
     end
   end

data/lib/raka/lang/psql/impl.rb

@@ -52,7 +52,7 @@ class Psql
 
     bash env, %(
     #{sh_cmd(schema)} #{param_str} -v _name_=#{task.output_stem} \
-      -v _schema_=#{schema.empty? ? '' : schema + '.'} -f #{fname} | tee #{fname}.log
+      -v _schema_=#{schema.empty? ? '' : schema + '.'} -f #{fname} | { cat; echo; } | sed '$ { /^$/ d; }' | tee #{fname}.log
     mv #{fname}.log #{task.name}
     )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raka
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.1
 platform: ruby
 authors:
 - yarray