lib/handle/command/connection.rb in handle-system-0.0.5 vs lib/handle/command/connection.rb in handle-system-0.0.6
- old
+ new
@@ -1,11 +1,9 @@
require 'tempfile'
module Handle
module Command
- HDL_HOME = ENV['HDL_HOME'] || '/usr/local/handle'
-
class Batch
def initialize(handle, index, auth)
@batch_file = Tempfile.new('hdl')
auth_type = auth.length == 2 ? "PUBKEY" : "SECKEY"
@batch_file.puts "AUTHENTICATE #{auth_type}:#{index}:#{handle}"
@@ -17,11 +15,11 @@
@batch_file.unlink
end
def execute!
@batch_file.close
- cmd = File.join(HDL_HOME, 'bin', 'hdl-genericbatch')
+ cmd = File.join(Handle::HOME, 'bin', 'hdl-genericbatch')
output = `#{cmd} #{@batch_file.path} 2>/dev/null`
results = output.lines.select { |line| line =~ /^=+>/ }
results.each do |rs|
(status, message) = rs.scan(/^=+>(.+)\[[0-9]+\]: (.+)/).flatten
(action, handle, code, message) = message.split(/:\s*/,4)
@@ -106,10 +104,10 @@
result.handle = handle
result
end
def resolve_handle(handle, types=[], indexes=[], auth=true)
- cmd = File.join(HDL_HOME, 'bin', 'hdl-qresolver')
+ cmd = File.join(Handle::HOME, 'bin', 'hdl-qresolver')
response = `#{cmd} #{handle} 2>/dev/null`.strip
if response =~ /^Got Response:/
response = response.lines.select { |line| line =~ /^\s*index=/ }.join("")
result = Handle::Record.from_data(response)
result.connection = self