unobtainium 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97948bc83a14acdbe6c71e330e66e907d2a19fe7
-  data.tar.gz: 33ad8b54a05cd91a90935896378bdba28d9f12cb
+  metadata.gz: b7101f0e169ee18822dea81ce744bf8b86bab64a
+  data.tar.gz: 500258b36f1090ec08f3c51c23f40818e555c394
 SHA512:
-  metadata.gz: 63da85ce1551f33687e11cbb1d59577303907797e8c0cf1a935d692d9922cfb8cf8ace0f30bdd4badc5f97245cc5449127f734952865e3121bc0c58f60266987
-  data.tar.gz: a737bd06d28b979976cd56ac4bd82ab7f918b21d32b6a84a036bb0b1706e9a6103580fa0acef97ce60533d161d5eb45fd77515df3c8e99e84438278b639954e8
+  metadata.gz: a372094b13fa1d4faaa78e5478aee58df00bafff7a6efd3b05ae8f7371d309128eb4c486c44d8ba4b9a7c36ec83b63d22d8a4d36176cd3608ec3fcd160e154c4
+  data.tar.gz: 5e5a94cf7577499a32af36fd6e0115b3fecd39d880ec3e97c1d11ae746274c5331e38a1daad919faa0904e497157c001d2b4491cd9bc2e94e5572ef4cfbf957a

data/.codeclimate.yml

@@ -9,6 +9,7 @@ engines:
       - a8e2b4ccb258f16eda697c5f98e21823
       - 442a316695836b4f4693fe3786cd3396
       - 1c24bb5da72323796b645814cc006684
+      - 4ff1112a73f7be30ecefa7bd90fdbf5a
     config:
       languages:
       - ruby

data/.rubocop.yml

@@ -27,6 +27,9 @@ Metrics/CyclomaticComplexity:
 Metrics/ClassLength:
   Max: 300
 
+Metrics/ModuleLength:
+  Max: 300
+
 # Style
 
 Style/StringLiterals:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unobtainium (0.4.0)
+    unobtainium (0.5.0)
       sys-proctable (~> 1.0)
 
 GEM
@@ -37,7 +37,7 @@ GEM
     gherkin (3.2.0)
     json (1.8.3)
     mini_portile2 (2.0.0)
-    multi_json (1.11.3)
+    multi_json (1.12.0)
     multi_test (0.1.2)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)

data/README.md

@@ -92,7 +92,7 @@ details.
 - [unobtainium-faraday](https://github.com/jfinkhaeuser/unobtainium-faraday) is
   a faraday-based driver for dealing with RESTish APIs.
 - [unobtainium-kramdown](https://github.com/jfinkhaeuser/unobtainium-kramdown) is
-  a faraday-based driver for dealing with Markdown structured text.
+  an open-uri-based driver for dealing with Markdown structured text.
 
 # Credits
 This gem is inspired by [LapisLazuli](https://github.com/spriteCloud/lapis-lazuli),

data/Rakefile

@@ -27,6 +27,8 @@ desc "Test all the things!"
 task :test do
   Rake::Task[:rubocop].invoke
   Rake::Task[:rspec].invoke
+  ENV['DRIVER'] = 'headless'
+  Rake::Task[:cuke].invoke
 end
 
 # Default is the test task

data/lib/unobtainium/drivers/phantom.rb

@@ -125,7 +125,14 @@ module Unobtainium
             timeout -= 1
           end
           if timeout <= 0
-            raise "Timeout waiting to connect to PhantomJS!"
+            runner.kill
+            out = runner.stdout.read
+            err = runner.stderr.read
+            runner.reset
+
+            raise "Timeout waiting to connect to PhantomJS!\n"\
+              "STDOUT: #{out}\n"\
+              "STDERR: #{err}"
           end
 
           # Run Selenium against server

data/lib/unobtainium/support/port_scanner.rb

@@ -57,22 +57,18 @@ module Unobtainium
         end
 
         # Test a socket for each domain
-        addr = Socket.sockaddr_in(port, host)
-
         test_domains.each do |domain|
-          begin
-            sock = Socket.new(domain, :STREAM)
-            return 0 == sock.connect(addr)
-          rescue Errno::EAFNOSUPPORT
-            next # try next domain
-          rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT
-            return false
-          ensure
-            if not sock.nil?
-              sock.close
-            end
+          addr = get_addr(host, port, domain)
+          if addr.nil?
+            next
+          end
+
+          if test_sockaddr(addr, domain)
+            return true
           end
         end
+
+        return false
       end
 
       ##
@@ -155,6 +151,54 @@ module Unobtainium
 
         return false
       end
+
+      # Create an address for the domain. That's a little convoluted, but it
+      # avoids errors with trying to use INET addresses with INET6 and vice versa.
+      def get_addr(host, port, domain)
+        begin
+          infos = Addrinfo.getaddrinfo(host, port, domain, :STREAM)
+          infos.each do |info|
+            if info.pfamily == Socket.const_get('PF_' + domain.to_s)
+              return info.to_sockaddr
+            end
+          end
+        rescue SocketError
+          # Host does not resolve in this domain
+          return nil
+        end
+
+        return nil
+      end
+
+      # Test a particular sockaddr
+      def test_sockaddr(addr, domain)
+        sock = Socket.new(domain, :STREAM)
+
+        connected = false
+        loop do
+          begin
+            sock.connect_nonblock(addr)
+          rescue Errno::EINPROGRESS
+            if not IO.select(nil, [sock], nil, 1)
+              # Timed out, retry?
+              next
+            end
+          rescue Errno::EISCONN
+            connected = true
+            break
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+            # Could not connect
+            break
+          rescue Errno::EINVAL, Errno::EAFNOSUPPORT
+            # Unsupported protocol
+            break
+          end
+        end
+
+        sock.close
+
+        return connected
+      end
     end # module PortScanner
   end # module Support
 end # module Unobtainium

data/lib/unobtainium/support/runner.rb

@@ -65,6 +65,9 @@ module Unobtainium
           raise "Command already running!"
         end
 
+        # Reset everything
+        reset
+
         # Capture options; pipes for stdout and stderr
         @stdout, @wout = IO.pipe
         @stderr, @werr = IO.pipe
@@ -77,6 +80,13 @@ module Unobtainium
         return @pid
       end
 
+      ##
+      # Resets stdout, stderr, etc. - does not kill a process, see #kill
+      # instead.
+      def reset
+        cleanup(true)
+      end
+
       ##
       # Wait for the command to exit.
       # @return [Process::Status] exit status of the command.
@@ -135,9 +145,6 @@ module Unobtainium
           end
           # rubocop:enable Lint/HandleExceptions
         end
-
-        # Clean up everything
-        cleanup(true)
       end
 
       ##
@@ -145,6 +152,7 @@ module Unobtainium
       # Use together with Runtime class to clean up any commands at exit.
       def destroy
         kill
+        reset
       end
 
       private

data/lib/unobtainium/version.rb

@@ -8,5 +8,5 @@
 #
 module Unobtainium
   # The current release version
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

data/spec/port_scanner_spec.rb

@@ -8,31 +8,32 @@ describe ::Unobtainium::Support::PortScanner do
   def connect_mock(_, addr)
     port, = Socket.unpack_sockaddr_in(addr)
     if port == 1234 or port == 4321
-      return 0
+      raise Errno::EISCONN
     end
     raise Errno::ECONNREFUSED
   end
 
   describe "port_open?" do
     it "detects an open port correctly" do
-      allow_any_instance_of(Socket).to receive(:connect).and_return(0)
+      allow_any_instance_of(Socket).to receive(:connect_nonblock).and_raise(
+          Errno::EISCONN)
       expect(tester.port_open?('localhost', 1234)).to be_truthy
     end
 
     it "detects a closed port correctly" do
-      allow_any_instance_of(Socket).to receive(:connect).and_raise(
+      allow_any_instance_of(Socket).to receive(:connect_nonblock).and_raise(
           Errno::ECONNREFUSED)
       expect(tester.port_open?('localhost', 1234)).to be_falsy
     end
 
     it "handles a single domain parameter" do
-      allow_any_instance_of(Socket).to receive(:connect).and_raise(
+      allow_any_instance_of(Socket).to receive(:connect_nonblock).and_raise(
           Errno::ECONNREFUSED)
       expect(tester.port_open?('localhost', 1234, :INET)).to be_falsy
     end
 
     it "handles many domain parameters" do
-      allow_any_instance_of(Socket).to receive(:connect).and_raise(
+      allow_any_instance_of(Socket).to receive(:connect_nonblock).and_raise(
           Errno::ECONNREFUSED)
       expect(tester.port_open?('localhost', 1234, [:INET, :INET6])).to be_falsy
     end
@@ -53,7 +54,7 @@ describe ::Unobtainium::Support::PortScanner do
     end
 
     it "finds an open port in a range" do
-      allow_any_instance_of(Socket).to receive(:connect) do |sock, addr|
+      allow_any_instance_of(Socket).to receive(:connect_nonblock) do |sock, addr|
         connect_mock(sock, addr)
       end
 
@@ -61,7 +62,7 @@ describe ::Unobtainium::Support::PortScanner do
     end
 
     it "finds an open port in an array" do
-      allow_any_instance_of(Socket).to receive(:connect) do |sock, addr|
+      allow_any_instance_of(Socket).to receive(:connect_nonblock) do |sock, addr|
         connect_mock(sock, addr)
       end
 
@@ -69,7 +70,7 @@ describe ::Unobtainium::Support::PortScanner do
     end
 
     it "doesn't find an open port in a range" do
-      allow_any_instance_of(Socket).to receive(:connect) do |sock, addr|
+      allow_any_instance_of(Socket).to receive(:connect_nonblock) do |sock, addr|
         connect_mock(sock, addr)
       end
 
@@ -77,7 +78,7 @@ describe ::Unobtainium::Support::PortScanner do
     end
 
     it "doesn't find an open port in an array" do
-      allow_any_instance_of(Socket).to receive(:connect) do |sock, addr|
+      allow_any_instance_of(Socket).to receive(:connect_nonblock) do |sock, addr|
         connect_mock(sock, addr)
       end
 
@@ -85,7 +86,7 @@ describe ::Unobtainium::Support::PortScanner do
     end
 
     it "finds an open port in mixed arguments" do
-      allow_any_instance_of(Socket).to receive(:connect) do |sock, addr|
+      allow_any_instance_of(Socket).to receive(:connect_nonblock) do |sock, addr|
         connect_mock(sock, addr)
       end
 
@@ -101,7 +102,7 @@ describe ::Unobtainium::Support::PortScanner do
     end
 
     it "can abort after the first find" do
-      allow_any_instance_of(Socket).to receive(:connect) do |sock, addr|
+      allow_any_instance_of(Socket).to receive(:connect_nonblock) do |sock, addr|
         connect_mock(sock, addr)
       end
 
@@ -109,7 +110,7 @@ describe ::Unobtainium::Support::PortScanner do
     end
 
     it "can scan for closed/available ports" do
-      allow_any_instance_of(Socket).to receive(:connect) do |sock, addr|
+      allow_any_instance_of(Socket).to receive(:connect_nonblock) do |sock, addr|
         connect_mock(sock, addr)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unobtainium
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler