gist 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 306aea3698bda142b6130a3160a10c7cfc816142
-  data.tar.gz: b5cc50975bfa626326ac4c865f2d1849d3b95d50
+  metadata.gz: 2f19484015dcf7461d0498fa37013e616aec23b4
+  data.tar.gz: e8784bc46d7261281acb0c947c8670c01588399a
 SHA512:
-  metadata.gz: 4f65b5b05ce628788db1fc1324191fa51c56f39827474efb44c0cbcef690001a89be5626b490a0111989ccea4a882fcb2e1d360cc75742d58fb2846e285a2129
-  data.tar.gz: 339e1387cb0f267a8a49e37963fc01fc353d6e77c7e1546ad029234c21672580ffac2ce0366e9443d22a020b9f92e5f4ac7c9cb30decc18ac3bb5ff5436fe3d6
+  metadata.gz: 3307a3891b8fc1d302ba15092ca165ec72dbeb773c0ca4f47a6a079716747864b475410192fd8a5f8afcff06e78378c414a1d39641c8421e2dd4d1c244a4faba
+  data.tar.gz: 865d65b608b91d4c258215e6d4e8b6af6278d2e78c0d368d66dcee146e69fd0fd293fe63f7031f273c177d259ac1cc3d5e713684b13dd1632d84a7442cede8b2

data/Rakefile

@@ -23,9 +23,7 @@ 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"))
-        .split("require 'netrc'\n").join(File.read("vendor/netrc.rb"))
+    f.puts File.read("lib/gist.rb").split("require 'json'\n").join(File.read("vendor/json.rb"))
 
     f.puts File.read("bin/gist").gsub(/^require.*gist.*\n/, '');
   end

data/build/gist

@@ -1314,302 +1314,11 @@ 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.6.0'
+  VERSION = '4.6.1'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
@@ -1662,7 +1371,7 @@ module Gist
   #
   # @return [String] string value of access token or `nil`, if not found
   def auth_token
-    @token ||= AuthTokenFile.read rescue nil || Netrc.read[self.api_url.host][1]
+    @token ||= AuthTokenFile.read rescue nil
   end
 
   # Upload a gist to https://gist.github.com

data/lib/gist.rb

@@ -8,17 +8,11 @@ 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.6.0'
+  VERSION = '4.6.1'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
@@ -71,7 +65,7 @@ module Gist
   #
   # @return [String] string value of access token or `nil`, if not found
   def auth_token
-    @token ||= AuthTokenFile.read rescue nil || Netrc.read[self.api_url.host][1]
+    @token ||= AuthTokenFile.read rescue nil
   end
 
   # Upload a gist to https://gist.github.com

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gist
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Conrad Irwin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,7 +96,6 @@ files:
 - spec/shorten_spec.rb
 - spec/spec_helper.rb
 - vendor/json.rb
-- vendor/netrc.rb
 homepage: https://github.com/defunkt/gist
 licenses:
 - MIT

data/vendor/netrc.rb

@@ -1,286 +0,0 @@
-
-# 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