openc3 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964ea4b3a9cace2d4e12c4321cd5f6f3e734f90e794aeb6e46cedad56f336732
-  data.tar.gz: e7948a2ca0dab6e9b975f6f4e8753ed7494b63f0161af293f2ce0797a507adeb
+  metadata.gz: e7cb703367de9f45fc0ffb6d7fd9e2d4fbf075d3c2be95081468558a757df2f6
+  data.tar.gz: 2580ce86c27ac4dc6a8dcdaa2e8c8531de1ff3ad5fb803516b70e4c8ac74c90f
 SHA512:
-  metadata.gz: 4fc717bb0d80d646771ae045e1f9a739907dbae94c05b94162f9685ecf8eee70fb2375b72ee75b8db25cb5f24b4579898d1af53b52f6d755cc33746356f50641
-  data.tar.gz: 2faf1ccd06fe62ed0f47286d91622ce83b220b7d6f42352be4c22f471538fbb838d73e3f151d9702cb60bdf2126aceaa25185156eb469f7a8fa5786740e6eb3b
+  metadata.gz: 43cb5951f41970eed0b27f355894d5c014b3f69132abe381640e6d9c1d9d04ab7eab8aecaf14c8e7ec1a51353ec953c68ee4e1ba7783f6d58014ae545dde48cf
+  data.tar.gz: a146e2222479e99a6afe1b726bc0e5c08863db658203538d3781ba83d06e3944f74e41e85b49572f52ddd59d56b55428b937e4ab3a6902277a4dd34df2746e22

data/bin/openc3cli

@@ -31,6 +31,7 @@ require 'openc3/models/scope_model'
 require 'openc3/models/plugin_model'
 require 'openc3/models/gem_model'
 require 'openc3/models/migration_model'
+require 'openc3/models/python_package_model'
 require 'openc3/models/tool_model'
 require 'openc3/packets/packet_config'
 require 'openc3/bridge/bridge'
@@ -258,6 +259,30 @@ def update_plugin(plugin_file_path, plugin_name, variables: nil, plugin_txt_line
   end
 end
 
+def wait_process_complete_internal(process_name, scope:)
+  STDOUT.flush
+  state = 'Running'
+  status = nil
+  while true
+    status = OpenC3::ProcessStatusModel.get(name: process_name, scope: scope)
+    state = status['state']
+    break if state != 'Running'
+    sleep(5)
+    print '.'
+    STDOUT.flush
+  end
+  puts "\nFinished: #{state}"
+  puts "Output:\n"
+  puts status['output']
+  if state == 'Complete'
+    puts "Success!"
+    exit 0
+  else
+    puts "Failed!"
+    exit 1
+  end
+end
+
 def wait_process_complete(process_name)
   STDOUT.flush
   state = 'Running'
@@ -433,7 +458,9 @@ def cli_pkg_install(filename, scope:)
     if File.extname(filename) == '.gem'
       OpenC3::GemModel.install(filename, scope: scope)
     else
-      OpenC3::PythonPackageModel.install(filename, scope: scope)
+      process_name = OpenC3::PythonPackageModel.install(filename, scope: scope)
+      print "Installing..."
+      wait_process_complete_internal(process_name, scope: scope)
     end
   else
     # Outside Cluster
@@ -451,7 +478,9 @@ def cli_pkg_uninstall(filename, scope:)
     if File.extname(filename) == '.rb'
       OpenC3::GemModel.destroy(filename)
     else
-      OpenC3::PythonPackageModel.destroy(filename, scope: scope)
+      process_name = OpenC3::PythonPackageModel.destroy(filename, scope: scope)
+      print "Uninstalling..."
+      wait_process_complete_internal(process_name, scope: scope)
     end
   else
     # Outside Cluster

data/data/config/tool.yaml

@@ -23,11 +23,11 @@ TOOL:
           values: .+
     INLINE_URL:
       summary: Internal url to load a tool
-      description: The url of the javascript file used to load the tool into single-SPA. Defaults to "js/app.js".
+      description: The url of the javascript file used to load the tool into single-SPA. Defaults to "main.js".
       parameters:
         - name: Url
           required: true
-          description: The inline url. If not given defaults to js/app.js. Generally should not be given unless using a non-standard filename.
+          description: The inline url. If not given defaults to main.js. Generally should not be given unless using a non-standard filename.
           values: .+
     WINDOW:
       summary: How to display the tool when navigated to

data/lib/openc3/models/auth_model.rb

@@ -43,6 +43,15 @@ module OpenC3
     end
 
     def self.verify(token)
+      # Handle a service password - Generally only used by ScriptRunner
+      # TODO: Replace this with temporary service tokens
+      service_password = ENV['OPENC3_SERVICE_PASSWORD']
+      return true if service_password and service_password == token
+
+      return verify_no_service(token)
+    end
+
+    def self.verify_no_service(token)
       return false if token.nil? or token.empty?
 
       time = Time.now
@@ -60,11 +69,6 @@ module OpenC3
       @@token_cache_time = time
       return true if @@token_cache == token_hash
 
-      # Handle a service password - Generally only used by ScriptRunner
-      # TODO: Replace this with temporary service tokens
-      service_password = ENV['OPENC3_SERVICE_PASSWORD']
-      return true if service_password and service_password == token
-
       return false
     end
 

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.0.1'
+OPENC3_VERSION = '6.0.2'
 module OpenC3
   module Version
     MAJOR = '6'
     MINOR = '0'
-    PATCH = '1'
+    PATCH = '2'
     OTHER = ''
-    BUILD = '3467e578f31cd2cf2e0070f0cfc731c970ce1cfe'
+    BUILD = '30bcab7b66f6a10baacea338b83fc5bfb89e68d6'
   end
-  VERSION = '6.0.1'
-  GEM_VERSION = '6.0.1'
+  VERSION = '6.0.2'
+  GEM_VERSION = '6.0.2'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "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.0.1",
+    "@openc3/js-common": "6.0.2",
     "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.0.1",
+    "@openc3/js-common": "6.0.2",
     "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.0.1",
+    "@openc3/js-common": "6.0.2",
     "@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.0.1",
+  "version": "6.0.2",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.0.1",
-    "@openc3/vue-common": "6.0.1",
+    "@openc3/js-common": "6.0.2",
+    "@openc3/vue-common": "6.0.2",
     "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.0.1",
+  "version": "6.0.2",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/vue-common": "6.0.1",
+    "@openc3/vue-common": "6.0.2",
     "vuetify": "^3.7.1"
   },
   "devDependencies": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler