cosmos 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9112201f45a7327cc5ce26c21e5bf83dc00ae783
-  data.tar.gz: ea97aee7b5c6b97d17e5161d6cce2565bed64f1e
+  metadata.gz: c3f5a1496a25bb28da92ceaddead81d9e659321d
+  data.tar.gz: a8f420d4b7285c87a61ef5823b49a1188581bf33
 SHA512:
-  metadata.gz: 080bfbf420c3c831b7dea10289633b289c2e116ed368bac38fcc70d89845709631f55ac39c439c335ef2f972ade3819d4b081ef04378b120b45145511f0d699a
-  data.tar.gz: 55b8c3ff623c95b3411785234ac36aa925820635c891e023accfd6edca90d6a5fd1b80516744842c1efbcee54371a49db69829bc39ec7895e2d0e53a4ba76a13
+  metadata.gz: 1ada5c833b4b5b21aafa6ea8f1d8c480bf741572ae8975176e0c66b35e987edfdb7238ec63a974fc57452c706e7e866cc672c51fd94c626ebed9a8373efe2520
+  data.tar.gz: 29a5d34e0ff1e63d0578773ba4448d1c8085afce85fedcdd442f87dad39117a986b6fb0e862800631f1941d0c92d10a51b2ba85128fdb53376de340c470be11f

data/Manifest.txt

@@ -774,6 +774,7 @@ lib/cosmos/gui/choosers/float_chooser.rb
 lib/cosmos/gui/choosers/integer_chooser.rb
 lib/cosmos/gui/choosers/string_chooser.rb
 lib/cosmos/gui/choosers/telemetry_chooser.rb
+lib/cosmos/gui/choosers/value_chooser.rb
 lib/cosmos/gui/dialogs/about_dialog.rb
 lib/cosmos/gui/dialogs/calendar_dialog.rb
 lib/cosmos/gui/dialogs/cmd_details_dialog.rb
@@ -1213,6 +1214,7 @@ spec/utilities/logger_spec.rb
 spec/utilities/message_log_spec.rb
 spec/utilities/quaternion_spec.rb
 spec/utilities/ruby_lex_utils_spec.rb
+tasks/gemfile_stats.rake
 tasks/manifest.rake
 tasks/spec.rake
 test/benchmarks/binary_accessor_benchmark.rb

data/Rakefile

@@ -73,6 +73,7 @@ require 'yard'
 # Import the rake tasks
 import 'tasks/manifest.rake'
 import 'tasks/spec.rake'
+import 'tasks/gemfile_stats.rake'
 
 # Update the built in task dependencies
 task :default => [:spec] # :test

data/data/crc.txt

@@ -6,10 +6,10 @@
 "lib/cosmos/win32/win32.rb" 0xEF748B06
 "lib/cosmos/win32/excel.rb" 0xB4D4195E
 "lib/cosmos/conversions/received_time_formatted_conversion.rb" 0xDC6ED414
-"lib/cosmos/conversions/unix_time_conversion.rb" 0xCDE826AB
+"lib/cosmos/conversions/unix_time_conversion.rb" 0x8F44C709
 "lib/cosmos/conversions/received_time_seconds_conversion.rb" 0x414E5121
-"lib/cosmos/conversions/new_packet_log_conversion.rb" 0x1E9D20F4
-"lib/cosmos/conversions/segmented_polynomial_conversion.rb" 0x5B2D3E02
+"lib/cosmos/conversions/new_packet_log_conversion.rb" 0x4F123D72
+"lib/cosmos/conversions/segmented_polynomial_conversion.rb" 0x1ADFA966
 "lib/cosmos/conversions/processor_conversion.rb" 0x07562BEB
 "lib/cosmos/conversions/unix_time_seconds_conversion.rb" 0x64C40BC3
 "lib/cosmos/conversions/conversion.rb" 0x9179ED6E
@@ -83,12 +83,13 @@
 "lib/cosmos/gui/opengl/texture_mapped_sphere.rb" 0x12D03C0E
 "lib/cosmos/gui/opengl/gl_viewport.rb" 0x49CAD811
 "lib/cosmos/gui/opengl/opengl.rb" 0xBE4A454D
-"lib/cosmos/gui/choosers/integer_chooser.rb" 0x0CCB26E3
+"lib/cosmos/gui/choosers/integer_chooser.rb" 0xFEA2E26F
 "lib/cosmos/gui/choosers/string_chooser.rb" 0x0A60837D
 "lib/cosmos/gui/choosers/file_chooser.rb" 0x575A4333
+"lib/cosmos/gui/choosers/value_chooser.rb" 0x4F652711
 "lib/cosmos/gui/choosers/telemetry_chooser.rb" 0x26375593
 "lib/cosmos/gui/choosers/combobox_chooser.rb" 0xAD5383D5
-"lib/cosmos/gui/choosers/float_chooser.rb" 0x23B2FA77
+"lib/cosmos/gui/choosers/float_chooser.rb" 0x93957577
 "lib/cosmos/tools/script_runner/script_runner_config.rb" 0x1E46E8AA
 "lib/cosmos/tools/script_runner/script_runner_frame.rb" 0x6FEE12DB
 "lib/cosmos/tools/script_runner/script_runner.rb" 0x0CC0CBB4
@@ -158,7 +159,7 @@
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tab.rb" 0xD0AC7888
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_config.rb" 0x08E6FA35
 "lib/cosmos/tools/tlm_grapher/tlm_grapher.rb" 0xBBFC2272
-"lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb" 0xB0994B7A
+"lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb" 0x91434E6C
 "lib/cosmos/tools/tlm_grapher/plot_editors/plot_editor.rb" 0x0C92BBB8
 "lib/cosmos/tools/tlm_grapher/plot_editors/xy_plot_editor.rb" 0x724D9469
 "lib/cosmos/tools/tlm_grapher/plot_editors/singlexy_plot_editor.rb" 0xA9B7CD4C
@@ -243,7 +244,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x895983E9
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0x1B3425B3
+"lib/cosmos/version.rb" 0x76ED4796
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D
@@ -264,7 +265,7 @@
 "lib/cosmos/packets/limits.rb" 0x9758BB50
 "lib/cosmos/packets/limits_response.rb" 0x9C5E8444
 "lib/cosmos/packets/commands.rb" 0x1A33428E
-"lib/cosmos/packets/structure.rb" 0xC8524C43
+"lib/cosmos/packets/structure.rb" 0x85F4F979
 "lib/cosmos/packets/telemetry.rb" 0x83D17863
 "lib/cosmos/packets/parsers/format_string_parser.rb" 0x8015C5E3
 "lib/cosmos/packets/parsers/packet_parser.rb" 0xEA0AF2C6
@@ -272,7 +273,7 @@
 "lib/cosmos/packets/parsers/processor_parser.rb" 0xEC75BA88
 "lib/cosmos/packets/parsers/limits_parser.rb" 0xFCFB27D0
 "lib/cosmos/packets/parsers/state_parser.rb" 0xCA3BFDFC
-"lib/cosmos/packets/parsers/macro_parser.rb" 0x4CC8096D
+"lib/cosmos/packets/parsers/macro_parser.rb" 0xE58A53CB
 "lib/cosmos/packets/parsers/limits_response_parser.rb" 0x05979119
 "lib/cosmos/packets/packet_config.rb" 0x37D677AC
 "lib/cosmos/packets/binary_accessor.rb" 0x7D41D474
@@ -306,7 +307,7 @@
 "lib/cosmos/interfaces/simulated_target_interface.rb" 0x15DC496F
 "lib/cosmos/interfaces/serial_interface.rb" 0xC376DDA0
 "lib/cosmos/interfaces/tcpip_client_interface.rb" 0x5F0DB50D
-"lib/cosmos/interfaces/udp_interface.rb" 0x99C0D354
+"lib/cosmos/interfaces/udp_interface.rb" 0x281409BD
 "lib/cosmos/interfaces/tcpip_server_interface.rb" 0xC8F6E908
 "lib/cosmos/script/limits.rb" 0x9CED41D8
 "lib/cosmos/script/commands.rb" 0x58ABA373

data/lib/cosmos/conversions/new_packet_log_conversion.rb

@@ -21,6 +21,7 @@ module Cosmos
     #
     # @param packet_log_writer_name [String] Name of the packet log writer to start new logs on
     def initialize(packet_log_writer_name = 'ALL')
+      super()
       @packet_log_writer_name = packet_log_writer_name
     end
 

data/lib/cosmos/conversions/segmented_polynomial_conversion.rb

@@ -65,6 +65,7 @@ module Cosmos
 
     # Initialize the converted_type to :FLOAT and converted_bit_size to 64.
     def initialize
+      super()
       @segments = []
       @converted_type = :FLOAT
       @converted_bit_size = 64

data/lib/cosmos/conversions/unix_time_conversion.rb

@@ -22,6 +22,7 @@ module Cosmos
     # @param microseconds_item_name [String] The telemetry item in the packet
     #   which represents microseconds
     def initialize(seconds_item_name, microseconds_item_name = nil)
+      super()
       @seconds_item_name = seconds_item_name
       @microseconds_item_name = microseconds_item_name
     end

data/lib/cosmos/gui/choosers/float_chooser.rb

@@ -9,74 +9,57 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'cosmos'
+require 'cosmos/gui/choosers/value_chooser'
 
 module Cosmos
 
-  class FloatChooser < Qt::Widget
+  class FloatChooserDoubleValidator < Qt::DoubleValidator
+    def initialize(*args)
+      super(*args)
+    end
 
+    def fixup(input)
+      begin
+        value = input.to_f
+        if value < bottom()
+          # Handle less than bottom
+          parent().setText(bottom().to_s)
+        elsif value > top()
+          # Handle greater than top
+          parent().setText(top().to_s)
+        end
+      rescue Exception => err
+        # Oh well no fixup
+      end
+    end
+  end
+
+  class FloatChooser < ValueChooser
     # Callback for a new value entered into the text field
     attr_accessor :sel_command_callback
 
-    def initialize(
-      parent, label_text, initial_value,
-      minimum_value = nil, maximum_value = nil, field_width = 20, fill = false
-    )
-      super(parent)
+    def initialize(parent, label_text, initial_value,
+                   minimum_value = nil, maximum_value = nil,
+                   field_width = 20, fill = false)
+      super(parent, label_text, initial_value, field_width, fill)
       @minimum_value = minimum_value
       @maximum_value = maximum_value
-      @field_width   = field_width
-
-      layout = Qt::HBoxLayout.new(self)
-      layout.setContentsMargins(0,0,0,0)
-
-      @float_label = Qt::Label.new(label_text)
-      @float_label.setSizePolicy(Qt::SizePolicy::Fixed, Qt::SizePolicy::Fixed) if fill
-      layout.addWidget(@float_label)
-      layout.addStretch unless fill
-      @float_value = Qt::LineEdit.new(initial_value.to_s)
-      @float_value.setMinimumWidth(field_width)
-      if minimum_value or maximum_value
-        validator = Qt::DoubleValidator.new(@float_value)
-        validator.setBottom(minimum_value) if minimum_value
-        validator.setTop(maximum_value) if maximum_value
-        validator.setNotation(Qt::DoubleValidator::StandardNotation)
-        @float_value.setValidator(validator)
-      end
-      @callback_in_progress = false
-      @float_value.connect(SIGNAL('editingFinished()')) do
-        unless @callback_in_progress # Prevent double fire on loss of focus
-          begin
-            @callback_in_progress = true
-            @sel_command_callback.call(string(), value()) if @sel_command_callback
-          ensure
-            @callback_in_progress = false
-          end
-        end
-      end
-      layout.addWidget(@float_value)
-      setLayout(layout)
 
-      @sel_command_callback = nil
-    end
-
-    # Returns the value as a string
-    def string
-      @float_value.text
+      validator = FloatChooserDoubleValidator.new(@value)
+      validator.setBottom(minimum_value) if minimum_value
+      validator.setTop(maximum_value) if maximum_value
+      validator.setNotation(Qt::DoubleValidator::StandardNotation)
+      @value.setValidator(validator)
     end
 
     # Returns the value as a float
     def value
-      float_value = @float_value.text.to_f
-      float_value = @minimum_value if @minimum_value and float_value < @minimum_value
-      float_value = @maximum_value if @maximum_value and float_value > @maximum_value
+      float_value = @value.text.to_f
+      float_value = @minimum_value if @minimum_value && float_value < @minimum_value
+      float_value = @maximum_value if @maximum_value && float_value > @maximum_value
       float_value
     end
 
-    # Sets the value of the text field
-    def value=(new_value)
-      @float_value.setText(new_value.to_s)
-    end
-
-  end # class FloatChooser
+  end
+end
 
-end # module Cosmos

data/lib/cosmos/gui/choosers/integer_chooser.rb

@@ -9,72 +9,59 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'cosmos'
+require 'cosmos/gui/choosers/value_chooser'
 
 module Cosmos
 
-  class IntegerChooser < Qt::Widget
+  class IntegerChooserIntValidator < Qt::IntValidator
+    def initialize(*args)
+      super(*args)
+    end
 
+    def fixup(input)
+      begin
+        value = input.to_i
+        if value < bottom()
+          # Handle less than bottom
+          parent().setText(bottom().to_s)
+        elsif value > top()
+          # Handle greater than top
+          parent().setText(top().to_s)
+        elsif input != value.to_s
+          # Handle poorly formatted (only known case is float given as starting value)
+          parent().setText(value.to_s)
+        end
+      rescue Exception => err
+        # Oh well no fixup
+      end
+    end
+  end
+
+  class IntegerChooser < ValueChooser
     # Callback called when the value changes
     attr_accessor :sel_command_callback
 
-    def initialize(
-      parent, label_text, initial_value,
-      minimum_value = nil, maximum_value = nil, field_width = 20, fill = false
-    )
-      super(parent)
+    def initialize(parent, label_text, initial_value,
+                   minimum_value = nil, maximum_value = nil,
+                   field_width = 20, fill = false)
+      super(parent, label_text, initial_value, field_width, fill)
       @minimum_value = minimum_value
       @maximum_value = maximum_value
 
-      layout = Qt::HBoxLayout.new(self)
-      layout.setContentsMargins(0,0,0,0)
-
-      @integer_label = Qt::Label.new(label_text)
-      @integer_label.setSizePolicy(Qt::SizePolicy::Fixed, Qt::SizePolicy::Fixed) if fill
-      layout.addWidget(@integer_label)
-      layout.addStretch() unless fill
-      @integer_value = Qt::LineEdit.new(initial_value.to_s)
-      @integer_value.setMinimumWidth(field_width)
-      if minimum_value or maximum_value
-        validator = Qt::IntValidator.new(@integer_value)
-        validator.setBottom(minimum_value) if minimum_value
-        validator.setTop(maximum_value) if maximum_value
-        @integer_value.setValidator(validator)
-      end
-      @callback_in_progress = false
-      @integer_value.connect(SIGNAL('editingFinished()')) do
-        unless @callback_in_progress # Prevent double fire on loss of focus
-          begin
-            @callback_in_progress = true
-            @sel_command_callback.call(string(), value()) if @sel_command_callback
-          ensure
-            @callback_in_progress = false
-          end
-        end
-      end
-      layout.addWidget(@integer_value)
-      setLayout(layout)
-
-      @sel_command_callback = nil
-    end
-
-    # Returns the value as a string
-    def string
-      @integer_value.text
+      validator = IntegerChooserIntValidator.new(@value)
+      validator.setBottom(minimum_value) if minimum_value
+      validator.setTop(maximum_value) if maximum_value
+      @value.setValidator(validator)
     end
 
     # Returns the value as an integer
     def value
-      integer_value = @integer_value.text.to_i
-      integer_value = @minimum_value if @minimum_value and integer_value < @minimum_value
-      integer_value = @maximum_value if @maximum_value and integer_value > @maximum_value
+      integer_value = @value.text.to_i
+      integer_value = @minimum_value if @minimum_value && integer_value < @minimum_value
+      integer_value = @maximum_value if @maximum_value && integer_value > @maximum_value
       integer_value
     end
 
-    # Sets the value
-    def value=(new_value)
-      @integer_value.setText(new_value.to_s)
-    end
-
-  end # class IntegerChooser
+  end
+end
 
-end # module Cosmos

data/lib/cosmos/gui/choosers/value_chooser.rb

@@ -0,0 +1,67 @@
+# encoding: ascii-8bit
+
+# Copyright 2014 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
+
+require 'cosmos'
+
+module Cosmos
+
+  class ValueChooser < Qt::Widget
+
+    # Callback for a new value entered into the text field
+    attr_accessor :sel_command_callback
+
+    def initialize(parent, label_text, initial_value, field_width = 20, fill = false)
+      super(parent)
+      @field_width = field_width
+
+      layout = Qt::HBoxLayout.new(self)
+      layout.setContentsMargins(0,0,0,0)
+
+      @label = Qt::Label.new(label_text)
+      @label.setSizePolicy(Qt::SizePolicy::Fixed, Qt::SizePolicy::Fixed) if fill
+      layout.addWidget(@label)
+      layout.addStretch unless fill
+      @value = Qt::LineEdit.new(initial_value.to_s)
+      @value.setMinimumWidth(field_width)
+      @callback_in_progress = false
+      @value.connect(SIGNAL('editingFinished()')) do
+        unless @callback_in_progress # Prevent double fire on loss of focus
+          begin
+            @callback_in_progress = true
+            @sel_command_callback.call(string(), value()) if @sel_command_callback
+          ensure
+            @callback_in_progress = false
+          end
+        end
+      end
+      layout.addWidget(@value)
+      setLayout(layout)
+
+      @sel_command_callback = nil
+    end
+
+    # Returns the value as a string
+    def string
+      @value.text
+    end
+
+    # Returns the value as a string
+    def value
+      string()
+    end
+
+    # Sets the value of the text field
+    def value=(new_value)
+      @value.setText(new_value.to_s)
+    end
+
+  end
+end
+

data/lib/cosmos/interfaces/udp_interface.rb

@@ -59,7 +59,7 @@ module Cosmos
       @write_timeout = @write_timeout.to_f if @write_timeout
       @read_timeout = ConfigParser.handle_nil(read_timeout)
       @read_timeout = @read_timeout.to_f if @read_timeout
-      @bind_address = ConfigParser.handle_nil(interface_address)
+      @bind_address = ConfigParser.handle_nil(bind_address)
       @bind_address = '127.0.0.1' if @bind_address and @bind_address.upcase == 'LOCALHOST'
       @write_socket = nil
       @read_socket = nil

data/lib/cosmos/packets/parsers/macro_parser.rb

@@ -85,18 +85,20 @@ module Cosmos
     end
 
     def create_new_packet_items(packet)
-      # Shift off the first macro index because since the first item(s) already exist we just rename
-      first_index = @macro.indices.shift
-      @macro.list.each do |name|
-        original_item_name = name
-        new_name = format_item_name(name, first_index)
-        item = packet.rename_item(name, new_name)
+      first_index = @macro.indices[0]
+      items = {}
 
-        # The renaming indices create new items
-        @macro.indices.each do |index|
-          new_item = item.clone
-          new_item.name = format_item_name(original_item_name, index)
-          packet.append(new_item)
+      @macro.indices.each do |index|
+        @macro.list.each do |name|
+          # The first index we just rename the item(s)
+          if index == first_index
+            new_name = format_item_name(name, first_index)
+            items[name] = packet.rename_item(name, new_name)
+          else # Subsequent indexes we clone the first item(s) and append them
+            new_item = items[name].clone
+            new_item.name = format_item_name(name, index)
+            packet.append(new_item)
+          end
         end
       end
     end

data/lib/cosmos/packets/structure.rb

@@ -312,7 +312,9 @@ module Cosmos
       string = ''
       synchronize_allow_reads(true) do
         @sorted_items.each do |item|
-          if item.data_type != :BLOCK
+          if (item.data_type != :BLOCK) ||
+             (item.data_type == :BLOCK and value_type != :RAW and
+              item.respond_to? :read_conversion and item.read_conversion)
             string << "#{indent_string}#{item.name}: #{read_item(item, value_type, buffer)}\n"
           else
             value = read_item(item, value_type, buffer)

data/lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb

@@ -886,11 +886,9 @@ module Cosmos
 
     # Builds the left frame of the tool
     def build_left_frame
-      # Frame around everything
       @tabbed_plots_left_frame = Qt::VBoxLayout.new
       @left_frame.addLayout(@tabbed_plots_left_frame)
 
-      # Seconds Plotted
       @seconds_plotted = FloatChooser.new(self,
                                           'Seconds Plotted:',
                                           @tabbed_plots_config.seconds_plotted,
@@ -900,12 +898,15 @@ module Cosmos
       @seconds_plotted.sel_command_callback = method(:handle_seconds_plotted_change)
       @tabbed_plots_left_frame.addWidget(@seconds_plotted)
 
-      # Points Saved
-      @points_saved = IntegerChooser.new(self, 'Points Saved:', @tabbed_plots_config.points_saved, 1, nil, 15)
+      @points_saved = IntegerChooser.new(self,
+                                         'Points Saved:',
+                                         @tabbed_plots_config.points_saved,
+                                         1,
+                                         nil,
+                                         15)
       @points_saved.sel_command_callback = method(:handle_points_saved_change)
       @tabbed_plots_left_frame.addWidget(@points_saved)
 
-      # Points Plotted
       @points_plotted = IntegerChooser.new(self,
                                            'Points Plotted:',
                                            @tabbed_plots_config.points_plotted,
@@ -915,7 +916,6 @@ module Cosmos
       @points_plotted.sel_command_callback = method(:handle_points_plotted_change)
       @tabbed_plots_left_frame.addWidget(@points_plotted)
 
-      # Refresh Rate Hz
       @refresh_rate_hz = FloatChooser.new(self,
                                           'Refresh Rate Hz:',
                                           @tabbed_plots_config.refresh_rate_hz,

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.7.0'
+COSMOS_VERSION = '3.7.1'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '7'
-    PATCH = '0'
-    BUILD = '1f6609f99bf4bd222f5e90ba10462a28c6594166'
+    PATCH = '1'
+    BUILD = 'efe6e6f49c53a6f9ac1d2069eeee50df2eb9cb4d'
   end
-  VERSION = '3.7.0'
+  VERSION = '3.7.1'
 end

data/spec/interfaces/udp_interface_spec.rb

@@ -16,7 +16,7 @@ module Cosmos
   describe UdpInterface do
     describe "initialize" do
       it "initializes the instance variables" do
-        i = UdpInterface.new('localhost','8888','8889','8890','127.0.0.1','64','5','5')
+        i = UdpInterface.new('localhost','8888','8889','8890','127.0.0.1','64','5','5','127.0.0.1')
       end
 
       it "is not writeable if no write port given" do

data/spec/packets/packet_spec.rb

@@ -612,9 +612,14 @@ module Cosmos
         i = p.get_item("TEST3")
         i.read_conversion = GenericConversion.new("value / 2")
         p.write("test3", 0x0406080A)
+        p.append_item("test4", 32, :BLOCK)
+        i = p.get_item("TEST4")
+        i.read_conversion = GenericConversion.new("value.to_s")
+        p.write("test4", "Test")
         expect(p.formatted).to include("TEST1: [1, 2]")
         expect(p.formatted).to include("TEST2: TRUE")
         expect(p.formatted).to include("TEST3: #{0x02030405}")
+        expect(p.formatted).to include("TEST4: Test")
       end
     end
 

data/spec/packets/parsers/macro_parser_spec.rb

@@ -110,23 +110,31 @@ module Cosmos
       it "adds multiple items to the packet" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
-        tf.puts 'MACRO_APPEND_START 1 2'
+        tf.puts 'MACRO_APPEND_START 1 4'
         tf.puts 'APPEND_ITEM WORD 16 UINT'
-        tf.puts 'APPEND_ITEM DOUBLE_WORD 32 UINT'
+        tf.puts 'APPEND_ITEM DWORD 32 UINT'
         tf.puts 'MACRO_APPEND_END'
         tf.close
         @pc.process_file(tf.path, "TGT1")
         pkt = @pc.telemetry["TGT1"]["PKT1"]
-        expect(pkt.items.length).to eql 7 # 4 plus the RECEIVED_XXX items
-        expect(pkt.items.keys).to include('WORD1','WORD2','DOUBLE_WORD1','DOUBLE_WORD2')
+        expect(pkt.items.length).to eql 11 # 8 plus the RECEIVED_XXX items
+        expect(pkt.items.keys).to include('WORD1','WORD2','WORD3','WORD4','DWORD1','DWORD2','DWORD3','DWORD4')
         expect(pkt.sorted_items[3].name).to eql 'WORD1'
         expect(pkt.sorted_items[3].bit_offset).to eql 0
-        expect(pkt.sorted_items[4].name).to eql 'DOUBLE_WORD1'
+        expect(pkt.sorted_items[4].name).to eql 'DWORD1'
         expect(pkt.sorted_items[4].bit_offset).to eql 16
         expect(pkt.sorted_items[5].name).to eql 'WORD2'
         expect(pkt.sorted_items[5].bit_offset).to eql 48
-        expect(pkt.sorted_items[6].name).to eql 'DOUBLE_WORD2'
+        expect(pkt.sorted_items[6].name).to eql 'DWORD2'
         expect(pkt.sorted_items[6].bit_offset).to eql 64
+        expect(pkt.sorted_items[7].name).to eql 'WORD3'
+        expect(pkt.sorted_items[7].bit_offset).to eql 96
+        expect(pkt.sorted_items[8].name).to eql 'DWORD3'
+        expect(pkt.sorted_items[8].bit_offset).to eql 112
+        expect(pkt.sorted_items[9].name).to eql 'WORD4'
+        expect(pkt.sorted_items[9].bit_offset).to eql 144
+        expect(pkt.sorted_items[10].name).to eql 'DWORD4'
+        expect(pkt.sorted_items[10].bit_offset).to eql 160
         tf.unlink
       end
 

data/tasks/gemfile_stats.rake

@@ -0,0 +1,81 @@
+# encoding: ascii-8bit
+
+# Copyright 2014 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
+
+desc 'Create a picture of gemfile downloads'
+task :gemfile_stats do
+  require 'gems'
+  require 'gruff'
+
+  def get_latest_gem_data
+    gem_data = []
+    versions = Gems.versions 'cosmos'
+    versions.each do |version|
+      version_no = version['number']
+      month = version['built_at'].split('-')[0..1].join('-')
+      gem_data << [month, version_no, Gems.total_downloads("cosmos",version_no)[:version_downloads]] if version_no.split('.')[0] >= '3' # anything before 3 is another gem
+    end
+    gem_data
+  end
+
+  # This is useful for testing to prevent server round trips
+  #File.open("gemdata.marshall", 'w') {|file| file.write(Marshal.dump(get_latest_gem_data)) }
+  #gem_data = Marshal.load(File.read("gemdata.marshall"))
+
+  gem_data = get_latest_gem_data()
+  # Convert all the date text into Ruby Dates
+  gem_data.map! {|x| [Date.strptime(x[0], "%Y-%m"), x[1], x[2]]}
+  # Sort first by date and then version number
+  gem_data.sort_by! {|x| [x[0], x[1]] }
+  # Collect all the minor version numbers counts
+  new_data = []
+  gem_data.each do |date, version, count|
+    if version.split('.')[2] == '0'
+      new_version = version[0..-2] + 'x'
+      new_data << [date, new_version, count]
+    else
+      new_data[-1][2] += count
+    end
+  end
+  gem_data = new_data
+
+  g = Gruff::StackedArea.new
+  g.title = 'COSMOS Downloads'
+  labels = {}
+  index = 0
+
+  start_date = gem_data[0][0]
+  end_date = gem_data[-1][0]
+  while (start_date <= end_date)
+    labels[index] = start_date.strftime("%Y-%m")
+    index += 1
+    start_date = start_date >> 1
+  end
+
+  dataset = []
+  index = 0
+  gem_data.each do |date, version, count|
+    data = []
+    labels.each do |label|
+      if date <= Date.strptime(label[1], "%Y-%m")
+        data << count
+      else
+        data << 0
+      end
+    end
+    dataset << [version, data]
+  end
+  g.labels = labels
+  g.marker_font_size = 12
+  dataset.each do |data|
+    g.data(data[0], data[1])
+  end
+  g.write('cosmos_downloads.png')
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1209,6 +1209,7 @@ files:
 - lib/cosmos/gui/choosers/integer_chooser.rb
 - lib/cosmos/gui/choosers/string_chooser.rb
 - lib/cosmos/gui/choosers/telemetry_chooser.rb
+- lib/cosmos/gui/choosers/value_chooser.rb
 - lib/cosmos/gui/dialogs/about_dialog.rb
 - lib/cosmos/gui/dialogs/calendar_dialog.rb
 - lib/cosmos/gui/dialogs/cmd_details_dialog.rb
@@ -1648,6 +1649,7 @@ files:
 - spec/utilities/message_log_spec.rb
 - spec/utilities/quaternion_spec.rb
 - spec/utilities/ruby_lex_utils_spec.rb
+- tasks/gemfile_stats.rake
 - tasks/manifest.rake
 - tasks/spec.rake
 - test/benchmarks/binary_accessor_benchmark.rb