os 0.6.3 → 0.7.2

data/README.rdoc

@@ -29,8 +29,10 @@ rubygems:
 Gem::Platform.local
 Gem.ruby
 
-facets gem (similar)
+facets gem (similar to rubygems, above)
 require 'facets/platform'
 Platform.local
 
-the Platform gem
+the "platform" gem, itself (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.

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_development_dependency "sane"
+    # gem.add_development_dependency "fast_require"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.7.2

data/lib/os.rb

@@ -1,4 +1,4 @@
-# a set of friendly files for determining your Ruby runtime
+# a set of friendly files for determining your Ruby runtime
 # treats cygwin as linux
 # also treats IronRuby on mono as...linux
 class OS
@@ -29,7 +29,7 @@ class OS
             # untested, of course
             Process.wait fork{}
             true
-          rescue NotImplementedError
+          rescue NotImplementedError, NoMethodError
             false
           end
         end
@@ -44,17 +44,27 @@ class OS
   class << self
     alias :doze? :windows? # a joke but I use it
   end
+  
+  def self.iron_ruby?
+   @iron_ruby ||= begin
+     if defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'ironruby')
+       true
+     else
+       false
+     end
+   end
+  end
 
   def self.bits
     @bits ||= begin
       require 'rbconfig'
-      host_cpu = RbConfig::CONFIG['host_cpu']
+      host_cpu = RbConfig::CONFIG['host_cpu']
       if host_cpu =~ /_64$/ # x86_64
         64
       elsif RUBY_PLATFORM == 'java' && ENV_JAVA['sun.arch.data.model'] # "32" or "64" http://www.ruby-forum.com/topic/202173#880613
-         ENV_JAVA['sun.arch.data.model'].to_i
-      elsif host_cpu == 'i386'
-        32
+        ENV_JAVA['sun.arch.data.model'].to_i
+      elsif host_cpu == 'i386'
+        32
       elsif RbConfig::CONFIG['host_os'] =~ /32$/ # mingw32, mswin32
         32
       else # cygwin only...I think
@@ -85,9 +95,66 @@ class OS
       File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
     end
   end
-  
+
   def self.mac?
-     RUBY_PLATFORM =~ /darwin/  
+    @mac = begin
+      if RUBY_PLATFORM =~ /darwin/
+        true
+      else
+        false
+      end
+    end      
+  end
+
+  # amount of memory the current process "is using", in RAM
+  # (doesn't include any swap memory that it may be using, just that in actual RAM)
+  # raises 'unknown' on jruby currently
+  def self.rss_bytes
+    # attempt to do this in a jruby friendly way
+    if OS::Underlying.windows?
+      # MRI, Java, IronRuby, Cygwin
+      if OS.java?
+        # no win32ole yet available...
+        require 'java'
+        mem_bean = java.lang.management.ManagementFactory.memory_mxbean
+        mem_bean.heap_memory_usage.used + mem_bean.non_heap_memory_usage.used
+      else
+        wmi = nil
+        begin
+          require 'win32ole'
+          wmi = WIN32OLE.connect("winmgmts://")
+        rescue LoadError, NoMethodError # NoMethod for IronRuby currently [sigh]
+          raise 'rss unknown for this platform'
+        end        
+        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
+        memory_used
+      end
+    elsif OS.posix? # assume linux I guess...
+      kb = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+    else
+      raise 'unknown rss for this platform'
+    end
+  end
+
+  class Underlying
+
+    def self.windows?
+      ENV['OS'] == 'Windows_NT'
+    end
+
   end
   
+  def self.cygwin?
+    @cygwin = begin
+      if RUBY_PLATFORM =~ /-cygwin/
+        true
+      else
+        false
+      end
+    end
+  end
+
 end

data/spec/spec.os.rb

@@ -1,65 +1,110 @@
 require 'rubygems' if RUBY_VERSION < '1.9'
+#require 'fast_require'
 require File.dirname(__FILE__) + '/../lib/os.rb' # load before sane
 require 'sane'
 load File.dirname(__FILE__) + '/../lib/os.rb'
 require 'spec/autorun'
+require 'rbconfig'
 
 describe "OS" do
 
   it "has a windows? method" do
-    if RUBY_PLATFORM =~ /mingw|mswin/
-      assert OS.windows? == true
-      assert OS.doze? == true
-      assert OS.posix? == false
-    else # ltodo jruby
-      if RUBY_PLATFORM =~ /linux/
+    if ENV['OS'] == 'Windows_NT'
+      unless RUBY_PLATFORM =~ /cygwin/
+        assert OS.windows? == true
+        assert OS.doze? == true
+        assert OS.posix? == false
+      else
+        assert OS::Underlying.windows?
         assert OS.windows? == false
         assert OS.posix? == true
       end
+      assert OS::Underlying.windows?
+    elsif (RbConfig::CONFIG["host_os"] == 'linux') || RUBY_PLATFORM =~ /linux/
+      assert OS.windows? == false
+      assert OS.posix? == true
+      assert !OS::Underlying.windows?
+    else
+      pending "create test"
     end
   end
 
   it "has a bits method" do
     if RUBY_PLATFORM =~ /mingw32/
-       assert OS.bits == 32
+      assert OS.bits == 32
     elsif RUBY_PLATFORM =~ /64/ # linux...
-       assert OS.bits == 64 
+      assert OS.bits == 64
     elsif RUBY_PLATFORM =~ /i686/
-       assert OS.bits == 32
+      assert OS.bits == 32
     elsif RUBY_PLATFORM =~ /java/ && RbConfig::CONFIG['host_os'] =~ /32$/
-       assert OS.bits == 32
+      assert OS.bits == 32
     elsif RUBY_PLATFORM =~ /java/ && RbConfig::CONFIG['host_cpu'] =~ /i386/
-       assert OS.bits == 32
+      assert OS.bits == 32
     elsif RUBY_PLATFORM =~ /i386/
       assert OS.bits == 32
-    else      
-       pending "os bits not tested!" + RUBY_PLATFORM + ' ' +  RbConfig::CONFIG['host_os'] 
+    else
+      pending "os bits not tested!" + RUBY_PLATFORM + ' ' +  RbConfig::CONFIG['host_os']
     end
 
   end
+  
+  it "should have an iron_ruby method" do
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
+      assert OS.iron_ruby? == true
+    else
+      assert OS.iron_ruby? == false
+    end
+  end
 
   it "should know if you're on java" do
     if RUBY_PLATFORM == 'java'
-      assert OS.java? == true # I want just this value...
+      assert OS.java? == true # must be [true | false]
     else
       assert OS.java? == false
     end
   end
-  
-  it "should have a ruby.exe method" do
+
+  it "should have a ruby_bin method" do
     if OS.windows?
-      assert OS.ruby_bin.include?('ruby.exe')
+      assert OS.ruby_bin.include?('.exe')
+      if OS.iron_ruby?
+        assert OS.ruby_bin.include?('ir.exe')
+      else
+        assert OS.ruby_bin.include?('ruby.exe')
+      end
     else
       assert OS.ruby_bin.include?('ruby') && OS.ruby_bin.include?('/')
     end
+
+    if OS.java?
+      assert OS.ruby_bin.include?('jruby') # I think
+    end
+
   end
   
+  it "should have a cygwin? method" do
+    if RUBY_PLATFORM =~ /cygwin/
+      assert OS.cygwin? == true
+    else
+      assert OS.cygwin? == false
+    end
+  end
+
   it "should have a mac? method" do
     if RUBY_PLATFORM =~ /darwin/
-      assert OS.mac?
+      assert OS.mac? == true
     else
-      assert !OS.mac?
+      assert OS.mac? == false
     end
   end
-  
+
+  it "should have a way to get rss_bytes on each platform" do
+    if !OS.iron_ruby?
+      bytes = OS.rss_bytes
+      assert bytes > 0 # should always be true
+      assert bytes.is_a?(Numeric) # don't want strings from any platform...
+    end
+  end
+
+
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: os
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  hash: 7
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - rdp
@@ -9,29 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -07:00
+date: 2010-05-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sane
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 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: []
@@ -58,21 +74,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 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.