check_http 0.0.9 → 0.1.0

data/README.md

@@ -33,6 +33,13 @@ You can also stream urls into it:
 $ cat list_of_urls.txt | check_http
 ```
 
+There is also support for an __advanced input mode__:
+
+```bash
+$ echo url=http://google.com location=my_house | check_http
+# results will include the location key and any other keys you place in the input stream
+```
+
 ### Via the lib:
 
 ```ruby

data/check_http.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency('ethon')
+  gem.add_dependency('ethon', '0.5.0')
   gem.add_dependency('kv', '0.0.4')
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')

data/lib/check_http.rb

@@ -13,7 +13,7 @@ module CheckHTTP
     @checker ||= Checker.new
   end
 
-  def check(url)
-    checker.check(url)
+  def check(url,opts={})
+    checker.check(url,opts)
   end
 end

data/lib/check_http/checker.rb

@@ -7,11 +7,11 @@ module CheckHTTP
     end
 
     def default_blacklist
-      [:response_header, :response_body, :httpauth_avail, :starttransfer_time, :appconnect_time, :pretransfer_time]  
+      [:response_headers, :response_body, :httpauth_avail, :starttransfer_time, :appconnect_time, :pretransfer_time]  
     end
 
-    def check(url)
-      clean(sample(url)).merge(:url => url)
+    def check(url, opts={})
+      clean(sample(url)).merge(opts)
     end
 
     def clean(result)

data/lib/check_http/cli.rb

@@ -2,22 +2,30 @@ $stdout.sync = true
 
 module CheckHTTP
   class CLI
-    def perform(url)
-      result = CheckHTTP.check(url.strip)
-      puts KV.unparse(result)
+    def perform(url, opts={})
+      if opts[:advanced]
+	data = KV.parse(url)
+	result = CheckHTTP.check(data['url'], data)
+        puts KV.unparse(result)
+      else
+        result = CheckHTTP.check(url.strip)
+        puts KV.unparse(result)
+      end
     end
 
     def run
       opts = {}
       ARGV.options do |o|
         o.banner = 'Usage: check_http [url]'
+	o.set_summary_indent('  ')
+	o.on('-a', '--advanced', 'enable advanced input mode') { opts[:advanced] = true }
         o.parse!
 
         if url = ARGV.shift
-          perform(url)
+          perform(url, opts)
         else
           ARGF.each_line do |url|
-            perform(url)
+            perform(url, opts)
           end
         end       
       end            

data/lib/check_http/version.rb

@@ -1,3 +1,3 @@
 module CheckHTTP
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/check_http/checker_spec.rb

@@ -17,11 +17,6 @@ describe CheckHTTP::Checker do
     checker.sample(url)
   end
 
-  it 'should return sampled results with url merged in' do
-    checker.stub(:sample).with(url) { mock_result }
-    checker.check(url).should eq(mock_result.merge(:url => url))
-  end
-
   it 'should clean sampled results before returning' do
     checker.stub(:sample).with(url) { mock_result }
     checker.should_receive(:clean).with(mock_result) { mock_result }
@@ -36,4 +31,9 @@ describe CheckHTTP::Checker do
   it 'should set the default blacklist upon initialization' do
     checker.blacklist.should eq(checker.default_blacklist)
   end
+
+ it 'should merge in additional values provided on input' do
+    checker.stub(:sample).with(url) { mock_result }
+    checker.check(url, {'check_id' => 1}).should eq(mock_result.merge({'check_id' => 1}))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: check_http
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,43 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70312254024540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70312254024540
 - !ruby/object:Gem::Dependency
   name: kv
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70312254023140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.4
+  version_requirements: *70312254023140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70312254022320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70312254022320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70312254021520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70312254021520
 description: a simple interface to gather curl stats against an HTTP resource
 email:
 - michael.gorsuch@gmail.com
@@ -109,15 +89,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1563738831700431400
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1563738831700431400
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: a simple interface to gather curl stats against an HTTP resource