jist 0.9.0 → 0.9.1

data/bin/jist

@@ -13,29 +13,28 @@ opts = OptionParser.new do |opts|
   opts.banner = <<-EOS
 Jist (v#{Jist::VERSION}) lets you upload to https://gist.github.com/
 
-Usage: #{executable_name} [-p] [-d DESC] [-t TOKEN] [-u URL] [-f NAME]* [FILE]*
+Usage: #{executable_name} [-p] [-d DESC] [-t TOKEN|-a] [-u URL] [-f NAME]* [FILE]*
        #{executable_name} --login
 
-When used with no arguments, jist creates an anonymous, private, gist, with
-no description. The FILENAME defaults to "a.rb" and we read the contents of
-STDIN.
+The content to be uploaded can be passed as a list of files, if none are
+specified STDIN will be read. The default filename for STDIN is "a.rb", and all
+filenames can be overridden by repeating the "-f" flag. The most useful reason
+to do this is to change the syntax highlighting.
 
-If you'd like your gists to be associated with your github account, so that
-you can edit them, and find them in future, first use `jist --login` to obtain
-an Oauth2 access token. This is stored and used for all future uses of jist.
+If you'd like your gists to be associated with your GitHub account, so that you
+can edit them and find them in future, first use `jist --login` to obtain an
+Oauth2 access token. This is stored and used by jist in the future.
 
-If you're calling jist from another program that already has an access_token
-with the "gist" scope, then pass it using `jist -t`.
+Public gists have guessable URLs and can be created with "-p", you can also set
+the description at the top of the gist by passing "-d".
 
-If you specify FILEs on the command line, then jist will use the names of the
-files you specify as the filenames for the gist. If you'd rather override the
-name you can specify the -f parameter once per file. If you don't specify any
-files, then the -f parameter will be used to name the contents of STDIN. If you
-don't specify the -f parameter at all when using STDIN, "a.rb" will be used.
+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".
 
-Making a gist public causes it to have a prettier, guessable url. And adding
-a description can provide useful context to people who stumble across your
-gist.
+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.
 
   EOS
 
@@ -89,7 +88,11 @@ begin
   else
     files = {}
     ARGV.zip(filenames).each do |(file, name)|
-      files[name || file] = File.read(File.expand_path(file))
+      files[name || file] = begin
+        File.read(File.expand_path(file))
+      rescue => e
+        raise e.extend(Jist::Error)
+      end
     end
 
     puts Jist.multi_gist(files, options)['html_url']

data/lib/jist.rb

@@ -5,7 +5,7 @@ require 'json'
 # It just gists.
 module Jist
 
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 
   # Exception tag for errors raised while gisting.
   module Error; end
@@ -73,13 +73,21 @@ module Jist
     request = Net::HTTP::Post.new(url)
     request.body = JSON.dump(json)
 
-    response = http(request)
+    retried = false
 
-    if Net::HTTPSuccess === response
-      JSON.parse(response.body)
-    else
-      raise "Got #{response.class} from gist: #{response.body}"
+    begin
+      response = http(request)
+      if Net::HTTPSuccess === response
+        JSON.parse(response.body)
+      else
+        raise "Got #{response.class} from gist: #{response.body}"
+      end
+    rescue => e
+      raise if retried
+      retried = true
+      retry
     end
+
   rescue => e
     raise e.extend Error
   end
@@ -126,18 +134,15 @@ module Jist
     raise e.extend Error
   end
 
-  private
-
-  module_function
   # Run an HTTP operation against api.github.com
   #
-  # @param [Net::HTTP::Request] request
-  # @return [Net::HTTP::Response]
+  # @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 = 5
+    connection.open_timeout = 10
     connection.read_timeout = 10
     connection.start do |http|
       http.request request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jist
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -35,8 +35,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jist.rb
-- !binary |-
-  YmluL2ppc3Q=
+- bin/jist
 homepage: https://github.com/ConradIrwin/jist
 licenses: []
 post_install_message: 
@@ -57,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Just allows you to upload gists