qwandry 0.0.2 → 0.0.3

data/TODO

@@ -4,4 +4,8 @@ TODO, or perhaps not...
 - Allow better customization of repositories
   - Customize collection phase (see LibraryRepository)
   - Customize naming phase
-- Match multiword args, ie: 'activerec 3.' => 'activerec*3.*' => 'activerecord-3.0.3' @done
+- If the user is using rvm, add the ruby src directory to the search path, maybe merge it with the normal ruby
+  - Examples: opening digest could get you both the ruby and the C sources.
+- For editors that don't support multi opening collections of files (ie: ./digest.rb and ./digest/) we could trick them by adding symlinks in a temp dir.
+  - Could be an option... might be a terrible idea :)
+- Instead of requiring users to find and configure other languages, small scripts for perl, python, etc. could introspect on their load paths.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/qw

@@ -34,14 +34,14 @@ opts = OptionParser.new do |opts|
   end
   
   opts.on("--customize", "Create and edit files for customizing Qwandry") do
-    dir = ENV['HOME'] && ENV['HOME'] + '/.qwandry/'
+    dir = Qwandry.config_dir
     if !dir
-      puts "Home directory must be defined."
+      puts "HOME directory must be defined."
       exit(1)
     else
-      FileUtils.mkdir(dir, :verbose=>true) unless File.exist?(dir)
+      FileUtils.mkdir_p(dir, :verbose=>true) unless File.exist?(dir)
       Dir[File.dirname(__FILE__) + '/../templates/*'].each do |path|
-        FileUtils.cp(path, dir, :verbose=>true, :preserve=>true)
+        FileUtils.cp(path, dir, :verbose=>true) unless File.exist?(path)
       end
       @qwandry.launch dir
     end

data/lib/qwandry/launcher.rb

@@ -70,7 +70,11 @@ module Qwandry
       end
       
       paths = package.is_a?(String) ? [package] : package.paths
-      system editor, *paths
+      # Editors may have options, 'mate -w' for instance
+      editor_and_options = editor.strip.split(/\s+/)
+      
+      # Launch the editor with its options and any paths that we have been passed
+      system(*(editor_and_options + paths))
     end
     
     private
@@ -95,9 +99,17 @@ module Qwandry
     end
     
     def custom_configuration!
-      custom_path = ENV['HOME'] && ENV['HOME'] + '/.qwandry/init.rb'
-      if File.exist? custom_path
-        eval IO.read(custom_path)
+      if config_dir = Qwandry.config_dir
+        custom_path = File.join(config_dir, 'init.rb')
+        if File.exist?(custom_path)
+          begin
+            eval IO.read(custom_path), nil, custom_path, 1
+          rescue Exception=>ex
+            STDERR.puts "Warning: error in custom file: #{custom_path.inspect}"
+            STDERR.puts "Exception: #{ex.message}"
+            STDERR.puts ex.backtrace
+          end
+        end
       end
     end
     

data/lib/qwandry.rb

@@ -21,4 +21,26 @@ module Qwandry
   autoload :FlatRepository,             "qwandry/flat_repository"
   autoload :LibraryRepository,          "qwandry/library_repository"
   autoload :Package,                    "qwandry/package"
+end
+
+# If defined, Qwandry will use XDG_CONFIG_HOME as the xdg spec. If not it 
+# will check for an existing `~/.qwandry`.  Finally it will fall back to
+# `~/.config/qwandry`.
+# 
+# Returns either the path the +config_dir+ or +nil+ if HOME is not defined.
+# 
+# XDG Spec:
+#   http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+# 
+def Qwandry.config_dir
+  subdir = '/.qwandry/'
+  if ENV['XDG_CONFIG_HOME']
+    File.join(ENV['XDG_CONFIG_HOME'], subdir)
+  elsif File.exist? File.join(ENV['HOME'], subdir)
+    File.join(ENV['HOME'], subdir)
+  elsif ENV['HOME']
+    File.join(ENV['HOME'],'.config', subdir)
+  else
+    nil
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qwandry
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Adam Sanderson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -08:00
+date: 2010-12-11 00:00:00 -08:00
 default_executable: qw
 dependencies: []