openc3 5.5.2.pre.beta0 → 5.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afdd0579f3b0663d3cd0d378483b372c2f3c34faa5856d1c5ef5b4a1e582af3
-  data.tar.gz: 9224b37cda9d56d8e867a0ead73d815b3140979355a85d408824377e628fec10
+  metadata.gz: 6ff99b8c3ca332659e787d054c96ed43f617a4e53ba3aea706c4ed799d024f9d
+  data.tar.gz: 72b7fe317faf9e6902a797de6ebfbd8069b51967c0adb54e9367f13ed74b4f15
 SHA512:
-  metadata.gz: 2c3e6009efea9ee0b7669634ba9dd0c45dd81fa9f47405ddd44ec375993e7d85b8f4b51547cb943c3229e2bfd7e5aa5ddfc5ad1de8963a6d05e8220c029e3baf
-  data.tar.gz: 4cbe48f762771ad19429e19102f5fe427607814b1eb2149a06ed713a972d807481b767b023031fe21c21465a67108e39ceb0fef003d0ffea533b3db223960764
+  metadata.gz: 73ca222afa29f68ad9c3dcdbe697a90eebb9d656db43e5f69dcc3e0fb7e5bb6f5dd0e774a80c4282a26a623a9d63ee0d8a8b8ad6f743e9bc6cad5cca876bc395
+  data.tar.gz: a33e0239e3c688968587154945b426a5f3f2f6f73d9ea0270868235b8ccef74c19f4a823ea2d9665c07f15a3441de577da79b46ac8c4fc0877959a0d4552ee02

data/data/config/widgets.yaml

@@ -1316,11 +1316,9 @@ Interactive Widgets:
         The api.tlm() function returns a Promise which is resolved with then()
         at which point we send the command with the telemetry value we received.
 
-        Scripts can be launched from a BUTTON using the `runScript()` method.
-      # warning:
-      #   If your button logic gets complex it's recommended to require a separate
-      #   script and pass the screen to the script using self,
-      #   e.g. require utility.rb; utility_method(self).
+        Scripts can be launched from a BUTTON using the `runScript()` method. `runScript()` takes three parameters,
+        the name of the script, whether to open the script in the foreground of Script Runner (default = true), and a hash of
+        environment variables. For example: `runScript('INST/procedures/script.rb', false, {'VAR': 'VALUE'})`
       parameters:
         - name: Button Text
           required: true
@@ -1332,7 +1330,14 @@ Interactive Widgets:
           values: .+
       example: |
         BUTTON 'Start Collect' 'api.cmd("INST COLLECT with TYPE NORMAL, DURATION 5")'
-        BUTTON 'Run Script' 'runScript("INST/procedures/script.rb")'
+        BUTTON 'Run Checks' 'runScript("INST/procedures/checks.rb")'
+        # More complex example with background checkbox and env vars
+        NAMED_WIDGET SCRIPTNAME COMBOBOX collect.rb checks.rb
+        NAMED_WIDGET BG CHECKBUTTON 'Background'
+        BUTTON 'Run Script' "var script=screen.getNamedWidget('SCRIPTNAME').text();" \
+          # Set an environment variable to be used by the script as ENV['TYPE']
+          "var env = {}; env['TYPE'] = 'TEST';" \
+          "runScript('INST/procedures/'+script, !screen.getNamedWidget('BG').checked(), env)"
     CHECKBUTTON:
       summary: Displays a check box
       description:

data/lib/openc3/core_ext/httpclient.rb

@@ -0,0 +1,11 @@
+require 'httpclient'
+
+class HTTPClient
+  alias original_initialize initialize
+
+  def initialize(*args, &block)
+    original_initialize(*args, &block)
+    # Force use of the default system CA certs (instead of the 6 year old bundled ones)
+    @session_manager&.ssl_config&.set_default_paths
+  end
+end

data/lib/openc3/core_ext.rb

@@ -17,12 +17,13 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/core_ext/array'
 require 'openc3/core_ext/binding'
 require 'openc3/core_ext/class'
+require 'openc3/core_ext/httpclient'
 require 'openc3/core_ext/openc3_io'
 require 'openc3/core_ext/exception'
 require 'openc3/core_ext/file'

data/lib/openc3/io/raw_logger.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'thread'

data/lib/openc3/utilities/authentication.rb

@@ -144,7 +144,8 @@ module OpenC3
 
     # Make the post request to keycloak
     def _make_request(headers, data)
-      uri = URI("#{@url}/realms/openc3/protocol/openid-connect/token")
+      realm = ENV['OPENC3_KEYCLOAK_REALM'] || 'openc3'
+      uri = URI("#{@url}/realms/#{realm}/protocol/openid-connect/token")
       @log[0] = "request uri: #{uri.to_s} header: #{headers.to_s} body: #{data.to_s}"
       STDOUT.puts @log[0] if JsonDRb.debug?
       saved_verbose = $VERBOSE; $VERBOSE = nil

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.5.2-beta0'
+OPENC3_VERSION = '5.5.2'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '5'
     PATCH = '2'
-    OTHER = 'pre.beta0'
-    BUILD = '417d0e4ab762ecc0ada17fd8e230b394721f9cd4'
+    OTHER = ''
+    BUILD = '9c73d9c7c86512a01e0373b12b3058d3ae6b5adf'
   end
-  VERSION = '5.5.2-beta0'
-  GEM_VERSION = '5.5.2.pre.beta0'
+  VERSION = '5.5.2'
+  GEM_VERSION = '5.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 5.5.2.pre.beta0
+  version: 5.5.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -798,6 +798,7 @@ files:
 - lib/openc3/core_ext/exception.rb
 - lib/openc3/core_ext/file.rb
 - lib/openc3/core_ext/hash.rb
+- lib/openc3/core_ext/httpclient.rb
 - lib/openc3/core_ext/io.rb
 - lib/openc3/core_ext/kernel.rb
 - lib/openc3/core_ext/math.rb
@@ -1048,9 +1049,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.14
 signing_key: