vantage 0.0.6 → 0.0.7

data/lib/vantage/cli.rb

@@ -10,21 +10,29 @@ module Vantage
     
     def run!
       ARGV.options do |o|
+        list = false
         urls = []
-        point = 'aws-us-east-1'
+        point = Vantage::Config.point_list.sample
         
         o.set_summary_indent("  ")
-        o.banner ="Usage: #{File.basename(__FILE__)} [OPTIONS]"
+        o.banner = "Usage: vantage [OPTIONS]"
+        o.banner += "\nExample: vantage -u http://google.com,http://yahoo.com"
+        o.on('-l', '--list-points', 'List allowed vantage points') { list = true } 
         o.on('-u', '--urls URLS', Array, 'List of urls to check') { |list| urls = list }
-        o.on('-p', '--point POINT', String, 'Vantage point to check from.  Default to aws-us-east-1.') { |p| point = p }
+        o.on('-p', '--point POINT', String, 'Vantage point to check from.  If not set, will use a random point') { |p| point = p }
         o.parse!
 
-        abort("Error: --urls is required\n\n#{o}") if urls.empty?
-
-        checks = urls.map { |u| { "url" => u } }
-        json = Vantage::Client.new.check("checks" => checks, "point" => point)
-        results = OkJson.decode(json)
-        results.each { |r| emit(r) }
+        if list
+          puts Vantage::Config.point_list.join("\n")
+        else
+          abort("Error: --urls is required\n\n#{o}") if urls.empty?
+          abort("Error: specified point does not exist\n\n#{o}") unless Vantage::Config.point_list.include?(point)
+        
+          checks = urls.map { |u| { "url" => u } }
+          json = Vantage::Client.new.check("checks" => checks, "point" => point)
+          results = OkJson.decode(json)
+          results.each { |r| emit(r) }
+       end
       end
     end
   end

data/lib/vantage/config.rb

@@ -2,6 +2,10 @@ module Vantage
   module Config
     extend self
 
+    def point_list
+      %w[aws-us-east-1 aws-us-west-2]
+    end
+
     def endpoint_base
       URI("http://anon:anon@points.vantage.io/checks")
     end

data/lib/vantage/version.rb

@@ -1,3 +1,3 @@
 module Vantage
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vantage
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies: []
 description: An example cli for vantage.io
 email:
@@ -57,3 +57,4 @@ signing_key:
 specification_version: 3
 summary: An example cli for vantage.io
 test_files: []
+has_rdoc: