lib/termup/base.rb in termup-1.0.1 vs lib/termup/base.rb in termup-1.1.0

@@ -1,33 +1,66 @@
-#!/usr/bin/env ruby
-require 'rubygems'
 require 'appscript'
 require 'yaml'
 
 module Termup
   class Base
     include Appscript
 
     def initialize(project)
-      @terminal = app('Terminal')
-      tabs = YAML.load(File.read("#{TERMUP_DIR}/#{project}.yml"))
-      tabs.each do |hash|
+      @apps = app("System Events").application_processes
+      @frontmost = @apps.get.select{|i| i.frontmost.get }.map{|i| i.name.get }.first
+      return unless ["Terminal", "iTerm"].include?(@frontmost)
+      @terminal = app(@frontmost)
+      
+      @project = YAML.load(File.read("#{TERMUP_DIR}/#{project}.yml"))
+      
+      # Split panes for iTerm
+      split_panes if @frontmost == "iTerm" and @project['options']['iterm']
+      
+      @project['tabs'].each do |hash|
         tabname = hash.keys.first
         cmds = hash.values.first
         cmds = [cmds].flatten
         tab = new_tab
         cmds.each do |cmd|
-          @terminal.do_script(cmd, :in => tab)
+          case @frontmost
+          when "Terminal"
+            @terminal.do_script(cmd, :in => tab)
+          when "iTerm"
+            @terminal.current_terminal.current_session.write(:text => "#{cmd}")
+          end
         end
       end
     end
 
     def new_tab
       if @got_first_tab_already
-        app("System Events").application_processes["Terminal.app"].keystroke("t", :using => :command_down)
+        case @frontmost
+        when "Terminal"
+          @apps[@frontmost].keystroke("t", :using => :command_down)
+        when "iTerm"
+          @apps[@frontmost].keystroke("]", :using => :command_down)
+        end
       end
       @got_first_tab_already = true
       sleep 0.01 # Allow some time to complete opening a new tab
-      @terminal.windows[1].tabs.last.get
+      @terminal.windows[1].tabs.last.get if @frontmost == "Terminal"
+    end
+    
+    def split_panes
+      # Virtical splits
+      (@project['options']['iterm']['width'] - 1).times do |i|
+        @apps[@frontmost].keystroke("d", :using => :command_down)
+      end
+      # Back to home
+      @apps[@frontmost].keystroke("]", :using => :command_down)
+      # Horizontal splits
+      @project['options']['iterm']['width'].times do |i|
+        (@project['options']['iterm']['height'] - 1).times do |i|
+          @apps[@frontmost].keystroke("d", :using => [ :command_down, :shift_down ])
+        end
+        # Move to the right
+        @apps[@frontmost].keystroke("]", :using => :command_down)
+      end
     end
   end
 end