fakeetc 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 478ba20702c29d670a5e38f12c8417528c8c04f8
-  data.tar.gz: d8fe0b47e4bccb6208bdb87bbae7f08fdcb28f12
+  metadata.gz: 1010bf297fbbf86c82442423a8d50ddf0943790e
+  data.tar.gz: c2067599d8eae21e06db5df1faf83be24c886302
 SHA512:
-  metadata.gz: a2e2517977a497aab29a9a948df92ec1b016f0c0eea4ce97662ec902064c5704840468fd594f57cea4836d1edb5c183467db7a3f815c5a68394d46b386eb680c
-  data.tar.gz: 3515da34591c0e5de8dc75ad5afacac713122b160a5a8d0234993e68889c9bd8704fae1da8e32846e2dd3ca3b309366b77e5f04f70013ee3e4c6a1ef3f7d2716
+  metadata.gz: 70f5945042165e7d71e27f2473d299fc38fffe66a0f349594e69f426195f628b73d064da1e9c01dba2cc957d2dfeb753ad58949466323382b15ad2cc78cdb44a
+  data.tar.gz: 78ce6591cac73f0a906ff2ce36f13a4be894ddf28295a1d723896468a5f282b6e83e732ff1463e8a5b61f8ad72ac5f3a00910b3ff88cbecdee2fce15624e5b68

data/NEWS.md

@@ -0,0 +1,12 @@
+# fakeetc NEWS
+## 0.3.0 (2015-06-03)
+- Add FakeEtc.getlogin
+- Let FakeEtc.getpwuid default to current user
+- Let FakeEtc.getgrgid default to current user's primary group
+
+## 0.2.0 (2015-02-13)
+- Add support for user functions (FakeEtc.getgrgid, FakeEtc.getgrnam, ...)
+- Add documentation (yardoc)
+
+## 0.1.0 (2015-02-02)
+- First public release

data/README.md

@@ -4,6 +4,7 @@ fakeetc
 [![Gem Version](http://img.shields.io/gem/v/fakeetc.svg?style=flat-square)][gem]
 [![Build Status](http://img.shields.io/travis/sometimesfood/fakeetc.svg?style=flat-square)][travis]
 [![Code Climate](http://img.shields.io/codeclimate/github/sometimesfood/fakeetc.svg?style=flat-square)][codeclimate]
+[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/sometimesfood/fakeetc.svg?style=flat-square)][codeclimate]
 
 A fake Ruby `Etc` module for your tests.
 

data/lib/fakeetc/base.rb

@@ -86,6 +86,40 @@ module FakeEtc # rubocop:disable Documentation
       end
     end
   end
+
+  def self.idbyargs(user_or_group, args)
+    fail ArgumentError unless [:user, :group].include?(user_or_group)
+    return args.first unless args.size.zero?
+    user_or_group == :user ? getpwnam(getlogin).uid : getpwnam(getlogin).gid
+  end
+  private_class_method :idbyargs
+
+  def self.getbyid(user_or_group, id)
+    fail ArgumentError unless [:user, :group].include?(user_or_group)
+    if user_or_group == :user
+      records = @users
+      id_name = :uid
+    else
+      records = @groups
+      id_name = :gid
+    end
+    records.values.find { |r| r.method(id_name).call == id }
+  end
+  private_class_method :getbyid
+
+  def self.getbyargs(user_or_group, args)
+    argument_error = "wrong number of arguments (#{args.size} for 0..1)"
+    fail ArgumentError, argument_error, caller if args.size > 1
+
+    id = idbyargs(user_or_group, args)
+    entry = getbyid(user_or_group, id)
+
+    unless entry
+      fail ArgumentError, "can't find #{user_or_group} for #{id}", caller
+    end
+    entry
+  end
+  private_class_method :getbyargs
 end
 
 # Runs a code block with FakeEtc.

data/lib/fakeetc/groups.rb

@@ -18,7 +18,7 @@ module FakeEtc # rubocop:disable Documentation
         group = Struct::Group.new(group_name,
                                   passwd,
                                   group_info[:gid],
-                                  group_info[:mem])
+                                  group_info[:mem] || [])
         @groups[group_name] = group
       end
     end
@@ -40,15 +40,14 @@ module FakeEtc # rubocop:disable Documentation
       group
     end
 
-    # Finds a group by its gid.
+    # Finds a group by its gid. Returns the current user's primary
+    #   group if no gid is supplied.
     # @param gid [Integer] the group's gid
     # @return [Struct::Group] the group
     # @raise [ArgumentError] if no group with the given gid can be
     #   found
-    def getgrgid(gid)
-      group = @groups.values.find { |g| g.gid == gid }
-      fail ArgumentError, "can't find group for #{gid}" if group.nil?
-      group
+    def getgrgid(*gid)
+      getbyargs(:group, gid)
     end
 
     # Returns an entry from the group list. Each successive call

data/lib/fakeetc/users.rb

@@ -1,5 +1,9 @@
 module FakeEtc # rubocop:disable Documentation
   class << self
+    # @return [String] the short user name of the currently "logged
+    #   in" fake user
+    attr_writer :login
+
     # Adds users to the FakeEtc user list.
     #
     # @param user_hash [Hash{String=>Hash{Symbol=>Integer,String}}]
@@ -21,20 +25,23 @@ module FakeEtc # rubocop:disable Documentation
     #
     # @return [void]
     def add_users(user_hash)
-      passwd = 'x'
-
       user_hash.each do |user_name, user_info|
-        user = Struct::Passwd.new(user_name,
-                                  passwd,
-                                  user_info[:uid],
-                                  user_info[:gid],
-                                  user_info[:gecos],
-                                  user_info[:dir],
-                                  user_info[:shell])
-        @users[user_name] = user
+        @users[user_name] = to_passwd(user_name, user_info)
       end
     end
 
+    def to_passwd(user_name, user_info)
+      passwd = 'x'
+      Struct::Passwd.new(user_name,
+                         passwd,
+                         user_info[:uid],
+                         user_info[:gid],
+                         user_info[:gecos],
+                         user_info[:dir],
+                         user_info[:shell])
+    end
+    private :to_passwd
+
     # Clears the user list.
     # @return [void]
     def clear_users
@@ -52,14 +59,13 @@ module FakeEtc # rubocop:disable Documentation
       user
     end
 
-    # Finds a user by their user id.
+    # Finds a user by their user id. Returns the current user if no
+    #   uid is supplied.
     # @param uid [Integer] the user's id
     # @return [Struct::Passwd] the user
     # @raise [ArgumentError] if no user with the given id can be found
-    def getpwuid(uid)
-      user = @users.values.find { |u| u.uid == uid }
-      fail ArgumentError, "can't find user for #{uid}" if user.nil?
-      user
+    def getpwuid(*uid)
+      getbyargs(:user, uid)
     end
 
     # Returns an entry from the user list. Each successive call
@@ -90,5 +96,11 @@ module FakeEtc # rubocop:disable Documentation
       endpwent
       nil
     end
+
+    # @return [String] the short user name of the currently "logged
+    #   in" fake user
+    def getlogin
+      @login
+    end
   end
 end

data/lib/fakeetc/version.rb

@@ -1,4 +1,4 @@
 module FakeEtc # rubocop:disable Documentation
   # Current FakeEtc version.
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/fakeetc_spec.rb

@@ -22,6 +22,7 @@ describe FakeEtc do
     }
     FakeEtc.add_groups(@groups)
     FakeEtc.add_users(@users)
+    FakeEtc.login = 'norwegian_blue'
   end
 
   after(:each) do
@@ -29,6 +30,7 @@ describe FakeEtc do
     FakeEtc.clear_users
     FakeEtc.endgrent
     FakeEtc.clear_groups
+    FakeEtc.login = nil
   end
 
   describe 'activate' do
@@ -44,7 +46,7 @@ describe FakeEtc do
   end
 
   describe 'with' do
-    it 'should activate Etc in a block' do
+    it 'should activate FakeEtc in a block' do
       real_etc = Etc
       fake_etc = FakeEtc
 
@@ -53,10 +55,23 @@ describe FakeEtc do
       end
       Etc.must_equal real_etc
     end
+
+    it 'should run the block if FakeEtc is already activated' do
+      real_etc = Etc
+      fake_etc = FakeEtc
+
+      FakeEtc.with do
+        Etc.must_equal fake_etc
+        FakeEtc.with do
+          Etc.must_equal fake_etc
+        end
+      end
+      Etc.must_equal real_etc
+    end
   end
 
   describe 'without' do
-    it 'should activate Etc in a block' do
+    it 'should deactivate FakeEtc in a block' do
       real_etc = Etc
       fake_etc = FakeEtc
 
@@ -69,6 +84,23 @@ describe FakeEtc do
       end
       Etc.must_equal real_etc
     end
+
+    it 'should run the block if FakeEtc is already deactivated' do
+      real_etc = Etc
+      fake_etc = FakeEtc
+
+      FakeEtc.with do
+        Etc.must_equal fake_etc
+        FakeEtc.without do
+          Etc.must_equal real_etc
+          FakeEtc.without do
+            Etc.must_equal real_etc
+          end
+        end
+        Etc.must_equal fake_etc
+      end
+      Etc.must_equal real_etc
+    end
   end
 
   describe 'getgrnam' do
@@ -94,6 +126,14 @@ describe FakeEtc do
       parrot_group.mem.must_equal @groups['parrots'][:mem]
     end
 
+    it 'should return the primary group of the current user' do
+      FakeEtc.login = 'red_leicester'
+      cheese_group = FakeEtc.getgrgid
+      cheese_group.must_be_instance_of Struct::Group
+      cheese_group.gid.must_equal @groups['cheeses'][:gid]
+      cheese_group.mem.must_equal @groups['cheeses'][:mem]
+    end
+
     it 'should raise exceptions for non-existent groups' do
       gid = 247
       err = -> { FakeEtc.getgrgid(gid) }.must_raise ArgumentError
@@ -182,6 +222,17 @@ describe FakeEtc do
       norwegian_blue.shell.must_equal @users['norwegian_blue'][:shell]
     end
 
+    it 'should return the current user' do
+      FakeEtc.login = 'red_leicester'
+      red_leicester = FakeEtc.getpwuid
+      red_leicester.must_be_instance_of Struct::Passwd
+      red_leicester.uid.must_equal @users['red_leicester'][:uid]
+      red_leicester.gid.must_equal @users['red_leicester'][:gid]
+      red_leicester.gecos.must_equal @users['red_leicester'][:gecos]
+      red_leicester.dir.must_equal @users['red_leicester'][:dir]
+      red_leicester.shell.must_equal @users['red_leicester'][:shell]
+    end
+
     it 'should raise exceptions for non-existent groups' do
       uid = 247
       err = -> { FakeEtc.getpwuid(uid) }.must_raise ArgumentError
@@ -234,6 +285,12 @@ describe FakeEtc do
       nil_user.must_be_nil
     end
   end
+
+  describe 'getlogin' do
+    it 'should return the name of the current fake user' do
+      FakeEtc.getlogin.must_equal 'norwegian_blue'
+    end
+  end
 end
 
 describe 'FakeEtc' do

data/spec/spec_helper.rb

@@ -1 +1,11 @@
+if ENV['CODECLIMATE_REPO_TOKEN']
+  require 'simplecov'
+  require 'codeclimate-test-reporter'
+  ignored_directories = %w(/spec/ /vendor/ /.bundle/)
+  formatters = [SimpleCov::Formatter::HTMLFormatter,
+                CodeClimate::TestReporter::Formatter]
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
+  SimpleCov.start { add_filter(ignored_directories) }
+end
+
 require 'minitest/autorun'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakeetc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sebastian Boehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: 5.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: 5.6.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -60,10 +60,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
-- README.md
-- LICENSE
-- NEWS
 - lib/fakeetc/base.rb
 - lib/fakeetc/groups.rb
 - lib/fakeetc/system.rb
@@ -72,6 +68,10 @@ files:
 - lib/fakeetc.rb
 - spec/fakeetc_spec.rb
 - spec/spec_helper.rb
+- Rakefile
+- README.md
+- NEWS.md
+- LICENSE
 homepage: https://github.com/sometimesfood/fakeetc
 licenses:
 - MIT
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='

data/NEWS

@@ -1,13 +0,0 @@
-* fakeetc NEWS
-** 0.2.0 (2015-02-13)
-
- - Add support for user functions (FakeEtc.getgrgid, FakeEtc.getgrnam, ...)
- - Add documentation (yardoc)
-
-** 0.1.0 (2015-02-02)
-
- - First public release
-
-# Local Variables:
-# mode: org
-# End: