os 0.5.0 → 0.6.0

data/README.rdoc

@@ -10,17 +10,21 @@ require 'os'
 >> OS.java?
 => true
 
->> OS.ruby_exe
+>> OS.ruby_bin
 => "c:\ruby18\bin\ruby.exe" # or "/usr/local/bin/ruby" or what not
 
 >> OS.posix?
 => false
 
+>> OS.mac?
+=> false
+
 If there are any other features you'd like, let me know.
 
 github.com/rdp/os
 
-
 Related:
-Gem.ruby
-Platform gem
+
+Gem.ruby method
+
+the Platform gem

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/os.rb

@@ -34,13 +34,13 @@ class OS
           rescue NotImplementedError
             false
           end
+        end
+      else
+        # assume non windows is posix
+        true
       end
-     else
-       # assume non windows is posix 
-       true
-     end
     end
-    
+
   end
 
   class << self
@@ -50,18 +50,15 @@ class OS
   def self.bits
     @bits ||= begin
       require 'rbconfig'
-      host_os = RbConfig::CONFIG['host_os']
-      if host_os =~ /32/
+      if RbConfig::CONFIG['host_cpu'] =~ /_64$/ # x86_64
+        64
+      elsif RbConfig::CONFIG['host_os'] =~ /32$/ # mingw32, mswin32
         32
-      else
-        if host_os =~ /64/
+      else # cygwin only...I think
+        if 1.size == 8
           64
-        else # cygwin...
-          if (1<<32).class == Fixnum
-            64
-          else
-            32
-          end
+        else
+          32
         end
       end
     end
@@ -77,7 +74,7 @@ class OS
       end
     end
   end
-  
+
   def self.ruby_bin
     @ruby_exe ||= begin
       require 'rbconfig'
@@ -85,4 +82,9 @@ class OS
       File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
     end
   end
-end
+  
+  def self.mac?
+     RUBY_PLATFORM =~ /darwin/  
+  end
+  
+end

data/spec/spec.os.rb

@@ -21,6 +21,8 @@ describe "OS" do
   it "has a bits method" do
     if RUBY_PLATFORM =~ /mingw32/
        assert OS.bits == 32
+    elsif RUBY_PLATFORM =~ /64/ # linux...
+       assert OS.bits == 64 
     end
   end
 
@@ -34,9 +36,17 @@ describe "OS" do
   
   it "should have a ruby.exe method" do
     if OS.windows?
-      assert OS.ruby_bin.include?('ruby.exe')
+      assert OS.ruby_bin.include?('ruby.exe')
     else
-      assert OS.ruby_bin.include?('ruby') && OS.ruby_bin.include?('/')
+      assert OS.ruby_bin.include?('ruby') && OS.ruby_bin.include?('/')
+    end
+  end
+  
+  it "should have a mac? method" do
+    if RUBY_PLATFORM =~ /darwin/
+      assert OS.mac?
+    else
+      assert !OS.mac?
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: os
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - rdp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -07:00
+date: 2010-01-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency