git.io 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: bundle exec rspec

data/README.md

@@ -1,8 +1,17 @@
 # Git.io
 
+[![Build Status](https://secure.travis-ci.org/jgorset/git.io.png)](http://travis-ci.org/jgorset/git.io)
+
 Command-line client for GitHub's URL shortener.
 
 ## Usage
 
     $ git.io http://github.com/jgorset/git.io
     http://git.io/J6MbsQ
+
+    $ git.io http://github.com/jgorset/git.io --code=git.io
+    http://git.io/git.io
+
+## Installation
+  
+    $ gem install git.io

data/git.io.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
   # s.add_runtime_dependency "rest-client"
 end

data/lib/gitio.rb

@@ -6,28 +6,34 @@ module Gitio
   autoload :Error,      "gitio/errors"
   autoload :CLI,        "gitio/cli"
 
+  # Shorten the given <tt>url</tt> with git.io.
+  #
+  # If <tt>code</tt> is given, git.io will attempt
+  # to use it in place of a random value for the
+  # shortened URL.
   def self.shorten(url, code=nil)
     Net::HTTP.start "git.io", 80 do |http|
       request = Net::HTTP::Post.new "/"
       request.content_type = "application/x-www-form-urlencoded"
 
-      query = {}.tap do |hash|
-        hash[:url] = url
-        hash[:code] = code if code
+      query = Hash.new.tap do |h|
+        h[:url] = url
+        h[:code] = code if code
       end
 
       request.body = URI.encode_www_form(query)
 
       response = http.request(request)
 
-      if short_url = response["Location"]
-        return short_url
+      if response.key? "Location"
+        return response["Location"]
       else
         raise Error, response.body
       end
     end
   end
 
+  # Expand the given <tt>url</tt> to its original form.
   def self.lengthen(url)
     url = URI(url)
 

data/lib/gitio/cli.rb

@@ -7,7 +7,7 @@ module Gitio
     def initialize(arguments)
       url, options = parse!(arguments)
 
-      if options[:code]
+      if options.include? :code
         puts Gitio.shorten(url, options[:code])
       else
         puts Gitio.shorten(url)
@@ -36,8 +36,11 @@ module Gitio
       error "You must specify an URL to shorten" if arguments.empty?
 
       [arguments.first, options]
+    rescue OptionParser::InvalidOption => e
+      error e
     end
 
+    # Print <tt>message</tt> and exit with the given <tt>code</tt>.
     def error(message, code=1)
       puts "git.io: #{message}"
       exit code

data/lib/gitio/version.rb

@@ -1,3 +1,3 @@
 module Gitio
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/cli_spec.rb

@@ -1,17 +1,22 @@
 require "gitio"
+require "support"
 
 describe Gitio::CLI do
-  
-  before do
-    $stdout = StringIO.new
-  end
 
   it "accepts an URL" do
-    Gitio::CLI.new ["http://github.com/jgorset/git.io"]
+    output = capture_stdout do
+      Gitio::CLI.new ["https://github.com/jgorset/git.io"]
+    end
+
+    output.should eq "http://git.io/git.io\n"
   end
 
   it "accepts an URL with a code" do
-    Gitio::CLI.new ["http://github.com/jgorset/git.io", "git.io"]
+    output = capture_stdout do
+      Gitio::CLI.new ["https://github.com/jgorset/git.io", "git.io"]
+    end
+
+    output.should eq "http://git.io/git.io\n"
   end
 
 end

data/spec/support.rb

@@ -0,0 +1,7 @@
+def capture_stdout
+  $stdout = StringIO.new
+  yield
+  $stdout.string
+ensure
+  $stdout = STDOUT
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git.io
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70294673264120 !ruby/object:Gem::Requirement
+  requirement: &70281193489480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294673264120
+  version_requirements: *70281193489480
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70281193488180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70281193488180
 description: Command-line client for GitHub's URL shortener, git.io.
 email:
 - jgorset@gmail.com
@@ -31,6 +42,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -42,6 +54,7 @@ files:
 - lib/gitio/version.rb
 - spec/cli_spec.rb
 - spec/gitio_spec.rb
+- spec/support.rb
 homepage: http://github.com/jgorset/git.io
 licenses: []
 post_install_message: 
@@ -69,3 +82,4 @@ summary: Command-line client for git.io
 test_files:
 - spec/cli_spec.rb
 - spec/gitio_spec.rb
+- spec/support.rb