workon 0.0.12 → 0.0.13

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+.redcar/
+tags

data/lib/workon.rb

@@ -5,7 +5,7 @@ require 'workon/actor'
 require "workon/version"
 
 module Workon
-  WORK_DIRS = '/Users/mike/Work/*/*'
+  WORK_DIRS = (ENV['WORKON_ROOT'] || ENV['HOME'] + '/Work') + '/*/*'
   
   def self.all_directories
     @_all_directories ||= Dir[WORK_DIRS]
@@ -38,8 +38,6 @@ module Workon
     Workon::Actor.ordered.each do |klass|
       klass.new(project_path).commit
     end
-    
-    Workon::CLI::Commands::InstallHelper.helper_message(project_path)
   end
   
   def self.load_configuration(args)

data/lib/workon/actor.rb

@@ -36,7 +36,7 @@ module Workon
 end
 
 require 'workon/actor/base'
-require 'workon/actor/text_mate'
+require 'workon/actor/editor'
 require 'workon/actor/web_browser'
 require 'workon/actor/finder'
 require 'workon/actor/git'

data/lib/workon/actor/base.rb

@@ -52,19 +52,19 @@ module Workon
       end
       
       def commit
-        run command
+        run command unless command.nil? || command.empty?
       end
       
-      def system(command)
+      def run(command)
         puts "Running #{command}"
-        Kernel.system command
+        Kernel.system command unless options[:dry_run]
       end
       
       def has_command?(command)
-        !`command -v #{command}`.empty?
+        !`command -v '#{command}'`.empty?
       end
       
-      def run(command)
+      def capture(command)
         puts "Running #{command}"
         output = %x(#{command}) unless options[:dry_run]
         return output
@@ -116,6 +116,12 @@ module Workon
       def tmux_window
         self.class.actor_name.downcase
       end
+      
+      def open_with_default(thing)
+        $open_command ||= has_command?('xdg-open') ? 'xdg-open' : 'open'
+        
+        "#{$open_command} #{thing}"
+      end
     end
   end
 end

data/lib/workon/actor/editor.rb

@@ -0,0 +1,10 @@
+module Workon
+  module Actor
+    class Editor < Base
+      def command
+        editor = [ ENV['WORKON_EDITOR'], ENV['EDITOR'] ].find {|e| !e.nil? && !e.empty? }
+        "#{editor} #{path}" if editor
+      end
+    end
+  end
+end

data/lib/workon/actor/finder.rb

@@ -2,7 +2,7 @@ module Workon
   module Actor
     class Finder < Base
       def command
-        "open #{path}"
+        open_with_default path
       end
     end
   end

data/lib/workon/actor/web_browser.rb

@@ -8,8 +8,9 @@ module Workon
         host_name   = fetch_option :host, %{#{project}.local}
         port_number = fetch_option :port, nil
         
-        command, qualified = port_number.nil? ? ping_test(host_name) : netstat_test(port_number)
-        %{#{command} && open http://#{qualified}}
+        command, qualified  = port_number.nil? ? ping_test(host_name) : netstat_test(port_number)
+        opener              = open_with_default "http://#{qualified}"
+        %(#{command} && #{opener})
       end
       
       private

data/lib/workon/cli.rb

@@ -20,6 +20,11 @@ module Workon
       
       Workon.find_project
       
+      if config[:show_project]
+        puts Workon.project_path
+        exit
+      end
+
       if config[:dump_configuration]
         Workon::Configuration.instance.dump_to_project_rc
         exit

data/lib/workon/cli/commands.rb

@@ -30,35 +30,21 @@ module Workon
         end
         
         def self.finder
-          "# Created by workon version #{Workon::VERSION}\n"
+          "# Created by workon\n"
         end
         
         def self.installed?
           !(File.read(bash_profile_path) =~ /#{finder}/).nil?
         end
         
-        def self.helper_message(path)
-          lines = [ "This is for the bash helper function",
-                    "cd #{path}" ]
-                    
-          lines.each {|l| puts l } if installed?
-        end
-        
         def self.helper_function
           <<'BASH'
 wo () {
-  OLDIFS=$IFS
-  IFS=$'\n'
-
-  workon_bin=$(which workon)
-  output=$($workon_bin $@)
-
-  for line in $output; do
-    echo $line
-  done
+  PROJECT=${!#}
+  PROJECT_PATH=$(workon -P ${PROJECT})
 
-  eval $line
-  IFS=$OLDIFS
+  workon $@
+  eval "cd $PROJECT_PATH"
 }
 BASH
         end

data/lib/workon/configuration.rb

@@ -11,7 +11,7 @@ module Workon
     end
     
     def initialize(*args)
-      @options = { without: [], only: [], install_helper: false, dump_configuration: false, project: nil, show_help: false }
+      @options = { show_project: false, without: [], only: [], install_helper: false, dump_configuration: false, project: nil, show_help: false }
       parse_options args.first unless args.empty?
     end
     
@@ -68,6 +68,10 @@ module Workon
           options[:install_helper] = true
         end
         
+        o.on_tail('-P', '--show-project', TrueClass, "Echo project's directory") do
+          options[:show_project] = true
+        end
+
         o.on_tail('-n', '--dry-run', 'Do not run any commands') do
           options[:dry_run] = true
         end

data/lib/workon/version.rb

@@ -1,3 +1,3 @@
 module Workon
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -2,7 +2,7 @@
 name: workon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Mike Wyatt
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-05-29 00:00:00 Z
 dependencies: []
 
 description: Runs actions based on directories
@@ -31,11 +31,11 @@ files:
 - lib/workon.rb
 - lib/workon/actor.rb
 - lib/workon/actor/base.rb
+- lib/workon/actor/editor.rb
 - lib/workon/actor/finder.rb
 - lib/workon/actor/git.rb
 - lib/workon/actor/middleman.rb
 - lib/workon/actor/passenger.rb
-- lib/workon/actor/text_mate.rb
 - lib/workon/actor/watchr.rb
 - lib/workon/actor/web_browser.rb
 - lib/workon/cli.rb

data/lib/workon/actor/text_mate.rb

@@ -1,9 +0,0 @@
-module Workon
-  module Actor
-    class TextMate < Base
-      def command
-        "mate #{path}"
-      end
-    end
-  end
-end