gist 4.2.1 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0de8d73bffeca7ab589673b0e9be457626f99ce
-  data.tar.gz: d0ddacc1956078ecde3e9f1c99d3ef438b44f32d
+  metadata.gz: 8dcb4ad16178e41476596aa05e8819ed3431e5f2
+  data.tar.gz: 6698bd0bda9e583700e5bec695d7e6b5c1b6fba5
 SHA512:
-  metadata.gz: 1bca74dbac5a4d6c20aefe8d6163bcc2d0e4990287704389f68b85d850ef92efb30bf6a522cd16ccba50e596000337a47f9195dd264df68575d7c7ff4f3dca86
-  data.tar.gz: af12d3e679224e27f74a0f76ecd9c372e15b96c71af174d5fb2ab1c7e21c2ab596500e5f9d84bdb1995a0a72b86f471e6ae6fdc68723897cfeed629402065729
+  metadata.gz: 7ca4af1b0e24281a929ea6a39e5e67a3b2a2c5bc7aed06039adac829665f5e5d013061a65b097a3be0a68bc623c43299f5f9b148b2a28113644aff267cd86036
+  data.tar.gz: c4bde01c49fe0182422071f8afa445b3da2af1d829b7d4f36df957eef059ddb097f4e248f232c5bebf06888e22327d7b44bb18f93cb2456965f9f03e8f031f32

data/README.md

@@ -50,7 +50,8 @@ upload content to https://gist.github.com/.
 
 ‌You can update existing gists with `-u`:
 
-    gist lib/gist.rb bin/gist -u 42f2c239d2eb57299408
+    gist -u GIST_ID FILE_NAME
+    gist -u 42f2c239d2eb57299408 test.txt
 
 ‌If you'd like to copy the resulting URL to your clipboard, use `-c`.
 
@@ -64,6 +65,16 @@ upload content to https://gist.github.com/.
 
     gist -o <a.rb
 
+‌To list (public gists or all gists for authed user) gists for user
+
+    gist -l : all gists for authed user
+    gist -l defunkt : list defunkt's public gists
+
+To read a gist and print it to STDOUT
+
+    gist -r GIST_ID
+    gist -r 374130
+
 ‌See `gist --help` for more detail.
 
 ## Login
@@ -77,27 +88,55 @@ an OAuth2 token (with the "gist" permission).
     GitHub username: ConradIrwin
     GitHub password:
     2-factor auth code:
-    Success! https://github.com/settings/applications
-
-You can read the 2-factor auth code from an sms or the authentification app,
-depending on how you [set your account up](https://github.com/settings/admin).
-
-Note: 2-factor authentication
-[just appeared recently](https://github.com/blog/1614-two-factor-authentication),
-so if you run into errors, update the gist gem.
-
-    gem update gist
+    Success! https://github.com/settings/tokens
 
 This token is stored in `~/.gist` and used for all future gisting. If you need to
-you can revoke it from https://github.com/settings/applications, or just delete the
-file.  If you need to store tokens for both github.com and a Github Enterprise instance 
-you can save your Github Enterprise token in `~/.gist.github.example.com` where 
-"github.example.com" is the URL for your Github Enterprise instance.
+you can revoke it from https://github.com/settings/tokens, or just delete the
+file. 
 
 ‌After you've done this, you can still upload gists anonymously with `-a`.
 
     gist -a a.rb
 
+#### Password-less login
+
+If you have a complicated authorization requirement you can manually create a
+token file by pasting a Github token with only the `gist` permission into a
+file called `~/.gist`. You can create one from https://github.com/settings/tokens
+
+This file should contain only the token (~40 hex characters), and to make it
+easier to edit, can optionally have a final newline (\n or \r\n).
+
+For example, one way to create this file would be to run:
+
+    echo MY_SECRET_TOKEN > ~/.gist
+
+### GitHub Enterprise
+
+If you'd like `gist` to use your locally installed [GitHub Enterprise](https://enterprise.github.com/),
+you need to export the `GITHUB_URL` environment variable (usually done in your `~/.bashrc`).
+
+    export GITHUB_URL=http://github.internal.example.com/
+
+Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist will
+automatically use github enterprise instead of the public github.com
+
+Your token for GitHub Enterprise will be stored in `.gist.<protocol>.<server.name>[.<port>]` (e.g.
+`~/.gist.http.github.internal.example.com` for the GITHUB_URL example above) instead of `~/.gist`.
+
+If you have multiple servers or use Enterprise and public GitHub often, you can work around this by creating scripts
+that set the env var and then run `gist`. Keep in mind that to use the public GitHub you must unset the env var. Just
+setting it to the public URL will not work. Use `unset GITHUB_URL`
+
+### Token file format
+
+If you cannot use passwords, as most Enterprise installations do, you can generate the token via the web interface
+and then simply save the string in the correct file. Avoid line breaks or you might see:
+```
+$ gist -l
+Error: Bad credentials
+```
+
 # Library
 
 ‌You can also use Gist as a library from inside your ruby code:
@@ -129,16 +168,6 @@ NOTE: The access_token must have the "gist" scope.
 ‌This will take them through the process of obtaining an OAuth2 token, and storing it
 in `~/.gist`, where it can later be read by `Gist.gist`
 
-## GitHub enterprise
-
-‌If you'd like `gist` to use your locally installed [GitHub Enterprise](https://enterprise.github.com/),
-you need to export the `GITHUB_URL` environment variable in your `~/.bashrc`.
-
-    export GITHUB_URL=http://github.internal.example.com/
-
-‌Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist will
-automatically use github enterprise instead of the public github.com
-
 ## Configuration
 
 ‌If you'd like `-o` or `-c` to be the default when you use the gist executable, add an

data/bin/gist

@@ -3,6 +3,10 @@
 # Silence Ctrl-C's
 trap('INT'){ exit 1 }
 
+if Signal.list.include? 'PIPE'
+  trap('PIPE', 'EXIT')
+end
+
 require 'optparse'
 require 'gist'
 
@@ -43,8 +47,13 @@ Instead of creating a new gist, 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.
 
-Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P] [-f NAME|-t EXT]* FILE*
+If you want to skip empty files, use the --skip-empty flag. If all files are
+empty no gist will be created.
+
+Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL]
+                          [--skip-empty] [-P] [-f NAME|-t EXT]* FILE*
        #{executable_name} --login
+       #{executable_name} [-l|-r]
 
   EOS
 
@@ -102,14 +111,30 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P]
 
   opts.on("--no-open")
 
+  opts.on("--skip-empty", "Skip gisting empty files") do
+    options[:skip_empty] = true
+  end
+
   opts.on("-P", "--paste", "Paste from the clipboard to gist") do
     options[:paste] = true
   end
 
-  opts.on("-R", "--raw", "Raw url of the new gist") do
+  opts.on("-R", "--raw", "Display raw URL of the new gist") do
     options[:raw] = true
   end
 
+  opts.on("-l", "--list [USER]", "List all gists for user") do |user|
+    options[:list] = user
+  end
+
+  opts.on("-r", "--read ID [FILENAME]", "Read a gist and print out the contents") do |id|
+    options[:read] = id
+  end
+
+  opts.on("--delete [ URL | ID ]", "Delete a gist") do |id|
+    options[:delete] = id
+  end
+
   opts.on_tail("-h","--help", "Show this message.") do
     puts opts
     exit
@@ -139,6 +164,26 @@ begin
 
   options[:public] = Gist.should_be_public?(options)
 
+  if options.key? :list
+    if options[:list]
+      Gist.list_all_gists(options[:list])
+    else
+      Gist.list_all_gists
+    end
+    exit
+  end
+
+  if options.key? :read
+    file_name = ARGV.first
+    Gist.read_gist(options[:read], file_name)
+    exit
+  end
+
+  if options.key? :delete
+    Gist.delete_gist(options[:delete])
+    exit
+  end
+
   if options[:paste]
     puts Gist.gist(Gist.paste, options)
   else
@@ -158,8 +203,10 @@ begin
         end
     end
 
-    puts Gist.multi_gist(files, options)
+    output = Gist.multi_gist(files, options)
+    puts output if output
   end
+
 rescue Gist::Error => e
   puts "Error: #{e.message}"
   exit 1

data/build/gist

@@ -1318,18 +1318,18 @@ end
 module Gist
   extend self
 
-  VERSION = '4.2.1'
+  VERSION = '4.6.2'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
-    'xclip'   => 'xclip -o',
-    'xsel -i'    => 'xsel -o',
     'pbcopy'  => 'pbpaste',
-    'putclip' => 'getclip'
+    'xclip'   => 'xclip -o',
+    'xsel -i' => 'xsel -o',
+    'putclip' => 'getclip',
   }
 
   GITHUB_API_URL   = URI("https://api.github.com/")
-  GIT_IO_URL       = URI("http://git.io")
+  GIT_IO_URL       = URI("https://git.io")
 
   GITHUB_BASE_PATH = ""
   GHE_BASE_PATH    = "/api/v3"
@@ -1346,6 +1346,34 @@ module Gist
   end
   class ClipboardError < RuntimeError; include Error end
 
+  # helper module for authentication token actions
+  module AuthTokenFile
+    def self.filename
+      if ENV.key?(URL_ENV_NAME)
+        File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/:/, '.').gsub(/[^a-z0-9.]/, '')}"
+      else
+        File.expand_path "~/.gist"
+      end
+    end
+
+    def self.read
+      File.read(filename).chomp
+    end
+
+    def self.write(token)
+      File.open(filename, 'w', 0600) do |f|
+        f.write token
+      end
+    end
+  end
+
+  # auth token for authentication
+  #
+  # @return [String] string value of access token or `nil`, if not found
+  def auth_token
+    @token ||= AuthTokenFile.read rescue nil
+  end
+
   # Upload a gist to https://gist.github.com
   #
   # @param [String] content  the code you'd like to gist
@@ -1354,10 +1382,14 @@ module Gist
   #
   # @see http://developer.github.com/v3/gists/
   def gist(content, options = {})
-    filename = options[:filename] || "a.rb"
+    filename = options[:filename] || default_filename
     multi_gist({filename => content}, options)
   end
 
+  def default_filename
+    "gistfile1.txt"
+  end
+
   # Upload a gist to https://gist.github.com
   #
   # @param [Hash] files  the code you'd like to gist: filename => content
@@ -1370,6 +1402,7 @@ module Gist
   # @option options [String] :update  the URL or id of a gist to update
   # @option options [Boolean] :copy  (false) Copy resulting URL to clipboard, if successful.
   # @option options [Boolean] :open  (false) Open the resulting URL in a browser.
+  # @option options [Boolean] :skip_empty (false) Skip gisting empty files.
   # @option options [Symbol] :output (:all) The type of return value you'd like:
   #   :html_url gives a String containing the url to the gist in a browser
   #   :short_url gives a String contianing a  git.io url that redirects to html_url
@@ -1388,15 +1421,21 @@ module Gist
     json[:files] = {}
 
     files.each_pair do |(name, content)|
-      raise "Cannot gist empty files" if content.to_s.strip == ""
-      json[:files][File.basename(name)] = {:content => content}
+      if content.to_s.strip == ""
+        raise "Cannot gist empty files" unless options[:skip_empty]
+      else
+        name = name == "-" ? default_filename : File.basename(name)
+        json[:files][name] = {:content => content}
+      end
     end
 
+    return if json[:files].empty? && options[:skip_empty]
+
     existing_gist = options[:update].to_s.split("/").last
     if options[:anonymous]
       access_token = nil
     else
-      access_token = (options[:access_token] || File.read(auth_token_file) rescue nil)
+      access_token = (options[:access_token] || auth_token())
     end
 
     url = "#{base_path}/gists"
@@ -1426,15 +1465,154 @@ module Gist
     raise e.extend Error
   end
 
+  # List all gists(private also) for authenticated user
+  # otherwise list public gists for given username (optional argument)
+  #
+  # @param [String] user
+  # @deprecated
+  #
+  # see https://developer.github.com/v3/gists/#list-gists
+  def list_gists(user = "")
+    url = "#{base_path}"
+
+    if user == ""
+      access_token = auth_token()
+      if access_token.to_s != ''
+        url << "/gists?access_token=" << CGI.escape(access_token)
+
+        request = Net::HTTP::Get.new(url)
+        response = http(api_url, request)
+
+        pretty_gist(response)
+
+      else
+        raise Error, "Not authenticated. Use 'gist --login' to login or 'gist -l username' to view public gists."
+      end
+
+    else
+      url << "/users/#{user}/gists"
+
+      request = Net::HTTP::Get.new(url)
+      response = http(api_url, request)
+
+      pretty_gist(response)
+    end
+  end
+
+  def list_all_gists(user = "")
+    url = "#{base_path}"
+
+    if user == ""
+      access_token = auth_token()
+      if access_token.to_s != ''
+        url << "/gists?per_page=100&access_token=" << CGI.escape(access_token)
+        get_gist_pages(url)
+      else
+        raise Error, "Not authenticated. Use 'gist --login' to login or 'gist -l username' to view public gists."
+      end
+
+    else
+      url << "/users/#{user}/gists?per_page=100"
+      get_gist_pages(url)
+    end
+
+  end
+
+  def read_gist(id, file_name=nil)
+    url = "#{base_path}/gists/#{id}"
+
+    access_token = auth_token()
+    if access_token.to_s != ''
+      url << "?access_token=" << CGI.escape(access_token)
+    end
+
+    request = Net::HTTP::Get.new(url)
+    response = http(api_url, request)
+
+    if response.code == '200'
+      body = JSON.parse(response.body)
+      files = body["files"]
+
+      if file_name
+        file = files[file_name]
+        raise Error, "Gist with id of #{id} and file #{file_name} does not exist." unless file
+      else
+        file = files.values.first
+      end
+
+      puts file["content"]
+    else
+      raise Error, "Gist with id of #{id} does not exist."
+    end
+  end
+
+  def delete_gist(id)
+    id = id.split("/").last
+    url = "#{base_path}/gists/#{id}"
+
+    access_token = auth_token()
+    if access_token.to_s != ''
+      url << "?access_token=" << CGI.escape(access_token)
+
+      request = Net::HTTP::Delete.new(url)
+      response = http(api_url, request)
+    else
+      raise Error, "Not authenticated. Use 'gist --login' to login."
+    end
+
+    if response.code == '204'
+      puts "Deleted!"
+    else
+      raise Error, "Gist with id of #{id} does not exist."
+    end
+  end
+
+  def get_gist_pages(url)
+
+    request = Net::HTTP::Get.new(url)
+    response = http(api_url, request)
+    pretty_gist(response)
+
+    link_header = response.header['link']
+
+    if link_header
+      links = Hash[ link_header.gsub(/(<|>|")/, "").split(',').map { |link| link.split('; rel=') } ].invert
+      get_gist_pages(links['next']) if links['next']
+    end
+
+  end
+
+  # return prettified string result of response body for all gists
+  #
+  # @params [Net::HTTPResponse] response
+  # @return [String] prettified result of listing all gists
+  #
+  # see https://developer.github.com/v3/gists/#response
+  def pretty_gist(response)
+    body = JSON.parse(response.body)
+    if response.code == '200'
+      body.each do |gist|
+        description = "#{gist['description'] || gist['files'].keys.join(" ")} #{gist['public'] ? '' : '(secret)'}"
+        puts "#{gist['html_url']} #{description.tr("\n", " ")}\n"
+        $stdout.flush
+      end
+
+    else
+      raise Error, body['message']
+    end
+  end
+
   # Convert long github urls into short git.io ones
   #
   # @param [String] url
   # @return [String] shortened url, or long url if shortening fails
   def shorten(url)
-    request = Net::HTTP::Post.new("/")
+    request = Net::HTTP::Post.new("/create")
     request.set_form_data(:url => url)
     response = http(GIT_IO_URL, request)
     case response.code
+    when "200"
+      URI.join(GIT_IO_URL, response.body).to_s
     when "201"
       response['Location']
     else
@@ -1506,10 +1684,8 @@ module Gist
       end
 
       if Net::HTTPCreated === response
-        File.open(auth_token_file, 'w', 0600) do |f|
-          f.write JSON.parse(response.body)['token']
-        end
-        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
+        AuthTokenFile.write JSON.parse(response.body)['token']
+        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/tokens"
         return
       elsif Net::HTTPUnauthorized === response
         puts "Error: #{JSON.parse(response.body)['message']}"
@@ -1689,14 +1865,6 @@ Could not find copy command, tried:
     ENV.key?(URL_ENV_NAME) ? URI(ENV[URL_ENV_NAME]) : GITHUB_API_URL
   end
 
-  def auth_token_file
-    if ENV.key?(URL_ENV_NAME)
-      File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/[^a-z.]/, '')}"
-    else
-      File.expand_path "~/.gist"
-    end
-  end
-
   def legacy_private_gister?
     return unless which('git')
     `git config --global gist.private` =~ /\Ayes|1|true|on\z/i
@@ -1715,6 +1883,10 @@ end
 # Silence Ctrl-C's
 trap('INT'){ exit 1 }
 
+if Signal.list.include? 'PIPE'
+  trap('PIPE', 'EXIT')
+end
+
 require 'optparse'
 
 # For the holdings of options.
@@ -1754,8 +1926,13 @@ Instead of creating a new gist, 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.
 
-Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P] [-f NAME|-t EXT]* FILE*
+If you want to skip empty files, use the --skip-empty flag. If all files are
+empty no gist will be created.
+
+Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL]
+                          [--skip-empty] [-P] [-f NAME|-t EXT]* FILE*
        #{executable_name} --login
+       #{executable_name} [-l|-r]
 
   EOS
 
@@ -1813,14 +1990,30 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P]
 
   opts.on("--no-open")
 
+  opts.on("--skip-empty", "Skip gisting empty files") do
+    options[:skip_empty] = true
+  end
+
   opts.on("-P", "--paste", "Paste from the clipboard to gist") do
     options[:paste] = true
   end
 
-  opts.on("-R", "--raw", "Raw url of the new gist") do
+  opts.on("-R", "--raw", "Display raw URL of the new gist") do
     options[:raw] = true
   end
 
+  opts.on("-l", "--list [USER]", "List all gists for user") do |user|
+    options[:list] = user
+  end
+
+  opts.on("-r", "--read ID [FILENAME]", "Read a gist and print out the contents") do |id|
+    options[:read] = id
+  end
+
+  opts.on("--delete [ URL | ID ]", "Delete a gist") do |id|
+    options[:delete] = id
+  end
+
   opts.on_tail("-h","--help", "Show this message.") do
     puts opts
     exit
@@ -1850,6 +2043,26 @@ begin
 
   options[:public] = Gist.should_be_public?(options)
 
+  if options.key? :list
+    if options[:list]
+      Gist.list_all_gists(options[:list])
+    else
+      Gist.list_all_gists
+    end
+    exit
+  end
+
+  if options.key? :read
+    file_name = ARGV.first
+    Gist.read_gist(options[:read], file_name)
+    exit
+  end
+
+  if options.key? :delete
+    Gist.delete_gist(options[:delete])
+    exit
+  end
+
   if options[:paste]
     puts Gist.gist(Gist.paste, options)
   else
@@ -1869,8 +2082,10 @@ begin
         end
     end
 
-    puts Gist.multi_gist(files, options)
+    output = Gist.multi_gist(files, options)
+    puts output if output
   end
+
 rescue Gist::Error => e
   puts "Error: #{e.message}"
   exit 1

data/build/gist.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIST" "1" "February 2014" "" "Gist manual"
+.TH "GIST" "1" "January 2018" "" "Gist manual"
 .
 .SH "NAME"
 \fBgist\fR \- upload code to https://gist\.github\.com
@@ -73,7 +73,7 @@ gist \-d "Random rbx bug" a\.rb
 You can update existing gists with \fB\-u\fR:
 .
 .IP
-gist lib/gist\.rb bin/gist \-u 42f2c239d2eb57299408
+gist \-u GIST_ID FILE_NAME gist \-u 42f2c239d2eb57299408 test\.txt
 .
 .IP "\(bu" 4
 If you\'d like to copy the resulting URL to your clipboard, use \fB\-c\fR\.
@@ -94,6 +94,28 @@ And you can just ask gist to open a browser window directly with \fB\-o\fR\.
 gist \-o <a\.rb
 .
 .IP "\(bu" 4
+To list (public gists or all gists for authed user) gists for user
+.
+.IP
+gist \-l : all gists for authed user gist \-l defunkt : list defunkt\'s public gists
+.
+.IP "" 0
+.
+.P
+To read a gist and print it to STDOUT
+.
+.IP "" 4
+.
+.nf
+
+gist \-r GIST_ID
+gist \-r 374130
+.
+.fi
+.
+.IP "" 0
+.
+.IP "\(bu" 4
 See \fBgist \-\-help\fR for more detail\.
 .
 .IP "" 0
@@ -110,39 +132,67 @@ Obtaining OAuth2 access_token from github\.
 GitHub username: ConradIrwin
 GitHub password:
 2\-factor auth code:
-Success! https://github\.com/settings/applications
+Success! https://github\.com/settings/tokens
 .
 .fi
 .
 .IP "" 0
 .
 .P
-You can read the 2\-factor auth code from an sms or the authentification app, depending on how you set your account up \fIhttps://github\.com/settings/admin\fR\.
+This token is stored in \fB~/\.gist\fR and used for all future gisting\. If you need to you can revoke it from https://github\.com/settings/tokens, or just delete the file\.
+.
+.IP "\(bu" 4
+After you\'ve done this, you can still upload gists anonymously with \fB\-a\fR\.
+.
+.IP
+gist \-a a\.rb
+.
+.IP "" 0
+.
+.P
+If you have a complicated authorization requirement you can manually create a token file by pasting a Github token with only the \fBgist\fR permission into a file called \fB~/\.gist\fR\. You can create one from https://github\.com/settings/tokens
 .
 .P
-Note: 2\-factor authentication just appeared recently \fIhttps://github\.com/blog/1614\-two\-factor\-authentication\fR, so if you run into errors, update the gist gem\.
+This file should contain only the token (~40 hex characters), and to make it easier to edit, can optionally have a final newline (\en or \er\en)\.
+.
+.P
+For example, one way to create this file would be to run:
 .
 .IP "" 4
 .
 .nf
 
-gem update gist
+echo MY_SECRET_TOKEN > ~/\.gist
 .
 .fi
 .
 .IP "" 0
 .
-.P
-This token is stored in \fB~/\.gist\fR and used for all future gisting\. If you need to you can revoke it from https://github\.com/settings/applications, or just delete the file\. If you need to store tokens for both github\.com and a Github Enterprise instance you can save your Github Enterprise token in \fB~/\.gist\.github\.example\.com\fR where "github\.example\.com" is the URL for your Github Enterprise instance\.
+.SS "GitHub Enterprise"
+If you\'d like \fBgist\fR to use your locally installed GitHub Enterprise \fIhttps://enterprise\.github\.com/\fR, you need to export the \fBGITHUB_URL\fR environment variable (usually done in your \fB~/\.bashrc\fR)\.
 .
-.IP "\(bu" 4
-After you\'ve done this, you can still upload gists anonymously with \fB\-a\fR\.
+.IP "" 4
 .
-.IP
-gist \-a a\.rb
+.nf
+
+export GITHUB_URL=http://github\.internal\.example\.com/
+.
+.fi
 .
 .IP "" 0
 .
+.P
+Once you\'ve done this and restarted your terminal (or run \fBsource ~/\.bashrc\fR), gist will automatically use github enterprise instead of the public github\.com
+.
+.P
+Your token for GitHub Enterprise will be stored in \fB\.gist\.<protocol>\.<server\.name>[\.<port>]\fR (e\.g\. \fB~/\.gist\.http\.github\.internal\.example\.com\fR for the GITHUB_URL example above) instead of \fB~/\.gist\fR\.
+.
+.P
+If you have multiple servers or use Enterprise and public GitHub often, you can work around this by creating scripts that set the env var and then run \fBgist\fR\. Keep in mind that to use the public GitHub you must unset the env var\. Just setting it to the public URL will not work\. Use \fBunset GITHUB_URL\fR
+.
+.SS "Token file format"
+If you cannot use passwords, as most Enterprise installations do, you can generate the token via the web interface and then simply save the string in the correct file\. Avoid line breaks or you might see: \fB$ gist \-l Error: Bad credentials\fR
+.
 .TP
 You can also use Gist as a library from inside your ruby code:
 .
@@ -198,19 +248,6 @@ This will take them through the process of obtaining an OAuth2 token, and storin
 .
 .IP "" 0
 .
-.SH "GitHub enterprise"
-.
-.IP "\(bu" 4
-If you\'d like \fBgist\fR to use your locally installed GitHub Enterprise \fIhttps://enterprise\.github\.com/\fR, you need to export the \fBGITHUB_URL\fR environment variable in your \fB~/\.bashrc\fR\.
-.
-.IP
-export GITHUB_URL=http://github\.internal\.example\.com/
-.
-.IP "\(bu" 4
-Once you\'ve done this and restarted your terminal (or run \fBsource ~/\.bashrc\fR), gist will automatically use github enterprise instead of the public github\.com
-.
-.IP "" 0
-.
 .SH "Configuration"
 .
 .IP "\(bu" 4

data/gist.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
 
   s.executables << 'gist'
 
-  %w(rake rspec webmock ronn).each do |gem|
-    s.add_development_dependency gem
-  end
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'ronn'
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'rspec', '>3'
 end

data/lib/gist.rb

@@ -12,18 +12,18 @@ end
 module Gist
   extend self
 
-  VERSION = '4.2.1'
+  VERSION = '4.6.2'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
-    'xclip'   => 'xclip -o',
-    'xsel -i'    => 'xsel -o',
     'pbcopy'  => 'pbpaste',
-    'putclip' => 'getclip'
+    'xclip'   => 'xclip -o',
+    'xsel -i' => 'xsel -o',
+    'putclip' => 'getclip',
   }
 
   GITHUB_API_URL   = URI("https://api.github.com/")
-  GIT_IO_URL       = URI("http://git.io")
+  GIT_IO_URL       = URI("https://git.io")
 
   GITHUB_BASE_PATH = ""
   GHE_BASE_PATH    = "/api/v3"
@@ -40,6 +40,34 @@ module Gist
   end
   class ClipboardError < RuntimeError; include Error end
 
+  # helper module for authentication token actions
+  module AuthTokenFile
+    def self.filename
+      if ENV.key?(URL_ENV_NAME)
+        File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/:/, '.').gsub(/[^a-z0-9.]/, '')}"
+      else
+        File.expand_path "~/.gist"
+      end
+    end
+
+    def self.read
+      File.read(filename).chomp
+    end
+
+    def self.write(token)
+      File.open(filename, 'w', 0600) do |f|
+        f.write token
+      end
+    end
+  end
+
+  # auth token for authentication
+  #
+  # @return [String] string value of access token or `nil`, if not found
+  def auth_token
+    @token ||= AuthTokenFile.read rescue nil
+  end
+
   # Upload a gist to https://gist.github.com
   #
   # @param [String] content  the code you'd like to gist
@@ -48,10 +76,14 @@ module Gist
   #
   # @see http://developer.github.com/v3/gists/
   def gist(content, options = {})
-    filename = options[:filename] || "a.rb"
+    filename = options[:filename] || default_filename
     multi_gist({filename => content}, options)
   end
 
+  def default_filename
+    "gistfile1.txt"
+  end
+
   # Upload a gist to https://gist.github.com
   #
   # @param [Hash] files  the code you'd like to gist: filename => content
@@ -64,6 +96,7 @@ module Gist
   # @option options [String] :update  the URL or id of a gist to update
   # @option options [Boolean] :copy  (false) Copy resulting URL to clipboard, if successful.
   # @option options [Boolean] :open  (false) Open the resulting URL in a browser.
+  # @option options [Boolean] :skip_empty (false) Skip gisting empty files.
   # @option options [Symbol] :output (:all) The type of return value you'd like:
   #   :html_url gives a String containing the url to the gist in a browser
   #   :short_url gives a String contianing a  git.io url that redirects to html_url
@@ -82,15 +115,21 @@ module Gist
     json[:files] = {}
 
     files.each_pair do |(name, content)|
-      raise "Cannot gist empty files" if content.to_s.strip == ""
-      json[:files][File.basename(name)] = {:content => content}
+      if content.to_s.strip == ""
+        raise "Cannot gist empty files" unless options[:skip_empty]
+      else
+        name = name == "-" ? default_filename : File.basename(name)
+        json[:files][name] = {:content => content}
+      end
     end
 
+    return if json[:files].empty? && options[:skip_empty]
+
     existing_gist = options[:update].to_s.split("/").last
     if options[:anonymous]
       access_token = nil
     else
-      access_token = (options[:access_token] || File.read(auth_token_file) rescue nil)
+      access_token = (options[:access_token] || auth_token())
     end
 
     url = "#{base_path}/gists"
@@ -120,15 +159,154 @@ module Gist
     raise e.extend Error
   end
 
+  # List all gists(private also) for authenticated user
+  # otherwise list public gists for given username (optional argument)
+  #
+  # @param [String] user
+  # @deprecated
+  #
+  # see https://developer.github.com/v3/gists/#list-gists
+  def list_gists(user = "")
+    url = "#{base_path}"
+
+    if user == ""
+      access_token = auth_token()
+      if access_token.to_s != ''
+        url << "/gists?access_token=" << CGI.escape(access_token)
+
+        request = Net::HTTP::Get.new(url)
+        response = http(api_url, request)
+
+        pretty_gist(response)
+
+      else
+        raise Error, "Not authenticated. Use 'gist --login' to login or 'gist -l username' to view public gists."
+      end
+
+    else
+      url << "/users/#{user}/gists"
+
+      request = Net::HTTP::Get.new(url)
+      response = http(api_url, request)
+
+      pretty_gist(response)
+    end
+  end
+
+  def list_all_gists(user = "")
+    url = "#{base_path}"
+
+    if user == ""
+      access_token = auth_token()
+      if access_token.to_s != ''
+        url << "/gists?per_page=100&access_token=" << CGI.escape(access_token)
+        get_gist_pages(url)
+      else
+        raise Error, "Not authenticated. Use 'gist --login' to login or 'gist -l username' to view public gists."
+      end
+
+    else
+      url << "/users/#{user}/gists?per_page=100"
+      get_gist_pages(url)
+    end
+
+  end
+
+  def read_gist(id, file_name=nil)
+    url = "#{base_path}/gists/#{id}"
+
+    access_token = auth_token()
+    if access_token.to_s != ''
+      url << "?access_token=" << CGI.escape(access_token)
+    end
+
+    request = Net::HTTP::Get.new(url)
+    response = http(api_url, request)
+
+    if response.code == '200'
+      body = JSON.parse(response.body)
+      files = body["files"]
+
+      if file_name
+        file = files[file_name]
+        raise Error, "Gist with id of #{id} and file #{file_name} does not exist." unless file
+      else
+        file = files.values.first
+      end
+
+      puts file["content"]
+    else
+      raise Error, "Gist with id of #{id} does not exist."
+    end
+  end
+
+  def delete_gist(id)
+    id = id.split("/").last
+    url = "#{base_path}/gists/#{id}"
+
+    access_token = auth_token()
+    if access_token.to_s != ''
+      url << "?access_token=" << CGI.escape(access_token)
+
+      request = Net::HTTP::Delete.new(url)
+      response = http(api_url, request)
+    else
+      raise Error, "Not authenticated. Use 'gist --login' to login."
+    end
+
+    if response.code == '204'
+      puts "Deleted!"
+    else
+      raise Error, "Gist with id of #{id} does not exist."
+    end
+  end
+
+  def get_gist_pages(url)
+
+    request = Net::HTTP::Get.new(url)
+    response = http(api_url, request)
+    pretty_gist(response)
+
+    link_header = response.header['link']
+
+    if link_header
+      links = Hash[ link_header.gsub(/(<|>|")/, "").split(',').map { |link| link.split('; rel=') } ].invert
+      get_gist_pages(links['next']) if links['next']
+    end
+
+  end
+
+  # return prettified string result of response body for all gists
+  #
+  # @params [Net::HTTPResponse] response
+  # @return [String] prettified result of listing all gists
+  #
+  # see https://developer.github.com/v3/gists/#response
+  def pretty_gist(response)
+    body = JSON.parse(response.body)
+    if response.code == '200'
+      body.each do |gist|
+        description = "#{gist['description'] || gist['files'].keys.join(" ")} #{gist['public'] ? '' : '(secret)'}"
+        puts "#{gist['html_url']} #{description.tr("\n", " ")}\n"
+        $stdout.flush
+      end
+
+    else
+      raise Error, body['message']
+    end
+  end
+
   # Convert long github urls into short git.io ones
   #
   # @param [String] url
   # @return [String] shortened url, or long url if shortening fails
   def shorten(url)
-    request = Net::HTTP::Post.new("/")
+    request = Net::HTTP::Post.new("/create")
     request.set_form_data(:url => url)
     response = http(GIT_IO_URL, request)
     case response.code
+    when "200"
+      URI.join(GIT_IO_URL, response.body).to_s
     when "201"
       response['Location']
     else
@@ -200,10 +378,8 @@ module Gist
       end
 
       if Net::HTTPCreated === response
-        File.open(auth_token_file, 'w', 0600) do |f|
-          f.write JSON.parse(response.body)['token']
-        end
-        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
+        AuthTokenFile.write JSON.parse(response.body)['token']
+        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/tokens"
         return
       elsif Net::HTTPUnauthorized === response
         puts "Error: #{JSON.parse(response.body)['message']}"
@@ -383,14 +559,6 @@ Could not find copy command, tried:
     ENV.key?(URL_ENV_NAME) ? URI(ENV[URL_ENV_NAME]) : GITHUB_API_URL
   end
 
-  def auth_token_file
-    if ENV.key?(URL_ENV_NAME)
-      File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/[^a-z.]/, '')}"
-    else
-      File.expand_path "~/.gist"
-    end
-  end
-
   def legacy_private_gister?
     return unless which('git')
     `git config --global gist.private` =~ /\Ayes|1|true|on\z/i

data/spec/auth_token_file_spec.rb

@@ -0,0 +1,61 @@
+describe Gist::AuthTokenFile do
+  subject { Gist::AuthTokenFile }
+
+  before(:each) do
+    stub_const("Gist::URL_ENV_NAME", "STUBBED_GITHUB_URL")
+  end
+
+  describe "::filename" do
+    let(:filename) { double() }
+
+    context "with default GITHUB_URL" do
+      it "is ~/.gist" do
+        File.should_receive(:expand_path).with("~/.gist").and_return(filename)
+        subject.filename.should be filename
+      end
+    end
+
+    context "with custom GITHUB_URL" do
+      before do
+        ENV[Gist::URL_ENV_NAME] = github_url
+      end
+      let(:github_url) { "http://gh.custom.org:442/" }
+
+      it "is ~/.gist.{custom_github_url}" do
+        File.should_receive(:expand_path).with("~/.gist.http.gh.custom.org.442").and_return(filename)
+        subject.filename.should be filename
+      end
+    end
+
+  end
+
+  describe "::read" do
+    let(:token) { "auth_token" }
+
+    it "reads file contents" do
+      File.should_receive(:read).and_return(token)
+      subject.read.should eq token
+    end
+
+    it "chomps file contents" do
+      File.should_receive(:read).and_return(token + "\n")
+      subject.read.should eq token
+    end
+  end
+
+  describe "::write" do
+    let(:token) { double() }
+    let(:filename) { double() }
+    let(:token_file) { double() }
+
+    before do
+      subject.stub(:filename) { filename }
+    end
+
+    it "writes token to file" do
+      File.should_receive(:open).with(filename, 'w', 0600).and_yield(token_file)
+      token_file.should_receive(:write).with(token)
+      subject.write(token)
+    end
+  end
+end

data/spec/ghe_spec.rb

@@ -63,7 +63,7 @@ describe '...' do
 
       it "uses them" do
         $stdin = StringIO.new "#{MOCK_USER}_wrong\n#{MOCK_PASSWORD}_wrong\n"
-        Gist.login! username: MOCK_USER, password: MOCK_PASSWORD
+        Gist.login! :username => MOCK_USER, :password => MOCK_PASSWORD
 
         assert_requested(:post, /#{MOCK_AUTHZ_GITHUB_URL}authorizations/)
       end

data/spec/gist_spec.rb

@@ -2,21 +2,21 @@ describe Gist do
 
   describe "should_be_public?" do
     it "should return false if -p is specified" do
-      Gist.should_be_public?(private: true).should be_false
+      Gist.should_be_public?(:private => true).should be_falsy
     end
 
     it "should return false if legacy_private_gister?" do
       Gist.should_receive(:legacy_private_gister?).and_return(true)
-      Gist.should_be_public?.should be_false
+      Gist.should_be_public?.should be_falsy
     end
 
     it "should return true if --no-private is specified" do
       Gist.stub(:legacy_private_gister?).and_return(true)
-      Gist.should_be_public?(private: false).should be_true
+      Gist.should_be_public?(:private => false).should be_truthy
     end
 
     it "should return true by default" do
-      Gist.should_be_public?.should be_true
+      Gist.should_be_public?.should be_truthy
     end
   end
 

data/spec/shorten_spec.rb

@@ -1,11 +1,15 @@
 describe '...' do
   before do
     stub_request(:post, /api\.github.com\/gists/).to_return(:body => '{"html_url": "http://github.com/"}')
-    stub_request(:post, "http://git.io/").to_return(:status => 201, :headers => { 'Location' => 'http://git.io/XXXXXX' })
   end
 
-  it "should return a shortened version of the URL" do
-    Gist.gist("Test gist", :output => :short_url, :anonymous => true).should == "http://git.io/XXXXXX"
+  it "should return a shortened version of the URL when response is 200" do
+    stub_request(:post, "https://git.io/create").to_return(:status => 200, :body => 'XXXXXX')
+    Gist.gist("Test gist", :output => :short_url, :anonymous => true).should == "https://git.io/XXXXXX"
   end
-end
 
+  it "should return a shortened version of the URL when response is 201" do
+    stub_request(:post, "https://git.io/create").to_return(:status => 201, :headers => { 'Location' => 'https://git.io/XXXXXX' })
+    Gist.gist("Test gist", :output => :short_url, :anonymous => true).should == "https://git.io/XXXXXX"
+  end
+end

data/spec/spec_helper.rb

@@ -5,11 +5,15 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :should
+  end
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :should
+  end
 end
 
 require 'webmock/rspec'
-require_relative '../lib/gist'
-
+require 'gist'

metadata

@@ -1,72 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: gist
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Conrad Irwin
-- ☈king
+- "☈king"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ronn
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Provides a single function (Gist.gist) that uploads a gist.
 email:
 - conrad.irwin@gmail.com
@@ -76,8 +76,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.MIT
 - README.md
@@ -87,6 +87,7 @@ files:
 - build/gist.1
 - gist.gemspec
 - lib/gist.rb
+- spec/auth_token_file_spec.rb
 - spec/clipboard_spec.rb
 - spec/ghe_spec.rb
 - spec/gist_spec.rb
@@ -105,19 +106,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Just allows you to upload gists
 test_files: []
-has_rdoc: