Platform 0.2.0 → 0.3.0

data/lib/platform.rb

@@ -39,60 +39,35 @@
 # ruby platform.rb
 #
 module Platform
-   
-   if RUBY_PLATFORM =~ /darwin/i
-      OS = :unix
-      IMPL = :macosx
-   elsif RUBY_PLATFORM =~ /linux/i
-      OS = :unix
-      IMPL = :linux
-   elsif RUBY_PLATFORM =~ /freebsd/i
-      OS = :unix
-      IMPL = :freebsd
-   elsif RUBY_PLATFORM =~ /netbsd/i
-      OS = :unix
-      IMPL = :netbsd
-   elsif RUBY_PLATFORM =~ /mswin/i
-      OS = :win32
-      IMPL = :mswin
-   elsif RUBY_PLATFORM =~ /cygwin/i
-      OS = :unix
-      IMPL = :cygwin
-   elsif RUBY_PLATFORM =~ /mingw/i
-      OS = :win32
-      IMPL = :mingw
-   elsif RUBY_PLATFORM =~ /bccwin/i
-      OS = :win32
-      IMPL = :bccwin
-   elsif RUBY_PLATFORM =~ /wince/i
-      OS = :win32
-      IMPL = :wince
-   elsif RUBY_PLATFORM =~ /vms/i
-      OS = :vms
-      IMPL = :vms
-   elsif RUBY_PLATFORM =~ /os2/i
-      OS = :os2
-      IMPL = :os2 # maybe there is some better choice here?
-   else
-      OS = :unknown
-      IMPL = :unknown
-   end
-   
+
+   # Each platform is defined as
+   # [ /regex/, ::OS, ::IMPL ]
+   # define them from most to least specific and
+   # [ /.*/, :unknown, :unknown ] should always come last
    # whither AIX, SOLARIS, and the other unixen?
-   
-   if RUBY_PLATFORM =~ /(i\d86)/i
-      ARCH = :x86
-   elsif RUBY_PLATFORM =~ /ia64/i
-      ARCH = :ia64
-   elsif RUBY_PLATFORM =~ /powerpc/i
-      ARCH = :powerpc
-   elsif RUBY_PLATFORM =~ /alpha/i
-      ARCH = :alpha
-   else
-      ARCH = :unknown
-   end
-   
+   PLATFORMS = [
+      [ /darwin/i,   :unix,      :macosx ],
+      [ /linux/i,    :unix,      :linux ],
+      [ /freebsd/i,  :unix,      :freebsd ],
+      [ /netbsd/i,   :unix,      :netbsd ],
+      [ /cygwin/i,   :hybrid,    :cygwin ],
+      [ /mingw/i,    :win32,     :mingw ],
+      [ /bccwin/i,   :win32,     :bccwin ],
+      [ /vms/i,      :vms,       :vms ],
+      [ /os2/i,      :os2,       :os2 ],
+      [ /.*/,        :unknwon,   :unknown ]
+   ]
+   x, OS, IMPL = PLATFORMS.find { |p| RUBY_PLATFORM =~ /#{p[0]}/ }
+      
    # What about AMD, Turion, Motorola, etc..?
+   ARCHS = [
+      [ /i\d86/,     :x86 ],
+      [ /ia64/,      :ia64 ],
+      [ /powerpc/,   :powerpc ],
+      [ /alpha/,     :alpha ],
+      [ /.*/,        :unknown ]
+   ]   
+   x, ARCH = ARCHS.find { |a| RUBY_PLATFORM =~ /#{a[0]}/}   
    
 end
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: Platform
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 date: 2005-06-29
 summary: Hopefully robust platform sensing
 require_paths: