sysinfo 0.8.0 → 0.9.0.pre.RC1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 41eb7522683b4f474f8cf49d15c03891eb5ba2718a549a8cec52b57afd21922d
+  data.tar.gz: 9d235a1c5f590f5088a55e4c15dfe0ff189dd19b0bd6037677c9530de8ff321c
+SHA512:
+  metadata.gz: b84c9a323f1a5a399d0821ef8b85c3e82d2dba38e5ef85f742155a5beb13c46e582e30ad0486299e9428dab41638525ec17db50a7653825a4f2be644412b5194
+  data.tar.gz: 4c8860fb1ec0305b623839bdfa07beeb9826ab20a07b939a3c8bde424f513bf1c1cf5a58739da8f6e492cd34441e539a60d835d0efabe612d42371cbdb599ccc

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,27 +1,28 @@
 require 'socket'
 require 'storable'
 require 'time'
+require 'tmpdir'
 
 # = SysInfo
-# 
-# A container for the platform specific system information. 
-# Portions of this code were originally from Amazon's EC2 AMI tools, 
-# specifically lib/platform.rb. 
+#
+# A container for the platform specific system information.
+# Portions of this code were originally from Amazon's EC2 AMI tools,
+# specifically lib/platform.rb.
 class SysInfo < Storable
   unless defined?(IMPLEMENTATIONS)
-    VERSION = "0.8.0".freeze
+    VERSION = "0.9.0".freeze
     IMPLEMENTATIONS = [
-    
-      # These are for JRuby, System.getproperty('os.name'). 
+
+      # These are for JRuby, System.getproperty('os.name').
       # For a list of all values, see: http://lopica.sourceforge.net/os.html
-      
+
       #regexp matcher       os        implementation
-      [/mac\s*os\s*x/i,     :unix,    :osx              ],  
-      [/sunos/i,            :unix,    :solaris          ], 
+      [/mac\s*os\s*x/i,     :unix,    :osx              ],
+      [/sunos/i,            :unix,    :solaris          ],
       [/windows\s*ce/i,     :windows, :wince            ],
-      [/windows/i,          :windows, :windows          ],  
+      [/windows/i,          :windows, :windows          ],
       [/osx/i,              :unix,    :osx              ],
-      
+
       # These are for RUBY_PLATFORM and JRuby
       [/java/i,             :java,    :java             ],
       [/darwin/i,           :unix,    :osx              ],
@@ -63,14 +64,14 @@ class SysInfo < Storable
   field :ipaddress_internal => String
   #field :ipaddress_external => String
   field :uptime => Float
-  
+
   field :paths
   field :tmpdir
   field :home
   field :shell
   field :user
   field :ruby
-  
+
   alias :implementation :impl
   alias :architecture :arch
 
@@ -78,10 +79,10 @@ 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
-  
+
   # Returns [vm, os, impl, arch]
   def find_platform_info
     vm, os, impl, arch = :ruby, :unknown, :unknown, :unknow
@@ -97,25 +98,25 @@ class SysInfo < Storable
     end
     os == :java ? guess_java : [vm, os, impl, arch]
   end
-  
+
   # Returns [hostname, ipaddr (internal), uptime]
   def find_network_info
     hostname, ipaddr, uptime = :unknown, :unknown, :unknown
     begin
       hostname = find_hostname
       ipaddr = find_ipaddress_internal
-      uptime = find_uptime       
+      uptime = find_uptime
     rescue => ex # Be silent!
     end
     [hostname, ipaddr, uptime]
   end
-  
+
     # Return the hostname for the local machine
   def find_hostname; Socket.gethostname; end
-  
-  # Returns the local uptime in hours. Use Win32API in Windows, 
+
+  # Returns the local uptime in hours. Use Win32API in Windows,
   # 'sysctl -b kern.boottime' os osx, and 'who -b' on unix.
-  # Based on Ruby Quiz solutions by: Matthias Reitinger 
+  # Based on Ruby Quiz solutions by: Matthias Reitinger
   # On Windows, see also: net statistics server
   def find_uptime
     hours = 0
@@ -128,24 +129,24 @@ class SysInfo < Storable
     hours
   end
 
-  
+
   # Return the local IP address which receives external traffic
   # from: http://coderrr.wordpress.com/2008/05/28/get-your-local-ip-address/
-  # NOTE: This <em>does not</em> open a connection to the IP address. 
+  # NOTE: This <em>does not</em> open a connection to the IP address.
   def find_ipaddress_internal
-    # turn off reverse DNS resolution temporarily 
-    orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true   
+    # turn off reverse DNS resolution temporarily
+    orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true
     UDPSocket.open {|s| s.connect('65.74.177.129', 1); s.addr.last } # GitHub IP
-  ensure  
+  ensure
     Socket.do_not_reverse_lookup = orig
   end
-  
+
   # Returns a String of the full platform descriptor in the format: VM-OS-IMPL-ARCH
   # e.g. <tt>java-unix-osx-x86_64</tt>
   def platform
     "#{@vm}-#{@os}-#{@impl}-#{@arch}"
   end
-  
+
     # Returns the environment paths as an Array
   def paths; execute_platform_specific(:paths); end
     # Returns the path to the current user's home directory
@@ -154,10 +155,10 @@ class SysInfo < Storable
   def shell; execute_platform_specific(:shell); end
     # Returns the path to the current temp directory
   def tmpdir; execute_platform_specific(:tmpdir); end
-  
+
  private
-  
-  # Look for and execute a platform specific method. 
+
+  # Look for and execute a platform specific method.
   # The name of the method will be in the format: +dtype-VM-OS-IMPL+.
   # e.g. find_uptime_ruby_unix_osx
   #
@@ -168,40 +169,40 @@ class SysInfo < Storable
       return self.send(meth) if SysInfo.private_method_defined?(meth)
       criteria.pop
     end
-    raise "#{dtype}_#{@vm}_#{@os}_#{@impl} not implemented" 
+    raise "#{dtype}_#{@vm}_#{@os}_#{@impl} not implemented"
   end
-  
+
   def paths_ruby_unix; (ENV['PATH'] || '').split(':'); end
   def paths_ruby_windows; (ENV['PATH'] || '').split(';'); end # Not tested!
   def paths_java
     delim = @impl == :windows ? ';' : ':'
     (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
-  
+
   # Ya, this is kinda wack. Ruby -> Java -> Kernel32. See:
-  # http://www.oreillynet.com/ruby/blog/2008/01/jruby_meets_the_windows_api_1.html  
+  # http://www.oreillynet.com/ruby/blog/2008/01/jruby_meets_the_windows_api_1.html
   # http://msdn.microsoft.com/en-us/library/ms724408(VS.85).aspx
   # Ruby 1.9.1: Win32API is now deprecated in favor of using the DL library.
   def find_uptime_java_windows_windows
@@ -215,30 +216,30 @@ class SysInfo < Storable
     ((getTickCount.call()).to_f / 1000).to_f
   end
   def find_uptime_ruby_unix_osx
-    # This is faster than "who" and could work on BSD also. 
+    # This is faster than "who" and could work on BSD also.
     (Time.now.to_f - Time.at(`sysctl -b kern.boottime 2>/dev/null`.unpack('L').first).to_f).to_f
   end
-  
+
   # This should work for most unix flavours.
   def find_uptime_ruby_unix
     # who is sloooooow. Use File.read('/proc/uptime')
     (Time.now.to_i - Time.parse(`who -b 2>/dev/null`).to_f)
   end
   alias_method :find_uptime_java_unix_osx, :find_uptime_ruby_unix
-  
-  # Determine the values for vm, os, impl, and arch when running on Java. 
+
+  # Determine the values for vm, os, impl, and arch when running on Java.
   def guess_java
     vm, os, impl, arch = :java, :unknown, :unknown, :unknown
     require 'java'
     include_class java.lang.System unless defined?(System)
-    
+
     osname = System.getProperty("os.name")
     IMPLEMENTATIONS.each do |r, o, i|
       next unless osname =~ r
       os, impl = [o, i]
       break
     end
-    
+
     osarch = System.getProperty("os.arch")
     ARCHITECTURES.each do |r, a|
       next unless osarch =~ r
@@ -247,12 +248,12 @@ class SysInfo < Storable
     end
     [vm, os, impl, arch]
   end
-  
-  # Returns the local IP address based on the hostname. 
+
+  # Returns the local IP address based on the hostname.
   # According to coderrr (see comments on blog link above), this implementation
   # doesn't guarantee that it will return the address for the interface external
   # traffic goes through. It's also possible the hostname isn't resolvable to the
-  # local IP.  
+  # local IP.
   #
   # NOTE: This code predates the current ip_address_internal. It was just as well
   # but the other code is cleaner. I'm keeping this old version here for now.
@@ -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,44 +1,25 @@
-@spec = Gem::Specification.new do |s|
-  s.name = "sysinfo"
-  s.rubyforge_project = "sysinfo"
-  s.version = "0.8.0"
-  s.summary = "SysInfo: All your system-independent infoz in one handy class. "
+Gem::Specification.new do |s|
+  s.name        = "sysinfo"
+  s.version     = "0.9.0-RC1"
+  s.summary     = "SysInfo: All your system-independent infoz in one handy class. "
   s.description = s.summary
-  s.author = "Delano Mandelbaum"
-  s.email = "delano@solutious.com"
-  s.homepage = "http://solutious.com/"
-  
-  
-  # = EXECUTABLES =
-  # The list of executables in your project (if any). Don't include the path, 
-  # just the base filename.
+  s.author      = "Delano Mandelbaum"
+  s.email       = "delano@solutious.com"
+  s.homepage    = "https://github.com/username/sysinfo"  # replace with actual URL
+  s.license     = "MIT"  # replace with actual license
+
   s.executables = %w[sysinfo]
-  
-  # = DEPENDENCIES =
-  # Add all gem dependencies
-  s.add_dependency 'storable'
-  s.add_dependency 'drydock'
-    
-  # = MANIFEST =
-  # The complete list of files to be included in the release. When GitHub packages your gem, 
-  # it doesn't allow you to run any command that accesses the filesystem. You will get an
-  # error. You can ask your VCS for the list of versioned files:
-  # git ls-files
-  # svn list -R
+
+  s.add_dependency 'storable', '0.10.pre.RC1'
+  s.add_dependency 'drydock', '<1.0'
+
   s.files = %w(
-  CHANGES.txt
-  LICENSE.txt
-  README.rdoc
-  Rakefile
-  bin/sysinfo
-  lib/sysinfo.rb
-  sysinfo.gemspec
+    CHANGES.txt
+    LICENSE.txt
+    README.rdoc
+    Rakefile
+    bin/sysinfo
+    lib/sysinfo.rb
+    sysinfo.gemspec
   )
-  
-  s.extra_rdoc_files = %w[README.rdoc LICENSE.txt]
-  s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
-  s.require_paths = %w[lib]
-  s.rubygems_version = '1.3.0'
-
-end
+end

metadata

@@ -1,56 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: sysinfo
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 0.9.0.pre.RC1
 platform: ruby
 authors:
 - Delano Mandelbaum
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: storable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.pre.RC1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.pre.RC1
 - !ruby/object:Gem::Dependency
   name: drydock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'SysInfo: All your system-independent infoz in one handy class.'
+        version: '1.0'
+description: 'SysInfo: All your system-independent infoz in one handy class.'
 email: delano@solutious.com
 executables:
 - sysinfo
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- LICENSE.txt
+extra_rdoc_files: []
 files:
 - CHANGES.txt
 - LICENSE.txt
@@ -59,39 +52,27 @@ files:
 - bin/sysinfo
 - lib/sysinfo.rb
 - sysinfo.gemspec
-homepage: http://solutious.com/
-licenses: []
-post_install_message: 
-rdoc_options:
-- --line-numbers
-- --title
-- ! 'SysInfo: All your system-independent infoz in one handy class.'
-- --main
-- README.rdoc
+homepage: https://github.com/username/sysinfo
+licenses:
+- MIT
+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'
-      segments:
-      - 0
-      hash: 1706058782098846642
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1706058782098846642
+      version: 1.3.1
 requirements: []
-rubyforge_project: sysinfo
-rubygems_version: 1.8.22
-signing_key: 
-specification_version: 3
-summary: ! 'SysInfo: All your system-independent infoz in one handy class.'
+rubygems_version: 3.3.26
+signing_key:
+specification_version: 4
+summary: 'SysInfo: All your system-independent infoz in one handy class.'
 test_files: []