vision_mate 0.1.4 → 0.2.0

data/lib/vision_mate/telnet.rb

@@ -63,15 +63,18 @@ module VisionMate
     end
 
     def wait_for_data
-      sleep 0.1 while scanner_status["finished_scan"]
-      sleep 0.1 until scanner_status["data_ready"]
+      sleep 1
+      while true
+        status = scanner_status
+        break if !status["scanning"] && status["data_ready"]
+        sleep 0.1
+      end
     end
 
     def scanner_status
       result = telnet_command "L"
       status = strip_prefix(result)
-      status_names = %w{initializing scanning finished_scan data_ready
-                        data_sent rack96 empty error}
+      status_names = %w{error empty rack96 data_sent data_ready finished_scan scanning initializing}
       status_values = extract_statuses(status)
 
       Hash[status_names.zip(status_values)]
@@ -84,7 +87,7 @@ module VisionMate
     end
 
     def to_binary_string(int)
-      int.to_s(2)
+      int.to_s(2).rjust(8,"0")
     end
 
     def retrieve_data
@@ -95,8 +98,10 @@ module VisionMate
       telnet_command "M0"
     end
 
+    # The OK is followed by the command value then possibly a response value.
+    # E.g. if you send an "L" the response will be "OKL61"
     def strip_prefix(string)
-      string[/^OK(.*)/, 1]
+      string[/^OK.(.*)/, 1]
     end
   end
 end

data/lib/vision_mate/version.rb

@@ -1,3 +1,3 @@
 module VisionMate
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: vision_mate
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Joe Jackson
@@ -9,79 +10,89 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: " Ruby client for the Thermo Scientific VisionMate 2D Scanner. "
+description: ! ' Ruby client for the Thermo Scientific VisionMate 2D Scanner. '
 email:
 - joe.jackson@scimedsolutions.com
 - mail@josephjaber.com
@@ -89,10 +100,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -119,26 +130,33 @@ files:
 homepage: http://github.com/SciMed/vision_mate
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3215525333886898766
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3215525333886898766
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby client for the Thermo Scientific VisionMate 2D Scanner.
 test_files:
 - spec/assets/empty_tube_results.txt

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5f81c4d5d557338d38d6884e03ac5a3d1b55d3e3
-  data.tar.gz: f23712ebbdf2179d3ec404a33710a0a534acf476
-SHA512:
-  metadata.gz: 32ae55647d4b839b112b7101c055642235e2ce7e2c3158b47402f205b248a66677cf1d0f1e7cd431b401696474491a2a321155b7928703764258d82be9cafa6e
-  data.tar.gz: 6cb1fb5ab28c3537035d3916469bd7fdf37d53b277b3f17c619a965e3b0d149057f1daf0a63515fb131335c3c23efa652407f713d30f48256a3c106e5085a181