gist 1.0.3 → 1.1.1

data/README.markdown

@@ -16,6 +16,7 @@ Old school:
     chmod 755 gist &&
     mv gist /usr/local/bin/gist
 
+
 Use
 ---
 
@@ -24,6 +25,7 @@ Use
     echo "puts :hi" | gist -t rb
     gist script.py
 
+
 Authentication
 --------------
 
@@ -34,6 +36,26 @@ Just have your git config set up with your GitHub username and token.
 
 You can find your token under [your account](https://github.com/account).
 
+You can also define github.token to be a command which returns the
+actual token on stdout by setting the variable to a command string
+prefixed with `!`. For example, the following command fetches the
+token from a password item named "github.token" on the Mac OS
+Keychain:
+
+    token = !security 2>&1 >/dev/null find-generic-password -gs github.token | ruby -e 'print $1 if STDIN.gets =~ /^password: \\\"(.*)\\\"$/'
+
+
+Defaults
+--------
+
+You can set a few options in your git config (using git-config(1)) to
+control the default behavior of gist(1).
+
+* gist.private - boolean (yes or no) - Determines whether to make a gist
+  private by default
+
+* gist.extension - string - Default extension for gists you create.
+
 
 Proxies
 -------
@@ -42,14 +64,15 @@ Set the HTTP_PROXY env variable to use a proxy.
 
     $ HTTP_PROXY=host:port gist file.rb
 
+
 Manual
 ------
 
-
 Visit <http://defunkt.github.com/gist/> or use:
 
     $ gist -m
 
+
 Ninja vs Shark
 --------------
 

data/lib/gist.rb

@@ -32,14 +32,15 @@ module Gist
 
   # Parses command line arguments and does what needs to be done.
   def execute(*args)
-    private_gist = false
-    gist_extension = nil
+    private_gist = defaults["private"]
+    gist_filename = nil
+    gist_extension = defaults["extension"]
 
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: gist [options] [filename or stdin]"
 
-      opts.on('-p', '--private', 'Make the gist private') do
-        private_gist = true
+      opts.on('-p', '--[no-]private', 'Make the gist private') do |priv|
+        private_gist = priv
       end
 
       t_desc = 'Set syntax highlighting of the Gist by file extension'
@@ -51,6 +52,11 @@ module Gist
         Gist::Manpage.display("gist")
       end
 
+      opts.on('-v', '--version', 'Print version') do
+        puts Gist::Version
+        exit
+      end
+
       opts.on('-h', '--help', 'Display this screen') do
         puts opts
         exit
@@ -72,6 +78,7 @@ module Gist
         # Check if arg is a file. If so, grab the content.
         if File.exists?(file = args[0])
           input = File.read(file)
+          gist_filename = file
           gist_extension = File.extname(file) if file.include?('.')
         else
           abort "Can't find #{file}"
@@ -81,7 +88,7 @@ module Gist
         input = $stdin.read
       end
 
-      url = write(input, private_gist, gist_extension)
+      url = write(input, private_gist, gist_extension, gist_filename)
       browse(url)
       puts copy(url)
     rescue => e
@@ -91,12 +98,13 @@ module Gist
   end
 
   # Create a gist on gist.github.com
-  def write(content, private_gist = false, gist_extension = nil)
+  def write(content, private_gist = false, gist_extension = nil, gist_filename = nil)
     url = URI.parse(CREATE_URL)
 
     # Net::HTTP::Proxy returns Net::HTTP if PROXY_HOST is nil
     proxy = Net::HTTP::Proxy(PROXY_HOST, PROXY_PORT)
-    req = proxy.post_form(url, data(nil, gist_extension, content, private_gist))
+    req = proxy.post_form(url,
+      data(gist_filename, gist_extension, content, private_gist))
 
     req['Location']
   end
@@ -117,11 +125,11 @@ module Gist
   # Tries to copy passed content to the clipboard.
   def copy(content)
     cmd = case true
-    when system("which pbcopy &> /dev/null")
+    when system("type pbcopy > /dev/null")
       :pbcopy
-    when system("which xclip &> /dev/null")
+    when system("type xclip > /dev/null")
       :xclip
-    when system("which putclip &> /dev/null")
+    when system("type putclip > /dev/null")
       :putclip
     end
 
@@ -143,12 +151,56 @@ private
     }.merge(private_gist ? { 'action_button' => 'private' } : {}).merge(auth)
   end
 
-  # Returns a hash of the user's GitHub credentials if see.
+  # Returns a hash of the user's GitHub credentials if set.
   # http://github.com/guides/local-github-config
   def auth
-    user  = `git config --global github.user`.strip
-    token = `git config --global github.token`.strip
+    user  = config("github.user")
+    token = config("github.token")
 
     user.empty? ? {} : { :login => user, :token => token }
   end
+
+  # Returns default values based on settings in your gitconfig. See
+  # git-config(1) for more information.
+  #
+  # Settings applicable to gist.rb are:
+  #
+  # gist.private - boolean
+  # gist.extension - string
+  def defaults
+    priv = config("gist.private")
+    extension = config("gist.extension")
+    extension = nil if extension && extension.empty?
+
+    return {
+      "private"   => priv,
+      "extension" => extension
+    }
+  end
+
+  # Reads a config value using git-config(1), returning something
+  # useful or nil.
+  def config(key)
+    str_to_bool `git config --global #{key}`.strip
+  end
+
+  # Parses a value that might appear in a .gitconfig file into
+  # something useful in a Ruby script.
+  def str_to_bool(str)
+    if str.size > 0 and str[0].chr == '!'
+      command = str[1, str.length]
+      value = `#{command}`
+    else
+      value = str
+    end
+
+    case value.downcase.strip
+    when "false", "0", "nil", "", "no", "off"
+      nil
+    when "true", "1", "yes", "on"
+      true
+    else
+      value
+    end
+  end
 end

data/lib/gist/version.rb

@@ -1,3 +1,3 @@
 module Gist
-  VERSION = Version = '1.0.3'
+  VERSION = Version = '1.1.1'
 end

data/man/gist.1

@@ -1,5 +1,5 @@
-.\" generated with Ron/v0.3
-.\" http://github.com/rtomayko/ron/
+.\" generated with Ronn/v0.4.1
+.\" http://github.com/rtomayko/ronn/
 .
 .TH "GIST" "1" "February 2010" "GITHUB" "Gist Manual"
 .
@@ -32,11 +32,11 @@ account if you user and token are provided (see \fBCONFIGURATION\fR).
 These options can be used to change this behavior:
 .
 .TP
-\fB\-p\fR, \fB\-\-private\fR 
+\fB\-p\fR, \fB\-\-private\fR
 Create a private gist instead of a public gist.
 .
 .TP
-\fB\-t\fR, \fB\-\-type\fR 
+\fB\-t\fR, \fB\-\-type\fR
 Set the file extension explicitly. Passing a type of \fBrb\fR ensure
 the gist is created as a Ruby file.
 .
@@ -44,11 +44,11 @@ the gist is created as a Ruby file.
 You may additionally ask for help:
 .
 .TP
-\fB\-h\fR, \fB\-\-help\fR 
+\fB\-h\fR, \fB\-\-help\fR
 Print help.
 .
 .TP
-\fB\-m\fR, \fB\-\-man\fR 
+\fB\-m\fR, \fB\-\-man\fR
 Display this man page.
 .
 .SH "CONFIGURATION"
@@ -57,8 +57,7 @@ Use git\-config(1) to display the currently configured GitHub username:
 .IP "" 4
 .
 .nf
-
-$ git config \-\-global github.user 
+$ git config \-\-global github.user
 .
 .fi
 .
@@ -70,8 +69,7 @@ Or, set the GitHub username with:
 .IP "" 4
 .
 .nf
-
-$ git config \-\-global github.user <username> 
+$ git config \-\-global github.user <username>
 .
 .fi
 .
@@ -87,8 +85,7 @@ information.
 .IP "" 4
 .
 .nf
-
-$ HTTP_PROXY=http://host:port/ gist script.py 
+$ HTTP_PROXY=http://host:port/ gist script.py
 .
 .fi
 .
@@ -97,11 +94,10 @@ $ HTTP_PROXY=http://host:port/ gist script.py
 .SH "EXAMPLES"
 .
 .nf
-
 $ gist < file.txt
 $ echo secret | gist \-\-private
 $ echo "puts :hi" | gist \-t rb
-$ gist script.py 
+$ gist script.py
 .
 .fi
 .

data/man/gist.1.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ron/v0.3'>
+  <meta name='generator' value='Ronn/v0.4.1'>
   <title>gist(1) -- gist on the command line</title>
   <style type='text/css'>
     body {margin:0}
@@ -64,6 +64,7 @@
 
 <h2 id='NAME'>NAME</h2>
 <p><code>gist</code> -- gist on the command line</p>
+
 <h2>SYNOPSIS</h2>
 
 <p><code>gist</code> [<code>-p</code>] [<code>-t extension</code>] <var>FILE</var></p>
@@ -90,14 +91,8 @@ account if you user and token are provided (see <code>CONFIGURATION</code>).</p>
 <p>These options can be used to change this behavior:</p>
 
 <dl>
-<dt>
-<code>-p</code>, <code>--private</code>
-</dt>
-<dd><p>Create a private gist instead of a public gist.</p></dd>
-<dt>
-<code>-t</code>, <code>--type</code>
-</dt>
-<dd><p>Set the file extension explicitly. Passing a type of <code>rb</code> ensure
+<dt><code>-p</code>, <code>--private</code></dt><dd><p>Create a private gist instead of a public gist.</p></dd>
+<dt><code>-t</code>, <code>--type</code></dt><dd><p>Set the file extension explicitly. Passing a type of <code>rb</code> ensure
 the gist is created as a Ruby file.</p></dd>
 </dl>
 
@@ -105,14 +100,8 @@ the gist is created as a Ruby file.</p></dd>
 <p>You may additionally ask for help:</p>
 
 <dl>
-<dt>
-<code>-h</code>, <code>--help</code>
-</dt>
-<dd><p>Print help.</p></dd>
-<dt>
-<code>-m</code>, <code>--man</code>
-</dt>
-<dd><p>Display this man page.</p></dd>
+<dt><code>-h</code>, <code>--help</code></dt><dd><p>Print help.</p></dd>
+<dt><code>-m</code>, <code>--man</code></dt><dd><p>Display this man page.</p></dd>
 </dl>
 
 
@@ -125,7 +114,7 @@ the gist is created as a Ruby file.</p></dd>
 
 <p>Or, set the GitHub username with:</p>
 
-<pre><code>$ git config --global github.user &lt;username&gt;
+<pre><code>$ git config --global github.user &lt;username>
 </code></pre>
 
 <p>See <a href="http://github.com/guides/local-github-config">http://github.com/guides/local-github-config</a> for more
@@ -158,6 +147,7 @@ $ gist script.py
 <a href="http://github.com">http://github.com</a>,
 <a href="http://github.com/defunkt/gist">http://github.com/defunkt/gist</a></p>
 
+
 <ol class='foot man'>
   <li class='tl'>GITHUB</li>
   <li class='tc'>February 2010</li>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gist
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -08:00
+date: 2010-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: []