os 0.8.0 → 0.9.0

data/Gemfile.lock

@@ -24,6 +24,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   jeweler

data/README.rdoc

@@ -3,13 +3,13 @@ The OS gem allows for some easy telling if you're on windows or not.
     require 'os'
     
     >> OS.windows?
-    => true   # also OS.doze?
+    => true   # or OS.doze?
     
     >> OS.bits
     => 32
     
     >> OS.java?
-    => true # if you're running in jruby also OS.jruby?
+    => true # if you're running in jruby.  Also OS.jruby?
     
     >> OS.ruby_bin
     => "c:\ruby18\bin\ruby.exe" # or "/usr/local/bin/ruby" or what not
@@ -20,14 +20,11 @@ The OS gem allows for some easy telling if you're on windows or not.
     >> OS.mac?
     => false
     
-    >> OS.java? # same as OS.jruby?
-    => true
-    
     >> OS.dev_null
     => "NUL" # or "/dev/null" depending on which platform
     
     >> OS.rss_bytes
-    => 12300033 # rss bytes this process is using currently, works in Linux/windows
+    => 12300033 # number of rss bytes this process is using currently.  Basically "total in memory footprint" (doesn't include RAM used by the process that's in swap/page file)
     
     >> puts OS.report
     ==> # a yaml report of helpful values
@@ -43,20 +40,23 @@ The OS gem allows for some easy telling if you're on windows or not.
     host: i386-apple-darwin10.6.0
     RUBY_PLATFORM: x86_64-darwin10.6.0
 
-If there are any other features you'd like, let me know.
+   >> OS.cpu_count  
+   => 2 # number of cores
+  
+If there are any other features you'd like, let me know, I'll do what I can to add them :)
 
-github.com/rdp/os for feedback et al
+http://github.com/rdp/os for feedback et al
 
 Related projects:
 
 rubygems:
-Gem::Platform.local
-Gem.ruby
+  Gem::Platform.local
+  Gem.ruby
 
-facets gem (similar to rubygems, above)
-require 'facets/platform'
-Platform.local
+the facets gem (has a class similar to rubygems, above)
+  require 'facets/platform'
+  Platform.local
 
-the "platform" gem, itself (different gem)
+the "platform" gem, itself (a different gem)
 
-The reason Gem::Platform.local felt wrong to me is that it treated cygwin as windows--which for most build environments, is wrong.
+The reason Gem::Platform.local felt wrong to me is that it treated cygwin as windows--which for most build environments, is wrong.  Hence the creation of this.

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/lib/os.rb

@@ -143,7 +143,10 @@ class OS
         processes = wmi.ExecQuery("select * from win32_process where ProcessId = #{Process.pid}")
         memory_used = nil
         # only allow for one...
-        for process in processes; raise if memory_used; memory_used = process.WorkingSetSize.to_i; end
+        for process in processes
+          raise if memory_used
+          memory_used = process.WorkingSetSize.to_i
+          end
         memory_used
       end
     elsif OS.posix? # linux [though I've heard it works in OS X]
@@ -205,6 +208,36 @@ class OS
     RbConfig::CONFIG.reject {|key, val| !relevant_keys.include? key }.merge({'RUBY_PLATFORM' => RUBY_PLATFORM}).to_yaml
   end
 
+  def self.cpu_count
+    @cpu_count ||=
+    case RUBY_PLATFORM
+      when /darwin9/
+        `hwprefs cpu_count`.to_i
+      when /darwin10/
+        (hwprefs_available? ? `hwprefs thread_count` : `sysctl -n hw.ncpu`).to_i
+      when /linux/
+        `cat /proc/cpuinfo | grep processor | wc -l`.to_i
+      when /freebsd/
+        `sysctl -n hw.ncpu`.to_i
+      else
+        if RbConfig::CONFIG['host_os'] =~ /darwin/
+           (hwprefs_available? ? `hwprefs thread_count` : `sysctl -n hw.ncpu`).to_i
+        elsif self.windows?
+          out = ENV['NUMBER_OF_PROCESSORS'].to_i
+          if out == 0
+             # in case env. variable not set
+            require 'win32ole'
+            wmi = WIN32OLE.connect("winmgmts://")
+            cpu = wmi.ExecQuery("select NumberOfCores from Win32_Processor") # don't count hyper-threaded in this
+            out = cpu.to_enum.first.NumberOfCores
+          end
+          out
+        else
+          raise 'unknown platform processor_count'
+        end
+      end
+  end
+
   class << self
     alias :doze? :windows? # a joke name but I use it and like it :P
     alias :jruby? :java?
@@ -213,6 +246,13 @@ class OS
     %w(host host_cpu host_os).each do |method_name|
       define_method(method_name) { config[method_name] }
     end
+    
+  end
+
+  private
+
+  def self.hwprefs_available?
+    `which hwprefs` != ''
   end
 
 end

data/os.gemspec

@@ -1,60 +1,48 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{os}
-  s.version = "0.8.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["rdp", "David McCullars"]
-  s.date = %q{2011-05-19}
-  s.description = %q{The OS gem allows for some useful and easy functions, like OS.windows? (=> true or false) OS.bits ( => 32 or 64) etc"}
-  s.email = %q{rogerpack2005@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".autotest",
-     ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "autotest/discover.rb",
-     "lib/os.rb",
-     "os.gemspec",
-     "spec/linux_spec.rb",
-     "spec/os_spec.rb",
-     "spec/osx_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/rdp/os}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple and easy way to know if you're on windows or not (reliably), as well as how many bits the OS is, etc.}
-  s.test_files = [
-    "spec/linux_spec.rb",
-     "spec/osx_spec.rb",
-     "spec/os_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 2.0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 2.0"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{os}
+  s.version = "0.7.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["rdp", "David McCullars"]
+  s.date = %q{2011-05-03}
+  s.description = %q{The OS gem allows for some useful and easy functions, like OS.windows? (=> true or false) OS.bits ( => 32 or 64) etc"}
+  s.email = %q{rogerpack2005@gmail.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/os.rb",
+  ]
+  s.homepage = %q{http://github.com/rdp/os}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{Simple and easy way to know if you're on windows or not (reliably), as well as how many bits the OS is, etc.}
+  s.test_files = [
+    "spec/spec.os.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>)
+      s.add_development_dependency(%q<rspec>, [">= 2.0"])
+    else
+      s.add_dependency(%q<jeweler>)
+      s.add_dependency(%q<rspec>, [">= 2.0"])
+    end
+  else
+    s.add_dependency(%q<jeweler>)
+    s.add_dependency(%q<rspec>, [">= 2.0"])
+  end
+end
+

data/spec/os_spec.rb

@@ -7,7 +7,7 @@ describe "OS" do
       unless RUBY_PLATFORM =~ /cygwin/
         assert OS.windows? == true
         assert OS.doze? == true
-        assert OS.posix? == false
+        assert OS.posix? == false # can fail in error at times...I guess because some other spec has reset ENV on us...
       else
         assert OS::Underlying.windows?
         assert OS.windows? == false
@@ -88,7 +88,11 @@ describe "OS" do
     if RUBY_PLATFORM =~ /darwin/
       assert OS.mac? == true
     else
-      assert OS.mac? == false
+      if OS.host_os == 'darwin'
+        assert OS.mac? == true
+      else
+        assert OS.mac? == false
+      end
     end
   end
 
@@ -114,6 +118,21 @@ describe "OS" do
     end
   end
 
+  it "has working cpu count method" do
+    assert OS.cpu_count >= 1
+    if OS.mac?
+      assert OS.cpu_count == 2 # my own developer box :P
+    end
+  end
+  
+  it "has working cpu count method with no env. variable" do
+    OS.instance_variable_set(:@cpu_count, nil) # reset it
+    if OS.windows?
+      ENV.delete('NUMBER_OF_PROCESSORS')
+      assert OS.cpu_count >= 1
+    end
+  end
+
 end
 
 describe OS, "provides access to to underlying config values" do

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems' if RUBY_VERSION < '1.9.0'
 require File.expand_path('../lib/os.rb', File.dirname(__FILE__))
 
 require 'rspec' # rspec2
+require 'rspec/autorun'
 
 RSpec.configure do |config|
   config.expect_with :rspec, :stdlib # enable `should` OR `assert`

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: os
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - rdp
@@ -16,13 +16,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -06:00
-default_executable: 
+date: 2011-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: os
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  name: jeweler
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,7 +58,24 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  name: rspec
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  prerelease: false
+  name: rspec
+  requirement: *id004
 description: The OS gem allows for some useful and easy functions, like OS.windows? (=> true or false) OS.bits ( => 32 or 64) etc"
 email: rogerpack2005@gmail.com
 executables: []
@@ -45,7 +87,6 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .document
-- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -58,13 +99,12 @@ files:
 - spec/os_spec.rb
 - spec/osx_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/rdp/os
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -88,12 +128,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Simple and easy way to know if you're on windows or not (reliably), as well as how many bits the OS is, etc.
-test_files: 
-- spec/linux_spec.rb
-- spec/osx_spec.rb
-- spec/os_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC