openc3 6.2.0 → 6.3.0

data/lib/openc3/utilities/ruby_lex_utils.rb

@@ -14,202 +14,26 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
-require 'irb'
 require 'irb/ruby-lex'
-require 'stringio'
-
-# Clear the $VERBOSE global since we're overriding methods
-old_verbose = $VERBOSE; $VERBOSE = nil
-class RubyLex
-  attr_accessor :indent
-  attr_accessor :line_no
-  attr_accessor :exp_line_no
-  attr_accessor :tokens
-  attr_accessor :code_block_open
-  attr_accessor :ltype
-  attr_accessor :line
-  attr_accessor :continue
-
-  def reinitialize
-    @line_no = 1
-    @prompt = nil
-    initialize_input()
-  end
-end
-$VERBOSE = old_verbose
+require 'prism'
 
 class RubyLexUtils
-  # Regular expression to detect blank lines
-  BLANK_LINE_REGEX  = /^\s*$/
-  # Regular expression to detect lines containing only 'else'
-  LONELY_ELSE_REGEX = /^\s*else\s*$/
-
-  KEY_KEYWORDS = [
-    'class'.freeze,
-    'module'.freeze,
-    'def'.freeze,
-    'undef'.freeze,
-    'begin'.freeze,
-    'rescue'.freeze,
-    'ensure'.freeze,
-    'end'.freeze,
-    'if'.freeze,
-    'unless'.freeze,
-    'then'.freeze,
-    'elsif'.freeze,
-    'else'.freeze,
-    'case'.freeze,
-    'when'.freeze,
-    'while'.freeze,
-    'until'.freeze,
-    'for'.freeze,
-    'break'.freeze,
-    'next'.freeze,
-    'redo'.freeze,
-    'retry'.freeze,
-    'in'.freeze,
-    'do'.freeze,
-    'return'.freeze,
-    'alias'.freeze
-  ]
-
-  # Create a new RubyLex and StringIO to hold the text to operate on
-  def initialize
-    # Taken from https://github.com/ruby/ruby/blob/master/test/irb/test_ruby_lex.rb#L827
-    IRB.init_config(nil)
-    IRB.conf[:VERBOSE] = false
-    # IRB.setup doesn't work because the command line options are passed
-    # and it doesn't recognize --warnings when we run rspec (see spec.rake)
-    # IRB.setup(__FILE__)
-    workspace = IRB::WorkSpace.new(binding)
-    @context = IRB::Context.new(nil, workspace)
-
-    @lex    = RubyLex.new
-    @lex_io = StringIO.new('')
-  end
-
-  def ripper_lex_without_warning(code)
-    RubyLex.ripper_lex_without_warning(code)
-  end
-
-  # @param text [String]
-  # @return [Boolean] Whether the text contains the 'begin' keyword
-  def contains_begin?(text)
-    @lex.reinitialize
-    @lex_io.string = text
-    @lex.set_input(@lex_io, context: @context)
-    tokens = ripper_lex_without_warning(text)
-    tokens.each do |token|
-      if token[1] == :on_kw and token[2] == 'begin'
-        return true
-      end
-    end
-    return false
-  end
-
-  # @param text [String]
-  # @return [Boolean] Whether the text contains the 'end' keyword
-  def contains_end?(text)
-    @lex.reinitialize
-    @lex_io.string = text
-    @lex.set_input(@lex_io, context: @context)
-    tokens = ripper_lex_without_warning(text)
-    tokens.each do |token|
-      if token[1] == :on_kw and token[2] == 'end'
-        return true
-      end
-    end
-    return false
-  end
-
-  # @param text [String]
-  # @return [Boolean] Whether the text contains a Ruby keyword
-  def contains_keyword?(text)
-    @lex.reinitialize
-    @lex_io.string = text
-    @lex.set_input(@lex_io, context: @context)
-    tokens = ripper_lex_without_warning(text)
-    tokens.each do |token|
-      if token[1] == :on_kw
-        if KEY_KEYWORDS.include?(token[2])
-          return true
-        end
-      elsif token[1] == :on_lbrace and !token[3].allbits?(Ripper::EXPR_BEG | Ripper::EXPR_LABEL)
-        return true
-      end
-    end
-    return false
-  end
-
-  # @param text [String]
-  # @return [Boolean] Whether the text contains a keyword which starts a block.
-  #   i.e. 'do', '{', or 'begin'
-  def contains_block_beginning?(text)
-    @lex.reinitialize
-    @lex_io.string = text
-    @lex.set_input(@lex_io, context: @context)
-    tokens = ripper_lex_without_warning(text)
-    tokens.each do |token|
-      if token[1] == :on_kw
-        if token[2] == 'begin' || token[2] == 'do'
-          return true
-        end
-      elsif token[1] == :on_lbrace
-        return true
-      end
-    end
-    return false
-  end
+  OPENING_DELIMITER_TYPES = %i(PARENTHESIS_LEFT BRACKET_LEFT BRACE_LEFT BRACKET_LEFT_ARRAY)
+  CLOSING_DELIMITER_TYPES = %i(PARENTHESIS_RIGHT BRACKET_RIGHT BRACE_RIGHT BRACKET_RIGHT_ARRAY)
 
-  def continue_block?(text)
-    @lex.reinitialize
-    @lex_io.string = text
-    @lex.set_input(@lex_io, context: @context)
-    tokens = RubyLex.ripper_lex_without_warning(text)
-    index = tokens.length - 1
-    while index > 0
-      token = tokens[index]
-      return true if token[1] == :on_kw and token[2] == "do"
-      index -= 1
-    end
-    return false
-  end
-
-  # @param text [String]
-  # @param progress_dialog [OpenC3::ProgressDialog] If this is set, the overall
-  #   progress will be set as the processing progresses
-  # @return [String] The text with all comments removed
-  def remove_comments(text, progress_dialog = nil)
-    @lex.reinitialize
-    @lex_io.string = text
-    @lex.set_input(@lex_io, context: @context)
-    comments_removed = ""
-    token_count = 0
-    progress = 0.0
-    tokens = ripper_lex_without_warning(text)
-    tokens.each do |token|
-      token_count += 1
-      if token[1] != :on_comment
-        comments_removed << token[2]
-      else
-        newline_count = token[2].count("\n")
-        comments_removed << ("\n" * newline_count)
-      end
-      if progress_dialog and token_count % 10000 == 0
-        progress += 0.01
-        progress = 0.0 if progress >= 0.99
-        progress_dialog.set_overall_progress(progress)
-      end
-    end
-
-    return comments_removed
-  end
+  UNINSTRUMENTABLE_KEYWORDS = %i(
+    KEYWORD_CLASS KEYWORD_MODULE KEYWORD_DEF KEYWORD_UNDEF KEYWORD_BEGIN KEYWORD_RESCUE
+    KEYWORD_ENSURE KEYWORD_END KEYWORD_IF KEYWORD_UNLESS
+    KEYWORD_THEN KEYWORD_ELSIF KEYWORD_ELSE KEYWORD_CASE KEYWORD_WHEN
+    KEYWORD_WHILE KEYWORD_UNTIL KEYWORD_FOR KEYWORD_BREAK KEYWORD_NEXT
+    KEYWORD_REDO KEYWORD_RETRY KEYWORD_IN KEYWORD_DO KEYWORD_RETURN KEYWORD_ALIAS
+  )
 
   # Yields each lexed segment and if the segment is instrumentable
   #
@@ -219,113 +43,124 @@ class RubyLexUtils
   # @yieldparam inside_begin [Integer] The level of indentation
   # @yieldparam line_no [Integer] The current line number
   def each_lexed_segment(text)
-    inside_begin = false
-    lex = RubyLex.new
-    lex_io = StringIO.new(text)
-    lex.set_input(lex_io, context: @context)
-    lex.line = ''
     line = ''
-    indent = 0
-    continue_indent = nil
     begin_indent = nil
-    previous_line_indent = 0
+    inside_begin = false
+    string_begin = false
+    orig_line_no = nil
+    line_no = nil
+    rescue_line_no = nil
+    waiting_on_newline = false
+    waiting_on_close = 0
+    prev_token = nil
+    instrumentable = true
+    tokens = Prism.lex(text).value
+    # See: https://github.com/ruby/prism/blob/main/lib/prism/parse_result.rb
+    # for what is returned by Prism.lex
+    # We process the tokens in pairs to recreate spacing and handle string assignments
+    tokens.each_cons(2) do |(token, lex_state), (next_token, _next_lex_state)|
+      # pp token # Uncomment for debugging
+      # Ignore embedded documentation must be at column 0 and looks like:
+=begin
+This is a comment
+And so is this
+=end
+      if token.type == :EMBDOC_BEGIN or token.type == :EMBDOC_LINE or token.type == :EMBDOC_END
+        prev_token = token
+        next
+      end
 
-    while lexed = lex.lex(@context)
-      lex.line_no += lexed.count("\n")
-      lex.line.concat lexed
-      line.concat lexed
+      # Recreate the spaces at the beginning of a line
+      # This has to come before we add the token.value to the line
+      if prev_token.nil?
+        line += ' ' * token.location.start_column
+      # If the previous token is STRING_CONTENT it is probably string interpolation so ignore it
+      # Otherwise if the previous token has changed lines we're on a newline so add space
+      elsif prev_token.type != :STRING_CONTENT and prev_token.location.end_line - prev_token.location.start_line > 0
+        line += ' ' * token.location.start_column
+      end
+      prev_token = token
 
-      if continue_indent
-        indent = previous_line_indent + lex.indent
+      # Comments require tacking on a newline but are otherwise ignored
+      if token.type == :COMMENT
+        line += "\n"
+        waiting_on_newline = false
       else
-        indent += lex.indent
-        lex.indent = 0
+        line += token.value
       end
 
-      if inside_begin and indent < begin_indent
-        begin_indent = nil
-        inside_begin = false
+      if UNINSTRUMENTABLE_KEYWORDS.include?(token.type)
+        instrumentable = false
       end
 
-      # Uncomment the following to help with debugging
-      #puts
-      #puts '*' * 80
-      #puts lex.line
-      #puts "lexed = #{lexed.chomp}, indent (of next line) = #{indent}, actual lex.indent = #{lex.indent}, continue = #{lex.continue}, ltype = #{lex.ltype.inspect}, code_block_open = #{lex.code_block_open}, continue_indent = #{continue_indent.inspect}, begin_indent = #{begin_indent.inspect}"
-
-      # These lines put multiple lines together that are really one line
-      if lex.continue or lex.ltype
-        if not continue_block?(lexed)
-          # Set the indent we should stop at
-          unless continue_indent
-            if (indent - previous_line_indent) > 1
-              continue_indent = indent - 1
-            else
-              continue_indent = previous_line_indent
-            end
-          end
-          next
-        end
-      elsif continue_indent
-        if indent > continue_indent
-          # Still have more content
-          next
-        else
-          # Ready to yield this combined line
-          yield line, !contains_keyword?(line), inside_begin, lex.exp_line_no
-          line = ''
-          lex.exp_line_no = lex.line_no
-          # puts "clear line 1"
-          lex.line = ''
-          previous_line_indent = indent
-          continue_indent = nil
-          next
+      # We're processing tokens in pairs so we need to check if we're at the end
+      # of the file and process the last line
+      if next_token.type == :EOF
+        if !line.empty?
+          yield line, instrumentable, inside_begin, orig_line_no
         end
+        break
       end
-      previous_line_indent = indent
-      continue_indent = nil
 
-      # Detect the beginning and end of begin blocks so we can not catch exceptions there
-      if contains_begin?(line)
-        if contains_end?(line)
-          # Assume the user is being fancy with a single line begin; end;
-          # Ignore
-        else
-          inside_begin = true
-          begin_indent = indent unless begin_indent # Don't restart for nested begins
+      # Recreate spaces between tokens rather than trying to figure out
+      # which tokens require spacing before and after
+      if token.location.start_line == next_token.location.start_line
+        spaces = next_token.location.start_column - token.location.end_column
+        line += ' ' * spaces
+      end
+      line_no ||= token.location.start_line
+      # Keep track of the original line number because the line number can change
+      # when we're putting together multiline structures like strings, arrays, hashes, etc.
+      orig_line_no ||= line_no
+
+      case token.type
+      when :BRACE_LEFT
+        # BRACE is a special case because it can be used for hashes and blocks
+        if lex_state != (Ripper::EXPR_BEG | Ripper::EXPR_LABEL)
+          instrumentable = false
+        end
+        waiting_on_close += 1
+      when :STRING_BEGIN
+        # Mark when a string begins to allow for processing string interpolation tokens
+        string_begin = true
+        line_no = token.location.start_line
+      when :STRING_END
+        string_begin = false
+        next
+      when :KEYWORD_BEGIN
+        inside_begin = true
+        begin_indent = token.location.start_column unless begin_indent # Don't restart for nested begins
+      when :KEYWORD_RESCUE
+        rescue_line_no = token.location.start_line
+      when :KEYWORD_END
+        # Assume the begin and end are aligned
+        # Otherwise we have to count any keywords that can close with END
+        if token.location.start_line == rescue_line_no || token.location.start_column == begin_indent
+          inside_begin = false
         end
+      when *OPENING_DELIMITER_TYPES
+        waiting_on_close += 1
+      when *CLOSING_DELIMITER_TYPES
+        waiting_on_close -= 1
+        waiting_on_newline = true
+      when :NEWLINE, :IGNORED_NEWLINE
+        waiting_on_newline = false
+        # If the next token is a STRING_BEGIN then hold off processing the newline
+        # because it's going to be a string assignment
+        next if next_token.type == :STRING_BEGIN
       end
 
-      # The following code does not care about indent
+      # Don't process the line yet if we're waiting for additional tokens
+      next if string_begin or waiting_on_newline or waiting_on_close > 0
 
-      loop do # loop to allow restarting for nested conditions
-        # Yield blank lines and lonely else lines before the actual line
-        while (index = line.index("\n"))
-          one_line = line[0..index]
-          if BLANK_LINE_REGEX.match?(one_line)
-            yield one_line, true, inside_begin, lex.exp_line_no
-            lex.exp_line_no += 1
-            line = line[(index + 1)..-1]
-          elsif LONELY_ELSE_REGEX.match?(one_line)
-            yield one_line, false, inside_begin, lex.exp_line_no
-            lex.exp_line_no += 1
-            line = line[(index + 1)..-1]
-          else
-            break
-          end
-        end
-
-        if contains_keyword?(line)
-          yield line, false, inside_begin, lex.exp_line_no
-        elsif !line.empty?
-          yield line, true, inside_begin, lex.exp_line_no
-        end
+      # This is where we process the line and yield it
+      if line_no != token.location.start_line or line_no != token.location.end_line
+        yield line, instrumentable, inside_begin, orig_line_no
         line = ''
-        lex.exp_line_no = lex.line_no
-        # puts "clear line 2"
-        lex.line = ''
-        break
-      end # loop do
-    end # while lexed
-  end # def each_lexed_segment
+        instrumentable = true
+        orig_line_no = nil
+        line_no = nil
+      end
+    end
+  end
 end

data/lib/openc3/utilities/target_file.rb

@@ -26,13 +26,17 @@ module OpenC3
     # Matches ScriptRunner.vue const TEMP_FOLDER
     TEMP_FOLDER = '__TEMP__'
 
-    def self.all(scope, path_matchers, target: nil, include_temp: false)
+    def self.all(scope, path_matchers, target: nil)
       target = target.upcase if target
 
+      include_temp = true
       bucket = Bucket.getClient()
       if target
         prefix = "#{scope}/targets/#{target}/"
         modified_prefix = "#{scope}/targets_modified/#{target}/"
+        if target != TEMP_FOLDER
+          include_temp = false
+        end
       else
         prefix = "#{scope}/targets/"
         modified_prefix = "#{scope}/targets_modified/"
@@ -42,7 +46,7 @@ module OpenC3
 
       # Add in local targets_modified if present
       if ENV['OPENC3_LOCAL_MODE']
-        local_modified = OpenC3::LocalMode.local_target_files(scope: scope, path_matchers: path_matchers, include_temp: include_temp)
+        local_modified = OpenC3::LocalMode.local_target_files(scope: scope, target: target, path_matchers: path_matchers, include_temp: include_temp)
         local_modified.each do |filename|
           if include_temp and filename.include?(TEMP_FOLDER)
             temp << filename

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.2.0'
+OPENC3_VERSION = '6.3.0'
 module OpenC3
   module Version
     MAJOR = '6'
-    MINOR = '2'
+    MINOR = '3'
     PATCH = '0'
     OTHER = ''
-    BUILD = '980820e02309298877cba83d612bd6705f305f1b'
+    BUILD = '52f29bf512b463d226b93d18f31aa71936d472b2'
   end
-  VERSION = '6.2.0'
-  GEM_VERSION = '6.2.0'
+  VERSION = '6.3.0'
+  GEM_VERSION = '6.3.0'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "^18.2.6",
     "@angular/router": "^18.2.6",
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.2.0",
+    "@openc3/js-common": "6.3.0",
     "rxjs": "~7.8.0",
     "single-spa": "^5.9.5",
     "single-spa-angular": "^9.2.0",

data/templates/tool_react/package.json

@@ -16,7 +16,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^6.1.1",
-    "@openc3/js-common": "6.2.0",
+    "@openc3/js-common": "6.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "single-spa-react": "^5.1.4"

data/templates/tool_svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.2.0",
+    "@openc3/js-common": "6.3.0",
     "@smui/button": "^7.0.0",
     "@smui/common": "^7.0.0",
     "@smui/card": "^7.0.0",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.2.0",
-    "@openc3/vue-common": "6.2.0",
+    "@openc3/js-common": "6.3.0",
+    "@openc3/vue-common": "6.3.0",
     "axios": "^1.7.7",
     "date-fns": "^4.1.0",
     "lodash": "^4.17.21",

data/templates/widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= widget_name %>",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/vue-common": "6.2.0",
+    "@openc3/vue-common": "6.3.0",
     "vuetify": "^3.7.1"
   },
   "devDependencies": {

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Ryan Melton
 - Jason Thomas
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.22'
-- !ruby/object:Gem::Dependency
-  name: irb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -777,16 +776,16 @@ email:
 - ryan@openc3.com
 - jason@openc3.com
 executables:
+- cstol_converter
 - openc3cli
 - rubysloc
-- cstol_converter
 extensions:
 - ext/openc3/ext/array/extconf.rb
 - ext/openc3/ext/buffered_file/extconf.rb
 - ext/openc3/ext/burst_protocol/extconf.rb
 - ext/openc3/ext/config_parser/extconf.rb
-- ext/openc3/ext/openc3_io/extconf.rb
 - ext/openc3/ext/crc/extconf.rb
+- ext/openc3/ext/openc3_io/extconf.rb
 - ext/openc3/ext/packet/extconf.rb
 - ext/openc3/ext/platform/extconf.rb
 - ext/openc3/ext/polynomial_conversion/extconf.rb
@@ -794,7 +793,6 @@ extensions:
 - ext/openc3/ext/string/extconf.rb
 - ext/openc3/ext/tabbed_plots_config/extconf.rb
 - ext/openc3/ext/telemetry/extconf.rb
-- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
 - Gemfile
@@ -837,7 +835,6 @@ files:
 - data/config/tool.yaml
 - data/config/unknown.yaml
 - data/config/widgets.yaml
-- ext/mkrf_conf.rb
 - ext/openc3/ext/array/array.c
 - ext/openc3/ext/array/extconf.rb
 - ext/openc3/ext/buffered_file/buffered_file.c
@@ -1009,6 +1006,7 @@ files:
 - lib/openc3/migrations/20241208080000_no_critical_cmd.rb
 - lib/openc3/migrations/20241208080001_no_trigger_group.rb
 - lib/openc3/migrations/20250108060000_news_feed.rb
+- lib/openc3/migrations/20250402000000_periodic_only_default.rb
 - lib/openc3/models/activity_model.rb
 - lib/openc3/models/auth_model.rb
 - lib/openc3/models/cvt_model.rb
@@ -1286,8 +1284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: OpenC3
 test_files: []