cosmos 4.5.1 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7429d28f8f97293a9c8f9779cd11b32c484b5611880bedd58f2cde82b348cd2
-  data.tar.gz: f64ef30f269a8c7d79d2dbd85c995e8eae63903d9eb534408c593e8def86cdcd
+  metadata.gz: b5f1bf9bb7d272191c8e09b184e251e36bffff6588302895621d56c08c7e10c0
+  data.tar.gz: b983bbb4786cc7b0c55493f55c0c619d7c8df40a18c5432b7a8a16ffefd8ec24
 SHA512:
-  metadata.gz: 7e7c12fac22a5a5e68f0d5cefeeab1327592d727a31e799001516f35000bc066e7ae7723417345c1578978e64a4a4e8d06a564035241a8a6ac4af2cf3ad73bad
-  data.tar.gz: ca43d50aac04edd22d03bc3a44c15c66911374a1cfe40a8ad08e2c91a9fe6c9b3192760d423df0197fc38137a7cf896462e73623163c1dba29a61368c2e0e8ca
+  metadata.gz: 8d7d2baf899f59181069c4007c0d0719f3f512061872059452cf5376c40a150c94daf66c7fc5b6df051a48fd9400eca8899486213510d98b646b434ecf58a624
+  data.tar.gz: '09acfa1481c96c6a20b6736ed04ed8c43e1ecacd759fac6343b52638202ca8fc9ec18941f0469c94b1a89ef0b39d49e49ce225bf56800fcc3cae97b3ba122077'

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

@@ -54,8 +54,7 @@ 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 ${COSMOS_REPO} COSMOS \
-  && git checkout cosmos4 \
+  && git clone -b cosmos4 ${COSMOS_REPO} COSMOS \
   && cd /devel/COSMOS \
   && bundle install
 
@@ -66,5 +65,7 @@ RUN cd /devel \
   && 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

data/README.md

@@ -111,7 +111,6 @@ If you discover a security vulnerability in COSMOS, please do not disclose to an
 
 ## 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

@@ -300,6 +300,14 @@ end
 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,18 +320,17 @@ 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 "1a. git config --global user.name \"Last, First\""
-  STDOUT.puts "1b. git config --global user.email \"me@ball.com\""
-  STDOUT.puts "1c. Ensure Ruby 2.5 is in your path"
-  STDOUT.puts "2. git checkout cosmos4"
-  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. /usr/bin/gem push cosmos-X.X.X.gem"
-  STDOUT.puts "10. /usr/bin/gem push cosmos-X.X.X-java.gem"
+  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 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. git pull"
   STDOUT.puts "13. Update COSMOS_VERSION in all Dockerfiles. Also update README.md"
@@ -332,6 +339,7 @@ task :docker_run do
   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/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'

data/data/crc.txt

@@ -221,7 +221,7 @@
 "lib/cosmos/io/buffered_file.rb" 0x031BC078
 "lib/cosmos/io/cosmos_snmp.rb" 0x64541158
 "lib/cosmos/io/io_multiplexer.rb" 0x526F4CB6
-"lib/cosmos/io/json_drb.rb" 0x7524D709
+"lib/cosmos/io/json_drb.rb" 0xFA1D3D3D
 "lib/cosmos/io/json_drb_object.rb" 0x4603769D
 "lib/cosmos/io/json_drb_rack.rb" 0xE3191B55
 "lib/cosmos/io/json_rpc.rb" 0x918384D3
@@ -245,7 +245,7 @@
 "lib/cosmos/packets/packet.rb" 0x8AA6A556
 "lib/cosmos/packets/packet_config.rb" 0x73BC0FFF
 "lib/cosmos/packets/packet_item.rb" 0xE0789E45
-"lib/cosmos/packets/packet_item_limits.rb" 0xC4534EAB
+"lib/cosmos/packets/packet_item_limits.rb" 0x1C49C06C
 "lib/cosmos/packets/parsers/format_string_parser.rb" 0x8015C5E3
 "lib/cosmos/packets/parsers/limits_parser.rb" 0xD680A7A1
 "lib/cosmos/packets/parsers/limits_response_parser.rb" 0x05979119
@@ -257,7 +257,7 @@
 "lib/cosmos/packets/parsers/xtce_converter.rb" 0x58820221
 "lib/cosmos/packets/parsers/xtce_parser.rb" 0x33A79E5D
 "lib/cosmos/packets/structure.rb" 0x9C7730B4
-"lib/cosmos/packets/structure_item.rb" 0x51291BF8
+"lib/cosmos/packets/structure_item.rb" 0x4181D978
 "lib/cosmos/packets/telemetry.rb" 0xAE95A294
 "lib/cosmos/processors.rb" 0x5241327D
 "lib/cosmos/processors/new_packet_log_processor.rb" 0x8BFC2259
@@ -280,7 +280,7 @@
 "lib/cosmos/streams/tcpip_client_stream.rb" 0xD4F3E5AE
 "lib/cosmos/streams/tcpip_socket_stream.rb" 0xAC1077D0
 "lib/cosmos/system.rb" 0x735DFB42
-"lib/cosmos/system/system.rb" 0x09C3228A
+"lib/cosmos/system/system.rb" 0xC2C1D75F
 "lib/cosmos/system/target.rb" 0x67DCFB35
 "lib/cosmos/tools/cmd_extractor/cmd_extractor.rb" 0x4BDD539F
 "lib/cosmos/tools/cmd_sender/cmd_param_table_item_delegate.rb" 0xA5AA99F7
@@ -464,7 +464,7 @@
 "lib/cosmos/utilities/ruby_lex_utils.rb" 0x00EEFAE2
 "lib/cosmos/utilities/simulated_target.rb" 0xB251C94B
 "lib/cosmos/utilities/sleeper.rb" 0x650C3CEB
-"lib/cosmos/version.rb" 0xBF9B5080
+"lib/cosmos/version.rb" 0xB78479FB
 "lib/cosmos/win32/excel.rb" 0x72BFBAC2
 "lib/cosmos/win32/win32.rb" 0xBCECA922
 "lib/cosmos/win32/win32_main.rb" 0x722DDE0D

data/ext/cosmos/ext/packet/packet.c

@@ -118,15 +118,9 @@ static VALUE received_time_equals(VALUE self, VALUE received_time) {
  *   received */
 static VALUE received_count_equals(VALUE self, VALUE received_count) {
   volatile VALUE read_conversion_cache = rb_ivar_get(self, id_ivar_read_conversion_cache);
-#ifdef RUBY_INTEGER_UNIFICATION /* Ruby 2.4.0 unified Fixnum and Bignum into Integer. This check allows the code to build pre- and post-2.4.0. */
   if (rb_funcall(received_count, id_method_class, 0) != rb_cInteger) {
     rb_raise(rb_eArgError, "received_count must be an Integer but is a %s", RSTRING_PTR(rb_funcall(rb_funcall(received_count, id_method_class, 0), id_method_to_s, 0)));
   }
-#else
-  if ((rb_funcall(received_count, id_method_class, 0) != rb_cFixnum) && (rb_funcall(received_count, id_method_class, 0) != rb_cBignum)) {
-    rb_raise(rb_eArgError, "received_count must be an Integer but is a %s", RSTRING_PTR(rb_funcall(rb_funcall(received_count, id_method_class, 0), id_method_to_s, 0)));
-  }
-#endif
   rb_ivar_set(self, id_ivar_received_count, received_count);
   if (RTEST(read_conversion_cache)) {
     rb_funcall(read_conversion_cache, id_method_clear, 0);

data/lib/cosmos/io/json_drb.rb

@@ -17,14 +17,6 @@ require 'set'
 require 'cosmos/io/json_rpc'
 require 'cosmos/io/json_drb_rack'
 require 'rack/handler/puma'
-if RUBY_ENGINE == 'ruby' and %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
-  begin
-    require 'stopgap_13632'
-  rescue Exception => err
-    msg = "Error loading stopgap. Make sure gem install stopgap_13632 succeeds: #{err.message}"
-    raise $!, msg, $!.backtrace
-  end
-end
 
 # Add methods to the Puma::Launcher and Puma::Single class so we can tell
 # if the server has been started.

data/lib/cosmos/packets/packet_item_limits.rb

@@ -91,24 +91,12 @@ module Cosmos
     end
 
     def persistence_setting=(persistence_setting)
-      if 0.class == Integer
-        # Ruby version >= 2.4.0
-        raise ArgumentError, "persistence_setting must be an Integer but is a #{persistence_setting.class}" unless Integer === persistence_setting
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "persistence_setting must be a Fixnum but is a #{persistence_setting.class}" unless Fixnum === persistence_setting
-      end
+      raise ArgumentError, "persistence_setting must be an Integer but is a #{persistence_setting.class}" unless Integer === persistence_setting
       @persistence_setting = persistence_setting
     end
 
     def persistence_count=(persistence_count)
-      if 0.class == Integer
-        # Ruby version >= 2.4.0
-        raise ArgumentError, "persistence_count must be an Integer but is a #{persistence_count.class}" unless Integer === persistence_count
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "persistence_count must be a Fixnum but is a #{persistence_count.class}" unless Fixnum === persistence_count
-      end
+      raise ArgumentError, "persistence_count must be an Integer but is a #{persistence_count.class}" unless Integer === persistence_count
       @persistence_count = persistence_count
     end
 

data/lib/cosmos/packets/structure_item.rb

@@ -112,13 +112,7 @@ module Cosmos
     end
 
     def bit_offset=(bit_offset)
-      if 0.class == Integer
-        # Ruby version >= 2.4.0
-        raise ArgumentError, "#{@name}: bit_offset must be an Integer" unless Integer === bit_offset
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "#{@name}: bit_offset must be a Fixnum" unless Fixnum === bit_offset
-      end
+      raise ArgumentError, "#{@name}: bit_offset must be an Integer" unless Integer === bit_offset
 
       byte_aligned = ((bit_offset % 8) == 0)
       if (@data_type == :FLOAT or @data_type == :STRING or @data_type == :BLOCK) and !byte_aligned
@@ -133,13 +127,8 @@ module Cosmos
     end
 
     def bit_size=(bit_size)
-      if 0.class == Integer
-        # Ruby version >=  2.4.0
-        raise ArgumentError, "#{name}: bit_size must be an Integer" unless Integer === bit_size
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "#{name}: bit_size must be a Fixnum" unless Fixnum === bit_size
-      end
+      raise ArgumentError, "#{name}: bit_size must be an Integer" unless Integer === bit_size
+
       byte_multiple = ((bit_size % 8) == 0)
       if bit_size <= 0 and (@data_type == :INT or @data_type == :UINT or @data_type == :FLOAT)
         raise ArgumentError, "#{@name}: bit_size cannot be negative or zero for :INT, :UINT, and :FLOAT items: #{bit_size}"
@@ -171,13 +160,7 @@ module Cosmos
 
     def array_size=(array_size)
       if array_size
-        if 0.class == Integer
-          # Ruby version >=  2.4.0
-          raise ArgumentError, "#{@name}: array_size must be an Integer" unless Integer === array_size
-        else
-          # Ruby version < 2.4.0
-          raise ArgumentError, "#{@name}: array_size must be a Fixnum" unless Fixnum === array_size
-        end
+        raise ArgumentError, "#{@name}: array_size must be an Integer" unless Integer === array_size
         raise ArgumentError, "#{@name}: array_size must be a multiple of bit_size" unless (@bit_size == 0 or (array_size % @bit_size == 0) or array_size < 0)
         raise ArgumentError, "#{@name}: bit_size cannot be negative or zero for array items" if @bit_size <= 0
       end

data/lib/cosmos/system/system.rb

@@ -992,7 +992,10 @@ module Cosmos
       cmd_meta.disabled = true
       tlm_meta = @telemetry.packet('SYSTEM', 'META')
       tlm_meta.sorted_items.each do |item|
-        next if item.name.include?("RECEIVED") # Tlm only items
+        # Ignore reserved items as these are all DERIVED and thus will throw an exception
+        # in CommandSender since they don't have write conversions due to:
+        # commands.build_cmd -> packet.restore_defaults -> packet.write_item
+        next if Packet::RESERVED_ITEM_NAMES.include?(item.name)
         cmd_meta.define(item.clone)
       end
       @config.commands['SYSTEM'] ||= {}

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.5.1'
+COSMOS_VERSION = '4.5.2'
 module Cosmos
   module Version
     MAJOR = '4'
     MINOR = '5'
-    PATCH = '1'
-    BUILD = 'cb4647f6e93fcfb1dd38500288ecf5e1a6f79c76'
+    PATCH = '2'
+    BUILD = 'a516d4699e4de74066155c12194c9286adcde9ea'
   end
-  VERSION = '4.5.1'
+  VERSION = '4.5.2'
 end

data/make_gems.sh

@@ -1,7 +1,7 @@
 # export VERSION= before running this
 git checkout master
 git pull
-rbenv global 2.4.4
+rbenv global 2.5.9
 rake release VERSION=$VERSION
 rake commit_release VERSION=$VERSION
 mv *.gem ~/share/.

data/spec/gui/qt_spec.rb

@@ -8,7 +8,7 @@
 # as published by the Free Software Foundation; version 3 with
 # attribution addendums as found in the LICENSE.txt
 
-if RUBY_ENGINE == 'ruby'
+if RUBY_ENGINE == 'ruby' && !ENV['GITHUB_ACTIONS']
   require 'spec_helper'
   require 'cosmos/gui/qt'
 

data/spec/gui/utilities/script_module_gui_spec.rb

@@ -8,7 +8,7 @@
 # as published by the Free Software Foundation; version 3 with
 # attribution addendums as found in the LICENSE.txt
 
-if RUBY_ENGINE == 'ruby'
+if RUBY_ENGINE == 'ruby' && !ENV['CI']
   require 'spec_helper'
   require 'cosmos/gui/qt'
   require 'cosmos/script'

data/spec/io/posix_serial_driver_spec.rb

@@ -8,7 +8,13 @@
 # as published by the Free Software Foundation; version 3 with
 # attribution addendums as found in the LICENSE.txt
 
-if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i and RUBY_ENGINE == 'ruby' and !ENV['TRAVIS']
+# NOTE: !ENV['DOCKER'] because of the following error while in container:
+#   Failure/Error: @handle = Kernel.open(port_name, File::RDWR | File::NONBLOCK)
+#   Errno::ENOENT:
+#     No such file or directory @ rb_sysopen - /dev/ttyS0
+#   ./lib/cosmos/io/posix_serial_driver.rb:48:in `initialize'
+
+if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i and RUBY_ENGINE == 'ruby' and !ENV['CI'] and !ENV['DOCKER']
 
   require 'spec_helper'
   require 'cosmos/io/posix_serial_driver'

data/spec/packets/packet_item_limits_spec.rb

@@ -84,25 +84,11 @@ module Cosmos
       end
 
       it "complains about persistence_setting = nil" do
-        if 0.class == Integer
-          # Ruby version >= 2.4.0
-          expect { @l.persistence_setting = nil}.to raise_error(ArgumentError, "persistence_setting must be an Integer but is a NilClass")
-        else
-          # Ruby version < 2.4.0
-          expect { @l.persistence_setting = nil}.to raise_error(ArgumentError, "persistence_setting must be a Fixnum but is a NilClass")
-        end
+        expect { @l.persistence_setting = nil}.to raise_error(ArgumentError, "persistence_setting must be an Integer but is a NilClass")
       end
 
-      if 0.class == Integer
-      # Ruby version >= 2.4.0
-        it "complains about persistence_setting that aren't Integer" do
-          expect { @l.persistence_setting = 5.5}.to raise_error(ArgumentError, "persistence_setting must be an Integer but is a Float")
-        end
-      else
-        # Ruby version < 2.4.0
-        it "complains about persistence_setting that aren't Fixnum" do
-          expect { @l.persistence_setting = 5.5}.to raise_error(ArgumentError, "persistence_setting must be a Fixnum but is a Float")
-        end
+      it "complains about persistence_setting that aren't Integer" do
+        expect { @l.persistence_setting = 5.5}.to raise_error(ArgumentError, "persistence_setting must be an Integer but is a Float")
       end
     end
 
@@ -114,24 +100,11 @@ module Cosmos
       end
 
       it "complains about persistence_count = nil" do
-        if 0.class == Integer
-          # Ruby version >= 2.4.0
-          expect { @l.persistence_count = nil}.to raise_error(ArgumentError, "persistence_count must be an Integer but is a NilClass")
-        else
-          # Ruby version < 2.4.0
-          expect { @l.persistence_count = nil}.to raise_error(ArgumentError, "persistence_count must be a Fixnum but is a NilClass")
-        end
+        expect { @l.persistence_count = nil}.to raise_error(ArgumentError, "persistence_count must be an Integer but is a NilClass")
       end
 
-      if 0.class == Integer
-        it "complains about persistence_count that aren't Integer" do
-          expect { @l.persistence_count = 5.5}.to raise_error(ArgumentError, "persistence_count must be an Integer but is a Float")
-        end
-      else
-        # Ruby version < 2.4.0
-        it "complains about persistence_count that aren't Fixnum" do
-          expect { @l.persistence_count = 5.5}.to raise_error(ArgumentError, "persistence_count must be a Fixnum but is a Float")
-        end
+      it "complains about persistence_count that aren't Integer" do
+        expect { @l.persistence_count = 5.5}.to raise_error(ArgumentError, "persistence_count must be an Integer but is a Float")
       end
     end
 

data/spec/packets/structure_item_spec.rb

@@ -69,13 +69,7 @@ module Cosmos
 
     describe "bit_offset=" do
       it "compains about bad bit offsets types" do
-        if 0.class == Integer
-          # Ruby version >= 2.4.0
-          expect { StructureItem.new("test", nil, 8, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_offset must be an Integer")
-        else
-          # Ruby version < 2.4.0
-          expect { StructureItem.new("test", nil, 8, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_offset must be a Fixnum")
-        end
+        expect { StructureItem.new("test", nil, 8, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_offset must be an Integer")
       end
 
       it "complains about unaligned bit offsets" do
@@ -91,13 +85,7 @@ module Cosmos
 
     describe "bit_size=" do
       it "complains about bad bit sizes types" do
-        if 0.class == Integer
-          # Ruby version >= 2.4.0
-          expect { StructureItem.new("test", 0, nil, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_size must be an Integer")
-          else
-          # Ruby version < 2.4.0
-          expect { StructureItem.new("test", 0, nil, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_size must be a Fixnum")
-        end
+        expect { StructureItem.new("test", 0, nil, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_size must be an Integer")
       end
 
       it "complains about 0 size INT, UINT, and FLOAT" do
@@ -122,13 +110,7 @@ module Cosmos
 
     describe "array_size=" do
       it "complains about bad array size types" do
-        if 0.class == Integer
-          # Ruby version >= 2.4.0
-          expect { StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, "") }.to raise_error(ArgumentError, "TEST: array_size must be an Integer")
-        else
-          # Ruby version < 2.4.0
-          expect { StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, "") }.to raise_error(ArgumentError, "TEST: array_size must be a Fixnum")
-        end
+        expect { StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, "") }.to raise_error(ArgumentError, "TEST: array_size must be an Integer")
       end
 
       it "complains about array size != multiple of bit size" do

data/spec/top_level/top_level_spec.rb

@@ -520,7 +520,7 @@ module Cosmos
 
   describe "open_file_browser" do
     it "opens a file browser" do
-      unless ENV['TRAVIS']
+      unless ENV['CI']
         expect(Cosmos).to receive(:system).with(/#{Dir.pwd}/)
         Cosmos.open_file_browser(Dir.pwd)
       end
@@ -529,7 +529,7 @@ module Cosmos
 
   describe "open_in_text_editor" do
     it "opens the file in a text editor" do
-      unless ENV['TRAVIS']
+      unless ENV['CI']
         expect(Cosmos).to receive(:system).with(/#{File.basename(__FILE__)}/)
         Cosmos.open_in_text_editor(__FILE__)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,6 +188,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: opengl-bindings
   requirement: !ruby/object:Gem::Requirement
@@ -482,15 +502,14 @@ extensions:
 - ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
-- ".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
@@ -2287,7 +2306,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.travis.yml

@@ -1,16 +0,0 @@
-env: JRUBY_OPTS=--debug
-dist: trusty
-language: ruby
-cache: bundler
-services:
-  - postgresql
-rvm:
-  - jruby-9.2.9.0
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
-before_install:
-  - sudo apt-get install -y libgl1-mesa-dev
-  - gem update --system
-  - gem install bundler
-script: bundle exec rake build spec