calypso 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 170ce85369fbbdf51b9ef207fbb371e51167b870
-  data.tar.gz: 0cb0131ed1eecc82b9567a93a819eaf7bbbeb6a4
+  metadata.gz: 54ea4595b7a3ec507bfbb0a49d03c24fb7cb7e49
+  data.tar.gz: 52ac19c39a4cc38adfabeb924dec1e1562ebe805
 SHA512:
-  metadata.gz: 7186a005c6c8d6582e99ebb87e16088760370c32160f99e5f374d692821a6cd230888ced193e8bc387debad0302d20ea38c5dd24a9ee673d9af1fa6a89b46e31
-  data.tar.gz: e54e457cfc00701dc1bb8e4fcb0e97b18b7fc8895c6593f11f9a1e233596029d38c87c7f71d3e2acd505f95fc4ad8e08991b35cbe3b714ff07bb17e2f4af2193
+  metadata.gz: 2b53b775c3e3ab569a804dc8f1077502fe05355d42088f8e303a39c7f68f369e708dcd98c793ff3ca1bdb719a04c37f7bceddbc9bf79eff37c02d154088dd6d4
+  data.tar.gz: a150d32764677cc1b22eb455374b53f197b1348dc98210a4b96f9ef19aa1e2cc1cdb123a9bc3bfb1b67b9062e027084eeaeaa0768bd3e2c63353969fdc86d011

data/lib/calypso/unittest.rb

@@ -38,6 +38,8 @@ module Calypso
     attr_reader :exec
     # @return [Boolean] Whether or not the test should be ran automatically.
     attr_reader :autorun
+    # @return [SerialPortData] Information about the serial port used by the test
+    attr_reader :serial
 
     # Create a new UnitTest model.
     #

data/lib/calypso/version.rb

@@ -19,5 +19,5 @@
 #
 module Calypso
   # Calypso version constant
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/calypso.rb

@@ -44,6 +44,8 @@ module Calypso
       options.bare = false
       options.hardware = nil
       options.run_mode = :all
+      options.tty_fix = false
+      options.tty_fix = true if ENV['TTY_FIX'].eql? 'true'
 
       parser = OptionParser.new do |p|
         p.banner = "Usage: calypso [options] -c [config]"
@@ -58,6 +60,11 @@ module Calypso
           options.bare = true
         end
 
+        p.on('-f', '--tty-fix',
+             'Enforce the correct TTY settings before trying to run a test') do
+          options.tty_fix = true
+        end
+
         p.on('-t [TESTID]', '--test [TESTID]',
              'Run a specific test') do |id|
           options.single = id
@@ -118,23 +125,24 @@ module Calypso
 
       case options.run_mode
       when :all
-        Calypso.run(config)
+        Calypso.run(config, options)
       when :hardware
-        Calypso.run_hardware(config, options.hardware)
+        Calypso.run_hardware(config, options, options.hardware)
       when :single
-        Calypso.run_single(config, options.single)
+        Calypso.run_single(config, options)
       end
     end
 
     # Run a single test.
     #
     # @param parser [Calypso::ParserProxy] Configuration parser.
-    # @param testid [String] Test identifier.
+    # @param options [OpenStruct] Options passed to Calypso on the cmd line.
     # @return [nil]
-    def run_single(parser, testid)
-      test = parser.tests[testid]
+    def run_single(parser, options)
+      test = parser.tests[options.single]
       puts "Running test [#{test.name}]"
       
+      Calypso.tty_fix(test.serial) if options.tty_fix
       test.execute
       puts "[#{test.name}]: #{test.success? ? 'OK' : 'FAIL'}"
     end
@@ -142,9 +150,10 @@ module Calypso
     # Run all tests for a specific piece of hardware.
     #
     # @param config [Calypso::ParserProxy] Configuration parser.
+    # @param options [OpenStruct] Options passed to Calypso on the cmd line.
     # @param hwid [String] Hardware ID.
     # @return [nil]
-    def run_hardware(config, hwid)
+    def run_hardware(config, options, hwid)
       hw = config.hardware[hwid]
       tests = hw.tests
       puts "Running #{hw.name} tests. Press enter to continue..."
@@ -152,6 +161,7 @@ module Calypso
 
       tests.each do |test|
         next unless test.autorun
+        Calypso.tty_fix(test.serial) if options.tty_fix
         test.execute
         success = "successfully" if test.success?
         success = "unsuccessfully" unless test.success?
@@ -170,14 +180,24 @@ module Calypso
     # Run all unit tests.
     #
     # @param parser [Calypso::ParserProxy] Configuration parser.
+    # @param options [OpenStruct] Options passed to Calypso on the cmd line.
     # @return [nil]
-    def run(parser)
+    def run(parser, options)
       hw = parser.hardware
 
       hw.each do |hwid, hwdata|
-        Calypso.run_hardware(parser, hwid)
+        Calypso.run_hardware(parser, options, hwid)
       end
     end
+
+    # Fix the serial TTY configuration.
+    #
+    # @param serial [Calypso::SerialPortData] Serial port data
+    # @return [nil]
+    def tty_fix(serial)
+      fix_cmd = "stty 57600 raw ignbrk hup < #{serial.port}"
+      system(fix_cmd)
+    end
   end
 end
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: calypso
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michel Megens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Embedded test automation.
 test_files: []
-has_rdoc: