netrc 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58ff22fb27f91e9e7a1d438fd790fa03533fd8f9
-  data.tar.gz: 35b9f2b6f2447ca9a4f39958d165011595932239
+  metadata.gz: abc7dade0f83a2542764f27110f02c194a8f21eb
+  data.tar.gz: a0a9842ed83ed5aa376e633853444da708877972
 SHA512:
-  metadata.gz: 178e9c25d3d775d76a6f987bdb998cd33bdfa7f164ca035fe706d32212554e3b5d36f46105c9159a48bcbcdfd4662230e43fa9e10dbeae5dfb00637cf4f138ee
-  data.tar.gz: 13c0243fd3427f91e47b5aa4ddbe293aa058b843c00b50c35515814d1eb9f651ebfd81d69598e16c6bfe9aa69c57d422198bdcb074b2c28770f52e23c64ef161
+  metadata.gz: 5ec0bc4855e159e33090e53bc212cfa164b58a88d34a967b247b347c5f0b9a3d7d21ddf97883f6d71fd63d08cc5e5587800557a0567ffdb353a048c1f5bc02bf
+  data.tar.gz: f1d5642f7afa850e782b0b822a5e25d1828abc901b108a5a74bd884642cdee68c068676e59c40064ea465c6504a30c48078991a53ec8c012528415aa7a56659e

data/changelog.txt

@@ -1,3 +1,8 @@
+0.10.0 12/10/14
+===============
+
+use `Dir.home` for finding home on Ruby 1.9+
+
 0.9.0 12/01/14
 ==============
 

data/lib/netrc.rb

@@ -1,26 +1,34 @@
 require 'rbconfig'
 
 class Netrc
-  VERSION = "0.9.0"
+  VERSION = "0.10.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)
+  end
+
+  def self.home_path
+    return Dir.home if defined? Dir.home # Ruby 1.9+
     if WINDOWS && !CYGWIN
       home = ENV['HOME']
       home ||= ENV['HOMEDRIVE'] + ENV['HOMEPATH'] if ENV['HOMEDRIVE'] && ENV['HOMEPATH']
       home ||= ENV['USERPROFILE']
-      File.join(home.gsub("\\","/"), "_netrc")
+      home.gsub("\\","/")
     else
       # In some cases, people run master process as "root" user, and run worker processes as "www" user.
       # Fix "Permission denied" error in worker processes when $HOME is "/root".
-      default_dir = (ENV['HOME'] && File.exist?(ENV['HOME']) && File.stat(ENV['HOME']).readable?) ? ENV['HOME'] : './'
-      File.join(default_dir, ".netrc")
+      (ENV['HOME'] && File.exist?(ENV['HOME']) && File.stat(ENV['HOME']).readable?) ? ENV['HOME'] : './'
     end
   end
 
+  def self.netrc_filename
+    WINDOWS && !CYGWIN ? "_netrc" : ".netrc"
+  end
+
   def self.config
     @config ||= {}
   end

data/test/test_netrc.rb

@@ -187,15 +187,18 @@ class TestNetrc < Test::Unit::TestCase
       n["m"] = "a", "b"
       n.save
       assert_equal(0600, File.stat("/tmp/test.netrc.gpg").mode & 0777)
-      assert_equal(["a", "b"], Netrc.read("/tmp/test.netrc.gpg")["m"])
+      netrc = Netrc.read("/tmp/test.netrc.gpg")["m"]
+      assert_equal("a", netrc.login)
+      assert_equal("b", netrc.password)
     end
   end
 
   def test_missing_environment
     nil_home = nil
     ENV["HOME"], nil_home = nil_home, ENV["HOME"]
-    n = Netrc.read
-    assert_equal(nil, n["x"])
+    assert_raise_with_message ArgumentError, "couldn't find HOME environment -- expanding `~'" do
+      Netrc.read
+    end
   ensure
     ENV["HOME"], nil_home = nil_home, ENV["HOME"]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netrc
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Keith Rarick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turn