cosmos 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a561fd5492c1b282759d45170da4e687b4e53eea086804bde1c549a75a8bdd5
-  data.tar.gz: c88407b16125e7ef2fb9764dd14338f6508e2fbde1567ff3b7d23b24f1b7dd2a
+  metadata.gz: 520339a0daade42a51611f9e17fe6e5a2c1343d9bab3ad6b36dbb03f11f55f28
+  data.tar.gz: 59a4d41cc6ef453ea1f375c5e9671aa0b14b390da42d8413bd080ab7bdb18ff4
 SHA512:
-  metadata.gz: f80a81b27f8c00611a730ef329b4c4afc01e572419ee03d1c7621295e2670a1e829d41511ee4a82af5874d43d32f7b51280281c26310ee8f1e79e767e987c542
-  data.tar.gz: 14f36f225ac641ca74dac4eca580ffad8e6ffea7d69bed1c685d387db0ff6d3977c6ad8b148b8a8117914bd7752914423d2691aa899b0ec902fde5c25f4e931a
+  metadata.gz: 700274a130767236a08e76ce223a09fa0229e659153c8a5f50896447796d3ca0e4487423704ece2d655511a642c6dfed0a8fc9482f8ee7ef9681f1726c23a2ce
+  data.tar.gz: 20773c2fd54d95674f66252edbd51faee8107cca83c05bace69a4607fd5563dc543d10f670513b4fb2df25d6ca6c18d0e58923f517e66f7f186fe7bc0e1eecbb

data/bin/cosmos

@@ -24,6 +24,7 @@ require 'cosmos'
 require 'cosmos/utilities/s3'
 require 'cosmos/models/scope_model'
 require 'cosmos/models/plugin_model'
+require 'cosmos/packets/packet_config'
 require 'cosmos/bridge/bridge'
 require 'ostruct'
 require 'optparse'
@@ -32,6 +33,7 @@ require 'fileutils'
 require 'find'
 require 'json'
 require 'redis'
+require 'psych'
 require 'erb'
 
 $redis_url = "redis://#{ENV['COSMOS_REDIS_HOSTNAME']}:#{ENV['COSMOS_REDIS_PORT']}"
@@ -40,25 +42,27 @@ $redis_url = "redis://#{ENV['COSMOS_REDIS_HOSTNAME']}:#{ENV['COSMOS_REDIS_PORT']
 MIGRATE_OPTIONS = OpenStruct.new
 MIGRATE_OPTIONS.all = false
 MIGRATE_PARSER = OptionParser.new do |op|
-  op.banner = "cosmos migrate PLUGIN [TGT1...]  # Create a COSMOS 5 plugin from existing COSMOS 4 targets"
-  op.on("-a", "--all", "Move all COSMOS 4 targets into a single COSMOS 5 plugin") do
+  op.banner = "cosmos migrate PLUGIN [TGT1...]      # Create a COSMOS 5 plugin from existing COSMOS 4 targets"
+  op.on("-a", "--all", "    Move all COSMOS 4 targets into a single COSMOS 5 plugin") do
     MIGRATE_OPTIONS.all = true
   end
 end
+ERROR_CODE = 67 # ASCII 'C' for COSMOS
 
 # Prints the usage text for the cosmos executable
 def print_usage
   puts "Usage:"
   puts "  cosmos help                          # Displays this information"
   puts "  cosmos rake                          # Runs rake in the local directory"
-  puts "  cosmos load /PATH/FILENAME.gem       # Loads a COSMOS plugin gem file"
+  puts "  cosmos validate /PATH/FILENAME.gem SCOPE variables.txt # Validate a COSMOS plugin gem file"
+  puts "  cosmos load /PATH/FILENAME.gem SCOPE variables.txt     # Loads a COSMOS plugin gem file"
   puts "  cosmos generate plugin PLUGIN_NAME   # Generate a COSMOS plugin"
   puts "  #{MIGRATE_PARSER}"
   puts "  cosmos bridge CONFIG_FILENAME        # Run COSMOS host bridge"
   puts "  cosmos bridgesetup CONFIG_FILENAME   # Create a default config file"
   puts "  cosmos geminstall GEMFILENAME        # Install loaded gem to /gems"
   puts "  cosmos rubysloc                      # Counts Ruby SLOC recursively. Run with --help for more info."
-  # puts "  cosmos xtce_converter                # Convert to and from the XTCE format. Run with --help for more info."
+  puts "  cosmos xtce_converter                # Convert to and from the XTCE format. Run with --help for more info."
   puts "  cosmos cstol_converter               # Converts CSTOL files (.prc) to COSMOS. Run with --help for more info."
   puts ""
 end
@@ -185,6 +189,76 @@ def migrate(args)
   puts "Plugin complete: #{File.expand_path('.')}" # Remember we're inside the plugin dir
 end
 
+def xtce_converter(args)
+  options = {}
+  option_parser = OptionParser.new do |option_parser|
+    option_parser.banner = "Usage: xtce_converter [options] --import input_xtce_filename --output output_dir\n"+
+      "       xtce_converter [options] --plugin /PATH/FILENAME.gem --output output_dir --variables variables.txt"
+    option_parser.separator("")
+    option_parser.on("-h", "--help", "Show this message") do
+      puts option_parser
+      exit
+    end
+    option_parser.on("-i VALUE", "--import VALUE", "Import the specified .xtce file") do |arg|
+      options[:import] = arg
+    end
+    option_parser.on("-o", "--output DIRECTORY", "Create files in the directory") do |arg|
+      options[:output] = arg
+    end
+    option_parser.on("-p", "--plugin PLUGIN", "Export .xtce file(s) from the plugin") do |arg|
+      options[:plugin] = arg
+    end
+    option_parser.on("-v", "--variables", "Optional variables file to pass to the plugin") do |arg|
+      options[:variables] = arg
+    end
+  end
+
+  begin
+    option_parser.parse!(args)
+  rescue => err
+    abort(option_parser.to_s)
+  end
+
+  if options[:import] && options[:plugin]
+    puts "xtce_converter options --import and --plugin are mutually exclusive"
+    abort(option_parser.to_s)
+  end
+
+  ENV['COSMOS_NO_STORE'] = '1' # it can be anything
+  Cosmos::Logger.stdout = false
+  Cosmos::Logger.level = Cosmos::Logger::DEBUG
+
+  if options[:import] && options[:output]
+    packet_config = Cosmos::PacketConfig.new
+    puts "Processing #{options[:import]}..."
+    packet_config.process_file(options[:import], nil)
+    puts "Writing COSMOS config files to #{options[:output]}/"
+    packet_config.to_config(options[:output])
+    exit(0)
+  elsif options[:plugin] && options[:output]
+    begin
+      variables = nil
+      variables = JSON.parse(File.read(options[:variables])) if options[:variables]
+      puts "Installing #{File.basename(options[:plugin])}"
+      plugin_hash = Cosmos::PluginModel.install_phase1(options[:plugin], variables, scope: 'DEFAULT', validate_only: true)
+      plugin_hash['variables']['xtce_output'] = options[:output]
+      Cosmos::PluginModel.install_phase2(plugin_hash['name'], plugin_hash['variables'], scope: 'DEFAULT', validate_only: true,
+        gem_file_path: options[:plugin])
+      result = 0 # bash and Windows consider 0 success
+    rescue => e
+      puts "Error: #{e.message}"
+      result = ERROR_CODE
+    ensure
+      name = Psych.safe_load(`gem spec #{options[:plugin]} name`).to_s
+      version = Psych.safe_load(`gem spec #{options[:plugin]} version`, permitted_classes: [Gem::Version]).to_s
+      Gem::Uninstaller.new(name, {:version => version, :force => true}).uninstall
+      exit(result)
+    end
+  else
+    abort(option_parser.to_s)
+  end
+end
+
 # A helper method to make the zip writing recursion work
 def write_zip_entries(base_dir, entries, zip_path, io)
   io.add(zip_path, base_dir) # Add the directory whether it has entries or not
@@ -212,7 +286,66 @@ def put_into_archive(disk_file_path, io, zip_file_path)
   end
 end
 
-def load_plugin(plugin_file_path, scope:, variables_file: nil)
+def validate_plugin(plugin_file_path, scope:, variables_file: nil)
+  ENV['COSMOS_NO_STORE'] = '1' # it can be anything
+  Cosmos::Logger.stdout = false
+  Cosmos::Logger.level = Cosmos::Logger::DEBUG
+  scope ||= 'DEFAULT'
+  variables = nil
+  variables = JSON.parse(File.read(variables_file)) if variables_file
+  puts "Installing #{File.basename(plugin_file_path)}"
+  plugin_hash = Cosmos::PluginModel.install_phase1(plugin_file_path, variables, scope: scope, validate_only: true)
+  Cosmos::PluginModel.install_phase2(plugin_hash['name'], plugin_hash['variables'], scope: scope, validate_only: true,
+    gem_file_path: plugin_file_path)
+  puts "Successfully validated #{File.basename(plugin_file_path)}"
+  result = 0 # bash and Windows consider 0 success
+rescue => e
+  puts "Error: #{e.message}"
+  result = ERROR_CODE
+ensure
+  name = Psych.safe_load(`gem spec #{plugin_file_path} name`).to_s
+  version = Psych.safe_load(`gem spec #{plugin_file_path} version`, permitted_classes: [Gem::Version]).to_s
+  Gem::Uninstaller.new(name, {:version => version, :force => true}).uninstall
+  exit(result)
+end
+
+def update_plugin(plugin_file_path, plugin_name, variables: nil, plugin_txt_lines: nil, scope:)
+  new_gem = File.basename(plugin_file_path)
+  old_gem = plugin_name.split("__")[0]
+  puts "Updating existing plugin: #{plugin_name} with #{File.basename(plugin_file_path)}"
+  plugin_model = Cosmos::PluginModel.get_model(name: plugin_name, scope: scope)
+  begin
+    # Only update if something has changed
+    if (new_gem != old_gem) or (variables != plugin_model.variables) or (plugin_txt_lines != plugin_model.plugin_txt_lines)
+      variables = plugin_model.variables unless variables
+      plugin_model.destroy
+      plugin_hash = Cosmos::PluginModel.install_phase1(plugin_file_path, existing_variables: variables, existing_plugin_txt_lines: plugin_txt_lines, process_existing: true, scope: scope)
+      Cosmos::PluginModel.install_phase2(plugin_hash, scope: scope)
+    else
+      puts "No changes detected - Exiting without change"
+    end
+  rescue => error
+    puts error.formatted
+    plugin_model.restore if plugin_model.destroyed?
+    raise error
+  end
+end
+
+# Loads a plugin into the COSMOS system
+# This code is used from the command line and is the same code that gets called if you
+# edit/upgrade or install a new plugin from the Admin interface
+#
+# Usage: cosmos load gemfile_path [scope] [plugin_hash_file_path]
+#
+# With just gemfile_path and/or scope: Will do nothing if any plugin
+# with the same gem file already exists
+#
+# Otherwise will do what the plugin_hash_file says to do
+# Plugin hash file must have the exact name of an existing plugin for upgrades and edits
+# Otherwise, it will be assumed that the plugin is intentionally being installed for a second
+# time
+#
+def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil)
   scope ||= 'DEFAULT'
   # Only create the scope if it doesn't already exist
   unless Cosmos::ScopeModel.names.include?(scope)
@@ -226,41 +359,47 @@ def load_plugin(plugin_file_path, scope:, variables_file: nil)
   end
 
   begin
-    # Try to find an existing plugin with this file to upgrade
-    gem_filename = File.basename(plugin_file_path, ".gem")
-    gem_filename = gem_filename.split('-')[0..-2].join('-')
-    plugin_names = Cosmos::PluginModel.names(scope: scope)
-    found = false
-    plugin_names.each do |plugin_name|
-      gem_name = plugin_name.split("__")[0]
-      gem_name = File.basename(plugin_name, ".gem")
-      gem_name = gem_name.split('-')[0..-2].join('-')
-      if gem_filename == gem_name
-        puts "Upgrading existing plugin: #{plugin_name} with #{plugin_file_path}"
-        plugin_model = Cosmos::PluginModel.get_model(name: plugin_name, scope: scope)
-        variables = plugin_model.variables
-        plugin_model.destroy
-        if variables_file
-          # Assume phase1 is already done
-          variables = JSON.parse(File.read(variables_file))
-          plugin_hash = Cosmos::PluginModel.new(name: File.basename(plugin_file_path), variables: variables, scope: scope).as_json
-        else
-          plugin_hash = Cosmos::PluginModel.install_phase1(plugin_file_path, variables, scope: scope)
+    if plugin_hash_file
+      # Admin Create / Edit / or Upgrade Plugin
+      Cosmos::PluginModel.install_phase1(plugin_file_path, scope: scope)
+      plugin_hash = JSON.parse(File.read(plugin_hash_file))
+    else
+      # Init or Command Line cosmos load with no plugin_hash_file
+      file_full_name = File.basename(plugin_file_path, ".gem")
+      file_gem_name = file_full_name.split('-')[0..-2].join('-')
+      found = false
+      plugin_names = Cosmos::PluginModel.names(scope: scope)
+      plugin_names.each do |plugin_name|
+        gem_name = plugin_name.split("__")[0]
+        full_name = File.basename(gem_name, ".gem")
+        gem_name = full_name.split('-')[0..-2].join('-')
+        if file_gem_name == gem_name
+          found = true
+          # Upgrade if version changed else do nothing
+          if file_full_name != full_name
+            update_plugin(plugin_file_path, plugin_name, scope: scope)
+          end
         end
-        Cosmos::PluginModel.install_phase2(plugin_hash['name'], plugin_hash['variables'], scope: scope)
-        found = true
       end
+      return if found
+
+      plugin_hash = Cosmos::PluginModel.install_phase1(plugin_file_path, scope: scope)
     end
-    unless found
-      puts "Loading new plugin: #{plugin_file_path}"
-      if variables_file
-        # Assume phase1 is already done
-        variables = JSON.parse(File.read(variables_file))
-        plugin_hash = Cosmos::PluginModel.new(name: File.basename(plugin_file_path), variables: variables, scope: scope).as_json
-      else
-        plugin_hash = Cosmos::PluginModel.install_phase1(plugin_file_path, scope: scope)
-      end
-      Cosmos::PluginModel.install_phase2(plugin_hash['name'], plugin_hash['variables'], scope: scope)
+
+    # Determine if plugin named in plugin_hash exists
+    existing_plugin_hash = Cosmos::PluginModel.get(name: plugin_hash['name'], scope: scope)
+
+    # Existing plugin hash will be present if plugin is being edited or upgraded
+    # If editing, gem name will match existing hash name
+    # If upgrading, gem name will not match the existing hash name
+
+    if existing_plugin_hash
+      # Upgrade or Edit
+      update_plugin(plugin_file_path, plugin_hash['name'], variables: plugin_hash['variables'], plugin_txt_lines: plugin_hash['plugin_txt_lines'], scope: scope)
+    else
+      # New Install
+      puts "Loading new plugin: #{plugin_file_path}\n#{plugin_hash}"
+      Cosmos::PluginModel.install_phase2(plugin_hash, scope: scope)
     end
   rescue => err
     abort("Error installing plugin: #{scope}: #{plugin_file_path}: #{err.formatted}")
@@ -305,8 +444,11 @@ if not ARGV[0].nil? # argument(s) given
   when 'rake'
     puts `rake #{ARGV[1..-1].join(' ')}`
 
+  when 'validate'
+    validate_plugin(ARGV[1], scope: ARGV[2], variables_file: ARGV[3])
+
   when 'load'
-    load_plugin(ARGV[1], scope: ARGV[2], variables_file: ARGV[3])
+    load_plugin(ARGV[1], scope: ARGV[2], plugin_hash_file: ARGV[3])
 
   when 'geminstall'
     gem_install(ARGV[1])
@@ -333,9 +475,8 @@ if not ARGV[0].nil? # argument(s) given
   when 'cstol_converter'
     puts `ruby /cosmos/bin/cstol_converter #{ARGV[1..-1].join(' ')}`
 
-  # TODO: This still needs work in COSMOS 5
-  # when 'xtce_converter'
-  #   puts `ruby /cosmos/bin/xtce_converter #{ARGV[1..-1].join(' ')}`
+  when 'xtce_converter'
+    xtce_converter(ARGV[1..-1])
 
   when 'bridge'
     ENV['COSMOS_NO_STORE'] = '1'

data/data/config/plugins.yaml

@@ -68,3 +68,13 @@ ROUTER:
 <%= MetaConfigParser.load('target.yaml').to_meta_config_yaml() %>
 <%= MetaConfigParser.load('microservice.yaml').to_meta_config_yaml() %>
 <%= MetaConfigParser.load('tool.yaml').to_meta_config_yaml() %>
+WIDGET:
+  summary: Define a custom widget
+  example: WIDGET HELLOWORLD
+  description: Defines a custom widget that can be used in Telemetry Viewer screens.
+  parameters:
+    - name: Widget Name
+      description: The name of the widget wil be used to build a path to the widget implementation. For example, `WIDGET HELLOWORLD` will find the as-built file tools/widgets/HelloworldWidget/HelloworldWidget.umd.min.js. See the [Custom Widgets](/docs/v5/custom-widgets)
+        guide for more details.
+      required: true
+      values: .+

data/ext/cosmos/ext/cosmos_io/cosmos_io.c

@@ -30,19 +30,19 @@ VALUE mCosmosIO = Qnil;
 static ID id_method_read = 0;
 
 /* Reads a length field and then return the String resulting from reading the
-  * number of bytes the length field indicates
-  *
-  * For example:
-  *   io = StringIO.new
-  *   # where io is "\x02\x01\x02\x03\x04...."
-  *   result = io.read_length_bytes(1)
-  *   # result will be "\x01x02" because the length field was given
-  *   # to be 1 byte. We read 1 byte which is a 2. So we then read two
-  *   # bytes and return.
-  *
-  * @param length_num_bytes [Integer] Number of bytes in the length field
-  * @return [String] A String of "length field" number of bytes
-  */
+ * number of bytes the length field indicates
+ *
+ * For example:
+ *   io = StringIO.new
+ *   # where io is "\x02\x01\x02\x03\x04...."
+ *   result = io.read_length_bytes(1)
+ *   # result will be "\x01x02" because the length field was given
+ *   # to be 1 byte. We read 1 byte which is a 2. So we then read two
+ *   # bytes and return.
+ *
+ * @param length_num_bytes [Integer] Number of bytes in the length field
+ * @return [String] A String of "length field" number of bytes
+ */
 static VALUE read_length_bytes(int argc, VALUE *argv, VALUE self)
 {
   int length_num_bytes = 0;
@@ -134,7 +134,7 @@ static VALUE read_length_bytes(int argc, VALUE *argv, VALUE self)
   }
 
   /* Read String */
-  temp_string_length = UINT2NUM(string_length);
+  temp_string_length = UINT2NUM((unsigned int)string_length);
   return_value = rb_funcall(self, id_method_read, 1, temp_string_length);
   if (NIL_P(return_value) || (RSTRING_LEN(return_value) != string_length))
   {

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

@@ -196,7 +196,7 @@ static VALUE packet_initialize(int argc, VALUE *argv, VALUE self)
     packet_name = argv[1];
     default_endianness = symbol_BIG_ENDIAN;
     description = Qnil;
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cPacketItem;
     break;
   case 3:
@@ -204,7 +204,7 @@ static VALUE packet_initialize(int argc, VALUE *argv, VALUE self)
     packet_name = argv[1];
     default_endianness = argv[2];
     description = Qnil;
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cPacketItem;
     break;
   case 4:
@@ -212,7 +212,7 @@ static VALUE packet_initialize(int argc, VALUE *argv, VALUE self)
     packet_name = argv[1];
     default_endianness = argv[2];
     description = argv[3];
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cPacketItem;
     break;
   case 5:

data/ext/cosmos/ext/structure/structure.c

@@ -56,6 +56,7 @@ static ID id_method_reverse = 0;
 static ID id_method_Integer = 0;
 static ID id_method_Float = 0;
 static ID id_method_kind_of = 0;
+static ID id_method_allocate_buffer_if_needed = 0;
 
 static ID id_ivar_buffer = 0;
 static ID id_ivar_bit_offset = 0;
@@ -520,7 +521,8 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
     {
       string_length = upper_bound - lower_bound + 1;
       string = malloc(string_length + 1);
-      if (string == NULL) {
+      if (string == NULL)
+      {
         rb_raise(rb_eNoMemError, "malloc of %d returned NULL", string_length + 1);
       }
       memcpy(string, buffer + lower_bound, string_length);
@@ -577,7 +579,8 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
       string_length = ((bit_size - 1) / 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char *)malloc(array_length);
-      if (unsigned_char_array == NULL) {
+      if (unsigned_char_array == NULL)
+      {
         rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
       }
       read_bitfield(lower_bound, upper_bound, bit_offset, bit_size, given_bit_offset, given_bit_size, param_endianness, buffer, (int)buffer_length, unsigned_char_array);
@@ -692,7 +695,8 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
       string_length = ((bit_size - 1) / 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char *)malloc(array_length);
-      if (unsigned_char_array == NULL) {
+      if (unsigned_char_array == NULL)
+      {
         rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
       }
       read_bitfield(lower_bound, upper_bound, bit_offset, bit_size, given_bit_offset, given_bit_size, param_endianness, buffer, (int)buffer_length, unsigned_char_array);
@@ -1147,7 +1151,8 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
       string_length = ((bit_size - 1) / 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char *)malloc(array_length);
-      if (unsigned_char_array == NULL) {
+      if (unsigned_char_array == NULL)
+      {
         rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
       }
 
@@ -1275,15 +1280,8 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
  */
 static int get_int_length(VALUE self)
 {
-  volatile VALUE buffer = rb_ivar_get(self, id_ivar_buffer);
-  if (RTEST(buffer))
-  {
-    return (int)RSTRING_LEN(buffer);
-  }
-  else
-  {
-    return 0;
-  }
+  rb_funcall(self, id_method_allocate_buffer_if_needed, 0);
+  return (int)RSTRING_LEN(rb_ivar_get(self, id_ivar_buffer));
 }
 
 /*
@@ -1310,24 +1308,21 @@ static VALUE read_item_internal(VALUE self, VALUE item, VALUE buffer)
     return Qnil;
   }
 
-  if (RTEST(buffer))
+  if (!(RTEST(buffer)))
   {
-    bit_offset = rb_ivar_get(item, id_ivar_bit_offset);
-    bit_size = rb_ivar_get(item, id_ivar_bit_size);
-    array_size = rb_ivar_get(item, id_ivar_array_size);
-    endianness = rb_ivar_get(item, id_ivar_endianness);
-    if (RTEST(array_size))
-    {
-      return rb_funcall(cBinaryAccessor, id_method_read_array, 6, bit_offset, bit_size, data_type, array_size, buffer, endianness);
-    }
-    else
-    {
-      return binary_accessor_read(cBinaryAccessor, bit_offset, bit_size, data_type, buffer, endianness);
-    }
+    buffer = rb_funcall(self, id_method_allocate_buffer_if_needed, 0);
+  }
+  bit_offset = rb_ivar_get(item, id_ivar_bit_offset);
+  bit_size = rb_ivar_get(item, id_ivar_bit_size);
+  array_size = rb_ivar_get(item, id_ivar_array_size);
+  endianness = rb_ivar_get(item, id_ivar_endianness);
+  if (RTEST(array_size))
+  {
+    return rb_funcall(cBinaryAccessor, id_method_read_array, 6, bit_offset, bit_size, data_type, array_size, buffer, endianness);
   }
   else
   {
-    rb_raise(rb_eRuntimeError, "No buffer given to read_item");
+    return binary_accessor_read(cBinaryAccessor, bit_offset, bit_size, data_type, buffer, endianness);
   }
 }
 
@@ -1404,8 +1399,8 @@ static VALUE structure_item_spaceship(VALUE self, VALUE other_item)
   if ((bit_offset == 0) && (other_bit_offset == 0))
   {
     /* Both bit_offsets are 0 so sort by bit_size
-      * This allows derived items with bit_size of 0 to be listed first
-      * Compare based on bit size */
+     * This allows derived items with bit_size of 0 to be listed first
+     * Compare based on bit size */
     bit_size = FIX2INT(rb_ivar_get(self, id_ivar_bit_size));
     other_bit_size = FIX2INT(rb_ivar_get(other_item, id_ivar_bit_size));
     if (bit_size == other_bit_size)
@@ -1518,12 +1513,12 @@ static VALUE structure_initialize(int argc, VALUE *argv, VALUE self)
   {
   case 0:
     default_endianness = HOST_ENDIANNESS;
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cStructureItem;
     break;
   case 1:
     default_endianness = argv[0];
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cStructureItem;
     break;
   case 2:
@@ -1592,6 +1587,10 @@ static VALUE resize_buffer(VALUE self)
       rb_str_concat(buffer, rb_str_times(ZERO_STRING, INT2FIX(defined_length - current_length)));
     }
   }
+  else
+  {
+    rb_funcall(self, id_method_allocate_buffer_if_needed, 0);
+  }
 
   return self;
 }
@@ -1618,6 +1617,7 @@ void Init_structure(void)
   id_method_Integer = rb_intern("Integer");
   id_method_Float = rb_intern("Float");
   id_method_kind_of = rb_intern("kind_of?");
+  id_method_allocate_buffer_if_needed = rb_intern("allocate_buffer_if_needed");
 
   MIN_INT8 = INT2NUM(-128);
   MAX_INT8 = INT2NUM(127);

data/lib/cosmos/api/tlm_api.rb

@@ -111,11 +111,11 @@ module Cosmos
 
     # Injects a packet into the system as if it was received from an interface
     #
-    # @param target_name[String] Target name of the packet
-    # @param packet_name[String] Packet name of the packet
-    # @param item_hash[Hash] Hash of item_name and value for each item you want to change from the current value table
+    # @param target_name [String] Target name of the packet
+    # @param packet_name [String] Packet name of the packet
+    # @param item_hash [Hash] Hash of item_name and value for each item you want to change from the current value table
     # @param type [Symbol] Telemetry type, :RAW, :CONVERTED (default), :FORMATTED, or :WITH_UNITS
-    def inject_tlm(target_name, packet_name, item_hash = nil, log: true, type: :CONVERTED, scope: $cosmos_scope, token: $cosmos_token)
+    def inject_tlm(target_name, packet_name, item_hash = nil, type: :CONVERTED, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'tlm_set', target_name: target_name, packet_name: packet_name, scope: scope, token: token)
       unless CvtModel::VALUE_TYPES.include?(type.intern)
         raise "Unknown type '#{type}' for #{target_name} #{packet_name}"