sysinfo 0.8.0 → 0.8.1

data/CHANGES.txt

@@ -1,11 +1,17 @@
 SYSINFO, CHANGES
 
+
+#### 0.8.1 (2014-02-11) #############################
+
+* CHANGE: Use Etc.getpwuid [jperville]
+
 #### 0.8.0 (2012-04-30) #############################
 
 * CHANGE: Removed #to_s
 * CHANGE: #platform now returns VM-OS-IMPL-ARCH
 * CHANGE: json is the default output format
 
+
 #### 0.7.2 (2010-02-12) #############################
 
 * CHANGE: Removed hanna dependency [Diego Elio 'Flameeyes' Pettenò]

data/lib/sysinfo.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'storable'
 require 'time'
+require 'tmpdir'
 
 # = SysInfo
 # 
@@ -9,7 +10,7 @@ require 'time'
 # specifically lib/platform.rb. 
 class SysInfo < Storable
   unless defined?(IMPLEMENTATIONS)
-    VERSION = "0.8.0".freeze
+    VERSION = "0.8.1".freeze
     IMPLEMENTATIONS = [
     
       # These are for JRuby, System.getproperty('os.name'). 
@@ -78,7 +79,7 @@ class SysInfo < Storable
     @vm, @os, @impl, @arch = find_platform_info
     @hostname, @ipaddress_internal, @uptime = find_network_info
     @ruby = RUBY_VERSION.split('.').collect { |v| v.to_i }
-    @user = ENV['USER']
+    @user = getpwattr(:name) || ENV['USER']
     require 'Win32API' if @os == :windows && @vm == :ruby
   end
   
@@ -178,25 +179,25 @@ class SysInfo < Storable
     (ENV['PATH'] || '').split(delim)
   end
   
-  def tmpdir_ruby_unix; (ENV['TMPDIR'] || '/tmp'); end
-  def tmpdir_ruby_windows; (ENV['TMPDIR'] || 'C:\\temp'); end
+  def tmpdir_ruby_unix; (Dir.tmpdir || '/tmp'); end
+  def tmpdir_ruby_windows; (Dir.tmpdir || 'C:\\temp'); end
   def tmpdir_java
     default = @impl == :windows ? 'C:\\temp' : '/tmp'
-    (ENV['TMPDIR'] || default)
+    (Dir.tmpdir || default)
   end
   
-  def shell_ruby_unix; (ENV['SHELL'] || 'bash').to_sym; end
+  def shell_ruby_unix; (ENV['SHELL'] || getpwattr(:shell) || 'bash').to_sym; end
   def shell_ruby_windows; :dos; end
   alias_method :shell_java_unix, :shell_ruby_unix
   alias_method :shell_java_windows, :shell_ruby_windows
   
-  def home_ruby_unix; File.expand_path(ENV['HOME']); end
+  def home_ruby_unix; File.expand_path(getpwattr(:dir)); end
   def home_ruby_windows; File.expand_path(ENV['USERPROFILE']); end
   def home_java
     if @impl == :windows
       File.expand_path(ENV['USERPROFILE'])
     else
-      File.expand_path(ENV['HOME'])
+      File.expand_path(getpwattr(:dir))
     end
   end
   
@@ -265,9 +266,17 @@ class SysInfo < Storable
     end
     ipaddr
   end
+
+  # Returns a named attribute of the user's /etc/password entry, or nil.
+  # As an example, `getpwdattr(:home)` will return the user's home directory
+  # without relying on ENV['HOME'] being present.
+  def getpwattr(pwattr)
+    passwd = Etc.getpwuid(Process::Sys.getuid) || {}
+    passwd[pwattr]
+  end
 end
 
 
 if $0 == __FILE__
   puts SysInfo.new.dump('json')
-end
+end

data/sysinfo.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "sysinfo"
   s.rubyforge_project = "sysinfo"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
   s.summary = "SysInfo: All your system-independent infoz in one handy class. "
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -41,4 +41,4 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.3.0'
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sysinfo
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: storable
@@ -76,21 +76,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1706058782098846642
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1706058782098846642
 requirements: []
 rubyforge_project: sysinfo
-rubygems_version: 1.8.22
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ! 'SysInfo: All your system-independent infoz in one handy class.'