termup 1.3.1 → 2.0.0

data/README.md

@@ -5,10 +5,12 @@ Automate opening up terminal tabs (or split panes) with a set of routine command
 
 It's the easiest way to get started for your projects every day.
 
-Compatible with Terminal.app, iTerm and iTerm2 on Mac OS X 10.6 - 10.8 and Ruby 1.8.7 - 1.9.3.
+Compatible with Terminal.app and iTerm 2 on Mac OS X 10.6 - 10.8 and Ruby 1.8.7 - 1.9.3.
 
 ![Split Panes](https://github.com/kenn/termup/raw/master/images/split_panes.png)
 
+**iTerm 1 users** the current version is not compatible with iTerms 1. Use v1.3.1 - `gem install termup -v=1.3.1`
+
 Installation
 ------------
 
@@ -26,38 +28,38 @@ Usage
 Call the following command:
 
 ```sh
-$ termup create new_project
+$ termup create myproject
 ```
 
-This will create a new project at `~/.config/termup/new_project.yml`. Edit the file:
+This will create a new project at `~/.config/termup/myproject.yml`. Edit the file:
 
 ```sh
-$ termup edit new_project
+$ termup edit myproject
 ```
 
 And now you're good to go:
 
 ```sh
-$ termup start new_project
+$ termup start myproject
 ```
 
 ### YAML Syntax ###
 
 ```yaml
-# ~/.config/termup/new_project.yml
+# ~/.config/termup/myproject.yml
 ---
 tabs:
-  - tab1:
+  tab1:
     - cd ~/projects/foo
     - git status
-    - mate .
-  - tab2:
+    - subl .
+  tab2:
     - mysql -u root
     - show databases;
-  - tab3:
+  tab3:
     - cd ~/projects/foo
     - tail -f log/development.log
-  - tab4:
+  tab4:
     - cd ~/projects/foo
     - autotest
 options:
@@ -73,10 +75,10 @@ Tabs can contain a single command, or YAML arrays to execute multiple commands.
 Commands have a shortcut for even fewer keystrokes.
 
 ```sh
-$ termup s new_project
+$ termup s myproject
 ```
 
-That's equivalent to `termup start new_project`.
+That's equivalent to `termup start myproject`.
 
 ### iTerm 2 Split Pane Support ###
 

data/lib/templates/iterm_advanced.yml

@@ -0,0 +1,25 @@
+# COMMENT OF SCRIPT HERE
+---
+tabs:
+  pane1:
+    commands:
+      - echo tab1
+    layout:
+      - split_vertically
+  pane2:
+    commands:
+      - echo tab2
+    layout:
+      - split_horizontally
+  pane3:
+    commands:
+      - echo tab3
+    layout:
+      - split_horizontally
+  pane4:
+    properties:
+      foreground_color: yellow
+      background_color: blue
+      transparency: 0.1
+    commands:
+      - echo tab4

data/lib/templates/iterm_basic.yml

@@ -0,0 +1,15 @@
+# COMMENT OF SCRIPT HERE
+---
+tabs:
+  pane1:
+    - echo tab1
+  pane2:
+    - echo tab2
+  pane3:
+    - echo tab3
+  pane4:
+    - echo tab4
+options:
+  iterm:
+    width: 2
+    height: 2

data/lib/templates/template.yml

@@ -1,17 +1,11 @@
 # COMMENT OF SCRIPT HERE
 ---
 tabs:
-  - tab1:
-    - cd ~/foo/bar
-    - git status
-  - tab2:
-    - mysql -u root
-    - show databases;
-  - tab3: echo "hello world"
-  - tab4:
-    - cd ~/foo/project
-    - autotest
-options:
-  iterm:
-    width: 2
-    height: 2
+  tab1:
+    - echo tab1
+  tab2:
+    - echo tab2
+  tab3:
+    - echo tab3
+  tab4:
+    - echo tab4

data/lib/termup.rb

@@ -1,4 +1,5 @@
 module Termup
-  autoload :Cli,  'termup/cli'
-  autoload :Base, 'termup/base'
+  autoload :Base,     'termup/base'
+  autoload :Cli,      'termup/cli'
+  autoload :Handler,  'termup/handler'
 end

data/lib/termup/base.rb

@@ -1,79 +1,90 @@
-require 'appscript'
 require 'yaml'
 
 module Termup
   class Base
-    ITERM1 = /^0\.10/
-    ITERM2 = /^1.0/
+    def initialize(project)
+      @handler = Termup::Handler.new
 
-    include Appscript
+      config = YAML.load(File.read("#{TERMUP_DIR}/#{project}.yml"))
+      @tabs = config['tabs']
 
-    def initialize(project)
-      @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)
+      # Config file compatibility checking
+      if @tabs.is_a?(Array) and @tabs.first.is_a?(Hash)
+        abort 'YAML syntax for config has been changed. See https://github.com/kenn/termup for details.'
+      end
 
-      @project = YAML.load(File.read("#{TERMUP_DIR}/#{project}.yml"))
+      @options = config['options'] || {}
+      @iterm_options = @options['iterm']
 
       # Split panes for iTerm 2
-      split_panes if iterm2? and @project['options']['iterm']
+      split_panes if @handler.iterm? and @iterm_options
 
-      @project['tabs'].each do |hash|
-        tabname = hash.keys.first
-        cmds = hash.values.first
-        cmds = [cmds].flatten
-        tab = new_tab
-        cmds.each do |cmd|
-          if terminal?
-            @terminal.do_script(cmd, :in => tab)
-          else
-            @terminal.current_terminal.current_session.write(:text => "#{cmd}")
-          end
+      # Setting up tabs / panes
+      @tabs.each_with_index do |(tabname, values), index|
+        # Set tab title
+        @handler.set_property(:name, tabname)
+
+        # Run commands
+        (advanced_iterm? ? values['commands'] : values).each do |command|
+          @handler.run command
         end
-      end
-    end
 
-    def new_tab
-      if @got_first_tab_already
-        if iterm2?
-          @apps[@frontmost].keystroke(']', :using => :command_down)
+        # Layout
+        if advanced_iterm?
+          values['properties'].each do |key, value|
+            @handler.set_property(key, value)
+          end if values['properties']
+
+          values['layout'].each do |command|
+            layout command
+          end if values['layout']
         else
-          @apps[@frontmost].keystroke('t', :using => :command_down)
+          # Move to next
+          if @iterm_options
+            layout :goto_next_pane
+          else
+            if index < @tabs.size - 1
+              layout :new_tab
+              sleep 0.01 # Allow some time to complete opening a new tab
+            else
+              layout :goto_next_tab # Back home
+            end
+          end
         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 if terminal?
     end
 
     def split_panes
-      # Virtical splits
-      (@project['options']['iterm']['width'] - 1).times do |i|
-        @apps[@frontmost].keystroke('d', :using => :command_down)
+      width, height = @iterm_options['width'], @iterm_options['height']
+      return unless width and height
+
+      (width - 1).times do
+        layout :split_vertically
       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 ])
+      layout :goto_next_pane # Back home
+      width.times do
+        (height - 1).times do
+          layout :split_horizontally
         end
-        # Move to the right
-        @apps[@frontmost].keystroke(']', :using => :command_down)
+        layout :goto_next_pane # Move to next, or back home
       end
     end
 
-    def terminal?
-      @frontmost == 'Terminal'
-    end
-
-    def iterm1?
-      @frontmost == 'iTerm' and @terminal.version.get =~ ITERM1
+    def advanced_iterm?
+      unless defined?(@advanced_iterm)
+        @advanced_iterm = case @tabs.values.first
+        when Hash   then true
+        when Array  then false
+        else
+          abort 'invalid YAML format'
+        end
+        abort 'advanced config only supported for iTerm' if @advanced_iterm and !@handler.iterm?
+      end
+      @advanced_iterm
     end
 
-    def iterm2?
-      @frontmost == 'iTerm' and @terminal.version.get =~ ITERM2
+    def layout(command)
+      @handler.layout(command)
     end
   end
 end

data/lib/termup/cli.rb

@@ -17,7 +17,9 @@ module Termup
     map 'l' => :list
     map 's' => :start
 
-    desc 'create PROJECT', 'Create termup project (Shortcut: c)'
+    desc 'create PROJECT', 'Create termup project (Shortcut: c, Options: --iterm_basic / --iterm_advanced)'
+    method_option :iterm_basic,     :type => :boolean, :required => false
+    method_option :iterm_advanced,  :type => :boolean, :required => false
     def create(project)
       edit(project)
     end
@@ -26,7 +28,13 @@ module Termup
     def edit(project)
       unless File.exists?(path(project))
         empty_directory TERMUP_DIR
-        template 'templates/template.yml', path(project)
+        if options['iterm_advanced']
+          template 'templates/iterm_advanced.yml', path(project)
+        elsif options['iterm_basic']
+          template 'templates/iterm_basic.yml', path(project)
+        else  
+          template 'templates/template.yml', path(project)
+        end
       end
       say 'please set $EDITOR in ~/.bash_profile' and return unless editor = ENV['EDITOR']
       system("#{editor} #{path(project)}")

data/lib/termup/handler.rb

@@ -0,0 +1,111 @@
+require 'appscript'
+
+module Termup
+  class Handler
+    def app(*args)
+      Appscript.app(*args)
+    end
+
+    def run(command)
+      if terminal?
+        app_process.do_script(command, :in => app_process.windows[1].tabs.last.get)
+      else
+        app_process.current_terminal.current_session.write(:text => command)
+      end
+    end
+
+    def set_property(key, value)
+      if iterm?
+        app_process.current_terminal.current_session.send(key).set(value)
+      else
+        # No-op for terminal for now
+      end
+    end
+
+    def activate
+      app_process.activate
+    end
+
+    def hit(key, *using)
+      activate
+      case key
+      when Integer
+        app('System Events').key_code key, using && { :using => using }
+      when String
+        app('System Events').keystroke key, using && { :using => using }
+      end
+    end
+
+    def terminal?
+      app_name == 'Terminal'
+    end
+
+    def iterm?
+      app_name == 'iTerm'
+    end
+
+    def app_name
+      @app_name ||= app_process.name.get
+    end
+
+    def app_process
+      @app_process ||= app.by_pid(term_pid)
+    end
+
+    def term_pid
+      return @term_pid if @term_pid
+
+      pid = Process.ppid
+
+      # Go up the process tree to find term-like process
+      100.times do
+        ppid = `ps -p #{pid} -o ppid=`.strip.to_i
+
+        abort 'terminal pid not found!' if ppid == 1
+
+        if term_like_pids.include?(ppid)
+          @term_pid = ppid
+          break
+        end
+
+        pid = ppid
+      end
+
+      @term_pid
+    end
+
+    def term_like_pids
+      @term_like_pids ||= `ps x | grep Term`.split("\n").reject{|i| i =~ /grep/ }.map{|i| i.match(/^\d+/).to_s.to_i }
+    end
+
+    def layout(command)
+      if iterm?
+        case command.to_sym
+        when :new_tab             then hit 't', :command_down
+        when :close_tab           then hit 'w', :command_down
+        when :goto_previous_tab   then hit '[', :command_down, :shift_down
+        when :goto_next_tab       then hit ']', :command_down, :shift_down
+        when :goto_previous_pane  then hit '[', :command_down
+        when :goto_next_pane      then hit ']', :command_down
+        when :split_vertically    then hit 'd', :command_down
+        when :split_horizontally  then hit 'd', :command_down, :shift_down
+        when :go_left             then hit 123, :command_down, :option_down
+        when :go_right            then hit 124, :command_down, :option_down
+        when :go_down             then hit 125, :command_down, :option_down
+        when :go_up               then hit 126, :command_down, :option_down
+        else
+          abort "Unknown iTerm2.app command: #{command}"
+        end
+      else
+        case command.to_sym
+        when :new_tab             then hit 't', :command_down
+        when :close_tab           then hit 'w', :command_down
+        when :goto_previous_tab   then hit '[', :command_down, :shift_down
+        when :goto_next_tab       then hit ']', :command_down, :shift_down
+        else
+          abort "Unknown Terminal.app command: #{command}"
+        end
+      end
+    end
+  end
+end

data/lib/termup/version.rb

@@ -1,3 +1,3 @@
 module Termup
-  VERSION = '1.3.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termup
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-appscript
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
+    none: false
 - !ruby/object:Gem::Dependency
   name: thor
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.16.0
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.16.0
+    none: false
 description: Setup terminal tabs with preset commands for your projects
 email:
 - kenn.ejima@gmail.com
@@ -53,15 +53,17 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/termup
+- lib/templates/iterm_advanced.yml
+- lib/templates/iterm_basic.yml
 - lib/templates/template.yml
 - lib/termup.rb
 - lib/termup/base.rb
 - lib/termup/cli.rb
+- lib/termup/handler.rb
 - lib/termup/version.rb
 - termup.gemspec
 homepage: https://github.com/kenn/termup
@@ -71,17 +73,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -89,3 +91,4 @@ signing_key:
 specification_version: 3
 summary: Setup terminal tabs with preset commands for your projects
 test_files: []
+has_rdoc: