handle-system 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76c65ae14325b6d728f70dcebf771e1fb751cf79
-  data.tar.gz: 21672e3d8709029e49c46f5e45b8d384acd08ca5
+  metadata.gz: 549796c65d94011546d191cd875f4f5acf6c66ba
+  data.tar.gz: 8bb4e27b7fca6429d6f0c2eb918ac286dc1f3950
 SHA512:
-  metadata.gz: b70973c2a12ce56edb3ccc497c6a96d3ea8636f7b6fc10e44c0a08a2b57a46c4830526b50f735faba62ae64273e99211fd1432ad1aa58182764e78b5d9a61a5f
-  data.tar.gz: cf546a453841f775eaae19b5ee5b8cac2cf3dc39fe139b344526f4a55a3750da4d82270c32e6a65a9987f270f6ad38dfdbe6082b88b0d1646ae445d3d3b69f41
+  metadata.gz: 3e471e7c08e283574a2439c6e13307841e555632a4dd2021154848a58118b6c39d72b0f7248ac7ebce1d44b37f26bc9f4f9980ec9270e0ab99dd83674c229a7d
+  data.tar.gz: 9bcbf9c24969da9722e580eb883a1f90d7b67961867c108e355c66de0a541fa4de149d44b23f76e3bf0c0f3d994cf0692467ea27d561cc951460e729936a06f2

data/README.md

@@ -58,4 +58,5 @@ record = conn.resolve_handle('handle.prefix/new.handle')
 
 ## History
 
+- v0.1.1 - Fix error handling (h/t [jcoyne](https://github.com/jcoyne))
 - v0.1.0 - First stable release

data/lib/handle/command/connection.rb

@@ -106,7 +106,7 @@ module Handle
 
       def resolve_handle(handle, types=[], indexes=[], auth=true)
         cmd = File.join(Handle::HOME, 'bin', 'hdl-qresolver')
-        response = `#{cmd} #{handle} 2>/dev/null`.strip
+        response = `#{cmd} #{handle} 2>&1`.strip
         if response =~ /^Got Response:/
           response = response.lines.select { |line| line =~ /^\s*index=/ }.join("")
           result = Handle::Record.from_data(response)
@@ -114,7 +114,7 @@ module Handle
           result.handle = handle
           result
         else
-          (code, message) = response.lines.to_a.last.scan(/Error\(([0-9]+)\): (.+)$/).flatten
+          (code, message) = response.scan(/Error\(([0-9]+)\): (.+)$/).last
           exception_klass = case code.to_i
           when 100 then Handle::NotFound
           else          Handle::HandleError

data/lib/handle/version.rb

@@ -1,3 +1,3 @@
 module Handle
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/command/connection_spec.rb

@@ -45,30 +45,41 @@ on_cruby do
       let(:server) { double(Handle::Java::Native::HSAdapter) }
       subject { Handle::Command::Connection.new('0.NA/FAKE.ADMIN', 300, 'privkey', 'keypass') }
 
-      it "#resolve_handle" do
-        expect(subject).to receive(:`) { |command|
-          expect(command).to match(/hdl-qresolver #{fake_handle}/)
-          "Got Response:\n#{record.to_s}"
-        }
-        expect(subject.resolve_handle(fake_handle)).to eq(record)
-      end
+      describe "#resolve_handle" do
+        it "is successful" do
+          expect(subject).to receive(:`) { |command|
+            expect(command).to match(/hdl-qresolver #{fake_handle}/)
+            "Got Response:\n#{record.to_s}"
+          }
+          expect(subject.resolve_handle(fake_handle)).to eq(record)
+        end
 
-      it "#resolve_handle (not found)" do
-        expect(subject).to receive(:`) { |command|
-          expect(command).to match(/hdl-qresolver #{bad_handle}/)
-          "Got Error:\nError(100): HANDLE NOT FOUND"
-        }
-        expect { subject.resolve_handle(bad_handle) }.to raise_error(Handle::NotFound)
-      end
+        it "handles not found" do
+          expect(subject).to receive(:`) { |command|
+            expect(command).to match(/hdl-qresolver #{bad_handle}/)
+            "Got Error:\nError(100): HANDLE NOT FOUND"
+          }
+          expect { subject.resolve_handle(bad_handle) }.to raise_error(Handle::NotFound)
+        end
 
-      it "#resolve_handle (other error)" do
-        expect(subject).to receive(:`) { |command|
-          expect(command).to match(/hdl-qresolver #{bad_handle}/)
-          "Got Error:\nError(3): SERVER TOO BUSY"
-        }
-        expect { subject.resolve_handle(bad_handle) }.to raise_error(Handle::HandleError)
+        it "handles other error" do
+          expect(subject).to receive(:`) { |command|
+            expect(command).to match(/hdl-qresolver #{bad_handle}/)
+            "Got Error:\nError(3): SERVER TOO BUSY"
+          }
+          expect { subject.resolve_handle(bad_handle) }.to raise_error(Handle::HandleError)
+        end
+
+        it "handles error on stderr (Bad prefix)" do
+          expect(subject).to receive(:`) { |command|
+            expect(command).to match(/hdl-qresolver #{bad_handle}/)
+            "received HDL-UDP response: Error(100): HANDLE NOT FOUND\n\nError: HandleException (SERVICE_NOT_FOUND) Unable to find service for prefix 0.NA/10427.TEXX; prefix resolution response: Error(100): HANDLE NOT FOUND\nHandleException (SERVICE_NOT_FOUND) Unable to find service for prefix 0.NA/10427.TEXX; prefix resolution response: Error(100): HANDLE NOT FOUND\nat net.handle.hdllib.HandleResolver.tryAuthGlobalServiceLookupAndThrowExceptionOnFailure(HandleResolver.java:804)"
+          }
+          expect { subject.resolve_handle(bad_handle) }.to raise_error(Handle::HandleError)
+        end
       end
 
+
       it "#create_record" do
         new_record = subject.create_record(new_handle)
         expect(new_record.connection).to eq(subject)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: handle-system
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby classes for interfacing with Handle System servers