httping 1.1.0 → 1.3.0

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009-2010 John Pignata
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -50,7 +50,7 @@ Tickets can be submitted by via GitHub issues.
 
 (The MIT License)
 
-Copyright (c) 2009 Jay Pignata
+Copyright (c) 2009-2010 John Pignata
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.3.0

data/lib/httping/runner.rb

@@ -71,13 +71,17 @@ class Runner
   def parse_uri
     uri = URI.parse(ARGV.first)
 
+    if uri.class == URI::Generic
+      uri = URI.parse("http://#{ARGV.first}")
+    end
+    
+    uri.path = "/" unless uri.path.match /^\//
+
     unless ["http", "https"].include?(uri.scheme) 
       puts "ERROR: Invalid URI #{uri}"
       exit
     end
 
-    uri.path = "/" unless uri.path.match /^\//
-    
     uri
   end  
 end

data/spec/extensions_spec.rb

@@ -5,13 +5,13 @@ describe "Enumerable" do
     @array = [1, 58, 49, 330, 2, 15, 3, 80]
   end
   
-  context ".sum" do
+  context "#sum" do
     it "returns the sum of all members of a set" do
       @array.sum.should be(538)
     end
   end
   
-  context ".mean" do
+  context "#mean" do
     it "returns the mean of a set" do
       @array.mean.should be(67)
     end
@@ -25,7 +25,7 @@ describe "Float" do
     @seconds = 48.31292
   end
   
-  context ".to_human_time" do
+  context "#to_human_time" do
     it "returns a human friendly string of the elapsed time represented by a float" do
       @milliseconds.to_human_time.should == "299 msecs"
       @second.to_human_time.should == "1 sec"
@@ -42,7 +42,7 @@ describe "Fixnum" do
     @gigabytes = 8_289_119_584
   end
   
-  context ".to_human_size" do
+  context "#to_human_size" do
     it "returns a human friendly string of the amount of bytes represented by a number" do
       @bytes.to_human_size.should == "12 bytes"
       @kilobytes.to_human_size.should == "8 kb"

data/spec/ping_spec.rb

@@ -12,7 +12,7 @@ describe "Ping" do
     Output.clear
   end
 
-  describe ".ping" do
+  describe "#ping" do
     context "a HTTP URI" do
       it "pings the configured url and outputs statistics" do
         @httping.ping 
@@ -45,7 +45,7 @@ describe "Ping" do
     end
   end
 
-  context ".count_reached?" do
+  context "#count_reached?" do
     it "returns false if a host has not yet been pinged the number of times requested" do
       2.times { @httping.ping }
       @httping.should_not be_count_reached
@@ -57,7 +57,7 @@ describe "Ping" do
     end
   end
   
-  context ".results" do
+  context "#results" do
     before do
       5.times { @httping.ping }
     end
@@ -68,7 +68,7 @@ describe "Ping" do
     end
   end
   
-  context ".json_results" do
+  context "#json_results" do
     before do
       @httping.format = :json
       2.times { @httping.ping }
@@ -80,7 +80,7 @@ describe "Ping" do
     end
   end
 
-  context ".quick_results" do
+  context "#quick_results" do
     before do
       @httping.format = :quick
       @httping.ping
@@ -92,7 +92,7 @@ describe "Ping" do
     end
   end
   
-  context ".run" do
+  context "#run" do
     before do
       @httping = Ping.new
       @httping.uri = URI.parse("http://www.example.com/")

data/spec/runner_spec.rb

@@ -10,7 +10,7 @@ describe "Runner" do
     Output.clear
   end
 
-  context ".parse_arguments" do
+  context "#parse_arguments" do
     it "parses command-line arguments into an options hash" do
       ARGV << "http://www.example.com"
       ARGV << "--count" << "3"
@@ -53,7 +53,7 @@ describe "Runner" do
     end
   end
 
-  context ".run" do
+  context "#run" do
     it "returns the params banner if no arguments are passed" do
       @runner.run
       Output.to_s.should == "Usage: httping [options] uri"
@@ -74,11 +74,11 @@ describe "Runner" do
     end
   end
   
-  context "parse_uri" do
+  context "#parse_uri" do
     it "outputs an error and exists if not given an HTTP(S) URI" do
       ARGV << "ftp://www.example.com"
       @runner.parse_uri
-      Output.to_s.should == "ERROR: Invalid URI ftp://www.example.com"
+      Output.to_s.should == "ERROR: Invalid URI ftp://www.example.com/"
     end
     
     it "accepts HTTP URIs" do
@@ -92,5 +92,11 @@ describe "Runner" do
       @runner.parse_uri
       Output.to_s.should_not match(/ERROR/)
     end
+
+    it "assumes HTTP for URIs without a scheme" do
+      ARGV << "www.example.com"
+      @runner.parse_uri
+      Output.to_s.should_not match(/ERROR/)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: httping
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - John Pignata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 -04:00
+date: 2009-12-28 00:00:00 -05:00
 default_executable: httping
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,8 +39,10 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.md
 files: 
+- LICENSE
 - README.md
 - Rakefile
 - VERSION