cosmos 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c831622d8bb205d35bbb73d5b72d93c9923028
-  data.tar.gz: 5dd0f0bbf288ba2595cb4e541b019bc1069f3ab3
+  metadata.gz: 6d1c8a2b2a4a135fab40129e5417a797319c8533
+  data.tar.gz: b92343e0fbffcc7db750c0420c08b59337a5fc99
 SHA512:
-  metadata.gz: 0dcd9a36210998709f829d5488f4f90a7ed69029df35f20fcc080027e212b23e26911c80a6957115829ca0b97691d0df8ffd59d86825cb0af0829462e1bbb77f
-  data.tar.gz: 2912f264846633602ffcd2fcaeed692ed39b1ad8fc38a69678eb540b185fdc40c7b8cdf44dde502eb7a3d6701c450dd1cdf6e3e409ad8afd984d15ac6d66cfaa
+  metadata.gz: 220d5599c798111b346d2461ca9073e7a4b09ce1a9c623d5a8343a1d2c2e2df21db90fc20fc03e7f6ba7a2f13287a63aa0fc24908a42bda459d3af77777a25a2
+  data.tar.gz: c0404b2ca2619ba1b984ee254187d15a145dac0e4278c1bd7dc43f31bea1d0ea28eb45dd4c696d66b50c13e2bbb3a046b1da2756d0379afcf26d812a95dbb117

data/Gemfile

@@ -1,6 +1,6 @@
 # encoding: ascii-8bit
 
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i
 # This is commented out because wdm does not currently support Ruby 2.2

data/data/crc.txt

@@ -1,6 +1,6 @@
 "lib/cosmos/ccsds/ccsds_parser.rb" 0x89A5FB3A
 "lib/cosmos/ccsds/ccsds_packet.rb" 0xA30EE27E
-"lib/cosmos/system/target.rb" 0x0D095C3F
+"lib/cosmos/system/target.rb" 0xF96070A6
 "lib/cosmos/system/system.rb" 0x9437DAD9
 "lib/cosmos/win32/win32_main.rb" 0x6D33DC6A
 "lib/cosmos/win32/win32.rb" 0xEF748B06
@@ -234,7 +234,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x895983E9
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0x57B2D7DE
+"lib/cosmos/version.rb" 0x1DE7C42D
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D

data/lib/cosmos/system/target.rb

@@ -196,14 +196,16 @@ module Cosmos
 
     # Make sure all partials are included in the cmd_tlm list for the MD5 calculation
     def add_cmd_tlm_partials(dir)
+      partial_files = []
       if Dir.exist?(File.join(dir, 'cmd_tlm'))
         # Grab all _*.txt files in the cmd_tlm folder and subfolders
         Dir[File.join(dir, 'cmd_tlm', '**', '_*.txt')].each do |filename|
-          @cmd_tlm_files << filename
+          partial_files << filename
         end
       end
+      partial_files.sort!
+      @cmd_tlm_files.concat(partial_files)
       @cmd_tlm_files.uniq!
-      @cmd_tlm_files.sort!
     end
 
   end # class Target

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.6.0'
+COSMOS_VERSION = '3.6.1'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '6'
-    PATCH = '0'
-    BUILD = 'c536539999e6ee8e176d875a88e4ae639bb1e196'
+    PATCH = '1'
+    BUILD = 'e2512eb4bbd5b9100b13af0cfae7d042489eac99'
   end
-  VERSION = '3.6.0'
+  VERSION = '3.6.1'
 end

data/spec/system/target_spec.rb

@@ -242,6 +242,33 @@ module Cosmos
 
           FileUtils.rm_r(tgt_dir)
         end
+
+        it "filename order must be preserved" do
+          tgt_path = File.join(Cosmos::USERPATH,'target_spec_temp')
+          tgt_name = "TEST"
+          tgt_dir = File.join(tgt_path,tgt_name)
+          FileUtils.mkdir_p(tgt_dir)
+          FileUtils.mkdir_p(tgt_dir + '/cmd_tlm')
+          File.open(tgt_dir + '/cmd_tlm/tgt_cmds.txt', 'w') {|file| file.puts "# comment"}
+          File.open(tgt_dir + '/cmd_tlm/tgt_cmds2.txt', 'w') {|file| file.puts "# comment"}
+          File.open(tgt_dir + '/cmd_tlm/tgt_cmds3.txt', 'w') {|file| file.puts "# comment"}
+          File.open(tgt_dir + '/cmd_tlm/tgt_tlm.txt', 'w') {|file| file.puts "# comment"}
+          File.open(tgt_dir + '/cmd_tlm/tgt_tlm2.txt', 'w') {|file| file.puts "# comment"}
+          File.open(tgt_dir + '/cmd_tlm/tgt_tlm3.txt', 'w') {|file| file.puts "# comment"}
+          File.open(File.join(tgt_dir,'target.txt'),'w') do |file|
+            file.puts("COMMANDS tgt_cmds3.txt")
+            file.puts("COMMANDS tgt_cmds2.txt")
+            file.puts("TELEMETRY tgt_tlm3.txt")
+            file.puts("TELEMETRY tgt_tlm.txt")
+          end
+
+          tgt = Target.new(tgt_name,nil,tgt_path)
+          expect(tgt.dir).to eql tgt_dir
+          expect(tgt.cmd_tlm_files.length).to eql 4
+          expect(tgt.cmd_tlm_files).to eql [tgt_dir + '/cmd_tlm/tgt_cmds3.txt', tgt_dir + '/cmd_tlm/tgt_cmds2.txt', tgt_dir + '/cmd_tlm/tgt_tlm3.txt', tgt_dir + '/cmd_tlm/tgt_tlm.txt']
+
+          FileUtils.rm_r(tgt_dir)
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler