sys-uname 0.9.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 634e16ee327f71855ae5beb73f403d3d9801969a
+  data.tar.gz: 51c9a68e6caaed60bd4795e0a800ca55500a8d03
+SHA512:
+  metadata.gz: 92410aef8438e64c17fd2f055f2015d7d013ee15915bc36511193df3156e66e962e2638caee2a818452b6c5facc43b56d67c84fd5124538723aeb22d0816c1d0
+  data.tar.gz: 89ddf92b1a4d5a0dcbe8dce8f944f42115d179f69508c7f473ac2cfc23063440e37d1068f39ecd779f3b9e6201a7f4b55d2b463d29a9f8a4d48a98cba9601d74

data/CHANGES

@@ -1,3 +1,13 @@
+== 1.0.0 - 19-Aug-2015
+* Added a sys-uname.rb shim so that you can require this library with
+  "sys-uname" or "sys/uname".
+* Added the architecture method for MS Windows.
+* Added a Sys::Platform class that adds several boolean methods to check
+  your operating system. It also adds the ARCH, OS, and IMPL constants
+  to simulate, and ultimately replace, the old "Platform" gem.
+* There is now just a single gem, instead of a separate gem for Windows
+  and Unix, so you shouldn't need to worry about platform checking.
+
 == 0.9.2 - 1-May-2013
 * Added a workaround for a win32ole thread bug. Thanks go to Tianlong Wu
   for the spot.

data/README

@@ -12,10 +12,16 @@
   gem install sys-uname --platform universal-mingw32
    
 = Synopsis
-  require 'sys/uname'
-  include Sys
+  require 'sys/uname' # require 'sys-uname' works, too
+
+  # You now have Sys::Uname and Sys::Platform classes available.
    
-  p Uname.uname
+  # Get full information about your system
+  p Sys::Uname.uname
+
+  # Check individual platform details about your system
+  p Sys::Platform.linux? # => true
+  p Sys::Platform::ARCH  # => :x86_46
    
 = Solaris Notes
   Users on SunOS get several extra methods: architecture, platform,
@@ -31,9 +37,18 @@
 
 = MS Windows Notes
   The C version for Windows has been completely scrapped in favor of an OLE
-  plus WMI approach.  It is pure Ruby.  Please see the MSDN documentation for
+  plus WMI approach. It is pure Ruby. Please see the MSDN documentation for
   the Win32_OperatingSystem class for a complete list of what each of the
   UnameStruct members mean.
 
+= The Platform Class
+  This was added both as a nicer way to check simple information about your
+  system, and as a replacement for the old 'Platform' gem which is no longer
+  maintained.
+
+= Future Plans
+  I may dump the "Uname" portion of this library, and rename the project
+  to just sys-platform.
+
 = Documentation
   For more details, see the 'uname.txt' file under the 'doc' directory. 

data/Rakefile

@@ -17,17 +17,13 @@ end
 namespace :gem do
   desc "Create the sys-uname gem"
   task :create => [:clean] do
+    require 'rubygems/package'
     spec = eval(IO.read('sys-uname.gemspec'))
-
-    if File::ALT_SEPARATOR
-      spec.platform = Gem::Platform::new(['universal', 'mingw32'])
-    end
-    
-    Gem::Builder.new(spec).build
+    Gem::Package.build(spec)
   end
 
   desc "Install the sys-uname gem"
-  task :install => [:build] do
+  task :install => [:create] do
     file = Dir["*.gem"].first
     sh "gem install #{file}"
   end
@@ -35,12 +31,6 @@ end
 
 desc "Run the test suite"
 Rake::TestTask.new("test") do |t|
-  if File::ALT_SEPARATOR
-    t.libs << 'lib/windows'
-  else
-    t.libs << 'lib/unix'
-  end
-
   t.warning = true
   t.verbose = true
 end

data/lib/sys-uname.rb

@@ -0,0 +1 @@
+require_relative 'sys/uname'

data/lib/sys/platform.rb

@@ -0,0 +1,54 @@
+module Sys
+  class Platform
+    # The CPU architecture
+    ARCH = File::ALT_SEPARATOR ? Uname.architecture.to_sym : Uname.machine.to_sym
+
+    # Returns a basic OS family, either :windows or :unix
+    OS = File::ALT_SEPARATOR ? :windows : :unix
+
+    # Returns the OS type, :macosx, :linux, :mingw32, etc
+    IMPL = case Uname.sysname
+      when /darwin|mac/i
+        :macosx
+      when /mingw|windows/i
+        require 'rbconfig'
+        RbConfig::CONFIG['host_os'].split('_').first.to_sym
+      when /linux/i
+        :linux
+      when /sunos|solaris/i
+        :solaris
+      when /bsd/i
+        :bsd
+    end
+
+    # Returns whether or not you're on a Windows OS
+    def self.windows?
+      Uname.sysname =~ /microsoft/i ? true : false
+    end
+
+    # Returns whether or not you're on a Unixy (non-Windows) OS
+    def self.unix?
+      Uname.sysname !~ /microsoft/i ? true : false
+    end
+
+    # Returns whether or not you're on a mac, i.e. OSX
+    def self.mac?
+      Uname.sysname =~ /darwin|mac/i ? true : false
+    end
+
+    # Returns whether or not you're on Linux
+    def self.linux?
+      Uname.sysname =~ /linux/i ? true : false
+    end
+
+    # Returns whether or not you're on Solaris
+    def self.solaris?
+      Uname.sysname =~ /sunos|solaris/i ? true : false
+    end
+
+    # Returns whether or not you're on any BSD platform
+    def self.bsd?
+      Uname.sysname =~ /bsd/i ? true : false
+    end
+  end
+end

data/lib/sys/uname.rb

@@ -0,0 +1,7 @@
+if File::ALT_SEPARATOR
+  require_relative 'windows/uname'
+else
+  require_relative 'unix/uname'
+end
+
+require_relative 'platform'

data/lib/{unix/sys → sys/unix}/uname.rb

@@ -13,7 +13,7 @@ module Sys
     class Error < StandardError; end
 
     # The version of the sys-uname library
-    VERSION = '0.9.2'
+    VERSION = '1.0.0'
 
     # :stopdoc
 

data/lib/{windows/sys → sys/windows}/uname.rb

@@ -20,7 +20,7 @@ module Sys
     class Error < StandardError; end
 
     # The version of the sys-uname library.
-    VERSION = '0.9.2'
+    VERSION = '1.0.0'
 
     fields = %w[
       boot_device
@@ -135,6 +135,35 @@ module Sys
       end
     end
 
+    # Returns the CPU architecture, e.g. "x86"
+    #
+    def self.architecture(cpu_num=0, host=Socket.gethostname)
+      cs = "winmgmts:{impersonationLevel=impersonate,(security)}"
+      cs << "//#{host}/root/cimv2:Win32_Processor='cpu#{cpu_num}'"
+      begin
+        wmi = WIN32OLE.connect(cs)
+      rescue WIN32OLERuntimeError => e
+        raise Error, e
+      else
+        case wmi.Architecture
+          when 0
+            "x86"
+          when 1
+            "mips"
+          when 2
+            "alpha"
+          when 3
+            "powerpc"
+          when 6
+            "ia64"
+          when 9
+            "x86_64"
+          else
+            "unknown"
+        end
+      end
+    end
+
     # Returns the machine hardware type.  e.g. "i686".
     #--
     # This may or may not return the expected value because some CPU types
@@ -285,10 +314,16 @@ module Sys
             return "Crusoe TM5000 Family"
           when 121
             return "Crusoe TM3000 Family"
+          when 122
+            return "Efficeon TM8000 Family"
           when 128
             return "Weitek"
           when 130
             return "Itanium Processor"
+          when 131
+            return "AMD Athlon 64 Processor Family"
+          when 132
+            return "AMD Opteron Processor Family"
           when 144
             return "PA-RISC Family"
           when 145
@@ -327,12 +362,18 @@ module Sys
             return "AMD Opteron Family"
           when 190
             return "K7"
+          when 198
+            return "Intel Core i7-2760QM"
           when 200
             return "IBM390 Family"
           when 201
             return "G4"
           when 202
             return "G5"
+          when 203
+            return "G6"
+          when 204
+            return "z/Architecture Base"
           when 250
             return "i860"
           when 251

data/sys-uname.gemspec

@@ -1,25 +1,19 @@
 require 'rubygems'
 
 Gem::Specification.new do |spec|
-  spec.name      = 'sys-uname'
-  spec.version   = '0.9.2'
-  spec.author    = 'Daniel J. Berger'
-  spec.email     = 'djberg96@gmail.com'
-  spec.homepage  = 'http://www.rubyforge.org/projects/sysutils'
-  spec.summary   = 'An interface for returning uname (platform) information'
-  spec.test_file = 'test/test_sys_uname.rb'
-  spec.license   = 'Artistic 2.0'
-  spec.files     = Dir['**/*'].reject{ |f| f.include?('git') } 
+  spec.name       = 'sys-uname'
+  spec.version    = '1.0.0'
+  spec.author     = 'Daniel J. Berger'
+  spec.email      = 'djberg96@gmail.com'
+  spec.homepage   = 'http://github.com/djberg96/sys-uname'
+  spec.summary    = 'An interface for returning uname (platform) information'
+  spec.license    = 'Artistic 2.0'
+  spec.files      = Dir['**/*'].reject{ |f| f.include?('git') } 
+  spec.test_files = FileList['test/test_sys_uname.rb', 'test/test_sys_platform.rb']
 
   spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/uname.txt']
-  spec.rubyforge_project = 'sysutils'
 
-  if File::ALT_SEPARATOR
-    spec.require_paths = ['lib', 'lib/windows']
-  else
-    spec.require_paths = ['lib', 'lib/unix']
-    spec.add_dependency('ffi', '>= 1.0.0')
-  end
+  spec.add_dependency('ffi', '>= 1.0.0')
 
   spec.description = <<-EOF
     The sys-uname library provides an interface for gathering information

data/test/test_sys_platform.rb

@@ -0,0 +1,70 @@
+##############################################################################
+# test_sys_platform.rb
+#
+# Test suite for the Sys::Platform class.
+##############################################################################
+require 'test-unit'
+require 'sys/uname'
+require 'rbconfig'
+
+class TC_Sys_Platform < Test::Unit::TestCase
+  def self.startup
+    @@host_os = RbConfig::CONFIG['host_os']
+    @@windows = @@host_os =~ /mingw|mswin|windows/i ? true : false
+  end
+
+  test "the ARCH constant is defined" do
+    assert_kind_of(Symbol, Sys::Platform::ARCH)
+  end
+
+  test "the OS constant is defined" do
+    assert_kind_of(Symbol, Sys::Platform::OS)
+  end
+
+  test "the IMPL constant is defined" do
+    assert_kind_of(Symbol, Sys::Platform::IMPL)
+  end
+
+  test "the mac? method is defined and returns a boolean" do
+    assert_respond_to(Sys::Platform, :mac?)
+    assert_boolean(Sys::Platform.mac?)
+  end
+
+  test "the windows? method is defined and returns a boolean" do
+    assert_respond_to(Sys::Platform, :windows?)
+    assert_boolean(Sys::Platform.windows?)
+  end
+
+  test "the windows? method returns the expected value" do
+    assert_equal(Sys::Platform.windows?, @@windows)
+  end
+
+  test "the unix? method is defined and returns a boolean" do
+    assert_respond_to(Sys::Platform, :unix?)
+    assert_boolean(Sys::Platform.unix?)
+  end
+
+  test "the unix? method returns the expected value" do
+    assert_equal(Sys::Platform.unix?, !@@windows)
+  end
+
+  test "the solaris? method is defined and returns a boolean" do
+    assert_respond_to(Sys::Platform, :solaris?)
+    assert_boolean(Sys::Platform.solaris?)
+  end
+
+  test "the linux? method is defined and returns a boolean" do
+    assert_respond_to(Sys::Platform, :linux?)
+    assert_boolean(Sys::Platform.linux?)
+  end
+
+  test "the bsd? method is defined and returns a boolean" do
+    assert_respond_to(Sys::Platform, :bsd?)
+    assert_boolean(Sys::Platform.bsd?)
+  end
+
+  def self.shutdown
+    @@host_os = nil
+    @@windows = nil
+  end
+end

data/test/test_sys_uname.rb

@@ -14,7 +14,7 @@ class TC_Sys_Uname < Test::Unit::TestCase
   end
 
   test "version constant is set to expected value" do
-    assert_equal('0.9.2', Uname::VERSION)
+    assert_equal('1.0.0', Uname::VERSION)
   end
 
   test "machine singleton method works as expected" do
@@ -210,7 +210,7 @@ class TC_Sys_Uname < Test::Unit::TestCase
 
     def test_csd_version
       assert_nothing_raised{ Uname.uname.csd_version }
-      assert_kind_of(String, Uname.uname.csd_version)
+      assert_kind_of([String, NilClass], Uname.uname.csd_version)
     end
 
     def test_cs_name

metadata

@@ -1,36 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sys-uname
 version: !ruby/object:Gem::Version
-  version: 0.9.2
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: ! "    The sys-uname library provides an interface for gathering information\n
-  \   about your current platform. The library is named after the Unix 'uname'\n    command
-  but also works on MS Windows. Available information includes\n    OS name, OS version,
-  system name and so on. Additional information is\n    available for certain platforms.\n"
+description: |2
+      The sys-uname library provides an interface for gathering information
+      about your current platform. The library is named after the Unix 'uname'
+      command but also works on MS Windows. Available information includes
+      OS name, OS version, system name and so on. Additional information is
+      available for certain platforms.
 email: djberg96@gmail.com
 executables: []
 extensions: []
@@ -41,40 +40,43 @@ extra_rdoc_files:
 - doc/uname.txt
 files:
 - CHANGES
-- doc/uname.txt
-- examples/uname_test.rb
-- lib/unix/sys/uname.rb
-- lib/windows/sys/uname.rb
 - MANIFEST
-- Rakefile
 - README
+- Rakefile
+- doc/uname.txt
+- examples/uname_test.rb
+- lib/sys-uname.rb
+- lib/sys/platform.rb
+- lib/sys/uname.rb
+- lib/sys/unix/uname.rb
+- lib/sys/windows/uname.rb
 - sys-uname.gemspec
+- test/test_sys_platform.rb
 - test/test_sys_uname.rb
-homepage: http://www.rubyforge.org/projects/sysutils
+homepage: http://github.com/djberg96/sys-uname
 licenses:
 - Artistic 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
-- lib/unix
 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: sysutils
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An interface for returning uname (platform) information
 test_files:
 - test/test_sys_uname.rb
+- test/test_sys_platform.rb