terminitor 0.5.2 → 0.6.0

data/README.md

@@ -86,22 +86,24 @@ YAML syntax.
 
 #### Ruby DSL Syntax ####
 
-    setup 'echo "setup"'   # code to run during setup
+````ruby
+setup 'echo "setup"'   # code to run during setup
 
-    # open a tab in current window with these commands
-    tab "echo 'default'", "echo 'default tab'"
+# open a tab in current window with these commands
+tab "echo 'default'", "echo 'default tab'"
 
-    window do
-      before { run 'cd /path' } # run this command before each command.
-      
-      run 'padrino start' # run in new window
+window do
+  before { run 'cd /path' } # run this command before each command.
+  
+  run 'padrino start' # run in new window
 
-      tab "echo 'first tab'", "echo 'of window'" # create a new tab in window and run it.
-      tab "named tab" do
-        run "echo 'named tab'"
-        run "ls"
-      end
-    end
+  tab "echo 'first tab'", "echo 'of window'" # create a new tab in window and run it.
+  tab "named tab" do
+    run "echo 'named tab'"
+    run "ls"
+  end
+end
+````
 
 The newer Ruby DSL syntax allows for more complicated behavior such as window creation as well as setup blocks that can be executed prior loading a project.
 
@@ -109,51 +111,58 @@ The newer Ruby DSL syntax allows for more complicated behavior such as window cr
 
 to create tabs, we can simply invoke the tab command with either the command arguments like:
 
-    tab "echo 'hi'", "gitx"
-    
+````ruby
+tab "echo 'hi'", "gitx"
+````
+
 or even pass it a block:
 
-    tab do
-      run "echo 'hi'"
-      run "mate ."
-    end
+````ruby
+tab do
+  run "echo 'hi'"
+  run "mate ."
+end
+````
 
 ##### Windows #####
 
 to create windows, we can simply invoke the window command with a block containing additional commands like:
 
-    window do
+````ruby
+window do
 
-      run "whoami"    # Runs the command in the current window.
-
-      tab "echo 'hi'" # Creates another tab
-      tab "mate ."    # And another
-      tab do          # Last hoorah
-        run "open http://www.google.com"
-      end
-    end
+  run "whoami"    # Runs the command in the current window.
 
+  tab "echo 'hi'" # Creates another tab
+  tab "mate ."    # And another
+  tab do          # Last hoorah
+    run "open http://www.google.com"
+  end
+end
+````
 
 ##### Before #####
 
 Sometimes you'll want to create a few commands that you want to run in each tab instance. You can do that with 'before':
 
-    before { run "cd /path" } # execute this command before other commands in the default window
-    run "whoami"
-    tab 'uptime'
+````ruby
+before { run "cd /path" } # execute this command before other commands in the default window
+run "whoami"
+tab 'uptime'
 
-    # In this instance, "cd /path" wil be executed in the default window before 'whoami' 
-    # and also in the tab before 'uptime'.
-    # You can also use this inside a specific window context:
+# In this instance, "cd /path" wil be executed in the default window before 'whoami' 
+# and also in the tab before 'uptime'.
+# You can also use this inside a specific window context:
 
-    window do
-      before 'cd /tmp'
-      run 'watchr test.watchr' # "cd /tmp" first than run watchr
+window do
+  before 'cd /tmp'
+  run 'watchr test.watchr' # "cd /tmp" first than run watchr
 
-      tab do
-        run 'padrino start' # "cd /tmp" is ran beforehand and then padrino start is executed
-      end
-    end
+  tab do
+    run 'padrino start' # "cd /tmp" is ran beforehand and then padrino start is executed
+  end
+end
+````
 
 
 
@@ -163,15 +172,19 @@ The setup block allows you to store commands that can be ran specifically before
 
 the command arguments:
 
-    setup "bundle install", "gitx"
+````ruby
+setup "bundle install", "gitx"
+````
     
 or with a block:
 
-    setup do
-      run "echo 'hi'"
-      run "bundle install"
-      run 'git remote add upstream git://github.com/achiu/terminitor.git'
-    end
+````ruby
+setup do
+  run "echo 'hi'"
+  run "bundle install"
+  run 'git remote add upstream git://github.com/achiu/terminitor.git'
+end
+````
 
 
 Once defined, you can invoke your projects setup with:
@@ -185,19 +198,23 @@ You can also set settings on each of your tabs and windows. for example, this is
 
 Open a tab with terminal settings "Grass"
 
-    tab :name => "named tab", :settings => "Grass" do
-      run "echo 'named tab'"
-      run "ls"
-    end
+````ruby
+tab :name => "named tab", :settings => "Grass" do
+  run "echo 'named tab'"
+  run "ls"
+end
+````
 
 This will create a tab with a title of 'named tab' using Terminals 'Grass' setting.
 
 
 How about a window with a specific size:
 
-    window :bounds => [10,20,300,200] do
+````ruby
+window :bounds => [10,20,300,200] do
 
-    end
+end
+````
 
 Currently, the following options are available:
 
@@ -322,9 +339,39 @@ focus during execution of these commands. Obviously the long term goal is to sol
 
 #### ITermCore ####
 
-Currently the iTerm Core only provides basic functionality such as opening tabs, windows, and executing commands within them. The capture
+Currently the iTerm Core only provides basic functionality such as opening tabs, windows, and executing commands within them. It is also possible to split tabs into panes. The capture
 and settings functionality will be integrated soon.
 
+Splitting tabs into panes works as follows:
+
+    tab do
+      pane "gitx" # first pane
+        pane do      # second pane level => horizontal split
+          run "irb"
+        end
+      pane 'ls'   # first pane level => vertical split
+    end
+
+should result into something like this:
+
+    #    ###########################
+    #    #            #            #
+    #    #            #            #
+    #    #   'gitx'   #            #
+    #    #            #            #
+    #    #            #            #
+    #    ##############    'ls'    #
+    #    #            #            #
+    #    #            #            #
+    #    #   'irb'    #            #
+    #    #            #            #
+    #    #            #            #
+    #    ###########################
+
+It is not possible to split the second level panes (the horizontal
+ones). Nevertheless you should be able to split tabs into any kind of pane pattern you wish
+with this syntax.
+
 
 #### Fetching ####
 
@@ -365,14 +412,15 @@ Thanks to the following people for their contributions so far:
  * Flavio Castelli ([flavio](https://github.com/flavio)) for contributing Konsole(KDE) core.
  * Alexey Kuleshov ([kulesa](https://github.com/kulesa)) for contributing the terminal settings and terminal settings capture functionality
  * Arthur Gunn     ([gunn](https://github.com/gunn)) for contributing a path to support tab syntax and load path.
- * Elliot Winkler  ([mcmire](https://github.com/mcmire)) for adding 1.8.6 compatiblity and ensuring tabs open in order.
+ * Elliot Winkler  ([mcmire](https://github.com/mcmire)) for adding 1.8.6 compatiblity and ensuring tabs open in order and fixing named tabs
  * Justin Hilemen  ([bobthecow](https://github.com/bobthecow)) for fixing the list command to remove the term extensions.
  * Dave Perrett    ([recurser](https://github.com/recurser)) for adding basic iTerm support.
  * Ilkka Laukkanen ([ilkka](https://github.com/achiu/terminitor/commits/master?author=ilkka)) for Terminator core and other fixes
  * Elia Schito     ([elia](https://github.com/achiu/terminitor/commits/master?author=elia)) for patch to allow usage of "&" for background operations
  * Dotan J. Nahum  ([jondot](https://github.com/jondot)) for adding windows(cmd.exe) support
- * Kyriacos Souroullas ([kyriacos](https://github.com/kyriacos) For removing params to support generic commands
- * Jerry Cheung ([jch](https://github.com/jch)) For adding ignore for emac backups
+ * Kyriacos Souroullas ([kyriacos](https://github.com/kyriacos) for removing params to support generic commands
+ * Jerry Cheung ([jch](https://github.com/jch)) for adding ignore for emac backups
+ * Michael Klein ([LevelbossMike](https://github.com/LevelbossMike)) for adding iTerm Pane support
 
 Acknowledgements
 -----------------

data/lib/terminitor/abstract_core.rb

@@ -53,7 +53,7 @@ module Terminitor
         # clean up prompt
         tab_content[:commands].insert(0, 'clear') if tab_name || !@working_dir.to_s.empty?
         # add title to tab
-        tab_content[:commands].insert(0, "PS1=$PS1\"\\e]2;#{tab_name}\\a\"") if tab_name
+        tab_content[:commands].insert(0, "PS1=\"$PS1\\e]2;#{tab_name}\\a\"") if tab_name
         tab_content[:commands].insert(0, "cd \"#{@working_dir}\"") unless @working_dir.to_s.empty?
         tab_content[:commands].each { |cmd| execute_command(cmd, :in => tab) }
       end

data/lib/terminitor/cores/iterm_core.rb

@@ -3,12 +3,12 @@ module Terminitor
   # This Core manages all the interaction with Appscript and the Terminal
   class ItermCore < AbstractCore
     include Appscript
-    
+
     ALLOWED_OPTIONS = {
       :window => [:bounds, :visible, :miniaturized],
       :tab => [:settings, :selected]
     }
-    
+
     # Initialize @terminal with Terminal.app, Load the Windows, store the Termfile
     # Terminitor::MacCore.new('/path')
     def initialize(path)
@@ -17,10 +17,10 @@ module Terminitor
       @windows  = @terminal.terminals
       @delayed_options = []
     end
-            
+
     # executes the given command via appscript
     # execute_command 'cd /path/to', :in => #<tab>
-    def execute_command(cmd, options = {})      
+    def execute_command(cmd, options = {})
       if options[:in]
         options[:in].write(:text => "#{cmd}")
       else
@@ -28,48 +28,33 @@ module Terminitor
       end
     end
 
-    # Opens a new tab and returns itself.
+    # Opens a new tab, iterm sets focus on new tab 
     # TODO : handle options (?)
     def open_tab(options = nil)
-      session = current_terminal.sessions.end.make( :new => :session )
-      session.exec(:command => ENV['SHELL'])
-      session
+      current_terminal.launch_ :session => 'New session'
     end
-    
-    # Opens A New Window, applies settings to the first tab and returns the tab object.
+
+    # Open new window, applies settings to the first tab. iterm sets focus on 
+    # new tab
     # TODO : handle options (?)
     def open_window(options = nil)
       window  = terminal.make( :new => :terminal )
-      session = window.sessions.end.make( :new => :session )
-      session.exec(:command => ENV['SHELL'])
-      session
-    end
-
-    # Returns the Terminal Process
-    # We need this method to workaround appscript so that we can instantiate new tabs and windows.
-    # otherwise it would have looked something like window.make(:new => :tab) but that doesn't work.
-    def terminal_process
-      app("System Events").application_processes["iTerm.app"]
-    end
-    
-    # Returns the last instantiated tab from active window
-    def return_last_tab
-      current_terminal.sessions.last.get rescue false
+      window.launch_ :session => 'New session'
     end
 
-    # returns the active windows
+    # Returns the active window i.e. the active terminal session in iTerm 
     def active_window
-      current_terminal.current_session.get
+      current_terminal.current_session
     end
-    
-    # Returns the current terminal
+
+    # Returns the current terminal i.e. the active iTerm window
     def current_terminal
       @terminal.current_terminal
     end
 
     # Sets options of the given object
     def set_options(object, options = {})
-      options.each_pair do |option, value| 
+      options.each_pair do |option, value|
         case option
         when :settings   # works for windows and tabs, for example :settings => "Grass"
           begin
@@ -97,7 +82,7 @@ module Terminitor
         end
       end
     end
-    
+
     # Apply delayed options and remove them from the queue
     def set_delayed_options
       @delayed_options.length.times do 
@@ -106,12 +91,134 @@ module Terminitor
       end
     end
 
+    # this command will run commands in the designated window
+    # run_in_window 'window1', {:tab1 => ['ls','ok']}
+    # @param [String] name of window
+    # @param [Hash] Hash of window's content extracted from Termfile
+    # @param [Hash] Hash of options
+    def run_in_window(window_name, window_content, options = {})
+      window_options = window_content[:options]
+      first_tab = true
+      window_content[:tabs].keys.sort.each do |tab_key|
+        tab_content = window_content[:tabs][tab_key]
+        # Open window on first 'tab' statement
+        # first tab is already opened in the new window, so first tab should be
+        # opened as a new tab in default window only
+        tab_options = tab_content[:options]
+        tab_name    = tab_options[:name] if tab_options
+        if first_tab && !options[:default]
+          first_tab = false
+          combined_options = (window_options.to_a + tab_options.to_a).inject([]) {|arr, pair| arr += pair }
+          window_options = Hash[*combined_options] # safe merge
+          tab = window_options.empty? ? open_window(nil) : open_window(window_options)
+        else
+        # give us the current window if its default, else open a tab.
+          tab = ( tab_key == 'default' ? active_window : open_tab(tab_options) )
+        end
+        # append our before block commands.
+        tab_content[:commands].insert(0, window_content[:before]).flatten! if window_content[:before]
+        # clean up prompt
+        tab_content[:commands].insert(0, 'clear') if tab_name || !@working_dir.to_s.empty?
+        # add title to tab
+        tab_content[:commands].insert(0, "PS1=$PS1\"\\e]2;#{tab_name}\\a\"") if tab_name
+        tab_content[:commands].insert(0, "cd \"#{@working_dir}\"") unless @working_dir.to_s.empty?
+        # if tab_content hash has a key :panes we know this tab should be split
+        # we can execute tab commands if there is no key :panes
+        if tab_content.key?(:panes)
+          handle_panes(tab_content) 
+        else
+          tab_content[:commands].each { |cmd| execute_command(cmd, :in => tab) }
+        end
+      end
+      set_delayed_options
+    end
+
+    def handle_panes(tab_content)
+      panes = tab_content[:panes]
+      tab_commands = tab_content[:commands]
+      first_pane_level_split(panes, tab_commands)
+      second_pane_level_split(panes, tab_commands)
+    end
+
+    def first_pane_level_split(panes, tab_commands)
+      first_pane = true
+      split_v_counter = 0
+      panes.keys.sort.each do |pane_key|
+        pane_content = panes[pane_key]
+        unless first_pane
+          split_v
+          split_v_counter += 1 
+        end
+        first_pane = false if first_pane
+        pane_commands = pane_content[:commands] 
+        execute_pane_commands(pane_commands, tab_commands)
+      end
+      split_v_counter.times { select_pane 'Left' }
+    end
+
+    def second_pane_level_split(panes, tab_commands)
+      panes.keys.sort.each do |pane_key|
+        pane_content = panes[pane_key]
+        handle_subpanes(pane_content[:panes], tab_commands) if pane_content.has_key? :panes
+        # select next vertical pane
+        select_pane 'Right'
+      end
+    end
+
+    def handle_subpanes(subpanes, tab_commands)
+      subpanes.keys.sort.each do |subpane_key|
+        subpane_commands = subpanes[subpane_key][:commands]
+        split_h
+        execute_pane_commands(subpane_commands, tab_commands)
+      end
+    end
+
+    def execute_pane_commands(pane_commands, tab_commands)
+      pane_commands = tab_commands + pane_commands
+      pane_commands.each { |cmd| execute_command cmd}
+    end
+
+
+    # Methods for splitting panes (GUI_scripting)
+    #
+    def iterm_menu
+      terminal_process = Appscript.app("System Events").processes["iTerm"]
+      terminal_process.menu_bars.first
+    end
+
+    def call_ui_action(menu, submenu = nil, action)
+      menu = iterm_menu.menu_bar_items[menu].menus[menu]
+      if submenu
+        menu = menu.menu_items[submenu].menus[submenu]
+      end
+      menu.menu_items[action].click
+    end
+
+    def split_v
+      call_ui_action("Shell", nil, "Split vertically")
+    end
+
+    def split_h
+      call_ui_action("Shell", nil, "Split horizontally")
+    end
+
+    # to select panes; iTerm's Appscript select method does not work
+    # as expected, we have to select via menu instead
+    def select_pane(direction)
+      valid_directions = %w[Above Below Left Right]
+      if valid_directions.include?(direction)
+        call_ui_action("Window", "Select Split Pane", "Select Pane #{direction}")
+      else
+        puts "Error: #{direction} is not a valid direction to select a pane; Only Above/Below/Left/Right are valid directions"
+      end
+    end
+
     private
-    
+
     # These methods are here for reference so I can ponder later
     # how I could possibly use them.
     # And Currently aren't tested. =(
-    
+
     # returns a window by the id
     def window_by_id(id)
       @windows.ID(id)
@@ -127,12 +234,12 @@ module Terminitor
     def set_window_title(window, title)
       window.custom_title.set(title)
     end
-    
+
     # selects options allowed for window or tab
     def allowed_options(object_type, options)
       Hash[ options.select {|option, value| ALLOWED_OPTIONS[object_type].include?(option) }]
     end
-    
+
     # Add option to the list of delayed options
     def delayed_option(option, value, object)
       @delayed_options << {

data/lib/terminitor/dsl.rb

@@ -28,7 +28,7 @@ module Terminitor
 
     # sets command context to be run inside a specific window
     # @param [Hash] options hash.
-    # @param [Proc] 
+    # @param [Proc]
     # @example
     #   window(:name => 'new window', :size => [80,30], :position => [9, 100]) { tab('ls','gitx') }
     #   window { tab('ls', 'gitx') }
@@ -47,6 +47,8 @@ module Terminitor
       # if we are in a window context, append commands to default tab.
       if @_context.is_a?(Hash) && @_context[:tabs]
         current = @_context[:tabs]['default'][:commands]
+      elsif @_context.is_a?(Hash)
+        current = @_context[:commands]
       else
         current = @_context
       end
@@ -82,19 +84,50 @@ module Terminitor
       tab_name = "tab#{tabs.keys.size}"
       if block_given?
         tab_contents = tabs[tab_name] = {:commands => []}
-        
+
         options = {}
         options = args.pop          if args.last.is_a? Hash
         options[:name] = args.first if args.first.is_a?(String) || args.first.is_a?(Symbol)
-        
+
         tab_contents[:options] = options unless options.empty?
-        
-        in_context tab_contents[:commands], &block
+
+        in_context tab_contents, &block
+        clean_up_context
       else
         tabs[tab_name] = { :commands => args}
       end
     end
 
+    # Generates a pane in the terminal. These can be nested to
+    # create horizontal panes. Vertical panes are created with each top
+    # level nest.
+    # @param [Array<String>] Array of comamnds
+    # @param [Proc]
+    # @example
+    #   pane "top"
+    #   pane { pane "uptime" }
+    def pane(*args, &block)
+      @_context[:panes] = {} unless @_context.has_key? :panes 
+      panes = @_context[:panes]
+      pane_name = "pane#{panes.keys.size}"
+      if block_given?
+        pane_contents = panes[pane_name] = {:commands => []}
+        if @_context.has_key? :is_first_lvl_pane
+          # after in_context  we should be able to access
+          # @_context and @_old_context as before
+          context = @_context
+          old_context = @_old_context
+          in_context pane_contents[:commands], &block
+          clean_up_context(context, old_context)
+        else
+          pane_contents[:is_first_lvl_pane] = true
+          in_context pane_contents, &block
+        end
+      else
+        panes[pane_name] = { :commands => args }
+      end
+    end
+
     # Returns yaml file as Terminitor formmatted hash
     # @return [Hash] Return hash format of Termfile
     def to_hash
@@ -111,6 +144,13 @@ module Terminitor
       @_context = @_old_context
     end
 
+    def clean_up_context(context = last_open_window, old_context = nil)
+      @_context = context
+      @_old_context = old_context
+    end
 
+    def last_open_window
+      @windows[@windows.keys.last]
+    end
   end
 end

data/lib/terminitor/version.rb

@@ -1,3 +1,3 @@
 module Terminitor
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/test/abstract_core_test.rb

@@ -123,11 +123,11 @@ context "AbstractCore" do
         mock(core).open_window(:bounds => [10,10], :settings => 'cool', :name => "first tab")  { "first"  }
         mock(core).open_tab(:settings => 'grass', :name => 'second tab')    { "second"  }
         mock(core).set_delayed_options { true  }
-        mock(core).execute_command('PS1=$PS1"\e]2;first tab\a"', :in => 'first')
+        mock(core).execute_command('PS1="$PS1\e]2;first tab\a"', :in => 'first')
         mock(core).execute_command('clear', :in => 'first')
         mock(core).execute_command('ls', :in => "first")
         mock(core).execute_command('ok', :in => "first")
-        mock(core).execute_command('PS1=$PS1"\e]2;second tab\a"', :in => 'second')
+        mock(core).execute_command('PS1="$PS1\e]2;second tab\a"', :in => 'second')
         mock(core).execute_command('clear', :in => 'second')
         mock(core).execute_command('ps', :in => "second")
         core.process!

data/test/cores/iterm_core_test.rb

@@ -11,54 +11,30 @@ on_platform "darwin" do
      @iterm_core = Terminitor::ItermCore.new('/path/to')  
     end
 
-    asserts "#terminal_process calls System Events" do
-      core = topic.dup
-      mock(core).app('System Events') { mock!.application_processes.returns("iTerm.app" => true) }
-      core.terminal_process
-    end
-
-    context "#open_tab" do
 
-      should "return the current tab" do
-        core = topic.dup
-        mock(core).current_terminal.stub!.sessions.stub!.end.
-          stub!.make(:new => :session).stub!.
-          exec(:command => ENV['SHELL'])
-        core.open_tab
-      end
+    asserts "#open_tab launches a new sessions" do
+      core = topic.dup
+      mock(core).current_terminal.stub!.launch_(:session => 'New session')
+      core.open_tab
+    end.nil
 
-    end
+    asserts "#open_window creates a new session" do
+      core = topic.dup
+      mock(core).terminal.stub!.make(:new => :terminal).stub!.launch_(:session => 'New session')
+      core.open_window
+    end.nil
 
-    context "#open_window" do
-    
-      should "return the last tab" do
-        core = topic.dup
-        mock(core).terminal.stub!.make(:new=>:terminal).
-          stub!.sessions.stub!.end.stub!.make(:new=>:session).
-          stub!.exec(:command => ENV['SHELL'])
-        core.open_window
-      end
-    end
-    
-    asserts "#return_last_tab returns the last tab" do
-     core = topic.dup
-     mock(core).current_terminal.stub!.sessions.stub!.
-       last.stub!.get.returns(true)
-     core.return_last_tab
-    end
-    
     asserts "#execute_command executes" do
       core = topic.dup
       mock(core).active_window.stub!.write(:text => "hasta").returns(true)
       core.execute_command('hasta')
     end
-    
+
     asserts "#active_window gives window" do
       core = topic.dup
       mock(core).current_terminal.stub!.current_session.stub!.get.returns(true)
       core.active_window
     end
-
   end
 end
 

data/test/dsl_test.rb

@@ -20,7 +20,7 @@ context "Dsl" do
 
         context "with :tabs" do
           setup { topic[:tabs] }
-          
+
           asserts(:[], 'tab2').equivalent_to({
             :commands=>["echo 'named tab'", "ls"],
             :options => {
@@ -87,3 +87,58 @@ context "Dsl" do
     end
   end
 end
+
+context "with panes" do
+  setup { Terminitor::Dsl.new File.expand_path('../fixtures/iterm_panes.term', __FILE__) }
+  asserts_topic.assigns :setup
+  asserts_topic.assigns :windows
+  asserts_topic.assigns :_context
+ 
+  context "creates correct hash" do
+    setup { topic.to_hash }
+
+    context "in windows" do
+      setup { topic[:windows] }
+
+      context "with default window" do
+        setup { topic['default'] }
+
+        context "tabs with panes " do
+          setup { topic[:tabs] }
+
+          context "tabs can hold panes" do
+            asserts(:[], 'tab1').equivalent_to({
+              :commands=>["ls"],
+              :panes => {
+                'pane0' => {
+                  :commands => ["echo 'first level pane'"],
+                  :is_first_lvl_pane => true,
+                  :panes => {
+                    'pane0' => {
+                      :commands => ["echo 'first second level pane'"]
+                    }
+                   }
+                },
+                'pane1' => {
+                  :commands => ["gitx"],
+                  :is_first_lvl_pane => true,
+                  :panes => {
+                    'pane0' => {
+                      :commands => ["ls"]
+                    },
+                    'pane1' => {
+                      :commands => ["echo 'wohoo'", "echo '2nd cmd'"]
+                    }
+                  }
+                }
+              }
+            })
+            asserts(:[], 'tab2').equivalent_to({
+              :commands => ["echo 'second tab'"]
+            })
+          end
+        end
+      end
+    end
+  end
+end

data/test/fixtures/iterm_panes.term

@@ -0,0 +1,20 @@
+tab do 
+  run 'ls'
+  pane do
+    run "echo 'first level pane'"
+    pane do
+      run "echo 'first second level pane'"
+    end
+  end
+  pane do
+    run "gitx"
+    pane 'ls'
+    pane do
+      run "echo 'wohoo'"
+      run "echo '2nd cmd'"
+    end
+  end
+end
+tab do
+  run "echo 'second tab'"
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: terminitor
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 -07:00
+date: 2011-05-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 6
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 0
         - 14
@@ -59,7 +56,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 6
@@ -75,7 +71,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -91,7 +86,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
         segments: 
         - 0
         - 12
@@ -107,7 +101,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -123,7 +116,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -185,6 +177,7 @@ files:
 - test/fixtures/bar.term
 - test/fixtures/foo.term
 - test/fixtures/foo.yml
+- test/fixtures/iterm_panes.term
 - test/runner_test.rb
 - test/teststrap.rb
 - test/yaml_test.rb
@@ -203,7 +196,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -212,7 +204,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -221,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: terminitor
-rubygems_version: 1.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Automate your development workflow