vision_mate 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8862e4a3e6fc5d74ed601f4cd4a084b4d49bd684
-  data.tar.gz: be967aa4c5c8319bdfd85a1e91c9533579ee8fa8
+  metadata.gz: 5f81c4d5d557338d38d6884e03ac5a3d1b55d3e3
+  data.tar.gz: f23712ebbdf2179d3ec404a33710a0a534acf476
 SHA512:
-  metadata.gz: 1044d370cdaf50827df903e04a806e4e0b4e6a6542534adf73780e06a56704cea10770cf54302a5b53a666364a6a5e8e0f1fd52663c5fe9466c04d4a1bf33492
-  data.tar.gz: e790bffc421236831a23a8508997e3461df7580056fa5200fbc0d191f944f8959adaaa6fe02cc6d4d50e96e96236033db3e98d02a51c5a85991ecb68688854cb
+  metadata.gz: 32ae55647d4b839b112b7101c055642235e2ce7e2c3158b47402f205b248a66677cf1d0f1e7cd431b401696474491a2a321155b7928703764258d82be9cafa6e
+  data.tar.gz: 6cb1fb5ab28c3537035d3916469bd7fdf37d53b277b3f17c619a965e3b0d149057f1daf0a63515fb131335c3c23efa652407f713d30f48256a3c106e5085a181

data/lib/vision_mate/telnet.rb

@@ -9,11 +9,10 @@ module VisionMate
 
     # For ruby 1.9 compatibility
     class Net::OpenTimeout; end
+    class Net::ReadTimeout; end
 
     def self.connect(host, port, telnet_class = Net::Telnet)
-      @telnet_connection ||= telnet_class.new(
-        "Host" => host, "Port" => port, "Timeout" => Configuration.timeout
-      )
+      @telnet_connection ||= verified_connection host, port, telnet_class
       new(@telnet_connection)
     rescue Net::OpenTimeout, Timeout::Error
       raise CouldNotConnect, "Failed to connect to #{host}:#{port}"
@@ -21,6 +20,20 @@ module VisionMate
       raise BadHostNameOrPort, "Malformed host name or port"
     end
 
+    def self.verified_connection(host, port, telnet_class)
+      telnet_connection = telnet_class.new(
+        "Host" => host, "Port" => port, "Timeout" => Configuration.timeout
+      )
+      telnet_connection.cmd("String" => "L", "Match" => /OK/)
+
+      telnet_connection
+    rescue Net::OpenTimeout, Timeout::Error => e
+      retries ||= 0
+      raise e if retries == 5
+      retries += 1
+      retry
+    end
+
     def initialize(telnet_connection)
       self.telnet_connection = telnet_connection
       set_scanner_to_manual

data/lib/vision_mate/version.rb

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

data/spec/vision_mate/telnet_spec.rb

@@ -9,6 +9,23 @@ describe VisionMate::Telnet do
   let(:telnet_connection) { double "telnet_connection" }
   before { VisionMate::Telnet.instance_variable_set(:@telnet_connection, nil) }
 
+  describe ".verified_connection" do
+    context "ruby 1.9.X conneciton will often fail to get scanner status" do
+      it "recreates the connection if the connection fails" do
+        telnet_connection.stub(:cmd).with(hash_including("String" => "L"))
+          .and_raise(Timeout::Error.new("Telnet connection failed on status"))
+
+        MockTelnet.should_receive(:new)
+          .with(hash_including("Host" => uri.host, "Port" => uri.port))
+          .at_least(:twice).and_return(telnet_connection)
+
+        expect {
+          VisionMate::Telnet.verified_connection(uri.host, uri.port, MockTelnet)
+        }.to raise_error(Timeout::Error)
+      end
+    end
+  end
+
   describe ".connect" do
     it "connects to telnet using a host and port" do
       MockTelnet.should_receive(:new)
@@ -34,6 +51,9 @@ describe VisionMate::Telnet do
 
     it "sets the scanner to manual" do
       MockTelnet.stub(new: telnet_connection)
+      telnet_connection.should_receive(:cmd).with(
+        "String" => "L", "Match" => /OK/
+      )
       telnet_connection.should_receive(:cmd).with(
         "String" => "M0", "Match" => /OK/
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vision_mate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joe Jackson