os 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/os.rb

@@ -1,58 +1,70 @@
 class OS
 
- # treat cygwin as linux
- # also treat IronRuby on mono as...linux
-
- if RUBY_PLATFORM =~ /cygwin/ # i386-cygwin
-   WINDOZE = false
- elsif ENV['OS'] == 'Windows_NT'
-   WINDOZE = true
- else
-   WINDOZE = false
- end
-
- # OS.windows?
- # true if on windows [and/or jruby]
- # false if on linux or cygwin
- def self.windows?
-  WINDOZE
- end
-
- def self.linux?
-  !WINDOZE
- end
-
- class << self
-   alias :windoze? :windows? #the joke one
- end
-
- require 'rbconfig'
- host_os = RbConfig::CONFIG['host_os']
- if host_os =~ /32/
-   BITS = 32
- else
-   if host_os =~ /64/
-    BITS = 64
-   else # cygwin
-    if (1<<32).class == Fixnum
-      BITS = 64
-    else
-      BITS = 32
+  # treat cygwin as linux
+  # also treat IronRuby on mono as...linux
+
+
+  # OS.windows?
+  # true if on windows [and/or jruby]
+  # false if on linux or cygwin
+  def self.windows?
+    @windows ||= begin
+      if RUBY_PLATFORM =~ /cygwin/ # i386-cygwin
+        false
+      elsif ENV['OS'] == 'Windows_NT'
+        true
+      else
+        false
+      end
     end
-   end
- end
 
+  end
 
- def self.bits
-  BITS
- end
+  # true for linux, os x, cygwin
+  def self.posix?
+    !OS.windows?
+  end
 
- def self.java?
-   if RUBY_PLATFORM =~ /java/
-     true
-   else
-     false
-   end
- end
+  class << self
+    alias :doze? :windows? # a joke but I use it
+  end
+
+  def self.bits
+    @bits ||= begin
+      require 'rbconfig'
+      host_os = RbConfig::CONFIG['host_os']
+      if host_os =~ /32/
+        32
+      else
+        if host_os =~ /64/
+          64
+        else # cygwin...
+          if (1<<32).class == Fixnum
+            64
+          else
+            32
+          end
+        end
+      end
+    end
+  end
 
+
+  def self.java?
+    @java ||= begin
+      if RUBY_PLATFORM =~ /java/
+        true
+      else
+        false
+      end
+    end
+  end
+  
+  def self.ruby_exe
+    @ruby_exe ||= begin
+      require 'rbconfig'
+      config = RbConfig::CONFIG
+      File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+    end
+  end
 end

data/spec/spec.os.rb

@@ -1,7 +1,5 @@
 require 'rubygems' if RUBY_VERSION < '1.9'
-# try to help sane gem out a bit
-$: << File.dirname(__FILE__) + '/../lib'
-require 'os'
+require File.dirname(__FILE__) + '/../lib/os' # load before sane
 require 'sane'
 require 'spec/autorun'
 
@@ -11,11 +9,11 @@ describe "OS" do
     if RUBY_PLATFORM =~ /mingw|mswin/
       assert OS.windows? == true
       assert OS.windoze? == true
-      assert OS.linux? == false
+      assert OS.posix? == false
     else # ltodo jruby
       if RUBY_PLATFORM =~ /linux/
         assert OS.windows? == false
-        assert OS.linux? == true
+        assert OS.posix? == true
       end
     end
   end
@@ -28,9 +26,18 @@ describe "OS" do
 
   it "should know if you're on java" do
     if RUBY_PLATFORM == 'java'
-      assert OS.java? == true
+      assert OS.java? == true # I want just this value...
     else
       assert OS.java? == false
     end
   end
+  
+  it "should have a ruby.exe method" do
+    if OS.windows?
+      assert OS.ruby_exe.include? 'ruby.exe'
+    else
+      OS.ruby
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: os
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors: 
 - rdp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -07:00
+date: 2010-01-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency