netrc 0.7.5 → 0.7.6

data/data/login.netrc

@@ -0,0 +1,3 @@
+# this is my login netrc
+machine m
+  login l # this is my username

data/data/password.netrc

@@ -0,0 +1,3 @@
+# this is my password netrc
+machine m
+  password p # this is my password

data/lib/netrc.rb

@@ -1,7 +1,7 @@
 require 'rbconfig'
 
 class Netrc
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 
   # 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/
@@ -26,13 +26,17 @@ class Netrc
   # exist, returns an empty object. Decrypt paths ending in .gpg.
   def self.read(path=default_path)
     check_permissions(path)
-    if path =~ /\.gpg$/
+    data = if path =~ /\.gpg$/
       decrypted = `gpg --batch --quiet --decrypt #{path}`
-      raise Error.new("Decrypting #{path} failed.") unless $?.success?
-      new(path, parse(lex(decrypted.split("\n"))))
+      if $?.success?
+        decrypted
+      else
+        raise Error.new("Decrypting #{path} failed.") unless $?.success?
+      end
     else
-      new(path, parse(lex(File.readlines(path))))
+      File.read(path)
     end
+    new(path, parse(lex(data.lines.to_a)))
   rescue Errno::ENOENT
     new(path, parse(lex([])))
   end
@@ -69,7 +73,7 @@ class Netrc
   end
 
   # Returns two values, a header and a list of items.
-  # Each item is a 7-tuple, containing:
+  # Each item is a tuple, containing some or all of:
   # - machine keyword (including trailing whitespace+comments)
   # - machine name
   # - login keyword (including surrounding whitespace+comments)
@@ -101,10 +105,14 @@ class Netrc
     while ts.length > 0
       cur << ts.take + ts.readto{|t| ! skip?(t)}
       cur << ts.take
-      cur << ts.readto{|t| t == "login"} + ts.take + ts.readto{|t| ! skip?(t)}
-      cur << ts.take
-      cur << ts.readto{|t| t == "password"} + ts.take + ts.readto{|t| ! skip?(t)}
-      cur << ts.take
+      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"}
       item << cur
       cur = []

data/test/test_netrc.rb

@@ -31,6 +31,28 @@ class TestNetrc < Test::Unit::TestCase
     assert_equal(exp, items)
   end
 
+  def test_login_file
+    pre, items = Netrc.parse(Netrc.lex(IO.readlines("data/login.netrc")))
+    assert_equal("# this is my login netrc\n", pre)
+    exp = [["machine ",
+            "m",
+            "\n  login ",
+            "l",
+            " # this is my username\n"]]
+    assert_equal(exp, items)
+  end
+
+  def test_password_file
+    pre, items = Netrc.parse(Netrc.lex(IO.readlines("data/password.netrc")))
+    assert_equal("# this is my password netrc\n", pre)
+    exp = [["machine ",
+            "m",
+            "\n  password ",
+            "p",
+            " # this is my password\n"]]
+    assert_equal(exp, items)
+  end
+
   def test_missing_file
     n = Netrc.read("data/nonexistent.netrc")
     assert_equal(0, n.length)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netrc
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70272465006100 !ruby/object:Gem::Requirement
+  requirement: &70245365255400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272465006100
+  version_requirements: *70245365255400
 description: This library can read and update netrc files, preserving formatting including
   comments and whitespace.
 email: geemus@gmail.com
@@ -33,6 +33,8 @@ files:
 - LICENSE
 - Readme.md
 - changelog.txt
+- data/login.netrc
+- data/password.netrc
 - data/permissive.netrc
 - data/sample.netrc
 - lib/netrc.rb