jist 1.1.1.pre.3 → 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
@@ -99,7 +106,7 @@ opts.parse!
 
 begin
   if options[:paste]
-    puts Jist.gist(Clippy.paste, options)['html_url']
+    puts Jist.gist(Jist.paste, options)['html_url']
   elsif ARGV.size == 0
     $stderr.puts "(type a gist. <ctrl-c> to cancel, <ctrl-d> when done)" if $stdin.tty?
     puts Jist.gist(ARGF.read, options)['html_url']

data/jist.gemspec

@@ -13,9 +13,8 @@ Gem::Specification.new do |s|
 
   s.executables << 'jist'
 
-  s.add_dependency 'clippy'
   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

@@ -1,13 +1,20 @@
 require 'net/https'
 require 'cgi'
 require 'json'
-require 'clippy'
 
 # It just gists.
 module Jist
   extend self
 
-  VERSION = '1.1.1.pre.3'
+  VERSION = '1.2.0'
+
+  # A list of clipboard commands with copy and paste support.
+  CLIPBOARD_COMMANDS = {
+    'xclip'   => 'xclip -o',
+    'xsel'    => 'xsel -o',
+    'pbcopy'  => 'pbpaste',
+    'putclip' => 'getclip'
+  }
 
   # Exception tag for errors raised while gisting.
   module Error; end
@@ -21,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.
@@ -43,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.
@@ -98,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
@@ -181,12 +204,33 @@ module Jist
   def on_success(body, options={})
     json = JSON.parse(body)
 
-    Clippy.copy(json['html_url']) if options[:copy]
+    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]
 
     json
   end
 
+  # Copy a string to the clipboard.
+  #
+  # @param [String] content
+  # @raise [RuntimeError] if no clipboard integration could be found
+  #
+  # This method was heavily inspired by defunkt's Gist#copy,
+  # @see https://github.com/defunkt/gist/blob/bca9b29/lib/gist.rb#L178
+  def copy(content)
+    IO.popen(clipboard_command(:copy), 'r+') { |clip| clip.print content }
+    raise "Copying to clipboard failed" unless paste == content
+  end
+
+  # Get a string from the clipboard.
+  #
+  # @param [String] content
+  # @raise [RuntimeError] if no clipboard integration could be found
+  def paste
+    `#{clipboard_command(:paste)}`
+  end
+
   # Find command from PATH environment.
   #
   # @param [String] cmd  command name to find

data/spec/clipboard_spec.rb

@@ -16,7 +16,7 @@ describe '...' do
   end
 
   it 'should try to copy the url when the clipboard option is passed' do
-    Clippy.should_receive(:copy).with(@bobo_url)
+    Jist.should_receive(:copy).with(@bobo_url)
     ask_for_copy
   end
 
@@ -29,6 +29,6 @@ describe '...' do
     ENV['PATH'] = ''
     lambda{
       ask_for_copy
-    }.should raise_error(/Clippy/)
+    }.should raise_error(/Could not find copy command/)
   end
 end

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,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: jist
 version: !ruby/object:Gem::Version
-  version: 1.1.1.pre.3
-  prerelease: 6
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: clippy
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,14 +28,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -93,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:
@@ -110,9 +111,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24