bake-toolkit 2.55.1 → 2.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eddaadabf40c2a7e6875e47b3e6d09f08aecd2754cc255a998c2a72aedfd2f6b
-  data.tar.gz: f8ddb34fbad87d446f00501db8b9d74714685b7beabc33cf065e75533cf0c44b
+  metadata.gz: b349db524315468c4e87e7fb31f2800dba7dc4e0b6abf87e0df75452cd9955a6
+  data.tar.gz: 106926fa41e1664269b45f67775922c315af94a62293d9e63a63b1563dd23a6b
 SHA512:
-  metadata.gz: 9d5c1b6754a1bc89d596867e4bfb694d16cbd588eb05c626d15ebb813a5fd8cd1d228aff2764933a0a1028bc4fdd13823bcd1115d52ebe8efa3d34121c384b03
-  data.tar.gz: 1e82b070eb55ed3e70402e93658abef331cc55e944f2a623c32fbd011595a52ff99ee35737c34b310f9bb2fc4c64f37482b67b5d9784c81cee8fe9bf9a3138d9
+  metadata.gz: 130090f2f6a60491f6f29e83487abd441ce3994e3642cdbd9fe9d344d08a81c6d3ce99a6fba348bfab90367a37345adcc73aed136a94fb52c6a1f54e9a2e8de5
+  data.tar.gz: 3c9dc04ee97cc6bd4abd2fbf01f88b2eaf5a4e79196a0ef0b59a3ae3d031a68b133bfeefaba0e7124fd7e94e4c7aae16c75b261cdffe374591fd4163558a5733

data/bin/bake-format

@@ -3,47 +3,29 @@
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 
 require_relative '../lib/format/bake_format'
-begin
-  if ARGV.size == 2
-    indent = '  '
-    input = ARGV[0]
-    output = ARGV[1]
-  elsif ARGV.size == 3
-    indent = ARGV[0]
-    indent = indent.split('=')
-    raise 'indent must have =' unless indent.size == 2
-    raise 'indent must start with --indent' unless indent.first == '--indent'
-    indent = indent.last
-    input = ARGV[1]
-    output = ARGV[2]
-  else
-    raise 'cannot understand'
-  end
-rescue
-  puts [
-    "Usage: #{__FILE__} [--indent=string] input output",
-    "  --indent=string, indent defaults to two spaces.",
-    "    Note, you can escape a tab in bash by ctrl-vTAB with sourrounding \" e.g. \"--input=    \"",
-    "  input, filename or '-' for stdin",
-    "  output, filename, '-' for stdout, '--' for same as input file"
-  ].join("\n")
-  exit 1
-end
+require_relative '../lib/format/options/options'
+
+$options = Bake::BakeFormatOptions.new(ARGV)
+$options.parse_options()
 
 data =
-  if input == '-'
+  if $options.input == '-'
     STDIN.read
   else
-    File.read(input)
+    File.read($options.input)
   end
 
 out =
-  if output == '-'
+  if $options.output == '-'
     STDOUT
-  elsif output == '--'
-    out = input == STDIN ? STDOUT : File.open(input, 'w')
+  elsif $options.output == '--'
+    out = ($options.input == '-') ? STDOUT : File.open($options.input, 'w')
   else
-    File.open(output, 'w')
+    File.open($options.output, 'w')
   end
 
-bake_format(data, out, indent)
+if ($options.start_line != nil) && ($options.end_line != nil)
+  bake_format_in_range(data, out, $options.indent, $options.start_line, $options.end_line)
+else
+  bake_format(data, out, $options.indent)
+end

data/bin/bake-rtext-service

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+
+require 'logger'
+
+require 'rtext/default_loader'
+require 'rtext/default_service_provider'
+require 'rtext/service'
+require 'rgen/environment'
+require 'rgen/fragment/fragmented_model'
+
+require_relative '../lib/bake/model/language'
+require_relative '../lib/bake/model/metamodel'
+require_relative '../lib/rtext-service/options/options'
+
+$options = Bake::BakeRtextServiceOptions.new(ARGV)
+$options.parse_options()
+
+model = RGen::Fragment::FragmentedModel.new(:env => @env)
+patterns = $options.patterns.map { |dir| File.join(dir, "{Project,Adapt}.meta") }
+
+loader = RText::DefaultLoader.new(
+  Bake::Language,
+  model,
+  :file_provider => proc { Dir.glob(patterns) })
+
+bake_service_provider = RText::DefaultServiceProvider.new(Bake::Language, model, loader)
+
+logger = Logger.new(STDOUT)
+logger.level =
+  case $options.loglevel
+  when 'debug' then Logger::DEBUG
+  when 'info' then Logger::INFO
+  when 'warn' then Logger::WARN
+  when 'error' then Logger::ERROR
+  when 'fatal' then Logger::FATAL
+  else Logger::INFO
+  end
+
+on_startup = -> {
+  Bake::Version.printBakeRtextServiceVersion
+  puts "Idle timeout #{$options.timeout} seconds, log level '#{$options.loglevel}'"
+}
+
+rtext_rervice = RText::Service.new(bake_service_provider,
+  { :timeout => $options.timeout, :logger => logger, :on_startup => on_startup })
+rtext_rervice.run()

data/lib/bake/config/loader.rb

@@ -117,7 +117,7 @@ module Bake
             checkCondition = lambda {|name,value|
               return true if adaptHash[name].empty?
               if !configHash.has_key?(name)
-                return adaptHash[name].any?{|ah| ah.empty?}
+                return adaptHash[name].any?{|ah| ah.match("")}
               end
               adaptHash[name].any? { |ah| configHash[name].any?{|ch| ah.match(ch)}}
             }

data/lib/blocks/compile.rb

@@ -249,7 +249,6 @@ module Bake
             srcFilePath = File.join(@projectDir, srcFilePath)
             cmdJson[source] = srcFilePath
           end
-          puts cmdJson
           cmdJson.gsub!("\"" , "\\\"")
           Blocks::CC2J << { :directory => @projectDir, :command => cmdJson, :file => srcFilePath }
         end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.55.1"
+      "2.56.0"
     end
 
     def self.printBakeVersion(ry = "")
@@ -19,6 +19,14 @@ module Bake
     def self.printBakecleanVersion()
       printBakeVersion("clean")
     end
+
+    def self.printBakeRtextServiceVersion()
+      printBakeVersion("-rtext-service")
+    end
+
+    def self.printBakeFormatVersion()
+      printBakeVersion("-format")
+    end
   end
 
   expectedRGen = "0.8.2"

data/lib/format/bake_format.rb

@@ -1,7 +1,12 @@
 def bake_format(data, output, indent)
+  start_line = 0
+  end_line = data.lines.count
+  bake_format_in_range(data, output, indent, start_line, end_line)
+end
+
+def bake_format_in_range(data, output, indent, start_line, end_line)
   indent_level = 0
-  data.each_line do |l|
-    l.strip!
+  data.each_line.with_index do |l, index|
     opening = l.count('{')
     closing = l.count('}')
     old_indent_level = indent_level
@@ -13,7 +18,12 @@ def bake_format(data, output, indent)
       else
         indent * indent_level
       end
-    output.puts((prefix + l).rstrip)
+
+    if index.between?(start_line, end_line)
+      l = (prefix + l.strip).rstrip
+    end
+
+    output.puts(l)
   end
   output.close
 end

data/lib/format/options/options.rb

@@ -0,0 +1,70 @@
+require_relative '../../common/options/parser'
+require_relative '../../common/version'
+
+module Bake
+
+  class BakeFormatOptions < Parser
+    attr_reader :indent, :input, :output # String
+    attr_reader :start_line, :end_line # Fixnum
+
+    def initialize(argv)
+      super(argv)
+
+      @input = '-'
+      @output = '-'
+      @start_line = nil
+      @end_line = nil
+      @indent = '  '
+      @index = 0
+
+      add_option([""             ], lambda { |x| collect_args(x)                                      })
+      add_option(["--indent"     ], lambda { |x| @indent = x                                          })
+      add_option(["--lines"      ], lambda { |x| set_lines(x)                                         })
+      add_option(["-h", "--help" ], lambda { usage; ExitHelper.exit(0)                                })
+      add_option(["--version"    ], lambda { Bake::Version.printBakeFormatVersion; ExitHelper.exit(0) })
+    end
+
+    def usage
+      puts [
+        "Usage: #{__FILE__} [--indent=string] [--lines=string] input output",
+        "  --indent=string, indent defaults to two spaces.",
+        "    Note, you can escape a tab in bash by ctrl-vTAB with sourrounding \" e.g. \"--input=    \"",
+        "  --lines=string, [start line]:[end line] - format a range of lines.",
+        "  input, filename or '-' for stdin",
+        "  output, filename, '-' for stdout, '--' for same as input file"
+      ].join("\n")
+    end
+
+    def parse_options()
+      parse_internal(true)
+    end
+
+  end
+
+end
+
+def collect_args(x)
+  if @index == 0
+    @input = x
+  elsif @index == 1
+    @output = x
+  elsif
+    Bake.formatter.printError("Error: wrong number of the arguments")
+    ExitHelper.exit(1)
+  end
+
+  @index += 1
+end
+
+def set_lines(lines)
+  m = lines.match(/(?<start_line>\d*):(?<end_line>\d*)/)
+
+  if m == nil
+    Bake.formatter.printError("Error: \"#{line}\" has invalid format")
+    ExitHelper.exit(1)
+  end
+
+  @start_line = m[:start_line].to_i
+  @end_line = m[:end_line].to_i
+
+end

data/lib/rtext-service/options/options.rb

@@ -0,0 +1,47 @@
+require_relative '../../common/options/parser'
+require_relative '../../common/version'
+
+module Bake
+  class BakeRtextServiceOptions < Parser
+    attr_reader :loglevel # String
+    attr_reader :patterns
+    attr_reader :timeout # Number
+
+    def initialize(argv)
+      super(argv)
+
+      @loglevel = 'info'
+      @patterns = []
+      @timeout = 3600
+
+      add_option([""                 ], lambda { |x| @patterns.push(x)                                    })
+      add_option(["-l", "--loglevel" ], lambda { |x| set_loglevel(x)                                      })
+      add_option(["-t", "--timeout"  ], lambda { |x| @timeout = x.to_i                                    })
+      add_option(["-h", "--help"     ], lambda { usage; ExitHelper.exit(0)                                })
+      add_option(["--version"        ], lambda { Bake::Version.printBakeFormatVersion; ExitHelper.exit(0) })
+    end
+
+    def usage
+      puts [
+        "Usage: #{__FILE__} [options] <dir patterns>",
+        "  -l, --loglevel [string], log level is one of [debug, info, warn, error, fatal].",
+        "  -t, --timeout [number], idle timeout in seconds after which the service will shutdown. Default is 3600.",
+        "  dir patterns, glob patterns."
+      ].join("\n")
+    end
+
+    def parse_options()
+      parse_internal(true)
+      @patterns = ['./**'] unless @patterns.any?
+    end
+  end
+end
+
+def set_loglevel(level)
+  unless level.match(/^debug|info|warn|error|fatal$/)
+    Bake.formatter.printError("Error: \"#{level}\" is wrong log level type")
+    Bake::ExitHelper.exit(1)
+  end
+
+  @loglevel = level
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.55.1
+  version: 2.56.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -145,6 +145,7 @@ executables:
 - bakeqac
 - bakeclean
 - bake-format
+- bake-rtext-service
 extensions: []
 extra_rdoc_files: []
 files:
@@ -152,6 +153,7 @@ files:
 - bin/bake
 - bin/bake-doc
 - bin/bake-format
+- bin/bake-rtext-service
 - bin/bakeclean
 - bin/bakeqac
 - bin/bakery
@@ -242,7 +244,9 @@ files:
 - lib/common/utils.rb
 - lib/common/version.rb
 - lib/format/bake_format.rb
+- lib/format/options/options.rb
 - lib/multithread/job.rb
+- lib/rtext-service/options/options.rb
 - lib/tocxx.rb
 - license.txt
 homepage: