cosmos 5.0.4 → 5.0.5

data/lib/cosmos/models/plugin_model.rb

@@ -32,6 +32,7 @@ require 'cosmos/models/tool_model'
 require 'cosmos/models/widget_model'
 require 'cosmos/models/microservice_model'
 require 'tmpdir'
+require 'tempfile'
 
 module Cosmos
   # Represents a COSMOS plugin that can consist of targets, interfaces, routers
@@ -41,6 +42,9 @@ module Cosmos
     PRIMARY_KEY = 'cosmos_plugins'
 
     attr_accessor :variables
+    attr_accessor :plugin_txt_lines
+    attr_accessor :needs_dependencies
+
 
     # NOTE: The following three class methods are used by the ModelController
     # and are reimplemented to enable various Model class methods to work
@@ -58,71 +62,100 @@ module Cosmos
 
     # Called by the PluginsController to parse the plugin variables
     # Doesn't actaully create the plugin during the phase
-    def self.install_phase1(gem_file_path, existing_variables = nil, scope:)
-      gem_filename = File.basename(gem_file_path)
-
-      # Load gem to internal gem server
-      Cosmos::GemModel.put(gem_file_path, gem_install: false, scope: scope)
-
-      # Extract gem and process plugin.txt to determine what VARIABLEs need to be filled in
-      pkg = Gem::Package.new(gem_file_path)
+    def self.install_phase1(gem_file_path, existing_variables: nil, existing_plugin_txt_lines: nil, process_existing: false, scope:, validate_only: false)
+      gem_name = File.basename(gem_file_path).split("__")[0]
 
       temp_dir = Dir.mktmpdir
+      tf = nil
       begin
-        pkg.extract_files(temp_dir)
-        plugin_txt_path = File.join(temp_dir, 'plugin.txt')
-        if File.exist?(plugin_txt_path)
-          parser = Cosmos::ConfigParser.new("http://cosmosc2.com")
-
-          # Phase 1 Gather Variables
-          variables = {}
-          parser.parse_file(plugin_txt_path,
-                            false,
-                            true,
-                            false) do |keyword, params|
-            case keyword
-            when 'VARIABLE'
-              usage = "#{keyword} <Variable Name> <Default Value>"
-              parser.verify_num_parameters(2, nil, usage)
-              variable_name = params[0]
-              value = params[1..-1].join(" ")
-              variables[variable_name] = value
-              if existing_variables && existing_variables.key?(variable_name)
-                variables[variable_name] = existing_variables[variable_name]
-              end
-              # Ignore everything else during phase 1
-            end
+        if File.exists?(gem_file_path)
+          # Load gem to internal gem server
+          Cosmos::GemModel.put(gem_file_path, gem_install: false, scope: scope) unless validate_only
+        else
+          gem_file_path = Cosmos::GemModel.get(temp_dir, gem_name)
+        end
+
+        # Extract gem and process plugin.txt to determine what VARIABLEs need to be filled in
+        pkg = Gem::Package.new(gem_file_path)
+
+        if existing_plugin_txt_lines and process_existing
+          # This is only used in cosmos load when everything is known
+          plugin_txt_lines = existing_plugin_txt_lines
+          file_data = existing_plugin_txt_lines.join("\n")
+          tf = Tempfile.new("plugin.txt")
+          tf.write(file_data)
+          tf.close
+          plugin_txt_path = tf.path
+        else
+          # Otherwise we always process the new and return both
+          pkg.extract_files(temp_dir)
+          plugin_txt_path = File.join(temp_dir, 'plugin.txt')
+          plugin_text = File.read(plugin_txt_path)
+          plugin_txt_lines = []
+          plugin_text.each_line do |line|
+            plugin_txt_lines << line.chomp
           end
+        end
+
+        parser = Cosmos::ConfigParser.new("http://cosmosc2.com")
 
-          model = PluginModel.new(name: gem_filename, variables: variables, scope: scope)
-          return model.as_json
+        # Phase 1 Gather Variables
+        variables = {}
+        parser.parse_file(plugin_txt_path,
+                          false,
+                          true,
+                          false) do |keyword, params|
+          case keyword
+          when 'VARIABLE'
+            usage = "#{keyword} <Variable Name> <Default Value>"
+            parser.verify_num_parameters(2, nil, usage)
+            variable_name = params[0]
+            value = params[1..-1].join(" ")
+            variables[variable_name] = value
+            if existing_variables && existing_variables.key?(variable_name)
+              variables[variable_name] = existing_variables[variable_name]
+            end
+            # Ignore everything else during phase 1
+          end
         end
+
+        model = PluginModel.new(name: gem_name, variables: variables, plugin_txt_lines: plugin_txt_lines, scope: scope)
+        result = model.as_json
+        result['existing_plugin_txt_lines'] = existing_plugin_txt_lines if existing_plugin_txt_lines and not process_existing and existing_plugin_txt_lines != result['plugin_txt_lines']
+        return result
       ensure
         FileUtils.remove_entry(temp_dir) if temp_dir and File.exist?(temp_dir)
+        tf.unlink if tf
       end
     end
 
     # Called by the PluginsController to create the plugin
     # Because this uses ERB it must be run in a seperate process from the API to
     # prevent corruption and single require problems in the current proces
-    def self.install_phase2(name, variables, scope:)
+    def self.install_phase2(plugin_hash, scope:, validate_only: false)
       rubys3_client = Aws::S3::Client.new
 
       # Ensure config bucket exists
-      begin
-        rubys3_client.head_bucket(bucket: 'config')
-      rescue Aws::S3::Errors::NotFound
-        rubys3_client.create_bucket(bucket: 'config')
+      unless validate_only
+        begin
+          rubys3_client.head_bucket(bucket: 'config')
+        rescue Aws::S3::Errors::NotFound
+          rubys3_client.create_bucket(bucket: 'config')
+        end
       end
 
       # Register plugin to aid in uninstall if install fails
-      plugin_model = PluginModel.new(name: name, variables: variables, scope: scope)
-      plugin_model.create
+      plugin_hash.delete("existing_plugin_txt_lines")
+      plugin_model = PluginModel.new(**(plugin_hash.transform_keys(&:to_sym)), scope: scope)
+      plugin_model.create unless validate_only
 
       temp_dir = Dir.mktmpdir
       begin
+        tf = nil
+
         # Get the gem from local gem server
-        gem_file_path = Cosmos::GemModel.get(temp_dir, name)
+        gem_name = plugin_hash['name'].split("__")[0]
+        gem_file_path = Cosmos::GemModel.get(temp_dir, gem_name)
 
         # Actually install the gem now (slow)
         Cosmos::GemModel.install(gem_file_path, scope: scope)
@@ -133,6 +166,11 @@ module Cosmos
         pkg = Gem::Package.new(gem_file_path)
         needs_dependencies = pkg.spec.runtime_dependencies.length > 0
         pkg.extract_files(gem_path)
+        needs_dependencies = true if Dir.exist?(File.join(gem_path, 'lib'))
+        if needs_dependencies
+          plugin_model.needs_dependencies = true
+          plugin_model.update
+        end
 
         # Temporarily add all lib folders from the gem to the end of the load path
         load_dirs = []
@@ -145,7 +183,12 @@ module Cosmos
           end
 
           # Process plugin.txt file
-          plugin_txt_path = File.join(gem_path, 'plugin.txt')
+          file_data = plugin_hash['plugin_txt_lines'].join("\n")
+          tf = Tempfile.new("plugin.txt")
+          tf.write(file_data)
+          tf.close
+          plugin_txt_path = tf.path
+          variables = plugin_hash['variables']
           if File.exist?(plugin_txt_path)
             parser = Cosmos::ConfigParser.new("http://cosmosc2.com")
 
@@ -156,8 +199,8 @@ module Cosmos
                 # Ignore during phase 2
               when 'TARGET', 'INTERFACE', 'ROUTER', 'MICROSERVICE', 'TOOL', 'WIDGET'
                 if current_model
-                  current_model.create
-                  current_model.deploy(gem_path, variables)
+                  current_model.create unless validate_only
+                  current_model.deploy(gem_path, variables, validate_only: validate_only)
                   current_model = nil
                 end
                 current_model = Cosmos.const_get((keyword.capitalize + 'Model').intern).handle_config(parser, keyword, params, plugin: plugin_model.name, needs_dependencies: needs_dependencies, scope: scope)
@@ -170,8 +213,8 @@ module Cosmos
               end
             end
             if current_model
-              current_model.create
-              current_model.deploy(gem_path, variables)
+              current_model.create unless validate_only
+              current_model.deploy(gem_path, variables, validate_only: validate_only)
               current_model = nil
             end
           end
@@ -182,21 +225,28 @@ module Cosmos
         end
       rescue => err
         # Install failed - need to cleanup
-        plugin_model.destroy
+        plugin_model.destroy unless validate_only
         raise err
       ensure
         FileUtils.remove_entry(temp_dir) if temp_dir and File.exist?(temp_dir)
+        tf.unlink if tf
       end
+
+      return plugin_model.as_json
     end
 
     def initialize(
       name:,
       variables: {},
+      plugin_txt_lines: [],
+      needs_dependencies: false,
       updated_at: nil,
       scope:
     )
       super("#{scope}__#{PRIMARY_KEY}", name: name, updated_at: updated_at, scope: scope)
       @variables = variables
+      @plugin_txt_lines = plugin_txt_lines
+      @needs_dependencies = ConfigParser.handle_true_false(needs_dependencies)
     end
 
     def create(update: false, force: false)
@@ -208,6 +258,8 @@ module Cosmos
       {
         'name' => @name,
         'variables' => @variables,
+        'plugin_txt_lines' => @plugin_txt_lines,
+        'needs_dependencies' => @needs_dependencies,
         'updated_at' => @updated_at
       }
     end
@@ -220,5 +272,13 @@ module Cosmos
         end
       end
     end
+
+    # Reinstall
+    def restore
+      plugin_hash = self.as_json
+      plugin_hash['name'] = plugin_hash['name'].split("__")[0]
+      Cosmos::PluginModel.install_phase2(plugin_hash, scope: @scope)
+      @destroyed = false
+    end
   end
 end

data/lib/cosmos/models/scope_model.rb

@@ -52,6 +52,8 @@ module Cosmos
     def deploy(gem_path, variables)
       seed_database()
 
+      ConfigTopic.initialize_stream(@scope)
+
       # COSMOS Log Microservice
       microservice_name = "#{@scope}__COSMOS__LOG"
       microservice = MicroserviceModel.new(

data/lib/cosmos/models/sorted_model.rb

@@ -119,6 +119,7 @@ module Cosmos
     def create(update: false)
       validate_start(update: update)
       @updated_at = Time.now.to_nsec_from_epoch
+      SortedModel.destroy(scope: @scope, start: update) if update
       Store.zadd(@primary_key, @start, JSON.generate(as_json()))
       if update
         notify(kind: 'updated')
@@ -129,8 +130,9 @@ module Cosmos
 
     # Update the Redis hash at primary_key
     def update(start:)
+      orig_start = @start
       @start = start
-      create(update: true)
+      create(update: orig_start)
     end
 
     # destroy the activity from the redis database

data/lib/cosmos/models/target_model.rb

@@ -22,6 +22,7 @@ require 'cosmos/models/model'
 require 'cosmos/models/cvt_model'
 require 'cosmos/models/microservice_model'
 require 'cosmos/topics/limits_event_topic'
+require 'cosmos/topics/config_topic'
 require 'cosmos/system'
 require 'cosmos/utilities/s3'
 require 'cosmos/utilities/zip'
@@ -360,7 +361,7 @@ module Cosmos
       return nil
     end
 
-    def deploy(gem_path, variables)
+    def deploy(gem_path, variables, validate_only: false)
       rubys3_client = Aws::S3::Client.new
       variables["target_name"] = @name
       start_path = "/targets/#{@folder_name}/"
@@ -389,14 +390,23 @@ module Cosmos
           FileUtils.mkdir_p(File.dirname(local_path))
           File.open(local_path, 'wb') { |file| file.write(data) }
           found = true
-          rubys3_client.put_object(bucket: 'config', key: key, body: data)
+          rubys3_client.put_object(bucket: 'config', key: key, body: data) unless validate_only
         end
         raise "No target files found at #{target_path}" unless found
 
         target_folder = File.join(temp_dir, @name)
-        build_target_archive(rubys3_client, temp_dir, target_folder)
-        system = update_store(temp_dir)
-        deploy_microservices(gem_path, variables, system)
+        # Build a System for just this target
+        system = System.new([@name], temp_dir)
+        if variables["xtce_output"]
+          puts "Converting target #{@name} to .xtce files in #{variables["xtce_output"]}/#{@name}"
+          system.packet_config.to_xtce(variables["xtce_output"])
+        end
+        unless validate_only
+          build_target_archive(rubys3_client, temp_dir, target_folder)
+          system = update_store(system)
+          deploy_microservices(gem_path, variables, system)
+          ConfigTopic.write({ kind: 'created', type: 'target', name: @name, plugin: @plugin }, scope: @scope)
+        end
       ensure
         FileUtils.remove_entry(temp_dir) if temp_dir and File.exist?(temp_dir)
       end
@@ -430,6 +440,7 @@ module Cosmos
         model = MicroserviceModel.get_model(name: "#{@scope}__#{type}__#{@name}", scope: @scope)
         model.destroy if model
       end
+      ConfigTopic.write({ kind: 'deleted', type: 'target', name: @name, plugin: @plugin }, scope: @scope)
     end
 
     ##################################################
@@ -497,9 +508,7 @@ module Cosmos
       end
     end
 
-    def update_store(temp_dir)
-      # Build a System for just this target
-      system = System.new([@name], temp_dir)
+    def update_store(system)
       target = system.targets[@name]
 
       # Add in the information from the target and update
@@ -606,7 +615,7 @@ module Cosmos
           ],
           topics: command_topic_list,
           target_names: [@name],
-          plugin: plugin,
+          plugin: @plugin,
           needs_dependencies: @needs_dependencies,
           scope: @scope
         )
@@ -629,7 +638,7 @@ module Cosmos
           ],
           topics: decom_command_topic_list,
           target_names: [@name],
-          plugin: plugin,
+          plugin: @plugin,
           needs_dependencies: @needs_dependencies,
           scope: @scope
         )
@@ -654,7 +663,7 @@ module Cosmos
           ],
           topics: packet_topic_list,
           target_names: [@name],
-          plugin: plugin,
+          plugin: @plugin,
           needs_dependencies: @needs_dependencies,
           scope: @scope
         )
@@ -677,7 +686,7 @@ module Cosmos
           ],
           topics: decom_topic_list,
           target_names: [@name],
-          plugin: plugin,
+          plugin: @plugin,
           needs_dependencies: @needs_dependencies,
           scope: @scope
         )
@@ -694,7 +703,7 @@ module Cosmos
           work_dir: '/cosmos/lib/cosmos/microservices',
           topics: packet_topic_list,
           target_names: [@name],
-          plugin: plugin,
+          plugin: @plugin,
           needs_dependencies: @needs_dependencies,
           scope: @scope
         )
@@ -710,7 +719,7 @@ module Cosmos
           cmd: ["ruby", "reducer_microservice.rb", microservice_name],
           work_dir: '/cosmos/lib/cosmos/microservices',
           topics: decom_topic_list,
-          plugin: plugin,
+          plugin: @plugin,
           needs_dependencies: @needs_dependencies,
           scope: @scope
         )
@@ -727,7 +736,7 @@ module Cosmos
           name: microservice_name,
           cmd: ["ruby", "cleanup_microservice.rb", microservice_name],
           work_dir: '/cosmos/lib/cosmos/microservices',
-          plugin: plugin,
+          plugin: @plugin,
           scope: @scope
         )
         microservice.create

data/lib/cosmos/models/tool_model.rb

@@ -209,13 +209,11 @@ module Cosmos
       return nil
     end
 
-    def deploy(gem_path, variables)
+    def deploy(gem_path, variables, validate_only: false)
       return unless @folder_name
 
-      rubys3_client = Aws::S3::Client.new
-
       # Ensure tools bucket exists
-      Cosmos::S3Utilities.ensure_public_bucket('tools')
+      Cosmos::S3Utilities.ensure_public_bucket('tools') unless validate_only
 
       variables["tool_name"] = @name
       start_path = "/tools/#{@folder_name}/"
@@ -223,16 +221,17 @@ module Cosmos
         next if filename == '.' or filename == '..' or File.directory?(filename)
 
         key = filename.split(gem_path + '/tools/')[-1]
-
         extension = filename.split('.')[-1]
         content_type = Rack::Mime.mime_type(".#{extension}")
 
-        cache_control = Cosmos::S3Utilities.get_cache_control(filename)
-
         # Load tool files
         data = File.read(filename, mode: "rb")
         data = ERB.new(data, trim_mode: "-").result(binding.set_variables(variables)) if data.is_printable?
-        rubys3_client.put_object(bucket: 'tools', content_type: content_type, cache_control: cache_control, key: key, body: data)
+        unless validate_only
+          cache_control = Cosmos::S3Utilities.get_cache_control(filename)
+          Aws::S3::Client.new.put_object(bucket: 'tools', content_type: content_type, cache_control: cache_control, key: key, body: data)
+          ConfigTopic.write({ kind: 'created', type: 'tool', name: @folder_name, plugin: @plugin }, scope: @scope)
+        end
       end
     end
 
@@ -242,6 +241,7 @@ module Cosmos
         prefix = "#{@folder_name}/"
         rubys3_client.list_objects(bucket: 'tools', prefix: prefix).contents.each do |object|
           rubys3_client.delete_object(bucket: 'tools', key: object.key)
+          ConfigTopic.write({ kind: 'deleted', type: 'tool', name: @folder_name, plugin: @plugin }, scope: @scope)
         end
       end
     end

data/lib/cosmos/models/widget_model.rb

@@ -108,25 +108,25 @@ module Cosmos
       raise ConfigParser::Error.new(parser, "Unknown keyword and parameters for Widget: #{keyword} #{parameters.join(" ")}")
     end
 
-    def deploy(gem_path, variables)
-      rubys3_client = Aws::S3::Client.new
-
+    def deploy(gem_path, variables, validate_only: false)
       # Ensure tools bucket exists
-      Cosmos::S3Utilities.ensure_public_bucket('tools')
+      Cosmos::S3Utilities.ensure_public_bucket('tools') unless validate_only
 
       filename = gem_path + "/tools/widgets/" + @full_name + '/' + @filename
 
-      cache_control = Cosmos::S3Utilities.get_cache_control(@filename)
-
       # Load widget file
       data = File.read(filename, mode: "rb")
       Cosmos.set_working_dir(File.dirname(filename)) do
         data = ERB.new(data, trim_mode: "-").result(binding.set_variables(variables)) if data.is_printable?
       end
-      # TODO: support widgets that aren't just a single js file (and its associated map file)
-      rubys3_client.put_object(bucket: 'tools', content_type: 'application/javascript', cache_control: cache_control, key: @s3_key, body: data)
-      data = File.read(filename + '.map', mode: "rb")
-      rubys3_client.put_object(bucket: 'tools', content_type: 'application/json', cache_control: cache_control, key: @s3_key + '.map', body: data)
+      unless validate_only
+        cache_control = Cosmos::S3Utilities.get_cache_control(@filename)
+        # TODO: support widgets that aren't just a single js file (and its associated map file)
+        rubys3_client = Aws::S3::Client.new
+        rubys3_client.put_object(bucket: 'tools', content_type: 'application/javascript', cache_control: cache_control, key: @s3_key, body: data)
+        data = File.read(filename + '.map', mode: "rb")
+        rubys3_client.put_object(bucket: 'tools', content_type: 'application/json', cache_control: cache_control, key: @s3_key + '.map', body: data)
+      end
     end
 
     def undeploy

data/lib/cosmos/packets/packet.rb

@@ -98,7 +98,7 @@ module Cosmos
       # @param buffer [String] String buffer to hold the packet data
       # @param item_class [Class] Class used to instantiate items (Must be a
       #   subclass of PacketItem)
-      def initialize(target_name, packet_name, default_endianness = :BIG_ENDIAN, description = nil, buffer = '', item_class = PacketItem)
+      def initialize(target_name, packet_name, default_endianness = :BIG_ENDIAN, description = nil, buffer = nil, item_class = PacketItem)
         super(default_endianness, buffer, item_class)
         # Explictly call the defined setter methods
         self.target_name = target_name

data/lib/cosmos/packets/structure.rb

@@ -66,7 +66,7 @@ module Cosmos
       # @param buffer [String] Buffer used to store the structure
       # @param item_class [Class] Class used to instantiate new structure items.
       #   Must be StructureItem or one of its subclasses.
-      def initialize(default_endianness = BinaryAccessor::HOST_ENDIANNESS, buffer = '', item_class = StructureItem)
+      def initialize(default_endianness = BinaryAccessor::HOST_ENDIANNESS, buffer = nil, item_class = StructureItem)
         if (default_endianness == :BIG_ENDIAN) || (default_endianness == :LITTLE_ENDIAN)
           @default_endianness = default_endianness
           if buffer
@@ -102,14 +102,11 @@ module Cosmos
       def read_item(item, value_type = :RAW, buffer = @buffer)
         return nil if item.data_type == :DERIVED
 
-        if buffer
-          if item.array_size
-            return BinaryAccessor.read_array(item.bit_offset, item.bit_size, item.data_type, item.array_size, buffer, item.endianness)
-          else
-            return BinaryAccessor.read(item.bit_offset, item.bit_size, item.data_type, buffer, item.endianness)
-          end
+        buffer = allocate_buffer_if_needed() unless buffer
+        if item.array_size
+          return BinaryAccessor.read_array(item.bit_offset, item.bit_size, item.data_type, item.array_size, buffer, item.endianness)
         else
-          raise "No buffer given to read_item"
+          return BinaryAccessor.read(item.bit_offset, item.bit_size, item.data_type, buffer, item.endianness)
         end
       end
 
@@ -117,9 +114,8 @@ module Cosmos
       #
       # @return [Integer] Size of the buffer in bytes
       def length
-        return @buffer.length if @buffer
-
-        return 0
+        allocate_buffer_if_needed()
+        return @buffer.length
       end
 
       # Resize the buffer at least the defined length of the structure
@@ -129,12 +125,23 @@ module Cosmos
           if @buffer.length < @defined_length
             @buffer << (ZERO_STRING * (@defined_length - @buffer.length))
           end
+        else
+          allocate_buffer_if_needed()
         end
 
         return self
       end
     end
 
+    # Allocate a buffer if not available
+    def allocate_buffer_if_needed
+      unless @buffer
+        @buffer = ZERO_STRING * @defined_length
+        @buffer.force_encoding(ASCII_8BIT_STRING)
+      end
+      return @buffer
+    end
+
     # Indicates if any items have been defined for this structure
     # @return [TrueClass or FalseClass]
     def defined?
@@ -340,14 +347,11 @@ module Cosmos
     #   parameter to check whether to perform conversions on the item.
     # @param buffer [String] The binary buffer to write the value to
     def write_item(item, value, value_type = :RAW, buffer = @buffer)
-      if buffer
-        if item.array_size
-          BinaryAccessor.write_array(value, item.bit_offset, item.bit_size, item.data_type, item.array_size, buffer, item.endianness, item.overflow)
-        else
-          BinaryAccessor.write(value, item.bit_offset, item.bit_size, item.data_type, buffer, item.endianness, item.overflow)
-        end
+      buffer = allocate_buffer_if_needed() unless buffer
+      if item.array_size
+        BinaryAccessor.write_array(value, item.bit_offset, item.bit_size, item.data_type, item.array_size, buffer, item.endianness, item.overflow)
       else
-        raise "No buffer given to write_item"
+        BinaryAccessor.write(value, item.bit_offset, item.bit_size, item.data_type, buffer, item.endianness, item.overflow)
       end
     end
 
@@ -432,14 +436,11 @@ module Cosmos
     # @param copy [TrueClass/FalseClass] Whether to copy the buffer
     # @return [String] Data buffer backing the structure
     def buffer(copy = true)
-      if @buffer
-        if copy
-          return @buffer.dup
-        else
-          return @buffer
-        end
+      local_buffer = allocate_buffer_if_needed()
+      if copy
+        return local_buffer.dup
       else
-        return nil
+        return local_buffer
       end
     end
 
@@ -525,15 +526,11 @@ module Cosmos
     module MethodMissing
       # Method missing provides reading/writing item values as if they were methods to the class
       def method_missing(name, value = nil)
-        if @buffer
-          if value
-            # Strip off the equals sign before looking up the item
-            return write(name.to_s[0..-2], value)
-          else
-            return read(name.to_s)
-          end
+        if value
+          # Strip off the equals sign before looking up the item
+          return write(name.to_s[0..-2], value)
         else
-          raise "No buffer available for method_missing"
+          return read(name.to_s)
         end
       end
     end

data/lib/cosmos/script/calendar.rb

@@ -42,6 +42,9 @@ module Cosmos
     # @param start [Time] Metadata time value, if nil will be current time
     # @return The result of the method call.
     def set_metadata(metadata, color: nil, start: nil)
+      unless metadata.is_a?(Hash)
+        raise "metadata must be a Hash: #{metadata} is a #{metadata.class}"
+      end
       color = color.nil? ? '#003784' : color
       data = { color: color, metadata: metadata }
       data[:start] = start.iso8601 unless start.nil?
@@ -52,12 +55,20 @@ module Cosmos
 
     # Updates the metadata
     #
-    # @param start [Integer] Metadata time value as integer seconds from epoch
     # @param metadata [Hash<Symbol, Variable>] A hash of metadata
     # @param color [String] Events color to show on Calendar tool, if nil will be blue
+    # @param start [Integer] Metadata time value as integer seconds from epoch
     # @return The result of the method call.
-    def update_metadata(start, metadata, color: nil)
+    def update_metadata(metadata, color: nil, start: nil)
+      unless metadata.is_a?(Hash)
+        raise "metadata must be a Hash: #{metadata} is a #{metadata.class}"
+      end
       color = color.nil? ? '#003784' : color
+      if start == nil
+        existing = get_metadata()
+        start = existing['start']
+        metadata = existing['metadata'].merge(metadata)
+      end
       data = { :color => color, :metadata => metadata }
       data[:start] = Time.at(start).iso8601
       response = $api_server.request('put', "/cosmos-api/metadata/#{start}", data: data, json: true)