globetrotter 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a77ed8d5c5ea59b1ec541a7444b090874e33ef8d
-  data.tar.gz: 4b8791eaabed67a6e414567c2f1089346e43391e
+  metadata.gz: b888a19dab6e39a83cc3c9dfd9314712c02ae8bf
+  data.tar.gz: bbf71fe7a2b929f648fef841779212f45f6f48f2
 SHA512:
-  metadata.gz: cbffd8ef57ecabbc09dc9c37a0948fcce9a3a4ecab3240a5198a7f45cf9658ae5c7652a50f1b44e18753e61e5d19abbec077e2c5c8274d886ea5b65a1ce349c9
-  data.tar.gz: c864bcec76287458b0d3181b6c68203274cf70e5d2447bb60e62e25fa2a1c02cfac01f2b1f312a1d82fe84ae904e2851081200a8b958087c70af5f5a8fcda636
+  metadata.gz: 37c74d82d195af4ff99ce60a595e1762168e40c26779d6f139792ed0e8f058279ec0815c28a55b6ae66e949d843589e3e0e2226ec0b3da6a223f339663d4a5d6
+  data.tar.gz: b4d66382e11f283a85722f7b81fe472a9e12873f0d85a9c6cd3232cecb84af62d1231dcfb00d38bc13e042cdd7827987d8ce6bcb120721fb255f0697d1c1482b

data/bin/globetrotter

@@ -2,51 +2,52 @@
 
 $:.unshift File.join(File.dirname(__FILE__), %w{.. lib})
 require 'globetrotter'
-require 'trollop'
+require 'optparse'
+require 'ostruct'
+require 'dnsruby'
 
-opts = Trollop.options do
-  opt :ns_count_to_check,
-      'How many nameservers to query',
-      type: Integer,
-      default: 100,
-      short: '-c'
-  opt :ns_max_age_minutes,
-      'Query nameservers validated <= this many minutes ago',
-      type: Integer,
-      default: 60,
-      short: '-a'
-  opt :query,
-      'Hostname to lookup',
-      type: String,
-      default: 'googleapis.com'
-  opt :timeout_seconds,
-      'Seconds to wait before queries timeout',
-      type: Integer,
-      default: 2,
-      short: '-t'
-  opt :concurrency,
-      'Number of concurrent DNS requests to make',
-      type: Integer,
-      default: 10,
-      short: '-p'
-end
+class GlobetrotterOptions
+  def self.parse(args)
+    options = OpenStruct.new
+    options.domain = 'googleapis.com'
+    options.ns_count_to_check = 100
+    options.ns_max_age_minutes = 60
+    options.timeout_seconds = 2
+    options.ns_query_concurrency = 10
 
-ns_count_to_check = opts.ns_count_to_check
-ns_max_age_minutes = opts.ns_max_age_minutes
-timeout_seconds = opts.timeout_seconds
-concurrency = opts.concurrency
-query = opts.query
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = 'Usage: globetrotter [options] example.org'
+      opts.on('-q googleapis.com', String, 'Domain to look up') do |o|
+        options.domain = o
+      end
+      opts.on('-n 100', Integer, 'Query N name servers') do |o|
+        options.ns_count_to_check = o
+      end
+      opts.on('-t 2', Integer, 'Wait T seconds per request') do |o|
+        options.timeout_seconds = o
+      end
+      opts.on('-p 10', Integer, 'Query P name servers in parallel') do |o|
+        options.ns_query_concurrency = o
+      end
+      opts.on('-a 60', Integer, 'Use name servers checked less than A minutes ago') do |o|
+        options.ns_max_age_minutes = o
+      end
+      opts.on_tail('-h', '--help', 'Display CLI help (this output)') do |o|
+        puts opts.help
+        exit
+      end
+      opts.on_tail('-v', '--version', 'Display Globetrotter version') do |o|
+        puts "Globetrotter #{Globetrotter::VERSION}"
+        exit
+      end
+    end # opt_parser
 
-Trollop.die :ns_count_to_check, 'must be positive' if ns_count_to_check < 0
-Trollop.die :ns_max_age_minutes, 'must be positive' if ns_max_age_minutes < 0
-Trollop.die :timeout_seconds, 'must be positive' if ns_max_age_minutes < 0
-Trollop.die :concurrency, 'must be positive' if ns_max_age_minutes < 0
+    opt_parser.parse!(args)
 
-gt = Globetrotter.new(
-  query: query,
-  ns_count_to_check: ns_count_to_check,
-  ns_max_age_minutes: ns_max_age_minutes,
-  timeout_seconds: timeout_seconds,
-  concurrency: concurrency
-)
+    options
+  end # parse()
+end # class Globetrotter Options
+
+options = GlobetrotterOptions.parse(ARGV)
+gt = Globetrotter.new(options)
 gt.run

data/globetrotter.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
 
   spec.add_runtime_dependency 'rubydns', '~> 0.8'
-  spec.add_runtime_dependency 'trollop', '~> 2.0'
+  spec.add_runtime_dependency 'dnsruby', '~> 1.54'
   spec.add_runtime_dependency 'wrest', '~> 1.5'
 end

data/lib/globetrotter.rb

@@ -8,12 +8,12 @@ require 'set'
 require 'ipaddr'
 
 class Globetrotter
-  def initialize(options = {})
-    @ns_max_age_minutes = options.fetch(:ns_max_age_minutes, 60)
-    @ns_count_to_check = options.fetch(:ns_count_to_check, 100)
-    @timeout_seconds = options.fetch(:timeout_seconds, 2)
-    @query = options.fetch(:query, 'googleapis.com')
-    @concurrency = options.fetch(:concurrency, 10)
+  def initialize(options)
+    @ns_max_age_minutes = options.ns_max_age_minutes
+    @ns_count_to_check = options.ns_count_to_check
+    @timeout_seconds = options.timeout_seconds
+    @query = options.domain
+    @concurrency = options.ns_query_concurrency
     @ns_ips = fetch_ns_ips
   end
 
@@ -62,7 +62,7 @@ class Globetrotter
     end
   end
 
-  def self.run(options = {})
+  def self.run(options)
     new(options).run
   end
 
@@ -72,10 +72,10 @@ class Globetrotter
 
   def fetch_ns_ips
     Wrest.logger = Logger.new(STDERR)
-    uri = 'http://public-dns.tk/nameservers.json'.to_uri
+    uri = "http://public-dns.tk/nameservers.json".to_uri
     nameservers = uri.get.deserialise.map { |data| Nameserver.new(data) }
     nameservers.select do |ns|
-      ns.valid? && ns.ipv4? && ns.age_minutes <= ns_max_age_minutes
+      ns.valid? && ns.ipv4? && (ns.age_minutes <= @ns_max_age_minutes)
     end.map(&:ip)
   end
 

data/lib/globetrotter/version.rb

@@ -1,3 +1,3 @@
 class Globetrotter
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: globetrotter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nick Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: dnsruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.54'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.54'
 - !ruby/object:Gem::Dependency
   name: wrest
   requirement: !ruby/object:Gem::Requirement