termup 1.0.1 → 1.1.0

data/README.md

@@ -13,7 +13,7 @@ Installation
 Usage
 -----
 
-#### Getting Started ####
+### Getting Started ###
 
 Call the following command:
 
@@ -27,27 +27,53 @@ And now you're good to go:
 
     $ termup start new_project
 
-#### YAML Syntax ####
+### YAML Syntax ###
 
     # ~/.config/termup/new_project.yml
     ---
-    - tab1:
-      - cd ~/foo/bar
-      - git status
-    - tab2:
-      - mysql -u root
-      - show databases;
-    - tab3: echo "hello world"
-    - tab4:
-      - cd ~/foo/project
-      - autotest
+    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
 
 Tabs can contain a single command, or YAML arrays to execute multiple commands.
 
-#### Shortcut ####
+### Shortcut ###
 
 Commands have a shortcut for even fewer keystrokes.
 
     $ termup s new_project
 
 That's equivalent to `termup start new_project`.
+
+### iTerm 2 Split Pane Support ###
+
+Specify iTerm option to use split pane.
+
+    options:
+      iterm:
+        width: 2
+        height: 2
+
+The setting above turns to:
+
+    #################
+    #       #       #
+    #   1   #   3   #
+    #       #       #
+    #################
+    #       #       #
+    #   2   #   4   #
+    #       #       #
+    #################

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/templates/template.yml

@@ -1,12 +1,17 @@
 # COMMENT OF SCRIPT HERE
 ---
-- tab1:
-  - cd ~/foo/bar
-  - git status
-- tab2:
-  - mysql -u root
-  - show databases;
-- tab3: echo "hello world"
-- tab4:
-  - cd ~/foo/project
-  - autotest
+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

data/lib/termup/base.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-require 'rubygems'
 require 'appscript'
 require 'yaml'
 
@@ -8,26 +6,61 @@ module Termup
     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

data/lib/termup/cli.rb

@@ -25,6 +25,7 @@ module Termup
 
     desc "edit PROJECT", "Edit termup project (Shortcut: e)"
     def edit(project)
+      create(project) unless File.exists?(path(project))
       say "please set $EDITOR in your .bash_profile." and return unless editor = ENV['EDITOR']
       system("#{editor} #{path(project)}")
     end

data/termup.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{termup}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenn Ejima"]

metadata

@@ -2,7 +2,7 @@
 name: termup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Kenn Ejima
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4478408603716674738
+      hash: 1610649593229339461
       segments: 
       - 0
       version: "0"