jist 1.0.1 → 1.1.0

data/README.md

@@ -153,6 +153,9 @@ export BROWSER=google-chrome
 If clipboard or browser integration don't work on your platform, please file a bug or
 (more ideally) a pull request.
 
+If you need to use an HTTP proxy to access the internet, export the `HTTP_PROXY` or
+`http_proxy` environment variable and jist will use it.
+
 Meta-fu
 =======
 

data/lib/jist.rb

@@ -6,7 +6,7 @@ require 'json'
 module Jist
   extend self
 
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
@@ -148,17 +148,31 @@ module Jist
     raise e.extend Error
   end
 
+  # Return HTTP connection
+  #
+  # @return [Net::HTTP]
+  def http_connection
+    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)
+                 else
+                   Net::HTTP.new("api.github.com", 443)
+                 end
+    connection.use_ssl = true
+    connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    connection.open_timeout = 10
+    connection.read_timeout = 10
+    connection
+  end
+
   # Run an HTTP operation against api.github.com
   #
   # @param [Net::HTTPRequest] request
   # @return [Net::HTTPResponse]
   def http(request)
-    connection = Net::HTTP.new("api.github.com", 443)
-    connection.use_ssl = true
-    connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    connection.open_timeout = 10
-    connection.read_timeout = 10
-    connection.start do |http|
+    http_connection().start do |http|
       http.request request
     end
   rescue Timeout::Error

data/spec/proxy_spec.rb

@@ -0,0 +1,19 @@
+describe '...' do
+  before do
+    @saved_env = ENV['HTTP_PROXY']
+  end
+
+  after do
+    ENV['HTTP_PROXY'] = @saved_env
+  end
+
+  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)
+  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)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jist
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -76,6 +76,7 @@ files:
 - jist.gemspec
 - lib/jist.rb
 - spec/clipboard_spec.rb
+- spec/proxy_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ConradIrwin/jist
 licenses: