cosmos 3.8.1 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e36eb7962f4256e6b26441b046cfd7581874e3
-  data.tar.gz: b46aa8db2bea92c1c4a431f33cf7bc20d72ba2ba
+  metadata.gz: d3c46acdd62517e6d5c2d740e931748fb350f256
+  data.tar.gz: 49f4f68d13f685e47b64f7ee859526ee4995829e
 SHA512:
-  metadata.gz: 2995ae3395b05c078c3d881e3943f31ceaa6517cc4152cc61cf06694a07f5f73bc486ea6170d70b4c5f151a1e11b3d0eac46ac0c3f453b11b80c9f9019df4295
-  data.tar.gz: e0246fb6ba01c6d8c7448e882d4eea210fd32b7600b86dab5c49137361e042e7d3d460269d592db413a11f8eba8a9d26a7edc3c83d418e6f4c074eaa5015d9bc
+  metadata.gz: 4dab21d757b4a8e70e5fdee34b6ea25eefd03f848e14cbc1120cc0114815a1c24c8da6ef2a6e1b72468fa8312100f7935a0ff2a50baf1a6d01278fc97ca7d636
+  data.tar.gz: 74e67b0e4d04b9795d0a463a791f4f81e054587d34bf76dbf63679a7991d102dce473722865380909347dbbe48bcbb72c4fa5a08bc36f4fd9b15c107f0d60136

data/data/crc.txt

@@ -1,5 +1,5 @@
 "lib/cosmos/io/json_drb.rb" 0x495EB58B
-"lib/cosmos/io/win32_serial_driver.rb" 0xB5AF7D58
+"lib/cosmos/io/win32_serial_driver.rb" 0xAA391322
 "lib/cosmos/io/io_multiplexer.rb" 0x9C3213AD
 "lib/cosmos/io/stderr.rb" 0x401624AF
 "lib/cosmos/io/tcpip_server.rb" 0x2A294912
@@ -18,7 +18,7 @@
 "lib/cosmos/processors/processor.rb" 0x1FEB7030
 "lib/cosmos/processors/statistics_processor.rb" 0xE732AE7F
 "lib/cosmos/processors/watermark_processor.rb" 0x8829E260
-"lib/cosmos/version.rb" 0x4EE6A9C7
+"lib/cosmos/version.rb" 0x88B858F6
 "lib/cosmos/conversions/new_packet_log_conversion.rb" 0x4AA03555
 "lib/cosmos/conversions/segmented_polynomial_conversion.rb" 0xC498CE81
 "lib/cosmos/conversions/processor_conversion.rb" 0xC72B73BD
@@ -98,7 +98,7 @@
 "lib/cosmos/packets/parsers/packet_parser.rb" 0x26478943
 "lib/cosmos/packets/telemetry.rb" 0x83D17863
 "lib/cosmos/packets/binary_accessor.rb" 0x7D41D474
-"lib/cosmos/packets/packet.rb" 0x3EFBEDE3
+"lib/cosmos/packets/packet.rb" 0xE0279245
 "lib/cosmos/packets/structure.rb" 0x85F4F979
 "lib/cosmos/packets/commands.rb" 0x1A33428E
 "lib/cosmos/packets/limits_response.rb" 0xB836D388
@@ -110,7 +110,7 @@
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/streams/stream_protocol.rb" 0xEC382CA0
 "lib/cosmos/streams/tcpip_client_stream.rb" 0xA644ADBA
-"lib/cosmos/streams/terminated_stream_protocol.rb" 0x5DBDE591
+"lib/cosmos/streams/terminated_stream_protocol.rb" 0x3B45B46D
 "lib/cosmos/streams/burst_stream_protocol.rb" 0xA9F43F1C
 "lib/cosmos/streams/tcpip_socket_stream.rb" 0x7096E4FA
 "lib/cosmos/streams/preidentified_stream_protocol.rb" 0xC258238E
@@ -144,7 +144,7 @@
 "lib/cosmos/script/cmd_tlm_server.rb" 0x15F91C95
 "lib/cosmos/script/limits.rb" 0x9CED41D8
 "lib/cosmos/script/script.rb" 0xF1B3E1F2
-"lib/cosmos/script/tools.rb" 0x18E9BE05
+"lib/cosmos/script/tools.rb" 0x6323067F
 "lib/cosmos/ccsds/ccsds_packet.rb" 0xA30EE27E
 "lib/cosmos/ccsds/ccsds_parser.rb" 0x89A5FB3A
 "lib/cosmos/win32/excel.rb" 0xB4D4195E

data/lib/cosmos/io/win32_serial_driver.rb

@@ -60,6 +60,7 @@ module Cosmos
                                   Win32::NULL,
                                   Win32::OPEN_EXISTING,
                                   Win32::FILE_ATTRIBUTE_NORMAL)
+      @mutex = Mutex.new
 
       # Configure the Comm Port
       dcb = Win32.get_comm_state(@handle)
@@ -78,7 +79,9 @@ module Cosmos
       if @handle
         # Close the Comm Port
         Win32.close_handle(@handle)
-        @handle = nil
+        @mutex.synchronize do
+          @handle = nil
+        end
       end
     end
 
@@ -112,11 +115,16 @@ module Cosmos
 
       loop do
         loop do
-          buffer = Win32.read_file(@handle, @read_max_length - data.length)
+          buffer = nil
+          @mutex.synchronize do
+            break unless @handle
+            buffer = Win32.read_file(@handle, @read_max_length - data.length)
+          end
+          break unless buffer
           data << buffer
-          break if buffer.length <= 0 or data.length >= @read_max_length
+          break if buffer.length <= 0 or data.length >= @read_max_length or !@handle
         end
-        break if data.length > 0
+        break if data.length > 0 or !@handle
         if @read_timeout and sleep_time >= @read_timeout
           raise Timeout::Error, "Read Timeout"
         end

data/lib/cosmos/packets/packet.rb

@@ -683,6 +683,7 @@ module Cosmos
           packet.processors[processor_name] = processor.clone
         end
       end
+      packet.instance_variable_set("@read_conversion_cache".freeze, nil)
       packet
     end
     alias dup clone

data/lib/cosmos/script/tools.rb

@@ -76,7 +76,7 @@ module Cosmos
     #######################################
 
     def _ensure_script_runner_frame
-      yield if defined? ScriptRunnerFrame && ScriptRunnerFrame.instance
+      yield if (defined? ScriptRunnerFrame) && ScriptRunnerFrame.instance
     end
 
     def set_line_delay(delay)
@@ -101,7 +101,7 @@ module Cosmos
     end
 
     def disable_instrumentation
-      if defined? ScriptRunnerFrame && ScriptRunnerFrame.instance
+      if (defined? ScriptRunnerFrame) && ScriptRunnerFrame.instance
         ScriptRunnerFrame.instance.use_instrumentation = false
         begin
           yield

data/lib/cosmos/streams/terminated_stream_protocol.rb

@@ -36,8 +36,8 @@ module Cosmos
                    sync_pattern = nil,
                    fill_sync_pattern = false)
       @write_termination_characters = write_termination_characters.hex_to_byte_string
-      @read_termination_characters  = read_termination_characters.hex_to_byte_string
-      @strip_read_termination       = ConfigParser.handle_true_false(strip_read_termination)
+      @read_termination_characters = read_termination_characters.hex_to_byte_string
+      @strip_read_termination = ConfigParser.handle_true_false(strip_read_termination)
 
       super(discard_leading_bytes, sync_pattern, fill_sync_pattern)
     end
@@ -62,10 +62,14 @@ module Cosmos
 
         # Reduce to packet data and setup current_data for next packet
         if index
-          if @strip_read_termination
-            packet_data = @data[0..(index - 1)]
+          if index > 0
+            if @strip_read_termination
+              packet_data = @data[0..(index - 1)]
+            else
+              packet_data = @data[0..(index + @read_termination_characters.length - 1)]
+            end
           else
-            packet_data = @data[0..(index + @read_termination_characters.length - 1)]
+            packet_data = ''
           end
           @data.replace(@data[(index + @read_termination_characters.length)..-1])
           return packet_data

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.8.1'
+COSMOS_VERSION = '3.8.2'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '8'
-    PATCH = '1'
-    BUILD = 'fa125f2a38e0aa28f6d3000a80ea5167115172d7'
+    PATCH = '2'
+    BUILD = '8283169565fc37b09011e37193d511ff15a7d42c'
   end
-  VERSION = '3.8.1'
+  VERSION = '3.8.2'
 end

data/spec/packets/packet_spec.rb

@@ -370,6 +370,21 @@ module Cosmos
         expect(@p.read_item(i, :CONVERTED, "\x02")).to eql 1
       end
 
+      it "clears the read conversion cache on clone" do
+        @p.append_item("item",8,:UINT)
+        i = @p.get_item("ITEM")
+        i.read_conversion = GenericConversion.new("value / 2")
+        @p.buffer = "\x02"
+        expect(@p.read("ITEM", :CONVERTED)).to eql 1
+        expect(@p.read_item(i, :CONVERTED)).to eql 1
+        cloned = @p.clone
+        cloned.buffer = "\x04"
+        expect(@p.read("ITEM", :CONVERTED)).to eql 1
+        expect(@p.read_item(i, :CONVERTED)).to eql 1
+        expect(cloned.read("ITEM", :CONVERTED)).to eql 2
+        expect(cloned.read_item(i, :CONVERTED)).to eql 2
+      end
+
       it "prevents the read conversion cache from being corrupted" do
         @p.append_item("item",8,:UINT)
         i = @p.get_item("ITEM")

data/tasks/gemfile_stats.rake

@@ -33,48 +33,43 @@ task :gemfile_stats do
   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
 
+  # Build up date labels on the bottom of the graph
+  labels = {} # Must be hash with integer keys and label value
+  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")
+    labels[index] = start_date.strftime("%m/%y")
     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
+  # Create an array of 0s the size of the labels which will hold the D/L counts
+  counts = Array.new(labels.length, 0)
+  dataset = {}
+  gem_data.each do |full_date, full_version, count|
+    # Build up just the major minor version: 1.0
+    version = full_version.split('.')[0..1].join('.')
+    date = full_date.strftime("%m/%y")
+    # Find the location in the count array to start adding counts
+    index = labels.key(date)
+    dataset[version] ||= counts.clone
+    # We fill in the count array starting at the first location
+    # and going until the end because this is a stacked area graph
+    # and all the counts are additive over time
+    (index...counts.length).each do |i|
+      dataset[version][i] += count
     end
-    dataset << [version, data]
   end
+
   g.labels = labels
   g.marker_font_size = 12
-  dataset.each do |data|
-    g.data(data[0], data[1])
+  dataset.each do |version, data|
+    g.data(version, data)
   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.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler