gist 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 687ff483f835c421449de703f4b33a8ec8341ed7
-  data.tar.gz: f5f46207b5e3cf3aa7d05253eb7f0f946e5429b3
+  metadata.gz: 306aea3698bda142b6130a3160a10c7cfc816142
+  data.tar.gz: b5cc50975bfa626326ac4c865f2d1849d3b95d50
 SHA512:
-  metadata.gz: 903fd99ebdfc68873b338965fc03cc2f7bb1aa08acf22d6f16c8c12aeb736df1fec1d798419f1a734b2b26177869514f4c7125610419d66347f3e8338a1afdcc
-  data.tar.gz: 8261a612326028a57aad653ba0889f004c20d6183658f4068736fdfa6f30466cac978912fe96e443b20a1ca99b8e9aeb3e9693913234650934006a9c0e2012f5
+  metadata.gz: 4f65b5b05ce628788db1fc1324191fa51c56f39827474efb44c0cbcef690001a89be5626b490a0111989ccea4a882fcb2e1d360cc75742d58fb2846e285a2129
+  data.tar.gz: 339e1387cb0f267a8a49e37963fc01fc353d6e77c7e1546ad029234c21672580ffac2ce0366e9443d22a020b9f92e5f4ac7c9cb30decc18ac3bb5ff5436fe3d6

data/README.md

@@ -70,6 +70,11 @@ upload content to https://gist.github.com/.
     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
@@ -83,18 +88,42 @@ an OAuth2 token (with the "gist" permission).
     GitHub username: ConradIrwin
     GitHub password:
     2-factor auth code:
-    Success! https://github.com/settings/applications
+    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
 
+### 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:
@@ -126,16 +155,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/Rakefile

@@ -23,7 +23,9 @@ task :standalone do
     f.puts "#!/usr/bin/env ruby"
     f.puts "# This is generated from https://github.com/defunkt/gist using 'rake standalone'"
     f.puts "# any changes will be overwritten."
-    f.puts File.read("lib/gist.rb").split("require 'json'\n").join(File.read("vendor/json.rb"))
+    f.puts File.read("lib/gist.rb")
+        .split("require 'json'\n").join(File.read("vendor/json.rb"))
+        .split("require 'netrc'\n").join(File.read("vendor/netrc.rb"))
 
     f.puts File.read("bin/gist").gsub(/^require.*gist.*\n/, '');
   end

data/bin/gist

@@ -123,6 +123,10 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P]
     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
@@ -167,6 +171,11 @@ begin
     exit
   end
 
+  if options.key? :delete
+    Gist.delete_gist(options[:delete])
+    exit
+  end
+
   if options[:paste]
     puts Gist.gist(Gist.paste, options)
   else

data/build/gist

@@ -1314,22 +1314,313 @@ rescue LoadError
   require File.join File.dirname(File.dirname(__FILE__)), 'vendor', 'json.rb'
 end
 
+begin
+  
+# The netrc library (https://github.com/heroku/netrc) is reproduced below, along
+# with its copyright and license:
+# - https://raw.githubusercontent.com/heroku/netrc/262ef111/LICENSE.md
+# - https://raw.githubusercontent.com/heroku/netrc/262ef111/lib/netrc.rb
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2011-2014 [CONTRIBUTORS.md](https://github.com/geemus/netrc/blob/master/CONTRIBUTORS.md)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'rbconfig'
+require 'io/console'
+
+class Netrc
+  VERSION = "0.11.0"
+
+  # see http://stackoverflow.com/questions/4871309/what-is-the-correct-way-to-detect-if-ruby-is-running-on-windows
+  WINDOWS = RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
+  CYGWIN  = RbConfig::CONFIG["host_os"] =~ /cygwin/
+
+  def self.default_path
+    File.join(ENV['NETRC'] || home_path, netrc_filename)
+  end
+
+  def self.home_path
+    home = Dir.respond_to?(:home) ? Dir.home : ENV['HOME']
+
+    if WINDOWS && !CYGWIN
+      home ||= File.join(ENV['HOMEDRIVE'], ENV['HOMEPATH']) if ENV['HOMEDRIVE'] && ENV['HOMEPATH']
+      home ||= ENV['USERPROFILE']
+      # XXX: old stuff; most likely unnecessary
+      home = home.tr("\\", "/") unless home.nil?
+    end
+
+    (home && File.readable?(home)) ? home : Dir.pwd
+  rescue ArgumentError
+    return Dir.pwd
+  end
+
+  def self.netrc_filename
+    WINDOWS && !CYGWIN ? "_netrc" : ".netrc"
+  end
+
+  def self.config
+    @config ||= {}
+  end
+
+  def self.configure
+    yield(self.config) if block_given?
+    self.config
+  end
+
+  def self.check_permissions(path)
+    perm = File.stat(path).mode & 0777
+    if perm != 0600 && !(WINDOWS) && !(Netrc.config[:allow_permissive_netrc_file])
+      raise Error, "Permission bits for '#{path}' should be 0600, but are "+perm.to_s(8)
+    end
+  end
+
+  # Reads path and parses it as a .netrc file. If path doesn't
+  # exist, returns an empty object. Decrypt paths ending in .gpg.
+  def self.read(path=default_path)
+    check_permissions(path)
+    data = if path =~ /\.gpg$/
+      decrypted = if ENV['GPG_AGENT_INFO']
+        `gpg --batch --quiet --decrypt #{path}`
+      else
+         print "Enter passphrase for #{path}: "
+         STDIN.noecho do
+           `gpg --batch --passphrase-fd 0 --quiet --decrypt #{path}`
+         end
+      end
+      if $?.success?
+        decrypted
+      else
+        raise Error.new("Decrypting #{path} failed.") unless $?.success?
+      end
+    else
+      File.read(path)
+    end
+    new(path, parse(lex(data.lines.to_a)))
+  rescue Errno::ENOENT
+    new(path, parse(lex([])))
+  end
+
+  class TokenArray < Array
+    def take
+      if length < 1
+        raise Error, "unexpected EOF"
+      end
+      shift
+    end
+
+    def readto
+      l = []
+      while length > 0 && ! yield(self[0])
+        l << shift
+      end
+      return l.join
+    end
+  end
+
+  def self.lex(lines)
+    tokens = TokenArray.new
+    for line in lines
+      content, comment = line.split(/(\s*#.*)/m)
+      content.each_char do |char|
+        case char
+        when /\s/
+          if tokens.last && tokens.last[-1..-1] =~ /\s/
+            tokens.last << char
+          else
+            tokens << char
+          end
+        else
+          if tokens.last && tokens.last[-1..-1] =~ /\S/
+            tokens.last << char
+          else
+            tokens << char
+          end
+        end
+      end
+      if comment
+        tokens << comment
+      end
+    end
+    tokens
+  end
+
+  def self.skip?(s)
+    s =~ /^\s/
+  end
+
+
+
+  # Returns two values, a header and a list of items.
+  # Each item is a tuple, containing some or all of:
+  # - machine keyword (including trailing whitespace+comments)
+  # - machine name
+  # - login keyword (including surrounding whitespace+comments)
+  # - login
+  # - password keyword (including surrounding whitespace+comments)
+  # - password
+  # - trailing chars
+  # This lets us change individual fields, then write out the file
+  # with all its original formatting.
+  def self.parse(ts)
+    cur, item = [], []
+
+    unless ts.is_a?(TokenArray)
+      ts = TokenArray.new(ts)
+    end
+
+    pre = ts.readto{|t| t == "machine" || t == "default"}
+
+    while ts.length > 0
+      if ts[0] == 'default'
+        cur << ts.take.to_sym
+        cur << ''
+      else
+        cur << ts.take + ts.readto{|t| ! skip?(t)}
+        cur << ts.take
+      end
+
+      if ts.include?('login')
+        cur << ts.readto{|t| t == "login"} + ts.take + ts.readto{|t| ! skip?(t)}
+        cur << ts.take
+      end
+
+      if ts.include?('password')
+        cur << ts.readto{|t| t == "password"} + ts.take + ts.readto{|t| ! skip?(t)}
+        cur << ts.take
+      end
+
+      cur << ts.readto{|t| t == "machine" || t == "default"}
+
+      item << cur
+      cur = []
+    end
+
+    [pre, item]
+  end
+
+  def initialize(path, data)
+    @new_item_prefix = ''
+    @path = path
+    @pre, @data = data
+
+    if @data && @data.last && :default == @data.last[0]
+      @default = @data.pop
+    else
+      @default = nil
+    end
+  end
+
+  attr_accessor :new_item_prefix
+
+  def [](k)
+    if item = @data.detect {|datum| datum[1] == k}
+      Entry.new(item[3], item[5])
+    elsif @default
+      Entry.new(@default[3], @default[5])
+    end
+  end
+
+  def []=(k, info)
+    if item = @data.detect {|datum| datum[1] == k}
+      item[3], item[5] = info
+    else
+      @data << new_item(k, info[0], info[1])
+    end
+  end
+
+  def length
+    @data.length
+  end
+
+  def delete(key)
+    datum = nil
+    for value in @data
+      if value[1] == key
+        datum = value
+        break
+      end
+    end
+    @data.delete(datum)
+  end
+
+  def each(&block)
+    @data.each(&block)
+  end
+
+  def new_item(m, l, p)
+    [new_item_prefix+"machine ", m, "\n  login ", l, "\n  password ", p, "\n"]
+  end
+
+  def save
+    if @path =~ /\.gpg$/
+      e = IO.popen("gpg -a --batch --default-recipient-self -e", "r+") do |gpg|
+        gpg.puts(unparse)
+        gpg.close_write
+        gpg.read
+      end
+      raise Error.new("Encrypting #{@path} failed.") unless $?.success?
+      File.open(@path, 'w', 0600) {|file| file.print(e)}
+    else
+      File.open(@path, 'w', 0600) {|file| file.print(unparse)}
+    end
+  end
+
+  def unparse
+    @pre + @data.map do |datum|
+      datum = datum.join
+      unless datum[-1..-1] == "\n"
+        datum << "\n"
+      else
+        datum
+      end
+    end.join
+  end
+
+  Entry = Struct.new(:login, :password) do
+    alias to_ary to_a
+  end
+
+end
+
+class Netrc::Error < ::StandardError
+end
+rescue LoadError
+  require File.join File.dirname(File.dirname(__FILE__)), 'vendor', 'netrc.rb'
+end
+
 # It just gists.
 module Gist
   extend self
 
-  VERSION = '4.5.0'
+  VERSION = '4.6.0'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
+    'pbcopy'  => 'pbpaste',
     'xclip'   => 'xclip -o',
     'xsel -i' => 'xsel -o',
-    'pbcopy'  => 'pbpaste',
-    'putclip' => 'getclip'
+    '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"
@@ -1350,7 +1641,7 @@ module Gist
   module AuthTokenFile
     def self.filename
       if ENV.key?(URL_ENV_NAME)
-        File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/[^a-z.]/, '')}"
+        File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/:/, '.').gsub(/[^a-z0-9.]/, '')}"
       else
         File.expand_path "~/.gist"
       end
@@ -1371,7 +1662,7 @@ module Gist
   #
   # @return [String] string value of access token or `nil`, if not found
   def auth_token
-    @token ||= AuthTokenFile.read rescue nil
+    @token ||= AuthTokenFile.read rescue nil || Netrc.read[self.api_url.host][1]
   end
 
   # Upload a gist to https://gist.github.com
@@ -1529,6 +1820,27 @@ module Gist
     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)
@@ -1569,10 +1881,12 @@ module Gist
   # @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
@@ -1645,7 +1959,7 @@ module Gist
 
       if Net::HTTPCreated === response
         AuthTokenFile.write JSON.parse(response.body)['token']
-        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
+        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/tokens"
         return
       elsif Net::HTTPUnauthorized === response
         puts "Error: #{JSON.parse(response.body)['message']}"
@@ -1962,6 +2276,10 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P]
     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
@@ -2006,6 +2324,11 @@ begin
     exit
   end
 
+  if options.key? :delete
+    Gist.delete_gist(options[:delete])
+    exit
+  end
+
   if options[:paste]
     puts Gist.gist(Gist.paste, options)
   else

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" "November 2015" "" "Gist manual"
+.TH "GIST" "1" "May 2017" "" "Gist manual"
 .
 .SH "NAME"
 \fBgist\fR \- upload code to https://gist\.github\.com
@@ -99,6 +99,22 @@ 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\.
 .
@@ -116,14 +132,14 @@ 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
-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\.
+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\.
@@ -133,6 +149,31 @@ gist \-a a\.rb
 .
 .IP "" 0
 .
+.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 "" 4
+.
+.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:
 .
@@ -188,19 +229,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/lib/gist.rb

@@ -8,22 +8,28 @@ rescue LoadError
   require File.join File.dirname(File.dirname(__FILE__)), 'vendor', 'json.rb'
 end
 
+begin
+  require 'netrc'
+rescue LoadError
+  require File.join File.dirname(File.dirname(__FILE__)), 'vendor', 'netrc.rb'
+end
+
 # It just gists.
 module Gist
   extend self
 
-  VERSION = '4.5.0'
+  VERSION = '4.6.0'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
+    'pbcopy'  => 'pbpaste',
     'xclip'   => 'xclip -o',
     'xsel -i' => 'xsel -o',
-    'pbcopy'  => 'pbpaste',
-    'putclip' => 'getclip'
+    '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"
@@ -44,7 +50,7 @@ module Gist
   module AuthTokenFile
     def self.filename
       if ENV.key?(URL_ENV_NAME)
-        File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/[^a-z.]/, '')}"
+        File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/:/, '.').gsub(/[^a-z0-9.]/, '')}"
       else
         File.expand_path "~/.gist"
       end
@@ -65,7 +71,7 @@ module Gist
   #
   # @return [String] string value of access token or `nil`, if not found
   def auth_token
-    @token ||= AuthTokenFile.read rescue nil
+    @token ||= AuthTokenFile.read rescue nil || Netrc.read[self.api_url.host][1]
   end
 
   # Upload a gist to https://gist.github.com
@@ -223,6 +229,27 @@ module Gist
     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)
@@ -263,10 +290,12 @@ module Gist
   # @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
@@ -339,7 +368,7 @@ module Gist
 
       if Net::HTTPCreated === response
         AuthTokenFile.write JSON.parse(response.body)['token']
-        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
+        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/tokens"
         return
       elsif Net::HTTPUnauthorized === response
         puts "Error: #{JSON.parse(response.body)['message']}"

data/spec/auth_token_file_spec.rb

@@ -19,10 +19,10 @@ describe Gist::AuthTokenFile do
       before do
         ENV[Gist::URL_ENV_NAME] = github_url
       end
-      let(:github_url) { "gh.custom.org" }
+      let(:github_url) { "http://gh.custom.org:442/" }
 
       it "is ~/.gist.{custom_github_url}" do
-        File.should_receive(:expand_path).with("~/.gist.#{github_url}").and_return(filename)
+        File.should_receive(:expand_path).with("~/.gist.http.gh.custom.org.442").and_return(filename)
         subject.filename.should be filename
       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/vendor/netrc.rb

@@ -0,0 +1,286 @@
+
+# The netrc library (https://github.com/heroku/netrc) is reproduced below, along
+# with its copyright and license:
+# - https://raw.githubusercontent.com/heroku/netrc/262ef111/LICENSE.md
+# - https://raw.githubusercontent.com/heroku/netrc/262ef111/lib/netrc.rb
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2011-2014 [CONTRIBUTORS.md](https://github.com/geemus/netrc/blob/master/CONTRIBUTORS.md)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'rbconfig'
+require 'io/console'
+
+class Netrc
+  VERSION = "0.11.0"
+
+  # see http://stackoverflow.com/questions/4871309/what-is-the-correct-way-to-detect-if-ruby-is-running-on-windows
+  WINDOWS = RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
+  CYGWIN  = RbConfig::CONFIG["host_os"] =~ /cygwin/
+
+  def self.default_path
+    File.join(ENV['NETRC'] || home_path, netrc_filename)
+  end
+
+  def self.home_path
+    home = Dir.respond_to?(:home) ? Dir.home : ENV['HOME']
+
+    if WINDOWS && !CYGWIN
+      home ||= File.join(ENV['HOMEDRIVE'], ENV['HOMEPATH']) if ENV['HOMEDRIVE'] && ENV['HOMEPATH']
+      home ||= ENV['USERPROFILE']
+      # XXX: old stuff; most likely unnecessary
+      home = home.tr("\\", "/") unless home.nil?
+    end
+
+    (home && File.readable?(home)) ? home : Dir.pwd
+  rescue ArgumentError
+    return Dir.pwd
+  end
+
+  def self.netrc_filename
+    WINDOWS && !CYGWIN ? "_netrc" : ".netrc"
+  end
+
+  def self.config
+    @config ||= {}
+  end
+
+  def self.configure
+    yield(self.config) if block_given?
+    self.config
+  end
+
+  def self.check_permissions(path)
+    perm = File.stat(path).mode & 0777
+    if perm != 0600 && !(WINDOWS) && !(Netrc.config[:allow_permissive_netrc_file])
+      raise Error, "Permission bits for '#{path}' should be 0600, but are "+perm.to_s(8)
+    end
+  end
+
+  # Reads path and parses it as a .netrc file. If path doesn't
+  # exist, returns an empty object. Decrypt paths ending in .gpg.
+  def self.read(path=default_path)
+    check_permissions(path)
+    data = if path =~ /\.gpg$/
+      decrypted = if ENV['GPG_AGENT_INFO']
+        `gpg --batch --quiet --decrypt #{path}`
+      else
+         print "Enter passphrase for #{path}: "
+         STDIN.noecho do
+           `gpg --batch --passphrase-fd 0 --quiet --decrypt #{path}`
+         end
+      end
+      if $?.success?
+        decrypted
+      else
+        raise Error.new("Decrypting #{path} failed.") unless $?.success?
+      end
+    else
+      File.read(path)
+    end
+    new(path, parse(lex(data.lines.to_a)))
+  rescue Errno::ENOENT
+    new(path, parse(lex([])))
+  end
+
+  class TokenArray < Array
+    def take
+      if length < 1
+        raise Error, "unexpected EOF"
+      end
+      shift
+    end
+
+    def readto
+      l = []
+      while length > 0 && ! yield(self[0])
+        l << shift
+      end
+      return l.join
+    end
+  end
+
+  def self.lex(lines)
+    tokens = TokenArray.new
+    for line in lines
+      content, comment = line.split(/(\s*#.*)/m)
+      content.each_char do |char|
+        case char
+        when /\s/
+          if tokens.last && tokens.last[-1..-1] =~ /\s/
+            tokens.last << char
+          else
+            tokens << char
+          end
+        else
+          if tokens.last && tokens.last[-1..-1] =~ /\S/
+            tokens.last << char
+          else
+            tokens << char
+          end
+        end
+      end
+      if comment
+        tokens << comment
+      end
+    end
+    tokens
+  end
+
+  def self.skip?(s)
+    s =~ /^\s/
+  end
+
+
+
+  # Returns two values, a header and a list of items.
+  # Each item is a tuple, containing some or all of:
+  # - machine keyword (including trailing whitespace+comments)
+  # - machine name
+  # - login keyword (including surrounding whitespace+comments)
+  # - login
+  # - password keyword (including surrounding whitespace+comments)
+  # - password
+  # - trailing chars
+  # This lets us change individual fields, then write out the file
+  # with all its original formatting.
+  def self.parse(ts)
+    cur, item = [], []
+
+    unless ts.is_a?(TokenArray)
+      ts = TokenArray.new(ts)
+    end
+
+    pre = ts.readto{|t| t == "machine" || t == "default"}
+
+    while ts.length > 0
+      if ts[0] == 'default'
+        cur << ts.take.to_sym
+        cur << ''
+      else
+        cur << ts.take + ts.readto{|t| ! skip?(t)}
+        cur << ts.take
+      end
+
+      if ts.include?('login')
+        cur << ts.readto{|t| t == "login"} + ts.take + ts.readto{|t| ! skip?(t)}
+        cur << ts.take
+      end
+
+      if ts.include?('password')
+        cur << ts.readto{|t| t == "password"} + ts.take + ts.readto{|t| ! skip?(t)}
+        cur << ts.take
+      end
+
+      cur << ts.readto{|t| t == "machine" || t == "default"}
+
+      item << cur
+      cur = []
+    end
+
+    [pre, item]
+  end
+
+  def initialize(path, data)
+    @new_item_prefix = ''
+    @path = path
+    @pre, @data = data
+
+    if @data && @data.last && :default == @data.last[0]
+      @default = @data.pop
+    else
+      @default = nil
+    end
+  end
+
+  attr_accessor :new_item_prefix
+
+  def [](k)
+    if item = @data.detect {|datum| datum[1] == k}
+      Entry.new(item[3], item[5])
+    elsif @default
+      Entry.new(@default[3], @default[5])
+    end
+  end
+
+  def []=(k, info)
+    if item = @data.detect {|datum| datum[1] == k}
+      item[3], item[5] = info
+    else
+      @data << new_item(k, info[0], info[1])
+    end
+  end
+
+  def length
+    @data.length
+  end
+
+  def delete(key)
+    datum = nil
+    for value in @data
+      if value[1] == key
+        datum = value
+        break
+      end
+    end
+    @data.delete(datum)
+  end
+
+  def each(&block)
+    @data.each(&block)
+  end
+
+  def new_item(m, l, p)
+    [new_item_prefix+"machine ", m, "\n  login ", l, "\n  password ", p, "\n"]
+  end
+
+  def save
+    if @path =~ /\.gpg$/
+      e = IO.popen("gpg -a --batch --default-recipient-self -e", "r+") do |gpg|
+        gpg.puts(unparse)
+        gpg.close_write
+        gpg.read
+      end
+      raise Error.new("Encrypting #{@path} failed.") unless $?.success?
+      File.open(@path, 'w', 0600) {|file| file.print(e)}
+    else
+      File.open(@path, 'w', 0600) {|file| file.print(unparse)}
+    end
+  end
+
+  def unparse
+    @pre + @data.map do |datum|
+      datum = datum.join
+      unless datum[-1..-1] == "\n"
+        datum << "\n"
+      else
+        datum
+      end
+    end.join
+  end
+
+  Entry = Struct.new(:login, :password) do
+    alias to_ary to_a
+  end
+
+end
+
+class Netrc::Error < ::StandardError
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gist
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Conrad Irwin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,6 +96,7 @@ files:
 - spec/shorten_spec.rb
 - spec/spec_helper.rb
 - vendor/json.rb
+- vendor/netrc.rb
 homepage: https://github.com/defunkt/gist
 licenses:
 - MIT
@@ -116,9 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Just allows you to upload gists
 test_files: []
-has_rdoc: