jist 1.2.0 → 1.3.0

data/Rakefile

@@ -4,3 +4,7 @@ desc 'run the tests' # that's non-DRY
 task :test do
   sh 'rspec spec'
 end
+
+task :clipfailtest do
+  sh 'PATH=/ /usr/bin/ruby -Ilib -S bin/jist -ac < lib/jist.rb'
+end

data/lib/jist.rb

@@ -1,12 +1,13 @@
 require 'net/https'
 require 'cgi'
 require 'json'
+require 'uri'
 
 # It just gists.
 module Jist
   extend self
 
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
@@ -16,8 +17,12 @@ module Jist
     'putclip' => 'getclip'
   }
 
+  GITHUB_API_URL = URI("https://api.github.com/")
+  GIT_IO_URL     = URI("http://git.io")
+
   # Exception tag for errors raised while gisting.
   module Error; end
+  class ClipboardError < RuntimeError; include Error end
 
   # Upload a gist to https://gist.github.com
   #
@@ -91,7 +96,7 @@ module Jist
     retried = false
 
     begin
-      response = http(request)
+      response = http(GITHUB_API_URL, request)
       if Net::HTTPSuccess === response
         on_success(response.body, options)
       else
@@ -107,12 +112,14 @@ module Jist
     raise e.extend Error
   end
 
-  # Convert long github urls into shotr git.io ones
+  # Convert long github urls into short 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)
+    request = Net::HTTP::Post.new("/")
+    request.set_form_data(:url => url)
+    response = http(GIT_IO_URL, request)
     case response.code
     when "201"
       response['Location']
@@ -150,7 +157,7 @@ module Jist
     request.content_type = 'application/json'
     request.basic_auth(username, password)
 
-    response = http(request)
+    response = http(GITHUB_API_URL, request)
 
     if Net::HTTPCreated === response
       File.open(File.expand_path("~/.jist"), 'w') do |f|
@@ -166,29 +173,32 @@ module Jist
 
   # Return HTTP connection
   #
+  # @param [URI::HTTP] The URI to which to connect
   # @return [Net::HTTP]
-  def http_connection
+  def http_connection(uri)
     env = ENV['http_proxy'] || ENV['HTTP_PROXY']
     connection = if env
-                   uri = URI(env)
-                   proxy_host, proxy_port = uri.host, uri.port
-                   Net::HTTP::Proxy(proxy_host, proxy_port).new("api.github.com", 443)
+                   proxy = URI(env)
+                   Net::HTTP::Proxy(proxy.host, proxy.port).new(uri.host, uri.port)
                  else
-                   Net::HTTP.new("api.github.com", 443)
+                   Net::HTTP.new(uri.host, uri.port)
                  end
-    connection.use_ssl = true
-    connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    if uri.scheme == "https"
+      connection.use_ssl = true
+      connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
     connection.open_timeout = 10
     connection.read_timeout = 10
     connection
   end
 
-  # Run an HTTP operation against api.github.com
+  # Run an HTTP operation
   #
-  # @param [Net::HTTPRequest] request
+  # @param [URI::HTTP] The URI to which to connect
+  # @param [Net::HTTPRequest] The request to make
   # @return [Net::HTTPResponse]
-  def http(request)
-    http_connection().start do |http|
+  def http(url, request)
+    http_connection(url).start do |http|
       http.request request
     end
   rescue Timeout::Error
@@ -214,19 +224,19 @@ module Jist
   # Copy a string to the clipboard.
   #
   # @param [String] content
-  # @raise [RuntimeError] if no clipboard integration could be found
+  # @raise [Jist::Error] 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
+    raise Error, 'Copying to clipboard failed.' unless paste == content
+  rescue Error => e
+    raise ClipboardError, e.message + "\nAttempted to copy: #{content}"
   end
 
   # Get a string from the clipboard.
   #
   # @param [String] content
-  # @raise [RuntimeError] if no clipboard integration could be found
+  # @raise [Jist::Error] if no clipboard integration could be found
   def paste
     `#{clipboard_command(:paste)}`
   end
@@ -252,12 +262,15 @@ module Jist
   #
   # @param [Symbol] action  either :copy or :paste
   # @return [String]  the command to run
-  # @raise [RuntimeError] if no clipboard integration could be found
+  # @raise [Jist::ClipboardError] if no clipboard integration could be found
   def clipboard_command(action)
     command = CLIPBOARD_COMMANDS.keys.detect do |cmd|
       which cmd
     end
-    raise "Could not find copy command, tried: #{CLIPBOARD_COMMANDS}" unless command
+    raise ClipboardError, <<-EOT unless command
+Could not find copy command, tried:
+    #{CLIPBOARD_COMMANDS.values.join(' || ')}
+    EOT
     action == :copy ? command : CLIPBOARD_COMMANDS[command]
   end
 

data/spec/clipboard_spec.rb

@@ -29,6 +29,6 @@ describe '...' do
     ENV['PATH'] = ''
     lambda{
       ask_for_copy
-    }.should raise_error(/Could not find copy command/)
+    }.should raise_error(/Could not find copy command.*http/m)
   end
 end

data/spec/proxy_spec.rb

@@ -7,13 +7,15 @@ describe '...' do
     ENV['HTTP_PROXY'] = @saved_env
   end
 
+  FOO_URL = URI('http://ddg.gg/')
+
   it "should be Net::HTTP when $HTTP_PROXY wasn't set" do
     ENV['HTTP_PROXY'] = ''
-    Jist.http_connection().should be_an_instance_of(Net::HTTP)
+    Jist.http_connection(FOO_URL).should be_an_instance_of(Net::HTTP)
   end
 
   it "should be Net::HTTP::Proxy when $HTTP_PROXY was set" do
     ENV['HTTP_PROXY'] = 'http://proxy.example.com:8080'
-    Jist.http_connection().should_not be_an_instance_of(Net::HTTP)
+    Jist.http_connection(FOO_URL).should_not be_an_instance_of(Net::HTTP)
   end
 end

metadata

@@ -1,25 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: jist
 version: !ruby/object:Gem::Version
-  version: 1.2.0
   prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -27,15 +26,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: json
 - !ruby/object:Gem::Dependency
-  name: rake
+  type: :development
   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
@@ -43,15 +42,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
 - !ruby/object:Gem::Dependency
-  name: rspec
+  type: :development
   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
@@ -59,15 +58,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec
 - !ruby/object:Gem::Dependency
-  name: webmock
+  type: :development
   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
@@ -75,6 +74,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: webmock
 description: Provides a single function (Jist.gist) that uploads a gist.
 email: conrad.irwin@gmail.com
 executables:
@@ -121,4 +121,3 @@ signing_key:
 specification_version: 3
 summary: Just allows you to upload gists
 test_files: []
-has_rdoc: