raka 0.3.4 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 895e1c40801f38ff5168449c25333ee40e9aca718f6d082a90d8898a75513373
-  data.tar.gz: 9d8228de56582ef7202f30d10f32a285ad96197599344bd9a471dabb1699bdd3
+  metadata.gz: 011d4dda2d79391c732fb51b383a015ee6f0e6b10f4bd1eb8e976af16100bdf5
+  data.tar.gz: 3e83d92014c4360dd0180db04e4d7abed90973e35a986dfa9b7afd25c16a1b86
 SHA512:
-  metadata.gz: 3fe0e6223cc75ebe754f353155a1c78c96d25ae55bbffc108a6d8485038d06ad0cebda5be8093d50d0cb24e12b670ed0335b07b880816f5913e1f2712675e30c
-  data.tar.gz: 245dbe2ed2b8f0966b0b3a980af00dda5cf084838228d40144e020de2a1545e3b856d90ebe51ab0419c53ca5a93a41929023903eb5171500e22c65ca44e043b1
+  metadata.gz: 8fa7be1a0d0e86851c36cb6a57a1638a10eb52a15f03ebc73819dbf1e6984524ecf909ddbad754d72542f800a6ff10bdd80d6feb7e5f4dbe56b9b53d86f26f04
+  data.tar.gz: f77dbe680509b21ceac1f13c1abe583c96d91ba6156efa88afc94519c4a837b220361851b5e4f56c7d2002eda79d6022c4cebcab6c341eea6af582d92ce919b8

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.8

data/bin/raka

@@ -62,22 +62,18 @@ cmd = ''
 opt_str = "-f #{entry}"
 opt_str += " -m -j #{options[:jobs]}" if options.key?(:jobs)
 cmd += "#{env}rake #{opt_str} #{extra_args} #{targets}"
+dry_cmd = 'RUBYOPT="-W0" ' + cmd + ' --dry-run'
+_, dry_msg, status = Open3.capture3(dry_cmd)
+exit(status) if status != 0
+unless (dry_msg.lines.first.chomp =~ /^.*\(.*not_needed.*\)$/).nil?
+  puts 'All targets are up to date'
+  exit(0)
+end
 puts cmd
-output = []
-ro, out = IO.pipe
-re, err = IO.pipe
 pid = fork do
-  status = system(cmd, out: out, err: err)
+  status = system(cmd)
   puts 'Error: rake returns the following information:' unless status
   exit($CHILD_STATUS.exitstatus)
 end
-out.close
-err.close
-ro.each_line do |l|
-  puts l
-  output << l.chomp
-end
-re.each_line { |l| puts l; }
 
 Process.wait(pid)
-puts 'All targets are up to date' if output.empty? && $CHILD_STATUS.exitstatus == 0

data/lib/raka/compile.rb

@@ -131,6 +131,7 @@ class DSLCompiler
 
   # compile token = rhs to rake rule
   # rubocop:disable Style/MethodLength
+  # rubocop:disable Style/PerceivedComplexity
   def compile(lhs, rhs)
     unless @env.instance_of?(Object)
       raise "DSL compile error: seems not a valid @env of rake with class #{@env.class}"
@@ -170,10 +171,12 @@ class DSLCompiler
     end
 
     # We generate a rule for each possible input type
-    @options.input_types.each do |ext|
+
+    (lhs._options_[:input_exts] || @options.input_types).each do |ext|
       # We find auto source from both THE scope and the root
       create_rule lhs, ext, actions, extra_deps, extra_tasks
     end
   end
 end
 # rubocop:enable Style/MethodLength
+# rubocop:enable Style/PerceivedComplexity

data/lib/raka/protocol.rb

@@ -86,11 +86,23 @@ end
 # helper functions to implement LanguageImpl
 def run_cmd(env, cmd)
   env.logger.debug(cmd)
-  Open3.popen3(cmd) do |_stdin, stdout, stderr, _thread|
-    env.logger.debug(stdout.read)
-    err = stderr.read
-    env.logger.info(err) unless err.empty?
+  out_r, out_w = IO.pipe
+  err_r, err_w = IO.pipe
+  if env.logger.level <= 0
+    pid = spawn(cmd, out: out_w)
+    Thread.new do
+      env.logger.debug(out_r.gets) until out_r.eof
+    end
+  elsif env.logger.level == 1
+    pid = spawn(cmd, out: out_w)
+  else
+    pid = spawn(cmd, out: out_w, err: err_w)
   end
+
+  Process.wait pid
+  out_w.close
+  err_w.close
+  err_r.close
 end
 
 def pick_kwargs(klass, kwargs)

data/lib/raka/token.rb

@@ -29,11 +29,17 @@ end
 class Token
   attr_reader :chain
 
-  def initialize(compiler, context, chain, inline_scope)
+  def initialize(compiler, context, chain, inline_scope, input_exts: nil)
     @compiler = compiler
     @context = context
     @chain = chain
     @inline_scope = inline_scope
+    @options = {}
+    @options[:input_exts] = input_exts
+  end
+
+  def _options_
+    @options
   end
 
   def _captures_(target)
@@ -74,7 +80,7 @@ class Token
 
   # attach a new item to the chain
   def _attach_(item)
-    Token.new(@compiler, @context, @chain + [item], @inline_scope)
+    Token.new(@compiler, @context, @chain + [item], @inline_scope, @options)
   end
 
   # rubocop:disable Style/MissingRespondToMissing  # for DSL not essential

data/lib/raka.rb

@@ -25,7 +25,7 @@ class Raka
     env = @env
     options = @options
     scopes = @scopes
-    @env.define_singleton_method(ext_alias || ext) do |*args|
+    @env.define_singleton_method(ext_alias || ext) do |*args, **kw|
       # Here the compiler are bound with @options so that when we change @options
       # using methods like scope in Rakefile, the subsequent rules defined will honor
       # the new settings
@@ -33,7 +33,7 @@ class Raka
       inline_scope_pattern = !args.empty? ? args[0] : nil
       Token.new(
         DSLCompiler.new(env, options), Context.new(ext, scopes.clone),
-        [], inline_scope_pattern
+        [], inline_scope_pattern, **kw
       )
     end
   end
@@ -41,7 +41,7 @@ class Raka
   def initialize(env, options)
     @env = env
     defaults = {
-      output_types: [:csv], input_types: [],
+      output_types: [:csv], input_types: nil,
       type_aliases: {},
       scopes: [],
       lang: ['lang/shell'],
@@ -51,7 +51,10 @@ class Raka
 
     create_logger options.log_level || (ENV['LOG_LEVEL'] || Logger::INFO).to_i
 
-    @options.input_types |= @options.output_types # any output can be used as intermediate
+    # if input_types given, obey it, otherwise use all output types as possible input types
+    unless @options.input_types
+      @options.input_types = @options.output_types # any output can be used as intermediate
+    end
     # specify root of scopes in options, scopes will append to each root
     @scopes = options.scopes.empty? ? [] : [options.scopes]
     @options.lang.each { |path| load File::join(File::dirname(__FILE__), "raka/#{path}/impl.rb") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raka
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.8
 platform: ruby
 authors:
 - yarray
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake