cosmos 4.4.0-java → 4.4.1-java

data/spec/packets/telemetry_spec.rb

@@ -596,6 +596,34 @@ module Cosmos
       end
     end
 
+    describe "all_item_strings" do
+      it "returns hidden TGT,PKT,ITEMs in the system" do
+        @tlm.packet("TGT1","PKT1").hidden = true
+        @tlm.packet("TGT1","PKT2").disabled = true
+        default = @tlm.all_item_strings() # Return only those not hidden or disabled
+        strings = @tlm.all_item_strings(true) # Return everything, even hidden & disabled
+        expect(default).to_not eq strings
+        # Spot check the default
+        expect(default).to include("TGT2 PKT1 ITEM1")
+        expect(default).to include("TGT2 PKT1 ITEM2")
+        expect(default).to_not include("TGT1 PKT1 ITEM1") # hidden
+        expect(default).to_not include("TGT1 PKT2 ITEM1") # disabled
+
+        items = {}
+        # Built from the before(:each) section
+        items['TGT1 PKT1'] = %w(ITEM1 ITEM2 ITEM3 ITEM4)
+        items['TGT1 PKT2'] = %w(ITEM1 ITEM2)
+        items['TGT2 PKT1'] = %w(ITEM1 ITEM2)
+        items.each do |tgt_pkt, items|
+          Packet::RESERVED_ITEM_NAMES.each do |item|
+            expect(strings).to include("#{tgt_pkt} #{item}")
+          end
+          items.each do |item|
+            expect(strings).to include("#{tgt_pkt} #{item}")
+          end
+        end
+      end
+    end
+
   end
 end
-

data/spec/system/system_spec.rb

@@ -45,7 +45,7 @@ module Cosmos
     describe "instance" do
       it "creates default ports" do
         # Don't check the actual port numbers but just that they exist
-        expect(System.ports.keys).to eql %w(CTS_API TLMVIEWER_API CTS_PREIDENTIFIED CTS_CMD_ROUTER REPLAY_API REPLAY_PREIDENTIFIED REPLAY_CMD_ROUTER DART_DECOM DART_STREAM)
+        expect(System.ports.keys).to eql %w(CTS_API TLMVIEWER_API CTS_PREIDENTIFIED CTS_CMD_ROUTER REPLAY_API REPLAY_PREIDENTIFIED REPLAY_CMD_ROUTER DART_STREAM DART_DECOM DART_MASTER)
       end
 
       it "creates default paths" do
@@ -349,7 +349,7 @@ module Cosmos
           # Try loading something that doesn't exist
           # It should fail and reload the original configuration
           name, err = System.load_configuration("BLAH")
-          expect(err).to eql nil
+          expect(err.message).to eql "Unable to find configuration: BLAH"
           expect(name).to eql original_config_name
 
           # Now load the second configuration. It shouldn't have the most

data/spec/utilities/message_log_spec.rb

@@ -70,9 +70,12 @@ module Cosmos
         log = MessageLog.new('TEST')
         log.start
         log.stop
-        Cosmos.set_working_dir do
-          expect(File.stat(log.filename).writable?).to be false
-          File.delete log.filename
+        if Kernel.is_windows? or Process.uid != 0
+          # writable? is always true for root, so skip this check
+          Cosmos.set_working_dir do
+            expect(File.stat(log.filename).writable?).to be false
+            File.delete log.filename
+          end
         end
       end
     end

data/tasks/gemfile_stats.rake

@@ -15,18 +15,25 @@ task :gemfile_stats do
 
   def get_latest_gem_data
     gem_data = []
+    # This is the only API call to Rubygems
     versions = Gems.versions 'cosmos'
     versions.each do |version|
       version_no = version['number']
+      next if version_no.split('.')[0] < '3' # anything before 3 is another gem
       month = version['built_at'].split('-')[0..1].join('-')
-      gem_data << [month, version_no, Gems.total_downloads("cosmos",version_no)[:version_downloads]] if version_no.split('.')[0] >= '3' # anything before 3 is another gem
+      downloads = version['downloads_count'].to_i
+      if gem_data.length > 0 && gem_data[-1][1] == version_no
+        gem_data[-1][2] += downloads
+      else
+        gem_data << [month, version_no, downloads]
+      end
     end
     gem_data
   end
 
   # This is useful for testing to prevent server round trips
   # Simply comment out this line when working on the formatting below (after first running once)
-  File.open("gemdata.marshall", 'w') {|file| file.write(Marshal.dump(get_latest_gem_data)) }
+  File.open("gemdata.marshall", 'w') {|file| file.write(Marshal.dump(get_latest_gem_data())) }
   gem_data = Marshal.load(File.read("gemdata.marshall"))
 
   # Convert all the date text into Ruby Dates
@@ -68,26 +75,28 @@ task :gemfile_stats do
     end
   end
 
-  # Force the date row to be text
-  sheet.Rows(1).NumberFormat = "\@"
+  # Put dates in rows as there are more dates than there are releases
+  # Force the date column to be text
+  sheet.Columns(1).NumberFormat = "\@"
   labels.values.each_with_index do |val, x|
-    sheet.Cells(1, (x+2)).Value = val
+    sheet.Cells((x+2), 1).Value = val
   end
 
-  row = 2
+  col = 2
   dataset.each do |version, data|
-    # Set the version (e.g. 3.0) in column 1
-    sheet.Cells(row, 1).Value = version
+    # Set the version (e.g. 3.0) in the top row
+    sheet.Cells(1, col).Value = version
+    # The download values by date appear below the version in the same column
     data.each_with_index do |val, x|
-      sheet.Cells(row, (x+2)).Value = val
+      sheet.Cells((x+2), col).Value = val
     end
-    row += 1
+    col += 1
   end
-  # Excel column name lookup
-  letters = ('A'..'Z').to_a.concat(('AA'..'AZ').to_a)
+  # Excel column name lookup, 4 sets of alphabets gives us 104 versions to work with
+  letters = ('A'..'Z').to_a.concat(('AA'..'AZ').to_a).concat(('BA'..'BZ').to_a).concat(('CA'..'CZ').to_a)
   chart = book.Charts.Add
   chart.Name = "COSMOS Downloads"
-  chart.SetSourceData(sheet.Range("A1:#{letters[labels.length]}#{dataset.length}"))
+  chart.SetSourceData(sheet.Range("A1:#{letters[dataset.length]}#{labels.length+1}"))
   chart.HasTitle = true
   chart.ChartTitle.Characters.Text = "COSMOS Downloads"
   chart.ChartType = 76 # AreaStacked

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: java
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -401,6 +401,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".dockerignore"
 - ".gitattributes"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
@@ -410,6 +411,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.txt
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -461,6 +463,7 @@ files:
 - autohotkey/config/targets/SYSTEM/screens/meta.txt
 - autohotkey/config/targets/SYSTEM/target.txt
 - autohotkey/config/tools/cmd_sender/cmd_sender.txt
+- autohotkey/config/tools/cmd_sequence/cmd_sequence.txt
 - autohotkey/config/tools/cmd_tlm_server/cmd_tlm_server.txt
 - autohotkey/config/tools/data_viewer/data_viewer.txt
 - autohotkey/config/tools/handbook_creator/assets/css/bootstrap-theme.css
@@ -512,6 +515,7 @@ files:
 - autohotkey/config/tools/tlm_viewer/tlm_viewer.txt
 - autohotkey/config/tools/tlm_viewer/tlm_viewer2.txt
 - autohotkey/config/tools/tlm_viewer/tlm_viewer3.txt
+- autohotkey/lib/cmd_sequence_exporter.rb
 - autohotkey/lib/example_background_task.rb
 - autohotkey/lib/user_version.rb
 - autohotkey/outputs/handbooks/README.txt
@@ -534,6 +538,7 @@ files:
 - autohotkey/tools/CmdExtractorAHK
 - autohotkey/tools/CmdSender
 - autohotkey/tools/CmdSenderAHK
+- autohotkey/tools/CmdSenderAHK2
 - autohotkey/tools/CmdSequence
 - autohotkey/tools/CmdSequenceAHK
 - autohotkey/tools/CmdSequenceAHK2
@@ -586,6 +591,7 @@ files:
 - autohotkey/tools/autohotkey.rb
 - autohotkey/tools/cmd_extractor.ahk
 - autohotkey/tools/cmd_sender.ahk
+- autohotkey/tools/cmd_sender2.ahk
 - autohotkey/tools/cmd_sequence.ahk
 - autohotkey/tools/cmd_sequence2.ahk
 - autohotkey/tools/cmd_tlm_server.ahk
@@ -793,6 +799,7 @@ files:
 - demo/config/targets/INST/cmd_tlm/_ccsds_tlm.txt
 - demo/config/targets/INST/cmd_tlm/inst_cmds.txt
 - demo/config/targets/INST/cmd_tlm/inst_tlm.txt
+- demo/config/targets/INST/cmd_tlm/inst_tlm_override.txt
 - demo/config/targets/INST/cmd_tlm_server.txt
 - demo/config/targets/INST/cmd_tlm_server2.txt
 - demo/config/targets/INST/doc/README.txt
@@ -913,7 +920,6 @@ files:
 - demo/lib/scpi_target.rb
 - demo/lib/user_version.rb
 - demo/outputs/dart/data/README.txt
-- demo/outputs/dart/logs/README.txt
 - demo/outputs/handbooks/README.txt
 - demo/outputs/logs/README.txt
 - demo/outputs/saved_config/README.txt
@@ -1319,7 +1325,6 @@ files:
 - lib/cosmos/core_ext/stringio.rb
 - lib/cosmos/core_ext/time.rb
 - lib/cosmos/dart/.rspec
-- lib/cosmos/dart/Gemfile
 - lib/cosmos/dart/Rakefile
 - lib/cosmos/dart/app/assets/config/manifest.js
 - lib/cosmos/dart/app/assets/images/.keep
@@ -1406,11 +1411,13 @@ files:
 - lib/cosmos/dart/examples/dart_decom_client.rb
 - lib/cosmos/dart/examples/dart_stream_client.rb
 - lib/cosmos/dart/lib/dart_common.rb
+- lib/cosmos/dart/lib/dart_constants.rb
 - lib/cosmos/dart/lib/dart_database_cleaner.rb
 - lib/cosmos/dart/lib/dart_decom_query.rb
 - lib/cosmos/dart/lib/dart_decommutator.rb
 - lib/cosmos/dart/lib/dart_importer.rb
 - lib/cosmos/dart/lib/dart_logging.rb
+- lib/cosmos/dart/lib/dart_master_query.rb
 - lib/cosmos/dart/lib/dart_packet_log_writer.rb
 - lib/cosmos/dart/lib/dart_reducer_manager.rb
 - lib/cosmos/dart/lib/dart_reducer_worker_thread.rb
@@ -1419,6 +1426,7 @@ files:
 - lib/cosmos/dart/processes/dart_decom_server.rb
 - lib/cosmos/dart/processes/dart_import.rb
 - lib/cosmos/dart/processes/dart_ingester.rb
+- lib/cosmos/dart/processes/dart_master.rb
 - lib/cosmos/dart/processes/dart_reducer.rb
 - lib/cosmos/dart/processes/dart_stream_server.rb
 - lib/cosmos/dart/processes/dart_util.rb
@@ -1586,6 +1594,7 @@ files:
 - lib/cosmos/system/target.rb
 - lib/cosmos/tools/cmd_extractor/cmd_extractor.rb
 - lib/cosmos/tools/cmd_sender/cmd_param_table_item_delegate.rb
+- lib/cosmos/tools/cmd_sender/cmd_params.rb
 - lib/cosmos/tools/cmd_sender/cmd_sender.rb
 - lib/cosmos/tools/cmd_sender/cmd_sender_text_edit.rb
 - lib/cosmos/tools/cmd_sequence/cmd_sequence.rb
@@ -1614,6 +1623,7 @@ files:
 - lib/cosmos/tools/cmd_tlm_server/routers.rb
 - lib/cosmos/tools/config_editor/config_editor.rb
 - lib/cosmos/tools/config_editor/config_editor_frame.rb
+- lib/cosmos/tools/config_editor/system_config_dialog.rb
 - lib/cosmos/tools/data_viewer/data_viewer.rb
 - lib/cosmos/tools/data_viewer/data_viewer_component.rb
 - lib/cosmos/tools/data_viewer/dump_component.rb
@@ -2178,7 +2188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.7.10
 signing_key:
 specification_version: 4
 summary: Ball Aerospace COSMOS

data/lib/cosmos/dart/Gemfile

@@ -1,69 +0,0 @@
-source 'https://rubygems.org'
-
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.1.4'
-# Use sqlite3 as the database for Active Record
-# gem 'sqlite3'
-# Use Puma as the app server
-gem 'puma', '~> 3.0'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.5'
-# Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 3.0'
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platform: :mri
-  gem 'rspec-rails', '~> 3.7'
-  gem 'simplecov', '~> 0.15'
-  gem 'codecov', '~> 0.1'
-  gem 'database_cleaner', '1.6.1'
-end
-
-group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
-end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-# Ryan added
-gem 'rest-client' # For examples
-gem 'childprocess'
-
-if RUBY_ENGINE == 'ruby'
-  gem 'pg', '~> 0.21'
-else
- gem 'activerecord-jdbcpostgresql-adapter', '~> 51.1'
-end
-
-if ENV['COSMOS_DEVEL']
-  gem 'cosmos', :path => ENV['COSMOS_DEVEL']
-else
-  gem 'cosmos'
-end