netrc 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff42e907d9e08059eca13e54dac95b5a7247cb02
-  data.tar.gz: d2692d21a8ab3880d2c06135e972e91b17c6455f
+  metadata.gz: f70510e23b55b31e755aca0e6d44f45b23476219
+  data.tar.gz: a059abe6bcfbafdf5bccdd780044b599bf817e9f
 SHA512:
-  metadata.gz: 92a9c3f6b1e85e748ab46f573eab3cd08b25dab74b82559be56d439f41099476c9b380c2f0ac032b17a01cd0da08696b1380a9935db9c6f2edfda724af56c2e7
-  data.tar.gz: 42e37d26587a9379f712f31f6b9c98923d7b439697e25037cff58bda148501dfcfee4c6441b260a5ae27b9905675141a975ca6e4e27da6b2b6d444110bc277cc
+  metadata.gz: ee4839509d4962d11095ac46b2610bc4975c0a8deb60ad5b5c3114fce33ecbfef2c7acdd2525051c7dedd02076f3c3277a06b71d4ca1e8b462601605f1c4cd12
+  data.tar.gz: e91eff73081c73e280c46bbbaa8bfc2ff17dbff809ef81bb97e3bc50cabffd0e1946f5287b4c2d8c190afb9da1d6ed198a4fe0089f7a0b3695da7fe1ada617ed

data/Readme.md

@@ -1,7 +1,7 @@
 # Netrc
 
 This library reads and writes
-[`.netrc` files](http://www.gnu.org/software/inetutils/manual/html_node/The-_002enetrc-File.html).
+[`.netrc` files](http://www.gnu.org/software/inetutils/manual/html_node/The-_002enetrc-file.html).
 
 ## API
 
@@ -13,8 +13,11 @@ If the file doesn't exist, Netrc.read will return an empty object. If
 the filename ends in ".gpg", it will be decrypted using
 [GPG](http://www.gnupg.org/).
 
-Read the user's default netrc file. On Unix: `$HOME/.netrc`.
-On Windows: `%HOME%\_netrc`, `%HOMEDRIVE%%HOMEPATH%\_netrc`, or `%USERPROFILE%\_netrc` (whichever is set first).
+Read the user's default netrc file.
+
+**On Unix:** `$NETRC/.netrc` or `$HOME/.netrc` (whichever is set first).
+
+**On Windows:** `%NETRC%\_netrc`, `%HOME%\_netrc`, `%HOMEDRIVE%%HOMEPATH%\_netrc`, or `%USERPROFILE%\_netrc` (whichever is set first).
 
     n = Netrc.read
 
@@ -47,4 +50,4 @@ Have fun!
 ## Running Tests
 
     $ bundle install
-    $ bundle exec turn test
+    $ bundle exec ruby -e 'Dir.glob "./test/**/test_*.rb", &method(:require)'

data/changelog.txt

@@ -1,3 +1,9 @@
+0.11.0 10/29/15
+===============
+
+Respect NETRC environment variable
+Fix for JRuby PernGen Space
+
 0.10.3 02/24/15
 ===============
 

data/lib/netrc.rb

@@ -1,14 +1,14 @@
 require 'rbconfig'
 
 class Netrc
-  VERSION = "0.10.3"
+  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(home_path, netrc_filename)
+    File.join(ENV['NETRC'] || home_path, netrc_filename)
   end
 
   def self.home_path
@@ -18,7 +18,7 @@ class Netrc
       home ||= File.join(ENV['HOMEDRIVE'], ENV['HOMEPATH']) if ENV['HOMEDRIVE'] && ENV['HOMEPATH']
       home ||= ENV['USERPROFILE']
       # XXX: old stuff; most likely unnecessary
-      home = home.gsub("\\", "/") unless home.nil?
+      home = home.tr("\\", "/") unless home.nil?
     end
 
     (home && File.readable?(home)) ? home : Dir.pwd
@@ -65,8 +65,25 @@ class Netrc
     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 = []
+    tokens = TokenArray.new
     for line in lines
       content, comment = line.split(/(\s*#.*)/m)
       content.each_char do |char|
@@ -96,6 +113,8 @@ class Netrc
     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)
@@ -110,19 +129,8 @@ class Netrc
   def self.parse(ts)
     cur, item = [], []
 
-    def ts.take
-      if length < 1
-        raise Error, "unexpected EOF"
-      end
-      shift
-    end
-
-    def ts.readto
-      l = []
-      while length > 0 && ! yield(self[0])
-        l << shift
-      end
-      return l.join
+    unless ts.is_a?(TokenArray)
+      ts = TokenArray.new(ts)
     end
 
     pre = ts.readto{|t| t == "machine" || t == "default"}

data/test/test_lex.rb

@@ -1,9 +1,9 @@
 $VERBOSE = true
-require 'test/unit'
+require 'minitest/autorun'
 
 require File.expand_path("#{File.dirname(__FILE__)}/../lib/netrc")
 
-class TestLex < Test::Unit::TestCase
+class TestLex < Minitest::Test
   def test_lex_empty
     t = Netrc.lex([])
     assert_equal([], t)

data/test/test_netrc.rb

@@ -1,11 +1,11 @@
 $VERBOSE = true
-require 'test/unit'
+require 'minitest/autorun'
 require 'fileutils'
 
 require File.expand_path("#{File.dirname(__FILE__)}/../lib/netrc")
 require "rbconfig"
 
-class TestNetrc < Test::Unit::TestCase
+class TestNetrc < Minitest::Test
 
   def setup
     Dir.glob('data/*.netrc').each{|f| File.chmod(0600, f)}
@@ -205,6 +205,13 @@ class TestNetrc < Test::Unit::TestCase
     ENV["HOME"], nil_home = nil_home, ENV["HOME"]
   end
 
+  def test_netrc_environment_variable
+    ENV["NETRC"] = File.join(Dir.pwd, 'data')
+    assert_equal File.join(Dir.pwd, 'data', '.netrc'), Netrc.default_path
+  ensure
+    ENV.delete("NETRC")
+  end
+
   def test_read_entry
     entry = Netrc.read("data/sample.netrc")['m']
     assert_equal 'l', entry.login

data/test/test_parse.rb

@@ -1,9 +1,9 @@
 $VERBOSE = true
-require 'test/unit'
+require 'minitest/autorun'
 
 require File.expand_path("#{File.dirname(__FILE__)}/../lib/netrc")
 
-class TestParse < Test::Unit::TestCase
+class TestParse < Minitest::Test
   def test_parse_empty
     pre, items = Netrc.parse([])
     assert_equal("", pre)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netrc
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Keith Rarick
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Library to read and write netrc files.