netrc 0.7.4 → 0.7.5

data/changelog.txt

@@ -1,3 +1,8 @@
+0.7.5 06/25/12
+==============
+
+* improved operating system detection
+
 0.7.4 06/04/12
 ==============
 

data/lib/netrc.rb

@@ -1,19 +1,23 @@
+require 'rbconfig'
+
 class Netrc
-  VERSION = "0.7.4"
-  CYGWIN  = RUBY_PLATFORM =~ /cygwin/i
-  WINDOWS = RUBY_PLATFORM =~ /win32|mingw32/i
+  VERSION = "0.7.5"
+
+  # 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
-    if WINDOWS
+    if WINDOWS && !CYGWIN
       File.join(ENV['USERPROFILE'].gsub("\\","/"), "_netrc")
     else
-      File.join(ENV["HOME"], ".netrc")
+      File.join((ENV["HOME"] || "./"), ".netrc")
     end
   end
 
   def self.check_permissions(path)
     perm = File.stat(path).mode & 0777
-    if perm != 0600 && !(CYGWIN) && !(WINDOWS)
+    if perm != 0600 && !(WINDOWS)
       raise Error, "Permission bits for '#{path}' should be 0600, but are "+perm.to_s(8)
     end
   end

data/test/test_netrc.rb

@@ -3,8 +3,10 @@ require 'test/unit'
 require 'fileutils'
 
 require File.expand_path("#{File.dirname(__FILE__)}/../lib/netrc")
+require "rbconfig"
 
 class TestNetrc < Test::Unit::TestCase
+
   def setup
     File.chmod(0600, "data/sample.netrc")
     File.chmod(0644, "data/permissive.netrc")
@@ -35,9 +37,23 @@ class TestNetrc < Test::Unit::TestCase
   end
 
   def test_permission_error
+    original_windows = Netrc::WINDOWS
+    Netrc.const_set(:WINDOWS, false)
+    Netrc.read("data/permissive.netrc")
+  rescue Netrc::Error
+    assert true, "Should raise an error if permissions are wrong on a non-windows system."
+  ensure
+    Netrc.const_set(:WINDOWS, original_windows)
+  end
+
+  def test_permission_error_windows
+    original_windows = Netrc::WINDOWS
+    Netrc.const_set(:WINDOWS, true)
     Netrc.read("data/permissive.netrc")
-    assert false, "Should raise an error if permissions are wrong."
   rescue Netrc::Error
+    assert false, "Should not raise an error if permissions are wrong on a non-windows system."
+  ensure
+    Netrc.const_set(:WINDOWS, original_windows)
   end
 
   def test_round_trip
@@ -98,7 +114,9 @@ class TestNetrc < Test::Unit::TestCase
     FileUtils.rm_f("/tmp/created.netrc")
     n = Netrc.read("/tmp/created.netrc")
     n.save
-    assert_equal(0600, File.stat("/tmp/created.netrc").mode & 0777)
+    unless Netrc::WINDOWS
+      assert_equal(0600, File.stat("/tmp/created.netrc").mode & 0777)
+    end
   end
 
   def test_encrypted_roundtrip
@@ -111,4 +129,15 @@ class TestNetrc < Test::Unit::TestCase
       assert_equal(["a", "b"], Netrc.read("/tmp/test.netrc.gpg")["m"])
     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"])
+  ensure
+    ENV["HOME"], nil_home = nil_home, ENV["HOME"]
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netrc
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70101253021640 !ruby/object:Gem::Requirement
+  requirement: &70272465006100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101253021640
+  version_requirements: *70272465006100
 description: This library can read and update netrc files, preserving formatting including
   comments and whitespace.
 email: geemus@gmail.com