qwandry 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/qwandry/configuration.rb

@@ -14,6 +14,18 @@ module Qwandry
         builders[name] << block
       end
       
+      # Registers a configuration is a specific binary is available.  If `binary` is not specified,
+      # it is assumed to be the same as the configuration name.
+      def register_if_present name, binary=nil, &block
+        binary ||= name
+        register(name, &block) if present? binary
+      end
+      
+      # Returns true if binary `name` is present.
+      def present? name
+        system("which #{name}", STDOUT=>"/dev/null")
+      end
+      
       # Sets the default configuration to launch, if no `configurations` are passed
       # in, it returns their names.
       def default(*configurations)
@@ -30,7 +42,7 @@ module Qwandry
       end
       
       # Loads a configuration file, and executes it in the context of the Qwandry::Configuration
-      # class.  See default_configuration.rb for an example, or run:
+      # class.  See `configuration/default.rb` for an example, or run:
       # 
       #     qw --customize
       # 

data/lib/qwandry/configuration/default.rb

@@ -9,7 +9,7 @@ register :ruby do
 end
 
 # Register the default ruby gems configuration:
-register :gem do
+register_if_present :gem do
   # Get the gem paths from the ruby load paths:
   paths = ($:).grep(/gems/).map{|p| p[/.+\/gems\//]}.uniq
   
@@ -18,7 +18,7 @@ register :gem do
 end
 
 # Register a perl configuration:
-register :perl do
+register_if_present :perl do
   # Execute a perl script to find all of the perl load paths:
   perl_paths = `perl -e 'foreach $k (@INC){print $k,"\n";}'` rescue ''
   
@@ -30,7 +30,7 @@ register :perl do
 end
 
 # Add python repositories:
-register :python do
+register_if_present :python do
   # Execute a python script to find all of the python load paths:
   python_paths = `python -c 'import sys;print(\"\\n\".join(sys.path))'` rescue ''
   
@@ -42,7 +42,7 @@ register :python do
 end
 
 # Add node.js repositories:
-register :node do
+register_if_present :node do
   # Execute a node script to find all of the load paths:
   node_script_path = File.join(File.dirname(__FILE__),'probe_node.js')
   node_paths = `node #{node_script_path}` rescue ''
@@ -52,6 +52,24 @@ register :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 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, '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
+  end
+end
+
 # Qwandry is a ruby app after all, so activate ruby and gem by default.  Other defaults can be set
 # with a custom init.rb
 default :ruby, :gem

data/lib/qwandry/flat_repository.rb

@@ -11,7 +11,7 @@ module Qwandry
     def scan(pattern)
       results = []
       all_paths.select do |path|
-        if File.fnmatch?(pattern, File.basename(path))
+        if File.fnmatch?(pattern, File.basename(path), File::FNM_CASEFOLD)
           results << package(File.basename(path), [path])
         end
       end

data/lib/qwandry/launcher.rb

@@ -18,6 +18,7 @@ module Qwandry
         packages.concat(repo.scan(pattern))
       end
       
+      differentiate packages
       packages
     end
   
@@ -38,6 +39,20 @@ module Qwandry
       # Launch the editor with its options and any paths that we have been passed
       system(*(editor_and_options + paths))
     end
-        
+    
+    private
+    
+    # If there are multiple packages named the same, append their path to the name.
+    # This could later be handled in other ways, for instance by merging the paths.
+    def differentiate(packages)
+      named_groups = Hash.new{|h,k| h[k] = []}
+      packages.each{|p| named_groups[p.name] << p }
+      named_groups.each do |name, packages| 
+        if packages.length > 1
+          packages.each{|p| p.name = "#{p.name} (#{p.paths.first})"} 
+        end
+      end
+    end
+    
   end
 end

data/lib/qwandry/library_repository.rb

@@ -14,7 +14,7 @@ module Qwandry
       results = Hash.new{|h,k| h[k] = package(k)}
       all_paths.select do |path|
         basename = File.basename(path)
-        if File.fnmatch?(pattern, basename)
+        if File.fnmatch?(pattern, basename, File::FNM_CASEFOLD)
           # strip any file extension
           basename.sub! /\.\w+$/,'' unless File.directory?(path)
           results[basename].paths << path

data/lib/qwandry/package.rb

@@ -1,8 +1,8 @@
 module Qwandry
   class Package
-    attr_reader :name
-    attr_reader :paths
-    attr_reader :repository
+    attr_accessor :name
+    attr_accessor :paths                  
+    attr_reader   :repository
   
     def initialize(name, paths, repository)
       @name = name

metadata

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