qwandry 0.1.2 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/lib/qwandry/configuration.rb

@@ -23,7 +23,7 @@ module Qwandry
       
       # Returns true if binary `name` is present.
       def present? name
-        system("which #{name}", STDOUT=>"/dev/null")
+        system("which #{name} > /dev/null")
       end
       
       # Sets the default configuration to launch, if no `configurations` are passed
@@ -144,4 +144,4 @@ module Qwandry
     end
     
   end
-end
+end

data/lib/qwandry/configuration/default.rb

@@ -1,20 +1,18 @@
-
 # Register the default ruby configuration:
 register :ruby do
-  # Reject binary paths, and then find only the `/lib/ruby` sources:
-  paths = ($:).reject{|path| path =~ /#{RUBY_PLATFORM}$/}.grep(/lib\/ruby/)
+  # Reject binary paths, and ruby gems. Gems will be loaded separately:
+  paths = ($:).reject{|path| path["/#{RUBY_PLATFORM}/"] || path["/gems/"] || path == '.' }
   
   # Add ruby standard libraries using the LibraryRepository:
-  add paths, :class=>Qwandry::LibraryRepository
+  add paths, :class=>Qwandry::LibraryRepository, :reject=>/\.(o|a|s|inc|def|dylib|rbc)$/
 end
 
 # Register the default ruby gems configuration:
 register_if_present :gem do
-  # Get the gem paths from the ruby load paths:
-  paths = ($:).grep(/gems/).map{|p| p[/.+\/gems\//]}.uniq
+  require 'rubygems' unless defined? Gem
   
-  # Add all the rubygems' paths:
-  add paths
+  # Add rubygems path:
+  add File.join(Gem.dir, 'gems')
 end
 
 # Register a perl configuration:
@@ -52,21 +50,23 @@ register_if_present :node do
   add node_paths
 end
 
-# If this is mri ruby and we can figure out where the user's ruby source directory is, add it.
-# This might not be quite right... 
-# 
-# TODO figure out how to identify different ruby variants.
-if RUBY_ENGINE == 'ruby'
-  register_if_present :mri, :rvm do
+# If this is mri ruby or rubinus and we can figure out where the user's ruby source directory is, add it.
+# TODO: Add support for macruby and jruby
+if RUBY_DESCRIPTION =~ /^(ruby|rubinius) /
+  name = case $1
+    when 'ruby'     then :mri
+    when 'rubinius' then :rbx
+  end
+  register_if_present name, :rvm do
     # If present, use the current rvm's ruby source.
     paths = []
     root = File.join(ENV['rvm_src_path'], ENV['rvm_ruby_string']) 
     paths << root                   # core objects: String, etc
-    paths << File.join(root, 'ext') # c extensions: Fiber, IO, etc.
+    paths << File.join(root, 'ext') # extensions: Fiber, IO, etc.
     paths << File.join(root, 'lib') # pure ruby libraries
   
     # Add the sources, use a LibraryRepository to bundle .h and .c files
-    add paths, :reject=>/\.(o|a|s|inc|def|dylib)$/, :class=>Qwandry::LibraryRepository
+    add paths, :reject=>/\.(o|a|s|inc|def|dylib|rbc)$/, :class=>Qwandry::LibraryRepository
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qwandry
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Adam Sanderson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 -07:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: qw
 dependencies: []