cosmos 4.4.1-java → 4.5.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e34fbd844de84ca2b8b051fa32cdb3d4a378b8042aeb968951af68e74a79da
-  data.tar.gz: c00194480b4dac9e5cc1c7c519f1f5b0f5ae343503735207ab22da09dcf6d18a
+  metadata.gz: 060701167ddcf37501a5f9bc029704f2f15d0a663b11041bf3320df5826e29f9
+  data.tar.gz: d71a10cd853c7eeb475408fa0d8a27d3e7971b907969b2250e8ae38d5d6decb4
 SHA512:
-  metadata.gz: 948f3c0738765b8c62057871449b56f05490bc66a5dd31e78fa8d5bf57d0b4bdd5c90b895d5eee5e4a3f345ddfaf2396838ac882599d949e030ae448ff626be7
-  data.tar.gz: c326e41b536132fb332a888b2e63157f1e75c4f0aeb29143525183ccb0456c2653a8c457acbbcc0ffba45b3aebbd5bb5d434aae83e35fe4b5ad1114f46715149
+  metadata.gz: 45c398e9bb54f33c71d238cd55413ce629ee4e79ab135723e5cf5f8a7dcf0aefcd5039c902c332f6387b3cec441369c5d750f4203fe5454253bc5bd845072487
+  data.tar.gz: cd8f4305482c575341a94c18f357f43ecd365f3624c4f3acb79849b0f6a1eee5410baab288dbda1ef85ce3e2cb4d6ce29db9450f1dfe233b5159562c75de2865

data/.github/workflows/build_v4.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+# Reference environment variables: https://docs.github.com/en/actions/reference/environment-variables
+
+name: Cosmos 4 Tests
+
+on:
+  push:
+    branches: [cosmos4]
+  pull_request:
+    branches: [cosmos4]
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        ruby-version: ["2.5", "2.6"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake build spec
+        env:
+          COSMOS_DEVEL: ${GITHUB_WORKSPACE}\.

data/Dockerfile

@@ -49,17 +49,23 @@ RUN cd /opt \
   && tar xvf jruby.tar.gz \
   && mv jruby-9.2.9.0 jruby
 
+ARG COSMOS_REPO=https://github.com/BallAerospace/COSMOS.git
+
 # Download and setup COSMOS devel area
 RUN gem install bundler --no-document
 RUN cd /devel \
-  && git clone https://github.com/BallAerospace/COSMOS.git \
+  && git clone -b cosmos4 ${COSMOS_REPO} COSMOS \
   && cd /devel/COSMOS \
   && bundle install
 
+ARG COSMOS_DOCKER_REPO=https://github.com/BallAerospace/cosmos-docker.git
+
 # Download COSMOS docker files to support docker release
 RUN cd /devel \
-  && git clone https://github.com/BallAerospace/cosmos-docker.git
-  
+  && git clone ${COSMOS_DOCKER_REPO}
+
 ENV COSMOS_DEVEL /devel/COSMOS
+ENV COSMOS_NO_SIMPLECOV 1
+ENV DOCKER 1
 WORKDIR /devel/COSMOS
-CMD bash
+CMD bash

data/Gemfile

@@ -8,4 +8,4 @@ gem 'ruby-termios', '>= 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cy
 #  gem 'wdm', '>= 0.1.0', :platforms => [:mswin, :mingw]
 #end
 gemspec
-instance_eval File.read(File.join(__dir__, 'install/config/dart/Gemfile'))
+instance_eval File.read(File.join(__dir__, 'install/config/dart/Gemfile')) unless ENV['CI']

data/Manifest.txt

@@ -1,12 +1,11 @@
-.coveralls.yml
 .dockerignore
 .gitattributes
 .github/ISSUE_TEMPLATE/bug_report.md
 .github/ISSUE_TEMPLATE/feature_request.md
 .github/ISSUE_TEMPLATE/help---usage---general-question.md
+.github/workflows/build_v4.yml
 .gitignore
 .rubocop.yml
-.travis.yml
 .yardopts
 CONTRIBUTING.txt
 Dockerfile
@@ -694,6 +693,29 @@ ext/cosmos/ext/tabbed_plots_config/tabbed_plots_config.c
 ext/cosmos/ext/telemetry/extconf.rb
 ext/cosmos/ext/telemetry/telemetry.c
 ext/mkrf_conf.rb
+extensions/vscode/.gitignore
+extensions/vscode/.vscode/launch.json
+extensions/vscode/.vscode/settings.json
+extensions/vscode/.vscode/tasks.json
+extensions/vscode/License.txt
+extensions/vscode/README.md
+extensions/vscode/client/License.txt
+extensions/vscode/client/README.md
+extensions/vscode/client/cosmos.configuration.json
+extensions/vscode/client/images/icon.png
+extensions/vscode/client/package-lock.json
+extensions/vscode/client/package.json
+extensions/vscode/client/src/extension.ts
+extensions/vscode/client/src/screen_preview.rb
+extensions/vscode/client/syntaxes/cosmos.tmLanguage.json
+extensions/vscode/client/tsconfig.json
+extensions/vscode/package-lock.json
+extensions/vscode/package.json
+extensions/vscode/server/License.txt
+extensions/vscode/server/package-lock.json
+extensions/vscode/server/package.json
+extensions/vscode/server/src/server.ts
+extensions/vscode/server/tsconfig.json
 install/Gemfile
 install/Launcher
 install/Launcher.bat
@@ -1454,8 +1476,10 @@ spec/interfaces/udp_interface_spec.rb
 spec/io/buffered_file_spec.rb
 spec/io/io_multiplexer_spec.rb
 spec/io/json_drb_object_spec.rb
+spec/io/json_drb_rack_spec.rb
 spec/io/json_drb_spec.rb
 spec/io/json_rpc_spec.rb
+spec/io/posix_serial_driver_spec.rb
 spec/io/raw_logger_pair_spec.rb
 spec/io/raw_logger_spec.rb
 spec/io/serial_driver_spec.rb

data/README.md

@@ -105,9 +105,12 @@ Before any contributions can be incorporated we do require all contributors to s
 
 This protects both you and us and you retain full rights to any code you write.
 
+## Vulnerability Disclosure
+
+If you discover a security vulnerability in COSMOS, please do not disclose to any public forum or our Github tickets system.  Please email the vulnerability details to COSMOS@ball.com, and give us 90 days to incorporate any needed changes. Also please also let us know how how you would like to be reffered to for attribution when we post the fix. Thanks!
+
 ## Code Status
 
-* [![Travis Build Status](https://travis-ci.org/BallAerospace/COSMOS.svg?branch=master)](https://travis-ci.org/BallAerospace/COSMOS)
 * [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/gw61r3dvakjamx6o?svg=true)](https://ci.appveyor.com/project/jasonatball/cosmos)
 * [![Code Climate](https://codeclimate.com/github/BallAerospace/COSMOS/badges/gpa.svg)](https://codeclimate.com/github/BallAerospace/COSMOS)
 * [![Codecov](https://img.shields.io/codecov/c/github/codecov/example-python.svg)](https://codecov.io/gh/BallAerospace/COSMOS)

data/Rakefile

@@ -169,8 +169,8 @@ task :build => [:devkit] do
   end
 end
 
-task :git_checkout_master do
-  system('git checkout master')
+task :git_checkout do
+  system('git checkout cosmos4')
 end
 
 task :install_crc do
@@ -192,7 +192,7 @@ task :gem => [:require_version] do
   system('gem build cosmos.gemspec')
 end
 
-task :commit_release_ticket => [:require_version, :git_checkout_master] do
+task :commit_release_ticket => [:require_version, :git_checkout] do
   system('git add data/crc.txt')
   system('git add demo/config/data/crc.txt')
   system('git add install/config/data/crc.txt')
@@ -233,7 +233,7 @@ task :version => [:require_version] do
   # Create the crc.txt file
   crc = RakeCrc32.new
   File.open("data/crc.txt",'w') do |file|
-    Dir[File.join('lib','**','*.rb')].each do |filename|
+    Dir[File.join('lib','**','*.rb')].sort.each do |filename|
       file_data = File.open(filename, 'rb').read.gsub("\x0D\x0A", "\x0A")
       file.puts "\"#{filename}\" #{sprintf("0x%08X", crc.calc(file_data))}"
     end
@@ -297,9 +297,17 @@ if RUBY_ENGINE == 'ruby'
   end
 end
 
-task :release => [:require_version, :git_checkout_master, :build, :spec, :manifest, :version, :install_crc, :gem]
+task :release => [:require_version, :git_checkout, :build, :spec, :manifest, :version, :install_crc, :gem]
 task :commit_release => [:commit_release_ticket, :tag_release]
 
+# HOW-TO: Performing a COSMOS 4 build
+# 1. rake docker_build
+# 2. rake docker_run
+# 3. Follow the individual steps printed out
+# NOTE: When doing git push you will be asked for password
+#       You will need to enter a Github access token value
+#       Create one on Github, User -> Settings -> Developer settings -> Personal access tokens
+
 task :docker_build do
   _, platform, *_ = RUBY_PLATFORM.split("-")
   if (platform == 'mswin32' or platform == 'mingw32') and which('winpty')
@@ -312,28 +320,26 @@ end
 task :docker_run do
   STDOUT.puts "Note, this is not automated on purpose to ensure each step is successful (with user entry of credentials for github/rubygems.org)"
   STDOUT.puts "Steps to perform a COSMOS release:"
-  STDOUT.puts "1. git config --global user.name \"First Last\""
+  STDOUT.puts "1. git config --global user.name \"Last, First\""
   STDOUT.puts "2. git config --global user.email \"me@ball.com\""
-  STDOUT.puts "3. git pull"
-  STDOUT.puts "4. export VERSION=X.X.X"
-  STDOUT.puts "5. rake release"
-  STDOUT.puts "6. rake commit_release"
-  STDOUT.puts "7. export PATH=/opt/jruby/bin:$PATH"
-  STDOUT.puts "8. rake gem"
-  STDOUT.puts "9. gem push cosmos-X.X.X.gem"
-  STDOUT.puts "10. gem push cosmos-X.X.X-java.gem"
+  STDOUT.puts "3. git checkout cosmos4"
+  STDOUT.puts "4. git pull"
+  STDOUT.puts "5. export VERSION=X.X.X"
+  STDOUT.puts "6. rake release"
+  STDOUT.puts "7. rake commit_release"
+  STDOUT.puts "8. export PATH=/opt/jruby/bin:$PATH"
+  STDOUT.puts "9. rake gem"
+  STDOUT.puts "10a. /usr/bin/gem push cosmos-X.X.X.gem"
+  STDOUT.puts "10b. /usr/bin/gem push cosmos-X.X.X-java.gem"
   STDOUT.puts "11. cd /devel/cosmos-docker"
-  STDOUT.puts "12. Update COSMOS_VERSION in all Dockerfiles"
-  STDOUT.puts "13. git commit -a -m \"Release COSMOS vX.X.X\""
-  STDOUT.puts "14. git push"
-  STDOUT.puts "15. git checkout -b vX.X.X"
-  STDOUT.puts "16. git push --set-upstream origin vX.X.X"
-  STDOUT.puts "17. Update release notes on github.com and cosmosrb.com"
-  
-  _, platform, *_ = RUBY_PLATFORM.split("-")
-  if (platform == 'mswin32' or platform == 'mingw32') and which('winpty')
-    system('winpty docker run -it --rm cosmos-dev')
-  else
-    system('docker run -it --rm cosmos-dev')
-  end  
+  STDOUT.puts "12. git pull"
+  STDOUT.puts "13. Update COSMOS_VERSION in all Dockerfiles. Also update README.md"
+  STDOUT.puts "14. git commit -a -m \"Release COSMOS vX.X.X\""
+  STDOUT.puts "15. git push"
+  STDOUT.puts "16. git checkout -b vX.X.X"
+  STDOUT.puts "17. git push --set-upstream origin vX.X.X"
+  STDOUT.puts "18. Update release notes on github.com and cosmosrb.com"
+  STDOUT.puts "    https://github.com/BallAerospace/COSMOS/pulls?q=is%3Apr+is%3Aclosed+base%3Acosmos4+no%3Amilestone"
+
+  system('docker run -it --rm cosmos-dev')
 end

data/autohotkey/tools/cmd_extractor.ahk

@@ -4,27 +4,28 @@ Sleep 500
 Send ^r ; Mode->Include Raw Data CE-3
 Sleep 500
 Click 500 95 ; Browse
-Sleep 1000
+WinWaitActive Select
 Send cmd.bin{Enter}
 WinWaitActive Command Extractor
-Click 200 446 ; Process Files
+Click 200 446 ; Process Data
 WinWaitActive Warning
 Sleep 500
-Send {Enter} ;
+Send {Enter}
 WinWaitActive Log File
+Sleep 500
 Click 450 305 ; Cancel
 WinWaitActive Command Extractor
 sleep 500
-Click 200 446 ; Process Files
+Click 200 446 ; Process Data
 WinWaitActive Warning
 Sleep 500
-Send {Enter} ;
+Send {Enter} ; Overwrite
 Sleep 500
-Send {Enter} ; Overwrite Yes
+Send {Enter} ; Warning Ok
 Sleep 5000 ; Allow the file to be processed CE-1
 Send {Enter}
 WinWaitActive Command Extractor
-Click 460 446 ; Open in Text Editor CE-2
+Click 315 446 ; Open in Text Editor CE-2
 Sleep 5000
 Send !f{x}      ; Exit text editor
 WinActivate Command Extractor
@@ -32,14 +33,15 @@ WinWaitActive Command Extractor
 Send !f{a} ; Analyze logs
 WinWaitActive Warning
 Sleep 500
-Send {Enter} ;
+Send {Enter}
 WinWaitActive Log File
+Sleep 500
 Click 450 305 ; Cancel
 WinWaitActive Command Extractor
 Send !f{a} ; Analyze logs
 WinWaitActive Warning
 Sleep 500
-Send {Enter} ;
+Send {Enter}
 WinWaitActive Log File
 Sleep 2000
 Send {Enter} ; Done

data/autohotkey/tools/cmd_sender.ahk

@@ -15,7 +15,7 @@ Sleep 1000
 Send {Enter}
 WinWaitActive Command Sender
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Command Sender
 Sleep 500
 Click 60 600 ; Click in the Command History

data/autohotkey/tools/cmd_sequence.ahk

@@ -1,7 +1,7 @@
 SetWinDelay 1000
 WinWaitActive Command Sequence
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Command Sequence
 
 Send ^o ; Open

data/autohotkey/tools/data_viewer.ahk

@@ -1,7 +1,7 @@
 WinWaitActive, Data Viewer ahk_class QWidget
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Data Viewer
 Sleep 500
 Send ^r ; Reset

data/autohotkey/tools/limits_monitor.ahk

@@ -2,7 +2,7 @@ SetWinDelay 1000
 WinWaitActive Limits Monitor
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Limits Monitor
 Sleep 3000
 Send !fp ; Options

data/autohotkey/tools/packet_viewer.ahk

@@ -3,7 +3,7 @@ SetTitleMatchMode 2 ; Contain the title anywhere to match
 WinWaitActive Packet Viewer
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Packet Viewer
 WinWaitActive Packet Viewer
 Sleep 500

data/autohotkey/tools/script_runner.ahk

@@ -538,7 +538,7 @@ Sleep 500
 
 ; Start the CmdTlmServer
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Script Runner
 Sleep 1000
 

data/autohotkey/tools/test_runner2.ahk

@@ -1,7 +1,7 @@
 SetWinDelay 500
 ; Start the CmdTlmServer
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 
 WinActivate Test Runner
 WinWaitActive Test Runner

data/autohotkey/tools/tlm_grapher.ahk

@@ -20,7 +20,7 @@ Sleep 500
 
 ; Connect to the CT server
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Telemetry Grapher
 Click 55 95  ; Start TG-3
 Sleep 500

data/autohotkey/tools/tlm_grapher3.ahk

@@ -3,7 +3,7 @@ WinWaitActive Telemetry Grapher
 
 ; Connect to the CT server
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Telemetry Grapher
 Send {Enter}
 

data/autohotkey/tools/tlm_viewer.ahk

@@ -3,7 +3,7 @@ SetKeyDelay 10
 
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 
 WinActivate Telemetry Viewer
 Sleep 1000

data/autohotkey/tools/tlm_viewer2.ahk

@@ -10,7 +10,7 @@ Send {Enter}
 
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 Run ruby.exe %A_ScriptDir%/ScriptRunner -w 600 -t 600
 
 WinWaitActive Script

data/autohotkey/tools/tlm_viewer5.ahk

@@ -4,7 +4,7 @@ SetKeyDelay 10
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
 WinActivate "INST ADCS"
-Sleep 4000
+Sleep 10000
 
 ; Close down command and telemetry server
 WinActivate Command and Telemetry Server

data/bin/rubysloc

@@ -13,25 +13,72 @@
 # Blank lines and comment lines are ignored.  All other
 # lines count as one line.
 
-files = []
-if ARGV.length == 0
-  require 'find'
+require 'ostruct'
+require 'optparse'
+
+options = OpenStruct.new
+options.filename = nil
+options.sort_column = nil
 
-  #Find all .rb and .rbw files from the current directory
-  Find.find('.') do |path|
-    Find.prune if FileTest.directory?(path) and File.basename(path) == 'pkg'
-    extension = File.extname(path)
-    files << path if extension.to_s =~ /\.rb/i
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: rubysloc"
+  opts.separator ""
+  opts.separator "Recursively calculate SLOC for all ruby files (*.rb) sorted by filename"
+  opts.separator ""
+  opts.on("-h", "--help", "Show this message") do
+    puts opts
+    exit
   end
-else
-  if ARGV[0] == '--infile' or ARGV[0] == '-i'
-    File.open(ARGV[1], 'r') {|file| file.each_line {|line| files << line.chomp.strip}}
+  opts.on("-i DIRECTORY/FILENAME", "--input DIRECTORY/FILENAME",
+    "Parse only the specified directory/filename (relative or absolute path)") do |arg|
+    options.filename = arg
+  end
+  opts.on("-s SORT", "--sort SORT", "Sort by the specified column. Must be one of LINES, COMMENTS, SLOC, or RATIO.") do |arg|
+    case arg
+    when 'LINES'
+      options.sort_column = 1
+    when 'COMMENTS'
+      options.sort_column = 2
+    when 'SLOC'
+      options.sort_column = 3
+    when 'RATIO'
+      options.sort_column = 4
+    else
+      puts opts
+      exit
+    end
+  end
+end
+
+begin
+  opts.parse!(ARGV)
+rescue => err
+  puts err
+  puts opts
+  exit
+end
+
+files = []
+if options.filename
+  options.filename = File.join(Dir.pwd, options.filename) unless File.exist?(options.filename)
+  if File.exist?(options.filename)
+    if File.directory?(options.filename)
+      # Dir only works with unix paths so swap backslashes
+      files = Dir[File.join(options.filename.gsub('\\','/'), '**', '*.rb')]
+    else
+      files << options.filename
+    end
   else
-    files = ARGV
+    puts "File #{options.filename} not found."
+    puts opts
+    exit
   end
+else
+  files = Dir['**/*.rb']
 end
 
 # Build results over all found ruby files
+longest_path = 1
 results = []
 files.each do |full_filename|
   filename = File.basename(full_filename)
@@ -43,21 +90,20 @@ files.each do |full_filename|
       lines += 1
       split_line = line.split
       if split_line[0].nil?
-        #Blank Line - Do Nothing
-        #puts "NOT COUNTED - #{line.chomp}"
+        # Blank Line - Do Nothing
       elsif split_line[0].to_s[0..0] == '#'
-        #Comment Line
-        #puts "COMMENT LINE - #{line.chomp}"
         comments += 1
       else
-        #puts "COUNTED - #{line.chomp}"
         slocs += 1
       end
     end
-    results << [filename, lines, comments, slocs, comments.to_f / slocs.to_f]
+    results << [full_filename, lines, comments, slocs, comments.to_f / slocs.to_f]
+    longest_path = full_filename.length if full_filename.length > longest_path
   end
 end
 
+results.sort_by! {|col| col[options.sort_column].finite? ? col[options.sort_column] : -1 } if options.sort_column
+
 # Print results to STDOUT
 total_files    = 0
 total_lines    = 0
@@ -65,12 +111,12 @@ total_comments = 0
 total_slocs    = 0
 total_ratio    = 0
 
-puts "|-----------------------------------|----------|----------|----------|--------|"
-puts "| Filename                          |  Lines   | Comments |  SLOCs   |  Ratio |"
-puts "|-----------------------------------|----------|----------|----------|--------|"
+puts sprintf("|-%-#{longest_path}s-|----------|----------|----------|--------|", "-"*longest_path)
+puts sprintf("| %-#{longest_path}s |  Lines   | Comments |  SLOCs   |  Ratio |", "Filename")
+puts sprintf("|-%-#{longest_path}s-|----------|----------|----------|--------|", "-"*longest_path)
 results.each do |filename, lines, comments, slocs, ratio|
-  filename = filename[0..32] if filename.length > 33
-  puts sprintf("| %-33s | %8d | %8d | %8d | %6.2f |",
+  # filename = filename[0..32] if filename.length > 33
+  puts sprintf("| %-#{longest_path}s | %8d | %8d | %8d | %6.2f |",
                filename, lines, comments, slocs, ratio)
   total_files    += 1
   total_lines    += lines
@@ -78,8 +124,7 @@ results.each do |filename, lines, comments, slocs, ratio|
   total_slocs    += slocs
 end
 total_ratio = total_comments.to_f / total_slocs.to_f if total_slocs != 0
-puts "|-----------------------------------|----------|----------|----------|--------|"
-puts sprintf("| Totals - %3d Files                | %8d | %8d | %8d | %6.2f |",
-             total_files, total_lines, total_comments, total_slocs, total_ratio)
-
-puts "|-----------------------------------|----------|----------|----------|--------|"
+puts sprintf("|-%-#{longest_path}s-|----------|----------|----------|--------|", "-"*longest_path)
+puts sprintf("| %-#{longest_path}s | %8d | %8d | %8d | %6.2f |",
+  "Totals - #{total_files} Files", total_lines, total_comments, total_slocs, total_ratio)
+puts sprintf("|-%-#{longest_path}s-|----------|----------|----------|--------|", "-"*longest_path)

data/bin/xtce_converter

@@ -36,7 +36,7 @@ option_parser = OptionParser.new do |option_parser|
 
   # Create the system option
   option_parser.on("--system VALUE", "Use an alternative system.txt file") do |arg|
-    Cosmos::System.instance(File.join(USERPATH, 'config', 'system', arg))
+    Cosmos::System.instance(File.join(Cosmos::USERPATH, 'config', 'system', arg))
   end
 
   # Handle --import mode

data/cosmos.gemspec

@@ -73,10 +73,11 @@ spec = Gem::Specification.new do |s|
       files
     else [] end
 
-  s.required_ruby_version = '~> 2.3'
+  s.required_ruby_version = '~> 2.4'
 
   # Runtime Dependencies
   s.add_runtime_dependency 'bundler', '>= 1.3'
+  s.add_runtime_dependency 'psych', '~> 3.3'
   s.add_runtime_dependency 'rdoc', '>= 4' # qtbindings doesn't parse in 6.0.0, fixed in 6.0.1
   s.add_runtime_dependency 'rake', '>= 10.0' # 10.0 released Nov 12, 2012
   s.add_runtime_dependency 'json', '>= 1.5', '< 3' # 2.0+ works with COSMOS
@@ -86,20 +87,13 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency 'uuidtools', '~> 2.1'
   s.add_runtime_dependency 'snmp', '~> 1.0'
   s.add_runtime_dependency 'rubyzip', '~> 1.2'
-  s.add_runtime_dependency 'nokogiri', '~> 1.10'
+  s.add_runtime_dependency 'nokogiri', ['~> 1.10', '< 1.13'] # Nokogiri 1.13 doesn't support Ruby 2.5
   s.add_runtime_dependency 'opengl-bindings', '~> 1.6' if RUBY_ENGINE == 'ruby' # MRI Only
-  s.add_runtime_dependency 'qtbindings', '~> 4.8.6', '>= 4.8.6.2' if RUBY_ENGINE == 'ruby' # MRI Only
+  s.add_runtime_dependency 'qtbindings', '~> 4.8.6', '>= 4.8.6.2' if RUBY_ENGINE == 'ruby' && !ENV['CI'] # MRI Only, not Github
   s.add_runtime_dependency 'puma', '~> 3.10'
   s.add_runtime_dependency 'rack', '~> 2.0'
   s.add_runtime_dependency 'httpclient', '~> 2.8'
 
-  # From http://www.rubydoc.info/gems/puma#Known_Bugs :
-  #   "For MRI versions 2.2.7, 2.2.8, 2.2.9, 2.2.10, 2.3.4 and 2.4.1, you may see stream closed in
-  #    another thread (IOError). It may be caused by a Ruby bug. It can be
-  #    fixed with the gem https://rubygems.org/gems/stopgap_13632"
-  # This is commented out because the gemspec is only evaluated at gem build time
-  # s.add_runtime_dependency 'stopgap_13632', '~> 1.2.0' if RUBY_ENGINE == 'ruby' and %w(2.2.7 2.2.8 2.3.4 2.4.1).include? RUBY_VERSION  # MRI Only
-
   # Development Dependencies
   s.add_development_dependency 'diff-lcs', '~> 1.3' if RUBY_ENGINE == 'ruby' # Get latest for MRI
   s.add_development_dependency 'rspec', '~> 3.5'
@@ -113,8 +107,8 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'guard-rspec', '~> 4.0'
   s.add_development_dependency 'simplecov', '~> 0.15'
   s.add_development_dependency 'codecov', '~> 0.1'
-  s.add_development_dependency 'benchmark-ips', '~> 2.0'
-  s.add_development_dependency 'ruby-prof', '~> 1.0' if RUBY_ENGINE == 'ruby' # MRI Only
+  s.add_development_dependency 'benchmark-ips', '= 2.7.2'
+  s.add_development_dependency 'ruby-prof', ['~> 1.0', '< 1.3'] if RUBY_ENGINE == 'ruby' # MRI Only
 
   s.post_install_message = "Thanks for installing Ball Aerospace COSMOS!\nStart your first project with: cosmos demo demo\n"
 end

data/data/config/interface_modifiers.yaml

@@ -84,8 +84,9 @@ OPTION:
     - name: Name
       required: true
       description: The option to set. COSMOS defines several options on the core provided
-        interfaces. The SerialInterface defines FLOW_CONTROL which can be NONE (default) or RTSCTS
-        and DATA_BITS which changes the data bits of the serial interface.
+        interfaces. The SerialInterface defines FLOW_CONTROL which can be NONE (default) or RTSCTS,
+        STRUCT to directly set fields in the Windows DCB or POSIX structure and it defines
+        DATA_BITS which changes the data bits of the serial interface.
         The TcpipServerInterface defines LISTEN_ADDRESS which is the IP address to accept
         connections on (default 0.0.0.0) and AUTO_SYSTEM_META which will automatically send
         SYSTEM META when the interface connects (default false).