jist 1.1.0 → 1.2.0

data/Gemfile

@@ -1,3 +1,3 @@
 source :rubygems
 
-gemspec
+gemspec

data/bin/jist

@@ -29,6 +29,9 @@ Anonymous gists are not associated with your GitHub account, they can be created
 with "-a" even after you have used "jist --login". If you already have an access
 token with the "gist" scope, you can pass that with "-t".
 
+If you would like to shorten the resulting gist URL, use the -s flag. This will
+use GitHub's URL shortener, git.io.
+
 To copy the resulting URL to your clipboard you can use the -c option, or to just
 open it directly in your browser, use -o. You can add `alias jist='jist -c'` to
 your shell's rc file to configure this behaviour by default.
@@ -37,7 +40,7 @@ Instead of creating a new jist, you can update an existing one by passing its ID
 or URL with "-u". For this to work, you must be logged in, and have created the
 original gist with the same GitHub account.
 
-Usage: #{executable_name} [-o|-c] [-p] [-d DESC] [-t TOKEN|-a] [-u URL] [-P] [-f NAME]* FILE*
+Usage: #{executable_name} [-o|-c] [-p] [-s] [-d DESC] [-t TOKEN|-a] [-u URL] [-P] [-f NAME]* FILE*
        #{executable_name} --login
 
   EOS
@@ -60,6 +63,10 @@ Usage: #{executable_name} [-o|-c] [-p] [-d DESC] [-t TOKEN|-a] [-u URL] [-P] [-f
     options[:description] = description
   end
 
+  opts.on("-s", "--shorten", "Shorten the gist URL using git.io.") do |shorten|
+    options[:shorten] = shorten
+  end
+
   opts.on("-u", "--update [ URL | ID ]", "Update an existing gist.") do |update|
     options[:update] = update
   end

data/jist.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.executables << 'jist'
 
   s.add_dependency 'json'
-  %w(rake rspec).each do |gem|
+  %w(rake rspec webmock).each do |gem|
     s.add_development_dependency gem
   end
 end

data/lib/jist.rb

@@ -6,7 +6,7 @@ require 'json'
 module Jist
   extend self
 
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
@@ -28,6 +28,7 @@ module Jist
   # @option options [String] :filename  ('a.rb') the filename
   # @option options [Boolean] :public  (false) is this gist public
   # @option options [Boolean] :anonymous  (false) is this gist anonymous
+  # @option options [Boolean] :shorten  (false) Shorten the resulting URL using git.io.
   # @option options [String] :access_token  (`File.read("~/.jist")`) The OAuth2 access token.
   # @option options [String] :update  the URL or id of a gist to update
   # @option options [Boolean] :copy  (false) Copy resulting URL to clipboard, if successful.
@@ -50,6 +51,7 @@ module Jist
   # @option options [String] :description  the description
   # @option options [Boolean] :public  (false) is this gist public
   # @option options [Boolean] :anonymous  (false) is this gist anonymous
+  # @option options [Boolean] :shorten  (false) Shorten the resulting URL using git.io.
   # @option options [String] :access_token  (`File.read("~/.jist")`) The OAuth2 access token.
   # @option options [String] :update  the URL or id of a gist to update
   # @option options [Boolean] :copy  (false) Copy resulting URL to clipboard, if successful.
@@ -105,6 +107,20 @@ module Jist
     raise e.extend Error
   end
 
+  # Convert long github urls into shotr git.io ones
+  #
+  # @param [String] url
+  # @return [String] shortened url, or long url if shortening fails
+  def shorten(url)
+    response = Net::HTTP.post_form(URI("http://git.io/"), :url => url)
+    case response.code
+    when "201"
+      response['Location']
+    else
+      url
+    end
+  end
+
   # Log the user into jist.
   #
   # This method asks the user for a username and password, and tries to obtain
@@ -188,6 +204,7 @@ module Jist
   def on_success(body, options={})
     json = JSON.parse(body)
 
+    json['html_url'] = shorten(json['html_url']) if options[:shorten]
     Jist.copy(json['html_url']) if options[:copy]
     Jist.open(json['html_url']) if options[:open]
 
@@ -214,6 +231,23 @@ module Jist
     `#{clipboard_command(:paste)}`
   end
 
+  # Find command from PATH environment.
+  #
+  # @param [String] cmd  command name to find
+  # @param [String] options  PATH environment variable
+  # @return [String]  the command found
+  def which(cmd, path=ENV['PATH'])
+    if RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin|cygwin/
+      path.split(File::PATH_SEPARATOR).each {|dir|
+        f = File.join(dir, cmd+".exe")
+        return f if File.executable?(f) && !File.directory?(f)
+      }
+      nil
+    else
+      return system("which #{cmd} > /dev/null 2>&1")
+    end
+  end
+
   # Get the command to use for the clipboard action.
   #
   # @param [Symbol] action  either :copy or :paste
@@ -221,7 +255,7 @@ module Jist
   # @raise [RuntimeError] if no clipboard integration could be found
   def clipboard_command(action)
     command = CLIPBOARD_COMMANDS.keys.detect do |cmd|
-      system("type #{cmd} >/dev/null 2>&1")
+      which cmd
     end
     raise "Could not find copy command, tried: #{CLIPBOARD_COMMANDS}" unless command
     action == :copy ? command : CLIPBOARD_COMMANDS[command]

data/spec/shorten_spec.rb

@@ -0,0 +1,11 @@
+describe '...' do
+  before do
+    stub_request(:post, /api\.github.com\/gists\?access_token=.*/).to_return(:body => '{"html_url": "http://github.com/"}')
+    stub_request(:post, "http://git.io/").to_return(:status => 201, :headers => { 'Location' => 'http://git.io/XXXXXX' })
+  end
+
+  it "should return a shortened version of the URL" do
+    Jist.gist("Test gist", :shorten => true).should == {"html_url" => "http://git.io/XXXXXX"}
+  end
+end
+

data/spec/spec_helper.rb

@@ -10,4 +10,6 @@ RSpec.configure do |config|
   config.filter_run :focus
 end
 
+require 'webmock/rspec'
 require_relative '../lib/jist'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jist
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a single function (Jist.gist) that uploads a gist.
 email: conrad.irwin@gmail.com
 executables:
@@ -77,6 +93,7 @@ files:
 - lib/jist.rb
 - spec/clipboard_spec.rb
 - spec/proxy_spec.rb
+- spec/shorten_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ConradIrwin/jist
 licenses: