os 0.7.2 → 0.7.4

data/README.rdoc

@@ -1,14 +1,14 @@
 The OS gem allows for some easy telling if you're on windows or not.
 
 require 'os'
->> OS.windows? 
-=> true
+>> OS.windows?
+=> true   # also OS.doze?
 
 >> OS.bits
 => 32
 
 >> OS.java?
-=> true
+=> 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
@@ -19,11 +19,20 @@ require 'os'
 >> 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
+
 If there are any other features you'd like, let me know.
 
-github.com/rdp/os
+github.com/rdp/os for feedback et al
 
-Related:
+Related projects:
 
 rubygems:
 Gem::Platform.local

data/Rakefile

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'rake'
 
+
+begin
+#  require 'psych'
+rescue ::LoadError
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -9,39 +15,12 @@ begin
     gem.description = %Q{The OS gem allows for some useful and easy functions, like OS.windows? (=> true or false) OS.bits ( => 32 or 64) etc"}
     gem.email = "rogerpack2005@gmail.com"
     gem.homepage = "http://github.com/rdp/os"
-    gem.authors = ["rdp"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.authors = ["rdp", "David McCullars"]
+    gem.add_development_dependency "rspec", ">= 2.0"
     # 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
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "os #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.4

data/lib/os.rb

@@ -4,7 +4,8 @@
 class OS
 
   # true if on windows [and/or jruby]
-  # false if on linux or cygwin
+  # false if on linux or cygwin on windows
+  
   def self.windows?
     @windows ||= begin
       if RUBY_PLATFORM =~ /cygwin/ # i386-cygwin
@@ -41,10 +42,6 @@ class OS
 
   end
 
-  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')
@@ -61,7 +58,7 @@ class OS
       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
+      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
@@ -114,17 +111,17 @@ class OS
     if OS::Underlying.windows?
       # MRI, Java, IronRuby, Cygwin
       if OS.java?
-        # no win32ole yet available...
+        # no win32ole on 1.5.x, so leave here for compatibility...maybe for awhile :P
         require 'java'
-        mem_bean = java.lang.management.ManagementFactory.memory_mxbean
+        mem_bean = java.lang.management.ManagementFactory.getMemoryMXBean
         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'
+        rescue LoadError, NoMethodError => e # NoMethod for IronRuby currently [sigh]
+          raise 'rss unknown for this platform ' + e.to_s
         end        
         processes = wmi.ExecQuery("select * from win32_process where ProcessId = #{Process.pid}")
         memory_used = nil
@@ -132,7 +129,7 @@ class OS
         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...
+    elsif OS.posix? # linux [though I've heard it works in OS X]
       kb = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
     else
       raise 'unknown rss for this platform'
@@ -156,5 +153,20 @@ class OS
       end
     end
   end
+  
+   def self.dev_null
+    @dev_null ||= begin
+      if OS.windows?
+        "NUL"
+      else
+        "/dev/null"
+      end
+    end
+  end
+
+  class << self
+    alias :doze? :windows? # a joke name but I use it and like it :P
+    alias :jruby? :java?
+  end
 
 end

data/spec/spec.os.rb

@@ -1,10 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9'
-#require 'fast_require'
-require File.dirname(__FILE__) + '/../lib/os.rb' # load before sane
+require 'rubygems' if RUBY_VERSION < '1.9.0'
+
+require File.dirname(__FILE__) + '/../lib/os.rb' # load before sane to avoid sane being able to requir the gemified version...
 require 'sane'
-load File.dirname(__FILE__) + '/../lib/os.rb'
-require 'spec/autorun'
-require 'rbconfig'
+load File.dirname(__FILE__) + '/../lib/os.rb' # just in case
+require 'rspec' # rspec2
 
 describe "OS" do
 
@@ -90,7 +89,7 @@ describe "OS" do
     end
   end
 
-  it "should have a mac? method" do
+  it "should have a functional mac? method" do
     if RUBY_PLATFORM =~ /darwin/
       assert OS.mac? == true
     else
@@ -99,12 +98,25 @@ describe "OS" do
   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...
+    bytes = OS.rss_bytes
+    assert bytes > 0 # should always be true
+    assert bytes.is_a?(Numeric) # don't want strings from any platform...
+  end
+  
+  it "should tell you what the right /dev/null is" do
+    if OS.windows?
+      OS.dev_null.should == "NUL"
+    else
+      OS.dev_null.should == "/dev/null"
+    end
+  end
+  
+  it "should have a jruby method" do
+    if RUBY_DESCRIPTION =~ /^(jruby|java)/
+      assert OS.jruby?
+    else
+      assert !OS.jruby?
     end
   end
-
 
 end

metadata

@@ -1,53 +1,41 @@
 --- !ruby/object:Gem::Specification 
 name: os
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
+  prerelease: 
+  version: 0.7.4
 platform: ruby
 authors: 
-- rdp
+  - rdp
+  - David McCullars
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -06:00
+date: 2011-02-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  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
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sane
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "2.0"
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: sane
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    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: []
@@ -55,48 +43,41 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+  - README.rdoc
 files: 
-- .document
-- .gitignore
-- README.rdoc
-- Rakefile
-- VERSION
-- lib/os.rb
-- spec/spec.os.rb
+  - .document
+  - README.rdoc
+  - Rakefile
+  - VERSION
+  - lib/os.rb
+  - spec/spec.os.rb
 has_rdoc: true
 homepage: http://github.com/rdp/os
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 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/spec.os.rb
+  - spec/spec.os.rb

data/.gitignore

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