raka 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a81d9e837185c89f4c0b306675a40e4196e409d6cbafb1cf094d29493bac18
-  data.tar.gz: a2fc038c599be3f1d4ba8e4cc39dbd29d485e24723321a54ce937a243175b36d
+  metadata.gz: 011cb849875835a2f870852a235004111610ed9c0eba29ada3c50d83bd0d8236
+  data.tar.gz: 77cbf3b3e2f594942302cdc1231d32a7ac3ce609097c3999905beedd322d934b
 SHA512:
-  metadata.gz: 520eb293b32a8ce0447fe1219c1a8c99672a50222ba903a7080b01a15efdc98a662b19c122332e8f9dca63bc3ba5a14e4cdd3e0a30f502bb4d6a52b96c98b93d
-  data.tar.gz: a8756e782078a30fc3a3751def61862273833e308131fa5a98cd2d60f5dc9a696beaa3caf8f4d6793f5944b9c8a089694d1992717fff42c27f01fcdcaa3a34a6
+  metadata.gz: cc771c7c40c7e9e8cc98d1150be293abac519500150324163160c863c99488ddb8e679b84c0f37c0c4d4386de984fd4aae2e56df5c54859a3fe25693d9655e57
+  data.tar.gz: 58b4980a085bff10965b1863e7b0e8b06db64b722412eac860ec95279cbb45461ab53ac6ae12648c9c413262e17daeb450d0c14db30f9c878df5fbfa5e066273

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/bin/raka

@@ -5,6 +5,11 @@ require 'optparse'
 require 'English'
 require 'open3'
 
+def get_version
+  version_file = File.join(File.dirname(__FILE__), '..', 'VERSION')
+  File.read(version_file).strip
+end
+
 def detect_main
   # check predefined files
   main_file_cands = ['Rakefile.raka', 'rakefile.raka', 'main.raka']
@@ -32,6 +37,11 @@ parser = OptionParser.new do |opts|
     set_option(options, :verbose, v)
   end
 
+  opts.on('--version', 'Show version') do
+    puts get_version
+    exit(0)
+  end
+
   opts.on('-f', '--file FILE', String, 'Run even when up to date') do |s|
     set_option(options, :file, s)
   end

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

metadata

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