godo 1.0.3 → 1.0.4

data/Manifest.txt

@@ -9,3 +9,4 @@ lib/project.rb
 lib/session.rb
 lib/template.yml
 lib/sessions/iterm_session.rb
+lib/sessions/terminal_session.rb

data/README.txt

@@ -32,7 +32,7 @@ creating controllers for other unixen should be straightforward if they can be c
 
 godo is a rewrite of my original 'gp' script (http://matt.blogs.it/entries/00002674.html) which fixes
 a number of the deficiencies of that script, turns it into a gem, has a better name, and steals the
-idea of using heuristics to detect project types from Solomon Whites gp variant (http://onrails.org/articles/2007/11/28/scripting-the-leopard-terminal).
+idea of using heuristics to detect project types from Solomon White's gp variant (http://onrails.org/articles/2007/11/28/scripting-the-leopard-terminal).
 	
 godo lives at the excellent GitHub: http://github.com/mmower/godo/ and accepts patches.
 
@@ -41,6 +41,7 @@ godo lives at the excellent GitHub: http://github.com/mmower/godo/ and accepts p
 * All-in-one configuration file
 * Flexible heuristics for detecting project type
 * Flexible actions for running commands
+* Project level customizations
 
 == SYNOPSIS:
 
@@ -54,8 +55,24 @@ godo <project>
 
 Where project is a search term that will match part of the project path name.
 
-To open a project and override the project type (i.e. do not use heuristics):
-	
+If the project has a .godo file at its root, then those actions will be used
+instead of using the heuristics.  A project level .godo file can reference
+actions defined in ~/.godo, a group of actions by project type, and
+arbitrary commands.
+
+Here's a sample project level .godo file:
+---
+actions:
+  - terminal
+  - command: echo 'tab before matcher'
+    label: This tab goes before the project matcher
+  - matcher: rails+git
+  - command: echo 'tab after matcher'
+  - terminal
+
+To open a project and override the project type (i.e. do not use heuristics nor
+a project level .godo file):
+
 godo -o <matcher> <project>
 
 == REQUIREMENTS:

data/Rakefile

@@ -10,6 +10,7 @@ Hoe.new('godo', Godo::VERSION) do |p|
   p.extra_deps << ['trollop','>= 1.7']
   p.extra_deps << ['rb-appscript','>= 0.5.1']
   p.extra_deps << ['ick','>= 0.2.2']
+  p.extra_deps << ['highline','>= 1.4']
   p.remote_rdoc_dir = 'godo'
 end
 

data/lib/finder.rb

@@ -7,17 +7,20 @@ module Godo
     # Find, if possible, a single project path matching the query string.
     #
     def self.find( query, options )
-      let( Finder.new( options["projects"], options["ignores"] ) ) do |finder|
+      let( Finder.new( options["projects"], options["ignores"], options["max_depth"] ) ) do |finder|
         finder.find( Regexp.escape( query ) )
       end
     end
     
     # Create a Finder which will search under the given root folders, ignoring
-    # folders that match any of the specified 'ignore' patterns.
+    # folders that match any of the specified 'ignore' patterns.  Searches only
+    # max_depth folders below the root paths, searches unlimited depth if not
+    # specified.
     #
-    def initialize( roots, ignores )
+    def initialize( roots, ignores, max_depth = 0 )
       @roots = roots.map { |root| File.expand_path( root ) }
       @ignores = ignores.map { |ignore| Regexp.compile( "/#{ignore}" ) }
+      @max_depth = max_depth.to_i
     end
     
     # Search for a folder matching the query.
@@ -49,6 +52,14 @@ module Godo
       @roots.each do |root|
         # puts "Searching for #{query} in #{root}"
         Find.find( root ) do |path|
+          if @max_depth > 0
+            # limit to @max_depth
+            partial_path = path.gsub(root, '')
+            Find.prune if partial_path =~ /\A\.+\Z/
+            depth = partial_path.split('/').length
+            Find.prune if depth > @max_depth + 1
+          end
+
           if filtered?( path )
             Find.prune
           elsif matches?( path, query )

data/lib/godo.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module Godo
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   LIBPATH = File.expand_path( File.dirname( __FILE__ ) )
   
   # When called with no arguments this will return the path to the gem
@@ -37,18 +37,22 @@ module Godo
     config = YAML::load( File.read( File.expand_path( "~/.godo" ) ) )
     require 'finder'
     paths = Finder.find( query, config )
-    if paths.empty?
+    found_path = if paths.empty?
       puts "No paths match for: #{query}"
     elsif paths.size > 1
+      require 'highline/import'
       puts "Multiple, ambgiuous, paths match for: #{query}"
-      paths.each do |path|
-        puts "\t#{path}"
-      end
+      puts "Please pick one of the following:"
+      choose(*paths)
     else
       puts "Matching project: #{paths.first}"
+      paths.first
+    end
+    
+    if found_path
       require 'project'
       project = Project.new( options, config )
-      project.invoke( paths.first )
+      project.invoke( found_path )
     end
   end
   

data/lib/project.rb

@@ -24,12 +24,31 @@ module Godo
     
   private
     def invoke_actions( path, action_group )
-      session = @session_class.new( path )
+      @session ||= @session_class.new( path )
       
-      missing_actions = action_group.find_all { |action| !@actions.has_key?( action ) }
-      if missing_actions.empty?
-        action_group.each { |action_name|
-          action = @actions[action_name]
+      action_group.each do |action_item|
+        action = case action_item
+        when String
+          @actions[action_item]
+        when Hash
+          if action_item["matcher"]
+            if matcher = @matchers.find { |matcher| matcher["name"] == action_item["matcher"] }
+              invoke_actions( path, matcher["actions"])
+              nil
+            else
+              puts "\tUnknown matcher: #{action_item["matcher"]}"
+            end
+          elsif action_item["command"]
+            action_item["label"] ||= action_item["command"]
+            action_item
+          else
+            puts "\tUnknown action type: #{action_item}"
+          end
+        else
+          puts "\tUnknown action type: #{action_item}"
+        end
+        
+        if action
           exit = case action["exit"]
           when true
             true
@@ -42,13 +61,11 @@ module Godo
           else
             false
           end
-          
-          puts "\trunning: #{action_name} (exit: #{exit})"
-          session.create( action["label"], action["command"], exit )
-        }
-      else
-        missing_actions.each do |action|
-          puts "\tMissing action: #{action}"
+        
+          puts "\trunning: #{action["label"]} (exit: #{exit})"
+          @session.create( action["label"], action["command"], exit )
+        else
+          puts "\tMissing action: #{action_item.inspect}"
         end
       end
     end
@@ -57,6 +74,8 @@ module Godo
       if @options[:override]
         puts @options[:override]
         @matchers.find { |matcher| matcher["name"] == @options[:override] }
+      elsif File.file?( project_level_godo = File.join(path, '.godo' ) )
+        YAML::load( File.read( project_level_godo ) )
       else
         @matchers.detect { |matcher|
           matcher["heuristics"].all? { |heuristic|

data/lib/sessions/terminal_session.rb

@@ -0,0 +1,35 @@
+require 'session'
+require 'appscript'
+
+module Godo
+  
+  class TerminalSession < Session
+    
+    def initialize( path )
+      super( path )
+      @@terminal ||= Appscript::app('Terminal')
+      @window = nil
+    end
+    
+    def start
+      if @window
+        @window.frontmost.set(true)
+        Appscript::app('Terminal').activate
+        Appscript::app("System Events").application_processes["Terminal.app"].keystroke("t", :using => :command_down)
+        while (@window.tabs.last.busy.get)
+          # we're not on the new tab yet.  wait a bit...
+          sleep 0.1
+        end
+      else
+        first_tab = @@terminal.do_script('')
+        @window = eval('Appscript::' + first_tab.to_s.gsub(/\.tabs.*$/, '')) # nasty hack.  is there a legit way to find my mommy?
+      end
+    end
+    
+    def execute( command )
+      @@terminal.do_script(command, :in => @window.tabs.last.get)
+    end
+    
+  end
+  
+end

data/lib/template.yml

@@ -192,6 +192,11 @@ projects:
   - ~/Projects/rails
   - ~/Projects/Cocoa
 
-# The session controller to use. Right now iTerm is the only
-# game in town.
+# Specifies how far down to search into the project root paths,
+# defaults to unlimited depth.
+# max_depth: 2
+
+# The session controller to use. Right now iTerm and Terminal are the
+# only options.
 sessions: ITermSession
+# sessions: TerminalSession

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: godo
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Matt Mower
@@ -30,7 +30,7 @@ cert_chain:
   yMQ/kUco
   -----END CERTIFICATE-----
 
-date: 2008-03-09 00:00:00 +00:00
+date: 2008-03-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.4"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: 
@@ -69,7 +78,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.1
     version: 
-description: "go (to project) do (stuffs)  godo provides a smart way of opening a project folder in multiple terminal tabs and, in each tab, invoking a commands appropriate to that project. For example if the folder contains a Rails project the actions might include: starting mongrel, tailing one or more logs, starting consoles or IRB sessions, tailing production logs, opening an editor, running autospec, or gitk.  godo works by searching your project paths for a given search string and trying to match it against paths found in one or more configured project roots. It will make some straightforward efforts to disambiguate among multiple matches to find the one you want.  godo then uses configurable heuristics to figure out what type of project it is, for example \"a RoR project using RSpec and Subversion\". From that it will invokes a series of action appropriate to the type of project detected with each action being run, from the project folder, in its own terminal session.  godo is entirely configured by a YAML file (~/.godo) that contains project types, heuristics, actions, project paths, and a session controller. A sample configuration file is provided that can be installed using godo --install.  godo comes with an iTerm session controller for MacOSX that uses the rb-appscript gem to control iTerm (see lib/session.rb and lib/sessions/iterm_session.rb). It should be relatively straightforward to add new controller (e.g. for Leopard Terminal.app), or a controller that works in a different way (e.g. by creating new windows instead of new tabs). There is nothing MacOSX specific about the rest of godo so creating controllers for other unixen should be straightforward if they can be controlled from ruby.  godo is a rewrite of my original 'gp' script (http://matt.blogs.it/entries/00002674.html) which fixes a number of the deficiencies of that script, turns it into a gem, has a better name, and steals the idea of using heuristics to detect project types from Solomon Whites gp variant (http://onrails.org/articles/2007/11/28/scripting-the-leopard-terminal).  godo lives at the excellent GitHub: http://github.com/mmower/godo/ and accepts patches."
+description: "go (to project) do (stuffs)  godo provides a smart way of opening a project folder in multiple terminal tabs and, in each tab, invoking a commands appropriate to that project. For example if the folder contains a Rails project the actions might include: starting mongrel, tailing one or more logs, starting consoles or IRB sessions, tailing production logs, opening an editor, running autospec, or gitk.  godo works by searching your project paths for a given search string and trying to match it against paths found in one or more configured project roots. It will make some straightforward efforts to disambiguate among multiple matches to find the one you want.  godo then uses configurable heuristics to figure out what type of project it is, for example \"a RoR project using RSpec and Subversion\". From that it will invokes a series of action appropriate to the type of project detected with each action being run, from the project folder, in its own terminal session.  godo is entirely configured by a YAML file (~/.godo) that contains project types, heuristics, actions, project paths, and a session controller. A sample configuration file is provided that can be installed using godo --install.  godo comes with an iTerm session controller for MacOSX that uses the rb-appscript gem to control iTerm (see lib/session.rb and lib/sessions/iterm_session.rb). It should be relatively straightforward to add new controller (e.g. for Leopard Terminal.app), or a controller that works in a different way (e.g. by creating new windows instead of new tabs). There is nothing MacOSX specific about the rest of godo so creating controllers for other unixen should be straightforward if they can be controlled from ruby.  godo is a rewrite of my original 'gp' script (http://matt.blogs.it/entries/00002674.html) which fixes a number of the deficiencies of that script, turns it into a gem, has a better name, and steals the idea of using heuristics to detect project types from Solomon White's gp variant (http://onrails.org/articles/2007/11/28/scripting-the-leopard-terminal).  godo lives at the excellent GitHub: http://github.com/mmower/godo/ and accepts patches."
 email: 
 - self@mattmower.com
 executables: 
@@ -92,6 +101,7 @@ files:
 - lib/session.rb
 - lib/template.yml
 - lib/sessions/iterm_session.rb
+- lib/sessions/terminal_session.rb
 has_rdoc: true
 homepage: http://simplyruby.rubyforge.org/godo
 post_install_message: