netrc 0.7.7 → 0.7.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTNhNjdkNGMxODcwZjcxMzMxYTkwMzRmN2U4M2YyZGFlNGZmNDI2OQ==
+  data.tar.gz: !binary |-
+    MmQ3MTBiNjMzNjEyOWIzNmM4OTM3ZWZhOTVlMDRiMTNlOThiYmZlNA==
+SHA512:
+  metadata.gz: !binary |-
+    ZjY4ZWNjZTQ4MWJmN2U2MTUwOThjNDAxMDNmMDJjNWJjYjM5YTAwZWMzYTZj
+    MGMzZmNkNWEwMTAwNGEzYTRjNzU0ZTVjMTQ4ZTJjZDJmNzY4ZWVlYWI3NDgz
+    YTBjMTU0MWRjNWFmZjExZTIyY2IxMDQ1YWViNWU4YzE0NzZjYTM=
+  data.tar.gz: !binary |-
+    YzQ3OWJkMzhhODUyZGQwMDA5NDgzMTQ1ODFiMTFiZmJlOTFhNTFmYWZiNmFi
+    MGY3MTQ0Nzg1MzM3MDhjODdmOTZiM2Q3ZjYxNWMyZTlhNjJjZTU0Y2JhMDNj
+    ZjJkMTM3ZjM5OTM2MzE0OWM4Mjk0MWQ3MWQ3YjQ5ZDBmMWE1NmQ=

data/LICENSE.md

@@ -0,0 +1,20 @@
+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.

data/Readme.md

@@ -18,6 +18,12 @@ Read the user's default netrc file (`$HOME/.netrc` on Unix;
 
     n = Netrc.read
 
+Configure netrc to allow permissive files (with permissions other than 0600):
+
+    Netrc.configure do |config|
+      config[:allow_permissive_netrc_file] = true
+    end
+
 Look up a username and password:
 
     user, pass = n["example.com"]

data/changelog.txt

@@ -1,3 +1,15 @@
+0.7.8 10/15/14
+==============
+
+add entry class to facilitate usage
+switch gem source to rubygems.org
+use guard, when available via guardfile
+add default/read-only behavior
+add allow_permissive_netrc_file option
+fix an undefined variable path
+fix Errno::EACCES error
+silence const warnings in test
+
 0.7.7 08/15/12
 ==============
 

data/data/default_only.netrc

@@ -0,0 +1,4 @@
+# this is my netrc with only a default
+default
+  login ld # this is my default username
+  password pd

data/data/sample_multi.netrc

@@ -0,0 +1,8 @@
+# this is my netrc with multiple machines
+machine m
+  login lm # this is my m-username
+  password pm
+
+machine n
+  login ln # this is my n-username
+  password pn

data/data/sample_multi_with_default.netrc

@@ -0,0 +1,12 @@
+# this is my netrc with multiple machines and a default
+machine m
+  login lm # this is my m-username
+  password pm
+
+machine n
+  login ln # this is my n-username
+  password pn
+
+default
+  login ld # this is my default username
+  password pd

data/data/sample_with_default.netrc

@@ -0,0 +1,8 @@
+# this is my netrc with default
+machine m
+  login l # this is my username
+  password p
+
+default
+  login default_login # this is my default username
+  password default_password

data/lib/netrc.rb

@@ -1,7 +1,7 @@
 require 'rbconfig'
 
 class Netrc
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 
   # 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/
@@ -11,13 +11,25 @@ class Netrc
     if WINDOWS && !CYGWIN
       File.join(ENV['USERPROFILE'].gsub("\\","/"), "_netrc")
     else
-      File.join((ENV["HOME"] || "./"), ".netrc")
+      # 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.exists?(ENV['HOME']) && File.stat(ENV['HOME']).readable?) ? ENV['HOME'] : './'
+      File.join(default_dir, ".netrc")
     end
   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)
+    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
@@ -101,19 +113,29 @@ class Netrc
       return l.join
     end
 
-    pre = ts.readto{|t| t == "machine"}
+    pre = ts.readto{|t| t == "machine" || t == "default"}
+
     while ts.length > 0
-      cur << ts.take + ts.readto{|t| ! skip?(t)}
-      cur << ts.take
+      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"}
+
+      cur << ts.readto{|t| t == "machine" || t == "default"}
+
       item << cur
       cur = []
     end
@@ -125,13 +147,21 @@ class Netrc
     @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}
-      [item[3], item[5]]
+      Entry.new(item[3], item[5])
+    elsif @default
+      Entry.new(@default[3], @default[5])
     end
   end
 
@@ -173,7 +203,7 @@ class Netrc
         gpg.close_write
         gpg.read
       end
-      raise Error.new("Encrypting #{path} failed.") unless $?.success?
+      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)}
@@ -191,6 +221,10 @@ class Netrc
     end.join
   end
 
+  Entry = Struct.new(:login, :password) do
+    alias to_ary to_a
+  end
+
 end
 
 class Netrc::Error < ::StandardError

data/test/test_netrc.rb

@@ -8,7 +8,7 @@ require "rbconfig"
 class TestNetrc < Test::Unit::TestCase
 
   def setup
-    File.chmod(0600, "data/sample.netrc")
+    Dir.glob('data/*.netrc').each{|f| File.chmod(0600, f)}
     File.chmod(0644, "data/permissive.netrc")
   end
 
@@ -60,21 +60,45 @@ class TestNetrc < Test::Unit::TestCase
 
   def test_permission_error
     original_windows = Netrc::WINDOWS
+    Netrc.send(:remove_const, :WINDOWS)
     Netrc.const_set(:WINDOWS, false)
     Netrc.read("data/permissive.netrc")
+    assert false, "Should raise an error if permissions are wrong on a non-windows system."
   rescue Netrc::Error
-    assert true, "Should raise an error if permissions are wrong on a non-windows system."
+    assert true, ""
   ensure
+    Netrc.send(:remove_const, :WINDOWS)
     Netrc.const_set(:WINDOWS, original_windows)
   end
 
+  def test_allow_permissive_netrc_file_option
+    Netrc.configure do |config|
+      config[:allow_permissive_netrc_file] = true
+    end
+    original_windows = Netrc::WINDOWS
+    Netrc.send(:remove_const, :WINDOWS)
+    Netrc.const_set(:WINDOWS, false)
+    Netrc.read("data/permissive.netrc")
+    assert true, ""
+  rescue Netrc::Error
+    assert false, "Should not raise an error if allow_permissive_netrc_file option is set to true"
+  ensure
+    Netrc.send(:remove_const, :WINDOWS)
+    Netrc.const_set(:WINDOWS, original_windows)
+    Netrc.configure do |config|
+      config[:allow_permissive_netrc_file] = false
+    end
+  end
+
   def test_permission_error_windows
     original_windows = Netrc::WINDOWS
+    Netrc.send(:remove_const, :WINDOWS)
     Netrc.const_set(:WINDOWS, true)
     Netrc.read("data/permissive.netrc")
   rescue Netrc::Error
     assert false, "Should not raise an error if permissions are wrong on a non-windows system."
   ensure
+    Netrc.send(:remove_const, :WINDOWS)
     Netrc.const_set(:WINDOWS, original_windows)
   end
 
@@ -96,7 +120,7 @@ class TestNetrc < Test::Unit::TestCase
   def test_set_get
     n = Netrc.read("data/sample.netrc")
     n["m"] = "a", "b"
-    assert_equal(["a", "b"], n["m"])
+    assert_equal(["a", "b"], n["m"].to_a)
   end
 
   def test_add
@@ -133,7 +157,7 @@ class TestNetrc < Test::Unit::TestCase
     n = Netrc.read("data/sample.netrc")
     n.new_item_prefix = "# added\n"
     n["x"] = "a", "b"
-    assert_equal(["a", "b"], n["x"])
+    assert_equal(["a", "b"], n["x"].to_a)
   end
 
   def test_get_missing
@@ -176,5 +200,62 @@ class TestNetrc < Test::Unit::TestCase
     ENV["HOME"], nil_home = nil_home, ENV["HOME"]
   end
 
+  def test_read_entry
+    entry = Netrc.read("data/sample.netrc")['m']
+    assert_equal 'l', entry.login
+    assert_equal 'p', entry.password
+
+    # hash-style
+    assert_equal 'l', entry[:login]
+    assert_equal 'p', entry[:password]
+  end
+
+  def test_write_entry
+    n = Netrc.read("data/sample.netrc")
+    entry = n['m']
+    entry.login    = 'new_login'
+    entry.password = 'new_password'
+    n['m'] = entry
+    assert_equal(['new_login', 'new_password'], n['m'].to_a)
+  end
+
+  def test_entry_splat
+    e = Netrc::Entry.new("user", "pass")
+    user, pass = *e
+    assert_equal("user", user)
+    assert_equal("pass", pass)
+  end
 
+  def test_entry_implicit_splat
+    e = Netrc::Entry.new("user", "pass")
+    user, pass = e
+    assert_equal("user", user)
+    assert_equal("pass", pass)
+  end
+
+  def test_with_default
+    netrc = Netrc.read('data/sample_with_default.netrc')
+    assert_equal(['l', 'p'], netrc['m'].to_a)
+    assert_equal(['default_login', 'default_password'], netrc['unknown'].to_a)
+  end
+
+  def test_multi_without_default
+    netrc = Netrc.read('data/sample_multi.netrc')
+    assert_equal(['lm', 'pm'], netrc['m'].to_a)
+    assert_equal(['ln', 'pn'], netrc['n'].to_a)
+    assert_equal([], netrc['other'].to_a)
+  end
+
+  def test_multi_with_default
+    netrc = Netrc.read('data/sample_multi_with_default.netrc')
+    assert_equal(['lm', 'pm'], netrc['m'].to_a)
+    assert_equal(['ln', 'pn'], netrc['n'].to_a)
+    assert_equal(['ld', 'pd'], netrc['other'].to_a)
+  end
+
+  def test_default_only
+    netrc = Netrc.read('data/default_only.netrc')
+    assert_equal(['ld', 'pd'], netrc['m'].to_a)
+    assert_equal(['ld', 'pd'], netrc['other'].to_a)
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netrc
 version: !ruby/object:Gem::Version
-  version: 0.7.7
-  prerelease: 
+  version: 0.7.8
 platform: ruby
 authors:
 - Keith Rarick
@@ -10,19 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70180390635460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180390635460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library can read and update netrc files, preserving formatting including
   comments and whitespace.
 email: geemus@gmail.com
@@ -30,40 +32,44 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
+- LICENSE.md
 - Readme.md
 - changelog.txt
+- data/default_only.netrc
 - data/login.netrc
 - data/newlineless.netrc
 - data/password.netrc
 - data/permissive.netrc
 - data/sample.netrc
+- data/sample_multi.netrc
+- data/sample_multi_with_default.netrc
+- data/sample_with_default.netrc
 - lib/netrc.rb
 - test/test_lex.rb
 - test/test_netrc.rb
 - test/test_parse.rb
 homepage: https://github.com/geemus/netrc
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library to read and write netrc files.
 test_files: []
+has_rdoc: 

data/LICENSE

@@ -1,7 +0,0 @@
-Copyright (c) 2012 Wesley Beary <geemus@gmail.com>
-
-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.