jist 0.6 → 0.7

data/bin/jist

@@ -6,14 +6,14 @@ require 'jist'
 
 # For the holdings of options.
 options = {}
-
+filenames = []
 
 opts = OptionParser.new do |opts|
   executable_name = File.split($0)[1]
   opts.banner = <<-EOS
 Jist (v#{Jist::VERSION}) lets you upload to https://gist.github.com/
 
-Usage: #{executable_name} [-p] [-d DESC] [-t TOKEN] [-f FILENAME] [FILE]
+Usage: #{executable_name} [-p] [-d DESC] [-t TOKEN] [-u URL] [-f NAME]* [FILE]*
        #{executable_name} --login
 
 When used with no arguments, jist creates an anonymous, private, gist, with
@@ -27,10 +27,11 @@ an Oauth2 access token. This is stored and used for all future uses of jist.
 If you're calling jist from another program that already has an access_token
 with the "gist" scope, then pass it using `jist -t`.
 
-If you specify a FILE on the command line, then jist will use that as the
-default value for FILENAME too. If not, jist will assume that the file you
-provide on STDIN is called "a.rb". The FILENAME is mostly important for
-determining which language to use for syntax highlighting.
+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.
 
 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
@@ -44,6 +45,7 @@ gist.
   end
 
   opts.on("-f", "--filename [NAME.EXTENSION]", "Sets the filename and syntax type.") do |filename|
+    filenames << filename
     options[:filename] = filename
   end
 
@@ -55,6 +57,10 @@ gist.
     options[:description] = description
   end
 
+  opts.on("-u", "--update [ URL | ID ]", "Update an existing gist.") do |update|
+    options[:update] = update
+  end
+
   opts.on("-t", "--token OAUTH_TOKEN", "The OAuth2 access_token to use.") do |token|
     options[:access_token] = token
   end
@@ -75,8 +81,11 @@ opts.parse!
 if 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']
-elsif ARGV.size == 1
-  puts Jist.gist(File.read(File.expand_path(ARGV[0])), {:filename => File.basename(ARGV[0])}.merge(options))['html_url']
 else
-  puts opts
+  files = {}
+  ARGV.zip(filenames).each do |(file, name)|
+    files[name || file] = File.read(File.expand_path(file))
+  end
+
+  puts Jist.multi_gist(files, options)['html_url']
 end

data/lib/jist.rb

@@ -5,7 +5,7 @@ require 'json'
 # It just gists.
 module Jist
 
-  VERSION = '0.6'
+  VERSION = '0.7'
 
   module_function
   # Upload a gist to https://gist.github.com
@@ -17,28 +17,47 @@ module Jist
   # @option options [String] :filename  ('a.rb') the filename
   # @option options [Boolean] :public  (false) is this gist public
   # @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
   #
   # @return [Hash]  the decoded JSON response from the server
   # @raise [Exception]  if something went wrong
   #
   # @see http://developer.github.com/v3/gists/
   def gist(content, options={})
+    filename = options[:filename] || "a.rb"
+    multi_gist({filename => content}, options)
+  end
+
+  # Upload a gist to https://gist.github.com
+  #
+  # @param [Hash] files  the code you'd like to gist {filename => content}
+  # @param [Hash] options  more detailed options
+  #
+  # @option options [String] :description  the description
+  # @option options [Boolean] :public  (false) is this gist public
+  # @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
+  #
+  # @return [Hash]  the decoded JSON response from the server
+  # @raise [Exception]  if something went wrong
+  #
+  # @see http://developer.github.com/v3/gists/
+  def multi_gist(files, options={})
     json = {}
 
     json[:description] = options[:description] if options[:description]
     json[:public] = !!options[:public]
+    json[:files] = {}
 
-    filename = options[:filename] || 'a.rb'
-
-    json[:files] = {
-      filename => {
-        :content => content
-      }
-    }
+    files.each_pair do |(name, content)|
+      json[:files][File.basename(name)] = {:content => content}
+    end
 
+    existing_gist = options[:update].to_s.split("/").last
     access_token = (options[:access_token] || File.read(File.expand_path("~/.jist")) rescue nil)
 
     url = "/gists"
+    url << "/" << CGI.escape(existing_gist) if existing_gist.to_s != ''
     url << "?access_token=" << CGI.escape(access_token) if access_token.to_s != ''
 
     request = Net::HTTP::Post.new(url)
@@ -46,7 +65,7 @@ module Jist
 
     response = http(request)
 
-    if Net::HTTPCreated === response
+    if Net::HTTPSuccess === response
       JSON.parse(response.body)
     else
       raise RuntimeError.new "Got #{response.class} from gist: #{response.body}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jist
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json