tcr 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 228eadaf6c734a9281952492ab146d7fee17e246
-  data.tar.gz: 64045b81372a13b4d957ea02bd266b5c7c443d3a
+  metadata.gz: 6c3b335b522930e2cda40cc99bacc68109e13189
+  data.tar.gz: 25d3fe32caf69278fc4753763e1c1ba84640a5c1
 SHA512:
-  metadata.gz: 1210aebd2ec013acb28546caeae5b29022e8cd7ddee1cb9e7814140c86d6e8fcc351798b10b2d2637baf104b7617719d3f28001bb3cde4cfee4821fa697625a5
-  data.tar.gz: d05fc665286ace6c2b77c6f30890aff288e872344da943a2f5c09afcf468c8c7b82acbabff10f227092fc6322aabbbf9cf82a0c10cdc758b07e004533110d84f
+  metadata.gz: ee2afda4d4a575fee8d988d12a56b1bfe27f30dac317776232fddc019499addec91348d8c3545fbf0cccdfef0c3153b5016f66a21e8767d9e7b345fe1f7f59f9
+  data.tar.gz: 7cc411a8feb6d80c3ee2b4541141d90e0d47845853474a69255a6b0773b683d1b2e417dc7539013adb059c5d5abc94464b4825a2e3948b2ebd212747886dfc98

data/lib/tcr.rb

@@ -88,11 +88,11 @@ class Socket
   class << self
     alias_method :real_tcp, :tcp
 
-    def tcp(host, port, socket_opts)
+    def tcp(host, port, *socket_opts)
       if TCR.configuration.hook_tcp_ports.include?(port)
         TCR::RecordableTCPSocket.new(host, port, TCR.cassette)
       else
-        real_tcp(host, port, socket_opts)
+        real_tcp(host, port, *socket_opts)
       end
     end
   end

data/lib/tcr/recordable_tcp_socket.rb

@@ -5,22 +5,26 @@ require 'thread'
 
 module TCR
   class RecordableTCPSocket
-    attr_reader :live, :socket
-    attr_accessor :recording
+    attr_reader :live, :socket, :recording
 
     def initialize(address, port, cassette)
       raise TCR::NoCassetteError.new unless TCR.cassette
 
       @read_lock = Queue.new
+      @recording = cassette.next_session
+      @live = cassette.recording?
 
-      if cassette.recording?
-        @live = true
-        @socket = TCPSocket.real_open(address, port)
+      if live
+        begin
+          @socket = TCPSocket.real_open(address, port)
+        rescue => e
+          recording << ["error", Marshal.dump(e)]
+          raise
+        end
       else
-        @live   = false
         @closed = false
+        check_recording_for_errors
       end
-      @recording = cassette.next_session
     end
 
     def read(bytes)
@@ -75,6 +79,10 @@ module TCR
 
     private
 
+    def check_recording_for_errors
+      raise Marshal.load(recording.first.last) if recording.first.first == "error"
+    end
+
     def _intercept_socket
       if @socket
         @socket = yield @socket

data/lib/tcr/version.rb

@@ -1,3 +1,3 @@
 module TCR
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/tcr_spec.rb

@@ -25,54 +25,91 @@ RSpec.describe TCR do
   end
 
   describe ".configuration" do
-     it "has a default cassette location configured" do
-       TCR.configuration.cassette_library_dir.should == "fixtures/tcr_cassettes"
-     end
+    it "has a default cassette location configured" do
+      TCR.configuration.cassette_library_dir.should == "fixtures/tcr_cassettes"
+    end
 
-     it "has an empty list of hook ports by default" do
-       TCR.configuration.hook_tcp_ports.should == []
-     end
+    it "has an empty list of hook ports by default" do
+      TCR.configuration.hook_tcp_ports.should == []
+    end
 
-     it "defaults to erroring on read/write mismatch access" do
-       TCR.configuration.block_for_reads.should be_falsey
-     end
+    it "defaults to erroring on read/write mismatch access" do
+      TCR.configuration.block_for_reads.should be_falsey
+    end
 
-     it "defaults to hit all to false" do
-       TCR.configuration.hit_all.should be_falsey
-     end
-   end
+    it "defaults to hit all to false" do
+      TCR.configuration.hit_all.should be_falsey
+    end
+  end
 
   describe ".configure" do
-    it "configures cassette location" do
-      expect {
-        TCR.configure { |c| c.cassette_library_dir = "some/dir" }
-      }.to change{ TCR.configuration.cassette_library_dir }.from("fixtures/tcr_cassettes").to("some/dir")
+    context "with cassette_library_dir option" do
+      it "configures cassette location" do
+        expect {
+          TCR.configure { |c| c.cassette_library_dir = "some/dir" }
+        }.to change{ TCR.configuration.cassette_library_dir }.from("fixtures/tcr_cassettes").to("some/dir")
+      end
     end
 
-    it "configures tcp ports to hook" do
-      expect {
-        TCR.configure { |c| c.hook_tcp_ports = [2525] }
-      }.to change{ TCR.configuration.hook_tcp_ports }.from([]).to([2525])
+    context "with hook_tcp_ports option" do
+      it "configures tcp ports to hook" do
+        expect {
+          TCR.configure { |c| c.hook_tcp_ports = [2525] }
+        }.to change{ TCR.configuration.hook_tcp_ports }.from([]).to([2525])
+      end
     end
 
-    it "configures allowing a blocking read mode" do
-      expect {
+    context "with block_for_reads option" do
+      before(:each) {
+        TCR.configure { |c|
+          c.hook_tcp_ports = [9999]
+          c.cassette_library_dir = '.'
+        }
+      }
+
+      it "configures allowing a blocking read mode" do
+        expect {
+          TCR.configure { |c| c.block_for_reads = true }
+        }.to change{ TCR.configuration.block_for_reads }.from(false).to(true)
+      end
+
+      it "blocks read thread until data is available instead of raising mismatch error" do
         TCR.configure { |c| c.block_for_reads = true }
-      }.to change{ TCR.configuration.block_for_reads }.from(false).to(true)
-    end
+        reads = Queue.new
 
-    it "configures to check if all sesstions was hit" do
-      expect {
-        TCR.configure { |c| c.hit_all = true }
-      }.to change{ TCR.configuration.hit_all }.from(false).to(true)
+        TCR.use_cassette("spec/fixtures/block_for_reads") do
+          sock = TCPSocket.open("google.com", 9999)
+
+          t = Thread.new do
+            reads << sock.gets
+          end
+
+          expect(reads.size).to eq(0)
+          sock.print("hello\n")
+          t.value
+          expect(reads.size).to eq(1)
+        end
+      end
+
+      context "when disabled" do
+        it "raises mismatch error" do
+          TCR.use_cassette("spec/fixtures/block_for_reads") do
+            sock = TCPSocket.open("google.com", 9999)
+            expect {
+              Timeout::timeout(1) { sock.gets }
+            }.to raise_error(TCR::DirectionMismatchError)
+          end
+        end
+      end
     end
-  end
 
-  it "raises an error if you connect to a hooked port without using a cassette" do
-    TCR.configure { |c| c.hook_tcp_ports = [2525] }
-    expect {
-      tcp_socket = TCPSocket.open("smtp.mandrillapp.com", 2525)
-    }.to raise_error(TCR::NoCassetteError)
+    context "with hit_all option" do
+      it "configures to check if all sessions were hit" do
+        expect {
+          TCR.configure { |c| c.hit_all = true }
+        }.to change{ TCR.configuration.hit_all }.from(false).to(true)
+      end
+    end
   end
 
   describe ".turned_off" do
@@ -98,44 +135,6 @@ RSpec.describe TCR do
     end
   end
 
-  describe "block_for_reads" do
-    before(:each) {
-      TCR.configure { |c|
-        c.hook_tcp_ports = [9999]
-        c.cassette_library_dir = '.'
-      }
-    }
-
-    it "blocks read thread until data is available instead of raising mismatch error" do
-      TCR.configure { |c| c.block_for_reads = true }
-      reads = Queue.new
-
-      TCR.use_cassette("spec/fixtures/block_for_reads") do
-        sock = TCPSocket.open("google.com", 9999)
-
-        t = Thread.new do
-          reads << sock.gets
-        end
-
-        expect(reads.size).to eq(0)
-        sock.print("hello\n")
-        t.value
-        expect(reads.size).to eq(1)
-      end
-    end
-
-    context "when disabled" do
-      it "raises mismatch error" do
-        TCR.use_cassette("spec/fixtures/block_for_reads") do
-          sock = TCPSocket.open("google.com", 9999)
-          expect {
-            Timeout::timeout(1) { sock.gets }
-          }.to raise_error(TCR::DirectionMismatchError)
-        end
-      end
-    end
-  end
-
   describe ".use_cassette" do
     before(:each) {
       TCR.configure { |c|
@@ -144,6 +143,13 @@ RSpec.describe TCR do
       }
     }
 
+    it "MUST be used when connecting to hooked ports (or else raises an error)" do
+      TCR.configure { |c| c.hook_tcp_ports = [2525] }
+      expect {
+        tcp_socket = TCPSocket.open("smtp.mandrillapp.com", 2525)
+      }.to raise_error(TCR::NoCassetteError)
+    end
+
     it "requires a block to call" do
       expect {
         TCR.use_cassette("test")
@@ -433,6 +439,32 @@ RSpec.describe TCR do
     end
   end
 
+  context "when TCPSocket.open raises an error during recording" do
+    before do
+      TCR.configure { |c|
+        c.format = "yaml" # JSON borks on binary strings
+        c.hook_tcp_ports = [143]
+        c.cassette_library_dir = "."
+      }
+
+      # record cassette
+      TCR.use_cassette("test") do
+        expect { Net::IMAP.new(nil) }.to raise_error(SystemCallError)
+      end
+    end
+
+    it "records error to cassette" do
+      expect(File.exist?('test.yaml')).to be(true)
+      expect(File.read('test.yaml')).not_to be_empty
+    end
+
+    it "re-raises the error during replay" do
+      TCR.use_cassette("test") do
+        expect { Net::IMAP.new(nil) }.to raise_error(SystemCallError)
+      end
+    end
+  end
+
   it "replaces sockets created with Socket.tcp" do
     TCR.configure { |c|
       c.hook_tcp_ports = [23]
@@ -440,7 +472,7 @@ RSpec.describe TCR do
     }
 
     TCR.use_cassette("test") do
-      sock = Socket.tcp("towel.blinkenlights.nl", 23, {})
+      sock = Socket.tcp("towel.blinkenlights.nl", 23)
       expect(sock).to be_a(TCR::RecordableTCPSocket)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Rob Forman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec