gist 1.1.1 → 1.2.0

data/README.markdown

@@ -6,9 +6,15 @@ Works great with Gist: The Website.
 Installation
 ------------
 
-RubyGem:
+[homebrew](http://mxcl.github.com/homebrew/):
+
+    brew install gist
+    gist -h
+
+RubyGems:
 
     gem install gist
+    gist -h
 
 Old school:
 
@@ -28,8 +34,15 @@ Use
 
 Authentication
 --------------
+There are two ways to set GitHub user and token info:
+
+Using env vars GITHUB_USER and GITHUB_TOKEN:
 
-Just have your git config set up with your GitHub username and token.
+    $ export GITHUB_USER="your-github-username"
+    $ export GITHUB_TOKEN="your-github-token"
+    $ gist ~/example
+
+Or by having your git config set up with your GitHub username and token.
 
     git config --global github.user "your-github-username"
     git config --global github.token "your-github-token"
@@ -56,6 +69,8 @@ control the default behavior of gist(1).
 
 * gist.extension - string - Default extension for gists you create.
 
+* gist.browse - boolean (yes or no) - Whether to open the gist in your
+  browser after creation. Default: yes
 
 Proxies
 -------
@@ -72,8 +87,7 @@ Visit <http://defunkt.github.com/gist/> or use:
 
     $ gist -m
 
+Bugs
+----
 
-Ninja vs Shark
---------------
-
-![Ninja vs Shark](http://github.com/defunkt/gist/tree/master%2Fbattle.png?raw=true)
+<http://github.com/defunkt/gist/issues>

data/Rakefile

@@ -16,7 +16,7 @@ end
 
 desc "Build gist manual"
 task :build_man do
-  sh "ron -br5 --organization=GITHUB --manual='Gist Manual' man/*.ron"
+  sh "ronn -br5 --organization=GITHUB --manual='Gist Manual' man/*.ron"
 end
 
 desc "Show gist manual"

data/lib/gist.rb

@@ -35,6 +35,7 @@ module Gist
     private_gist = defaults["private"]
     gist_filename = nil
     gist_extension = defaults["extension"]
+    browse_enabled = defaults["browse"]
 
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: gist [options] [filename or stdin]"
@@ -48,6 +49,10 @@ module Gist
         gist_extension = '.' + extension
       end
 
+      opts.on('-o','--[no-]open', 'Open gist in browser') do |o|
+        browse_enabled = o
+      end
+
       opts.on('-m', '--man', 'Print manual') do
         Gist::Manpage.display("gist")
       end
@@ -89,7 +94,7 @@ module Gist
       end
 
       url = write(input, private_gist, gist_extension, gist_filename)
-      browse(url)
+      browse(url) if browse_enabled
       puts copy(url)
     rescue => e
       warn e
@@ -115,21 +120,24 @@ module Gist
   end
 
   # Given a url, tries to open it in your browser.
-  # TODO: Linux, Windows
+  # TODO: Linux
   def browse(url)
     if RUBY_PLATFORM =~ /darwin/
       `open #{url}`
+    elsif ENV['OS'] == 'Windows_NT' or
+      RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw|wince/i
+      `start "" "#{url}"`
     end
   end
 
   # Tries to copy passed content to the clipboard.
   def copy(content)
     cmd = case true
-    when system("type pbcopy > /dev/null")
+    when system("type pbcopy > /dev/null 2>&1")
       :pbcopy
-    when system("type xclip > /dev/null")
+    when system("type xclip > /dev/null 2>&1")
       :xclip
-    when system("type putclip > /dev/null")
+    when system("type putclip > /dev/null 2>&1")
       :putclip
     end
 
@@ -168,19 +176,26 @@ private
   # 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
+      "private"   => config("gist.private"),
+      "browse"    => config("gist.browse"),
+      "extension" => extension,
     }
   end
 
-  # Reads a config value using git-config(1), returning something
-  # useful or nil.
+  # Reads a config value using:
+  # => Environement: GITHUB_TOKEN, GITHUB_USER
+  #                  like vim gist plugin
+  # => git-config(1)
+  #
+  # return something useful or nil
   def config(key)
+    env_key = ENV[key.upcase.gsub(/\./, '_')]
+    return env_key if env_key and not env_key.empty?
+
     str_to_bool `git config --global #{key}`.strip
   end
 

data/lib/gist/version.rb

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

data/man/gist.1

@@ -1,7 +1,7 @@
-.\" generated with Ronn/v0.4.1
+.\" generated with Ronn/v0.5
 .\" http://github.com/rtomayko/ronn/
 .
-.TH "GIST" "1" "February 2010" "GITHUB" "Gist Manual"
+.TH "GIST" "1" "May 2010" "GITHUB" "Gist Manual"
 .
 .SH "NAME"
 \fBgist\fR \-\- gist on the command line
@@ -52,11 +52,28 @@ Print help.
 Display this man page.
 .
 .SH "CONFIGURATION"
+There are two ways to set GitHub user and token info:
+.
+.IP "\(bu" 4
+Using env vars GITHUB_USER and GITHUB_TOKEN
+.
+.IP
+$ export GITHUB_USER=johndoe
+$ export GITHUB_TOKEN=mysecretgithubtoken
+$ gist ~/example
+.
+.IP "\(bu" 4
+Using git\-config(1)
+.
+.IP "" 0
+.
+.P
 Use git\-config(1) to display the currently configured GitHub username:
 .
 .IP "" 4
 .
 .nf
+
 $ git config \-\-global github.user
 .
 .fi
@@ -69,6 +86,7 @@ Or, set the GitHub username with:
 .IP "" 4
 .
 .nf
+
 $ git config \-\-global github.user <username>
 .
 .fi
@@ -85,6 +103,7 @@ information.
 .IP "" 4
 .
 .nf
+
 $ HTTP_PROXY=http://host:port/ gist script.py
 .
 .fi
@@ -94,6 +113,7 @@ $ HTTP_PROXY=http://host:port/ gist script.py
 .SH "EXAMPLES"
 .
 .nf
+
 $ gist < file.txt
 $ echo secret | gist \-\-private
 $ echo "puts :hi" | gist \-t rb
@@ -108,4 +128,4 @@ $ gist script.py
 Chris Wanstrath :: chris@ozmm.org
 .
 .SH "SEE ALSO"
-hub(1), git(1), git\-clone(1),\fIhttp://github.com\fR, \fIhttp://github.com/defunkt/gist\fR
+hub(1), git(1), git\-clone(1), \fIhttp://github.com\fR, \fIhttp://github.com/defunkt/gist\fR

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='Ronn/v0.4.1'>
+  <meta name='generator' value='Ronn/v0.5'>
   <title>gist(1) -- gist on the command line</title>
   <style type='text/css'>
     body {margin:0}
@@ -107,6 +107,18 @@ the gist is created as a Ruby file.</p></dd>
 
 <h2>CONFIGURATION</h2>
 
+<p>There are two ways to set GitHub user and token info:</p>
+
+<ul>
+<li><p>Using env vars GITHUB_USER and GITHUB_TOKEN</p>
+
+<p>$ export GITHUB_USER=johndoe
+$ export GITHUB_TOKEN=mysecretgithubtoken
+$ gist ~/example</p></li>
+<li><p>Using git-config(1)</p></li>
+</ul>
+
+
 <p>Use git-config(1) to display the currently configured GitHub username:</p>
 
 <pre><code>$ git config --global github.user
@@ -150,7 +162,7 @@ $ gist script.py
 
 <ol class='foot man'>
   <li class='tl'>GITHUB</li>
-  <li class='tc'>February 2010</li>
+  <li class='tc'>May 2010</li>
   <li class='tr'>gist(1)</li>
 </ol>
 

data/man/gist.1.ron

@@ -33,6 +33,10 @@ These options can be used to change this behavior:
     Set the file extension explicitly. Passing a type of `rb` ensure
     the gist is created as a Ruby file.
 
+  * `-o`, `--[no-]open`:
+    Open the gist in your browser after creation. Or don't. Defaults
+    to --open
+
 You may additionally ask for help:
 
   * `-h`, `--help`:
@@ -41,7 +45,17 @@ You may additionally ask for help:
   * `-m`, `--man`:
     Display this man page.
 
-## CONFIGURATION
+## AUTHENTICATION
+
+There are two ways to set GitHub user and token info:
+
+  * Using env vars GITHUB_USER and GITHUB_TOKEN
+
+    $ export GITHUB_USER=johndoe
+    $ export GITHUB_TOKEN=mysecretgithubtoken
+    $ gist ~/example
+
+  * Using git-config(1)
 
 Use git-config(1) to display the currently configured GitHub username:
 
@@ -54,9 +68,24 @@ Or, set the GitHub username with:
 See <http://github.com/guides/local-github-config> for more
 information.
 
-`gist` will check the `HTTP_PROXY` env variable if supplied:
+## CONFIGURATION
+
+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.
+
+* gist.browse - boolean (yes or no) - Whether to open the gist in your
+  browser after creation. Default: yes
+
+## ENVIRONMENT
+
+The following environment variables affect the execution of `gist`:
 
-    $ HTTP_PROXY=http://host:port/ gist script.py
+* HTTP_PROXY - Proxy to use when Gisting. Should be "http://host:port/"
 
 ## EXAMPLES
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gist
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
+date: 2010-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -46,18 +51,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Creates Gists from STDIN or files.