vision_mate 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2e9ed2987b07be1525567b32a3d7042e891c5e
-  data.tar.gz: 988fdb4f1a9763fb54c13bf89541780af9f84344
+  metadata.gz: 8862e4a3e6fc5d74ed601f4cd4a084b4d49bd684
+  data.tar.gz: be967aa4c5c8319bdfd85a1e91c9533579ee8fa8
 SHA512:
-  metadata.gz: be57dbd5aa4c94ed4621c6d366bb7ee37ec902615ddf4e6537ee1e360076f17022dbc6f1fbea05b94fecd5ee98f146e9d2c688697c93a7f7d4f08094074d4b1b
-  data.tar.gz: a1e1e669cde65ffe6c7ec19a2656cda0b4080fd64017c2454d02fb75195683f6798eed7bf2d6f87079f8584cc0187c9fb960fc1e119525e44b935648bde444cb
+  metadata.gz: 1044d370cdaf50827df903e04a806e4e0b4e6a6542534adf73780e06a56704cea10770cf54302a5b53a666364a6a5e8e0f1fd52663c5fe9466c04d4a1bf33492
+  data.tar.gz: e790bffc421236831a23a8508997e3461df7580056fa5200fbc0d191f944f8959adaaa6fe02cc6d4d50e96e96236033db3e98d02a51c5a85991ecb68688854cb

data/lib/vision_mate/configuration.rb

@@ -4,7 +4,8 @@ module VisionMate
   #
   module Configuration
     class << self
-      attr_accessor :host, :port
+      attr_accessor :host, :port, :timeout
     end
+    self.timeout ||= 2
   end
 end

data/lib/vision_mate/telnet.rb

@@ -11,7 +11,10 @@ module VisionMate
     class Net::OpenTimeout; end
 
     def self.connect(host, port, telnet_class = Net::Telnet)
-      new(telnet_class.new("Host" => host, "Port" => port))
+      @telnet_connection ||= telnet_class.new(
+        "Host" => host, "Port" => port, "Timeout" => Configuration.timeout
+      )
+      new(@telnet_connection)
     rescue Net::OpenTimeout, Timeout::Error
       raise CouldNotConnect, "Failed to connect to #{host}:#{port}"
     rescue SocketError
@@ -31,19 +34,28 @@ module VisionMate
     end
 
     def initiate_scan
-      telnet_connection.cmd("String" => "S", "Match" => /OK/)
+      telnet_command("S")
       wait_for_data
     end
 
     private
 
+    def telnet_command(string)
+      telnet_connection.cmd("String" => string, "Match" => /OK/)
+    rescue Net::ReadTimeout, Timeout::Error
+      retries ||= 0
+      raise CouldNotConnect, "Telnet command timed out: #{string}" if retries == 5
+      retries += 1
+      retry
+    end
+
     def wait_for_data
       sleep 0.1 while scanner_status["finished_scan"]
       sleep 0.1 until scanner_status["data_ready"]
     end
 
     def scanner_status
-      result = telnet_connection.cmd("String" => "L", "Match" => /OK/)
+      result = telnet_command "L"
       status = strip_prefix(result)
       status_names = %w{initializing scanning finished_scan data_ready
                         data_sent rack96 empty error}
@@ -63,11 +75,11 @@ module VisionMate
     end
 
     def retrieve_data
-      telnet_connection.cmd("String" => "D", "Match" => /OK/)
+      telnet_command "D"
     end
 
     def set_scanner_to_manual
-      telnet_connection.cmd("String" => "M0", "Match" => /OK/)
+      telnet_command "M0"
     end
 
     def strip_prefix(string)

data/lib/vision_mate/version.rb

@@ -1,3 +1,3 @@
 module VisionMate
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/scanner_integeration_spec.rb

@@ -14,6 +14,7 @@ describe "Integrating With a Scanner" do
       .and_return one_tube_string
     telnet.stub(:cmd).with(hash_including("String" => "L")).and_return("OK37")
     Net::Telnet.stub new: telnet
+    VisionMate::Telnet.instance_variable_set(:@telnet_connection, nil)
   end
 
   it "scans a rack of tubes" do

data/spec/vision_mate/telnet_spec.rb

@@ -1,4 +1,5 @@
 require_relative "../../lib/vision_mate/telnet"
+require_relative "../../lib/vision_mate/configuration"
 
 class MockTelnet; end
 
@@ -6,6 +7,7 @@ describe VisionMate::Telnet do
   subject { VisionMate::Telnet.new(telnet_connection) }
   let(:uri) { double("uri", host: "192.168.3.132", port: "8000") }
   let(:telnet_connection) { double "telnet_connection" }
+  before { VisionMate::Telnet.instance_variable_set(:@telnet_connection, nil) }
 
   describe ".connect" do
     it "connects to telnet using a host and port" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vision_mate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joe Jackson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler