cosmos 4.0.3 → 4.1.0

data/lib/cosmos/packets/commands.rb

@@ -19,7 +19,7 @@ module Cosmos
   #
   # This should not be confused with the Api module which implements the JSON
   # API that is used by tools when accessing the Server. The Api module always
-  # provides Ruby primatives where the PacketDefinition class can return actual
+  # provides Ruby primatives where the PacketConfig class can return actual
   # Packet or PacketItem objects. While there are some overlapping methods between
   # the two, these are separate interfaces into the system.
   class Commands

data/lib/cosmos/packets/structure.rb

@@ -198,7 +198,7 @@ module Cosmos
         # to re-sort. We also re-sort if the current item is less than the less
         # item because we are inserting.
         if last_item.bit_offset <= 0 or item.bit_offset <= 0 or item.bit_offset < last_item.bit_offset
-          @sorted_items = @sorted_items.sort {|item1, item2| item1 <=> item2}
+          @sorted_items = @sorted_items.sort
         end
       else
         @sorted_items << item

data/lib/cosmos/packets/structure_item.rb

@@ -17,6 +17,8 @@ module Cosmos
   class StructureItem
     include Comparable
 
+    @@create_index = 0
+
     # Valid data types adds :DERIVED to those defined by BinaryAccessor
     DATA_TYPES = BinaryAccessor::DATA_TYPES << :DERIVED
 
@@ -81,6 +83,8 @@ module Cosmos
       self.bit_size = bit_size
       self.array_size = array_size
       self.overflow = overflow
+      @create_index = @@create_index
+      @@create_index += 1
       @structure_item_constructed = true
       verify_overall()
     end
@@ -190,6 +194,10 @@ module Cosmos
       verify_overall() if @structure_item_constructed
     end
 
+    def create_index
+      @create_index.to_i
+    end
+
     if RUBY_ENGINE != 'ruby' or ENV['COSMOS_NO_EXT']
       # Comparison Operator based on bit_offset. This means that StructureItems
       # with different names or bit sizes are equal if they have the same bit
@@ -202,9 +210,17 @@ module Cosmos
         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
+          # Compare based on bit size then create index
           if @bit_size == other_bit_size
-            return 0
+            if @create_index
+              if @create_index <= other_item.create_index
+                return -1
+              else
+                return 1
+              end
+            else
+              return 0
+            end
           elsif @bit_size < other_bit_size
             return -1
           else
@@ -216,8 +232,16 @@ module Cosmos
         if ((@bit_offset >= 0) && (other_bit_offset >= 0)) || ((@bit_offset < 0) && (other_bit_offset < 0))
           # Both Have Same Sign
           if @bit_offset == other_bit_offset
-            return 0
-          elsif @bit_offset < other_bit_offset
+            if @create_index
+              if @create_index <= other_item.create_index
+                return -1
+              else
+                return 1
+              end
+            else
+              return 0
+            end
+          elsif @bit_offset <= other_bit_offset
             return -1
           else
             return 1
@@ -225,7 +249,15 @@ module Cosmos
         else
           # Different Signs
           if @bit_offset == other_bit_offset
-            return 0
+            if @create_index
+              if @create_index < other_item.create_index
+                return -1
+              else
+                return 1
+              end
+            else
+              return 0
+            end
           elsif @bit_offset < other_bit_offset
             return 1
           else

data/lib/cosmos/script/cmd_tlm_server.rb

@@ -57,14 +57,42 @@ module Cosmos
       return $cmd_tlm_server.get_target_info(target_name)
     end
 
+    def get_all_target_info
+      return $cmd_tlm_server.get_all_target_info
+    end
+
+    def get_target_ignored_parameters(target_name)
+      return $cmd_tlm_server.get_target_ignored_parameters(target_name)
+    end
+
+    def get_target_ignored_items(target_name)
+      return $cmd_tlm_server.get_target_ignored_items(target_name)
+    end
+
     def get_interface_info(interface_name)
       return $cmd_tlm_server.get_interface_info(interface_name)
     end
 
+    def get_all_router_info
+      return $cmd_tlm_server.get_all_router_info
+    end
+
+    def get_all_interface_info
+      return $cmd_tlm_server.get_all_interface_info
+    end
+
     def get_router_info(router_name)
       return $cmd_tlm_server.get_router_info(router_name)
     end
 
+    def get_all_cmd_info
+      return $cmd_tlm_server.get_all_cmd_info
+    end
+
+    def get_all_tlm_info
+      return $cmd_tlm_server.get_all_tlm_info
+    end
+
     def get_cmd_cnt(target_name, command_name)
       return $cmd_tlm_server.get_cmd_cnt(target_name, command_name)
     end
@@ -73,10 +101,34 @@ module Cosmos
       return $cmd_tlm_server.get_tlm_cnt(target_name, packet_name)
     end
 
+    def get_packet_loggers
+      return $cmd_tlm_server.get_packet_loggers
+    end
+
     def get_packet_logger_info(packet_logger_name)
       return $cmd_tlm_server.get_packet_logger_info(packet_logger_name)
     end
 
+    def get_all_packet_logger_info
+      return $cmd_tlm_server.get_all_packet_logger_info
+    end
+
+    def get_background_tasks
+      return $cmd_tlm_server.get_background_tasks
+    end
+
+    def start_background_task(task_name)
+      return $cmd_tlm_server.start_background_task(task_name)
+    end
+
+    def stop_background_task(task_name)
+      return $cmd_tlm_server.stop_background_task(task_name)
+    end
+
+    def get_server_status
+      return $cmd_tlm_server.get_server_status
+    end
+
     def get_cmd_log_filename(packet_log_writer_name = 'DEFAULT')
       return $cmd_tlm_server.get_cmd_log_filename(packet_log_writer_name)
     end
@@ -133,6 +185,28 @@ module Cosmos
       return $cmd_tlm_server.start_new_server_message_log
     end
 
-  end # module Script
+    def subscribe_server_messages(queue_size = CmdTlmServer::DEFAULT_SERVER_MESSAGES_QUEUE_SIZE)
+      return $cmd_tlm_server.subscribe_server_messages(queue_size)
+    end
+
+    def unsubscribe_server_messages(id)
+      return $cmd_tlm_server.unsubscribe_server_messages(id)
+    end
+
+    def get_server_message(id, non_block = false)
+      return $cmd_tlm_server.get_server_message(id, non_block)
+    end
+
+    def cmd_tlm_reload
+      return $cmd_tlm_server.cmd_tlm_reload
+    end
+
+    def cmd_tlm_clear_counters
+      return $cmd_tlm_server.cmd_tlm_clear_counters
+    end
 
-end # module Cosmos
+    def get_output_logs_filenames(filter = '*tlm.bin')
+      return $cmd_tlm_server.get_output_logs_filenames(filter)
+    end    
+  end
+end

data/lib/cosmos/script/replay.rb

@@ -0,0 +1,60 @@
+# encoding: ascii-8bit
+
+# Copyright 2017 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+module Cosmos
+
+  module Script
+    private
+
+    def replay_select_file(filename, packet_log_reader = "DEFAULT")
+      $cmd_tlm_server.replay_select_file(filename, packet_log_reader)
+    end
+
+    def replay_status
+      $cmd_tlm_server.replay_status
+    end
+
+    def replay_set_playback_delay(delay)
+      $cmd_tlm_server.replay_set_playback_delay(delay)
+    end
+
+    def replay_play
+      $cmd_tlm_server.replay_play
+    end
+
+    def replay_reverse_play
+      $cmd_tlm_server.replay_reverse_play
+    end
+
+    def replay_stop
+      $cmd_tlm_server.replay_stop
+    end
+
+    def replay_step_forward
+      $cmd_tlm_server.replay_step_forward
+    end
+
+    def replay_step_back
+      $cmd_tlm_server.replay_step_back
+    end
+
+    def replay_move_start
+      $cmd_tlm_server.replay_move_start
+    end
+
+    def replay_move_end
+      $cmd_tlm_server.replay_move_end
+    end
+
+    def replay_move_index(index)
+      $cmd_tlm_server.replay_move_index(index)
+    end    
+  end
+end

data/lib/cosmos/script/script.rb

@@ -12,6 +12,7 @@ require 'cosmos'
 require 'cosmos/io/json_drb_object'
 require 'cosmos/tools/cmd_tlm_server/cmd_tlm_server'
 require 'cosmos/script/cmd_tlm_server'
+require 'cosmos/script/replay'
 require 'cosmos/script/commands'
 require 'cosmos/script/telemetry'
 require 'cosmos/script/limits'
@@ -20,6 +21,7 @@ require 'cosmos/script/tools'
 
 $cmd_tlm_server = nil
 $cmd_tlm_disconnect = false
+$cmd_tlm_replay_mode = false
 
 module Cosmos
   class CheckError < RuntimeError; end
@@ -39,6 +41,7 @@ module Cosmos
     # Called when this module is mixed in using "include Cosmos::Script"
     def self.included(base)
       $cmd_tlm_disconnect = false
+      $cmd_tlm_replay_mode = false
       $cmd_tlm_server = nil
       initialize_script_module()
     end
@@ -48,8 +51,12 @@ module Cosmos
         # Start up a standalone CTS in disconnected mode
         $cmd_tlm_server = CmdTlmServer.new(config_file, false, true)
       else
-        # Start a Json connect to the real CTS server
-        $cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['CTS_API'], System.ports['CTS_API'])
+        # Start a Json connect to the real server
+        if $cmd_tlm_replay_mode
+          $cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['REPLAY_API'], System.ports['REPLAY_API'])
+        else
+          $cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['CTS_API'], System.ports['CTS_API'])
+        end
       end
     end
 
@@ -72,5 +79,16 @@ module Cosmos
       $cmd_tlm_server.disconnect if $cmd_tlm_server && !$cmd_tlm_disconnect
     end
 
+    def set_replay_mode(replay_mode)
+      if replay_mode != $cmd_tlm_replay_mode
+        $cmd_tlm_replay_mode = replay_mode
+        initialize_script_module()
+      end
+    end
+
+    def get_replay_mode
+      $cmd_tlm_replay_mode
+    end
+
   end
 end

data/lib/cosmos/script/scripting.rb

@@ -72,9 +72,9 @@ module Cosmos
       prompt_combo_box(string, options)
     end
 
-    def _file_dialog(message, directory, select_files = true)
+    def _file_dialog(message, directory, filter, select_files = true)
       answer = ''
-      files = Dir["#{directory}/*"]
+      files = Dir["#{directory}/#{filter}"]
       if select_files
         files.select! {|f| !File.directory? f }
       else
@@ -87,17 +87,17 @@ module Cosmos
       end
       return answer
     end
-    def save_file_dialog(directory = Cosmos::USERPATH, message = "Save File")
-      _file_dialog(message, directory)
+    def save_file_dialog(directory = Cosmos::USERPATH, message = "Save File", filter = "*")
+      _file_dialog(message, directory, filter)
     end
-    def open_file_dialog(directory = Cosmos::USERPATH, message = "Open File")
-      _file_dialog(message, directory)
+    def open_file_dialog(directory = Cosmos::USERPATH, message = "Open File", filter = "*")
+      _file_dialog(message, directory, filter)
     end
-    def open_files_dialog(directory = Cosmos::USERPATH, message = "Open File(s)")
-      _file_dialog(message, directory)
+    def open_files_dialog(directory = Cosmos::USERPATH, message = "Open File(s)", filter = "*")
+      _file_dialog(message, directory, filter)
     end
     def open_directory_dialog(directory = Cosmos::USERPATH, message = "Open Directory")
-      _file_dialog(message, directory, false)
+      _file_dialog(message, directory, "*", false)
     end
 
     def prompt_for_hazardous(target_name, cmd_name, hazardous_description)

data/lib/cosmos/script/tools.rb

@@ -92,6 +92,20 @@ module Cosmos
       end
     end
 
+    ###########################
+    # Telemetry Screen methods
+    ###########################
+
+    # Get the organized list of available telemetry screens
+    def get_screen_list(config_filename = nil, force_refresh = false)
+      $cmd_tlm_server.get_screen_list(config_filename, force_refresh)
+    end
+
+    # Get a specific screen definition
+    def get_screen_definition(screen_full_name, config_filename = nil, force_refresh = false)
+      $cmd_tlm_server.get_screen_definition(screen_full_name, config_filename, force_refresh)
+    end  
+
   end # module Script
 
 end # module Cosmos

data/lib/cosmos/system/system.rb

@@ -17,6 +17,8 @@ require 'cosmos/system/target'
 require 'cosmos/packet_logs'
 require 'fileutils'
 require 'drb/acl'
+require 'zip'
+require 'zip/filesystem'
 require 'bundler'
 
 module Cosmos
@@ -52,7 +54,7 @@ module Cosmos
     # @return [String] Stores the initial configuration file used when this
     #   System was initialized
     instance_attr_reader :initial_filename
-    # @return [PacketDefinition] Stores the initial packet list used when this
+    # @return [PacketConfig] Stores the initial packet list used when this
     #   System was initialized
     instance_attr_reader :initial_config
     # @return [ACL] Access control list showing which machines can have access
@@ -71,9 +73,9 @@ module Cosmos
     instance_attr_reader :additional_md5_files
 
     # Known COSMOS ports
-    KNOWN_PORTS = ['CTS_API', 'TLMVIEWER_API', 'CTS_PREIDENTIFIED', 'CTS_CMD_ROUTER']
+    KNOWN_PORTS = ['CTS_API', 'TLMVIEWER_API', 'CTS_PREIDENTIFIED', 'CTS_CMD_ROUTER', 'REPLAY_API', 'REPLAY_PREIDENTIFIED', 'REPLAY_CMD_ROUTER']
     # Known COSMOS hosts
-    KNOWN_HOSTS = ['CTS_API', 'TLMVIEWER_API', 'CTS_PREIDENTIFIED', 'CTS_CMD_ROUTER']
+    KNOWN_HOSTS = ['CTS_API', 'TLMVIEWER_API', 'CTS_PREIDENTIFIED', 'CTS_CMD_ROUTER', 'REPLAY_API', 'REPLAY_PREIDENTIFIED', 'REPLAY_CMD_ROUTER']
     # Known COSMOS paths
     KNOWN_PATHS = ['LOGS', 'TMP', 'SAVED_CONFIG', 'TABLES', 'HANDBOOKS', 'PROCEDURES', 'SEQUENCES']
 
@@ -88,69 +90,7 @@ module Cosmos
     #   read. Be default this is <Cosmos::USERPATH>/config/system/system.txt
     def initialize(filename = nil)
       raise "Cosmos::System created twice" unless @@instance.nil?
-      @targets = {}
-      @targets['UNKNOWN'] = Target.new('UNKNOWN')
-      @config = nil
-      @commands = nil
-      @telemetry = nil
-      @limits = nil
-      @default_packet_log_writer = PacketLogWriter
-      @default_packet_log_writer_params = []
-      @default_packet_log_reader = PacketLogReader
-      @default_packet_log_reader_params = []
-      @sound = false
-      @use_dns = false
-      @acl = nil
-      @staleness_seconds = 30
-      @limits_set = :DEFAULT
-      @use_utc = false
-      @additional_md5_files = []
-      @meta_init_filename = nil
-
-      @ports = {}
-      @ports['CTS_API'] = 7777
-      @ports['TLMVIEWER_API'] = 7778
-      @ports['CTS_PREIDENTIFIED'] = 7779
-      @ports['CTS_CMD_ROUTER'] = 7780
-
-      @listen_hosts = {}
-      @listen_hosts['CTS_API'] = '127.0.0.1'
-      @listen_hosts['TLMVIEWER_API'] = '127.0.0.1'
-      # Localhost would be more secure but historically these are open to allow for chaining servers by default
-      @listen_hosts['CTS_PREIDENTIFIED'] = '0.0.0.0'
-      @listen_hosts['CTS_CMD_ROUTER'] = '0.0.0.0'
-
-      @connect_hosts = {}
-      @connect_hosts['CTS_API'] = '127.0.0.1'
-      @connect_hosts['TLMVIEWER_API'] = '127.0.0.1'
-      @connect_hosts['CTS_PREIDENTIFIED'] = '127.0.0.1'
-      @connect_hosts['CTS_CMD_ROUTER'] = '127.0.0.1'
-
-      @paths = {}
-      @paths['LOGS'] = File.join(USERPATH, 'outputs', 'logs')
-      @paths['TMP'] = File.join(USERPATH, 'outputs', 'tmp')
-      @paths['SAVED_CONFIG'] = File.join(USERPATH, 'outputs', 'saved_config')
-      @paths['TABLES'] = File.join(USERPATH, 'outputs', 'tables')
-      @paths['HANDBOOKS'] = File.join(USERPATH, 'outputs', 'handbooks')
-      @paths['PROCEDURES'] = [File.join(USERPATH, 'procedures')]
-      @paths['SEQUENCES'] = File.join(USERPATH, 'outputs', 'sequences')
-
-      unless filename
-        system_arg = false
-        ARGV.each do |arg|
-          if system_arg
-            filename = File.join(USERPATH, 'config', 'system', arg)
-            break
-          end
-          system_arg = true if arg == '--system'
-        end
-        filename = File.join(USERPATH, 'config', 'system', 'system.txt') unless filename
-      end
-      process_file(filename)
-      ENV['COSMOS_LOGS_DIR'] = @paths['LOGS']
-
-      @initial_filename = filename
-      @initial_config = nil
+      reset_variables(filename)
       @@instance = self
     end
 
@@ -489,6 +429,8 @@ module Cosmos
       end # parser.parse_file
     end
 
+
+
     # Load the specified configuration by iterating through the SAVED_CONFIG
     # directory looking for a matching MD5 sum. Updates the internal state so
     # subsequent commands and telemetry methods return the new configuration.
@@ -507,12 +449,16 @@ module Cosmos
             update_config(@initial_config)
           else
             # Look for the requested configuration in the saved configurations
-            configuration_directory = find_configuration(name)
-            if configuration_directory
+            configuration = find_configuration(name)
+            if configuration
               # We found the configuration requested. Reprocess the system.txt
               # and reload the packets
               begin
-                process_file(File.join(configuration_directory, 'system.txt'), configuration_directory)
+                unless File.directory?(configuration)
+                  # Zip file configuration so unzip and reset configuration path
+                  configuration = unzip(configuration)
+                end
+                process_file(File.join(configuration, 'system.txt'), configuration)
                 load_packets(name)
               rescue Exception => error
                 # Failed to load - Restore initial
@@ -539,8 +485,145 @@ module Cosmos
       return self.instance.load_configuration(name)
     end
 
+    # Resets the System's internal state to defaults.
+    #
+    # @params [String] Path to system.txt config file to process. Defaults to config/system/system.txt
+    def reset_variables(filename = nil)
+      @targets = {}
+      @targets['UNKNOWN'] = Target.new('UNKNOWN')
+      @config = nil
+      @commands = nil
+      @telemetry = nil
+      @limits = nil
+      @default_packet_log_writer = PacketLogWriter
+      @default_packet_log_writer_params = []
+      @default_packet_log_reader = PacketLogReader
+      @default_packet_log_reader_params = []
+      @sound = false
+      @use_dns = false
+      @acl = nil
+      @staleness_seconds = 30
+      @limits_set = :DEFAULT
+      @use_utc = false
+      @additional_md5_files = []
+      @meta_init_filename = nil
+
+      @ports = {}
+      @ports['CTS_API'] = 7777
+      @ports['TLMVIEWER_API'] = 7778
+      @ports['CTS_PREIDENTIFIED'] = 7779
+      @ports['CTS_CMD_ROUTER'] = 7780
+      @ports['REPLAY_API'] = 7877
+      @ports['REPLAY_PREIDENTIFIED'] = 7879
+      @ports['REPLAY_CMD_ROUTER'] = 7880
+
+      @listen_hosts = {}
+      @listen_hosts['CTS_API'] = '127.0.0.1'
+      @listen_hosts['TLMVIEWER_API'] = '127.0.0.1'
+      # Localhost would be more secure but historically these are open to allow for chaining servers by default
+      @listen_hosts['CTS_PREIDENTIFIED'] = '0.0.0.0'
+      @listen_hosts['CTS_CMD_ROUTER'] = '0.0.0.0'
+      @listen_hosts['REPLAY_API'] = '127.0.0.1'
+      # Localhost would be more secure but historically these are open to allow for chaining servers by default
+      @listen_hosts['REPLAY_PREIDENTIFIED'] = '0.0.0.0'
+      @listen_hosts['REPLAY_CMD_ROUTER'] = '0.0.0.0'
+
+      @connect_hosts = {}
+      @connect_hosts['CTS_API'] = '127.0.0.1'
+      @connect_hosts['TLMVIEWER_API'] = '127.0.0.1'
+      @connect_hosts['CTS_PREIDENTIFIED'] = '127.0.0.1'
+      @connect_hosts['CTS_CMD_ROUTER'] = '127.0.0.1'
+      @connect_hosts['REPLAY_API'] = '127.0.0.1'
+      @connect_hosts['REPLAY_PREIDENTIFIED'] = '127.0.0.1'
+      @connect_hosts['REPLAY_CMD_ROUTER'] = '127.0.0.1'
+
+      @paths = {}
+      @paths['LOGS'] = File.join(USERPATH, 'outputs', 'logs')
+      @paths['TMP'] = File.join(USERPATH, 'outputs', 'tmp')
+      @paths['SAVED_CONFIG'] = File.join(USERPATH, 'outputs', 'saved_config')
+      @paths['TABLES'] = File.join(USERPATH, 'outputs', 'tables')
+      @paths['HANDBOOKS'] = File.join(USERPATH, 'outputs', 'handbooks')
+      @paths['PROCEDURES'] = [File.join(USERPATH, 'procedures')]
+      @paths['SEQUENCES'] = File.join(USERPATH, 'outputs', 'sequences')
+
+      unless filename
+        system_arg = false
+        ARGV.each do |arg|
+          if system_arg
+            filename = File.join(USERPATH, 'config', 'system', arg)
+            break
+          end
+          system_arg = true if arg == '--system'
+        end
+        filename = File.join(USERPATH, 'config', 'system', 'system.txt') unless filename
+      end
+      process_file(filename)
+      ENV['COSMOS_LOGS_DIR'] = @paths['LOGS']
+
+      @initial_filename = filename
+      @initial_config = nil
+    end
+
+    # Reset variables and load packets
+    def reset(filename = nil)
+      reset_variables(filename)
+      load_packets()
+    end
+
+    # Class level convenience reset method
+    def self.reset
+      self.instance.reset
+    end
+
     protected
 
+    def unzip(zip_file)
+      zip_dir = File.join(@paths['TMP'], File.basename(zip_file, ".*"))
+      # Only unzip if we have to. We assume the unzipped directory structure is
+      # intact. If not they'll get a popop with the errors encountered when
+      # loading the configuration.
+      unless File.exist? zip_dir
+        Zip::File.open(zip_file) do |zip_file|
+          zip_file.each do |entry|
+            path = File.join(@paths['TMP'], entry.name)
+            FileUtils.mkdir_p(File.dirname(path))
+            zip_file.extract(entry, path) unless File.exist?(path)
+          end
+        end
+      end
+      zip_dir
+    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
+      entries.each do |e|
+        zip_file_path = File.join(zip_path, e)
+        disk_file_path = File.join(base_dir, e)
+        if File.directory? disk_file_path
+          recursively_deflate_directory(disk_file_path, io, zip_file_path)
+        else
+          put_into_archive(disk_file_path, io, zip_file_path)
+        end
+      end
+    end
+
+    def recursively_deflate_directory(disk_file_path, io, zip_file_path)
+      io.add(zip_file_path, disk_file_path)
+      entries = Dir.entries(disk_file_path) - %w(. ..)
+      write_zip_entries(disk_file_path, entries, zip_file_path, io)
+    end
+
+    def put_into_archive(disk_file_path, io, zip_file_path)
+      io.get_output_stream(zip_file_path) do |f|
+        data = nil
+        File.open(disk_file_path, 'rb') do |file|
+          data = file.read
+        end
+        f.write(data)
+      end
+    end
+
     def auto_detect_gem_based_targets
       Bundler.load.specs.each do |spec|
         spec_name_split = spec.name.split('-')
@@ -577,7 +660,7 @@ module Cosmos
       Cosmos.set_working_dir do
         Dir.foreach(@paths['SAVED_CONFIG']) do |filename|
           full_path = File.join(@paths['SAVED_CONFIG'], filename)
-          if Dir.exist?(full_path) && (filename[-32..-1] == name)
+          if File.exist?(full_path) && File.basename(filename, ".*")[-32..-1] == name
             return full_path
           end
         end
@@ -587,35 +670,45 @@ module Cosmos
 
     def save_configuration
       Cosmos.set_working_dir do
-        configuration_directory = find_configuration(@config.name)
-        configuration_directory = File.join(@paths['SAVED_CONFIG'], File.build_timestamped_filename([@config.name], '')) unless configuration_directory
-        unless Dir.exist?(configuration_directory)
+        configuration = find_configuration(@config.name)
+        configuration = File.join(@paths['SAVED_CONFIG'], File.build_timestamped_filename([@config.name], '.zip')) unless configuration
+        unless File.exist?(configuration)
           begin
-            # Create the directory
-            FileUtils.mkdir_p(configuration_directory)
-
-            # Copy target files into directory
-            @targets.each do |target_name, target|
-              destination_dir = File.join(configuration_directory, target.original_name)
-              unless Dir.exist?(destination_dir)
-                FileUtils.cp_r(target.dir, destination_dir)
-              end
-            end
+            Zip.continue_on_exists_proc = true
+            Zip::File.open(configuration, Zip::File::CREATE) do |zipfile|
+              zip_file_path = File.basename(configuration, ".zip")
+              zipfile.mkdir zip_file_path
 
-            # Create custom system.txt file
-            File.open(File.join(configuration_directory, 'system.txt'), 'w') do |file|
+              # Copy target files into archive
+              zip_targets = []
               @targets.each do |target_name, target|
-                target_filename = File.basename(target.filename)
-                target_filename = nil unless File.exist?(target.filename)
-                if target.substitute
-                  file.puts "DECLARE_TARGET #{target.original_name} #{target.name} #{target_filename}"
-                else
-                  file.puts "DECLARE_TARGET #{target.name} nil #{target_filename}"
+                entries = Dir.entries(target.dir) - %w(. ..)
+                zip_target = File.join(zip_file_path, target.original_name)
+                # Check the stored list of targets. We can't ask the zip file
+                # itself because it's in progress and hasn't been saved
+                unless zip_targets.include?(zip_target)
+                  write_zip_entries(target.dir, entries, zip_target, zipfile)
+                  zip_targets << zip_target
+                end
+              end
+
+              # Create custom system.txt file
+              zipfile.get_output_stream(File.join(zip_file_path, 'system.txt')) do |file|
+                @targets.each do |target_name, target|
+                  target_filename = File.basename(target.filename)
+                  target_filename = nil unless File.exist?(target.filename)
+                  # Create a newline character since Zip opens files in binary mode
+                  newline = Kernel.is_windows? ? "\r\n" : "\n"
+                  if target.substitute
+                    file.write "DECLARE_TARGET #{target.original_name} #{target.name} #{target_filename}#{newline}"
+                  else
+                    file.write "DECLARE_TARGET #{target.name} nil #{target_filename}#{newline}"
+                  end
                 end
               end
             end
           rescue Exception => error
-            Logger.error "Problem saving configuration to #{configuration_directory}: #{error.class}:#{error.message}"
+            Logger.error "Problem saving configuration to #{configuration}: #{error.class}:#{error.message}\n#{error.backtrace.join("\n")}\n"
           end
         end
       end