termup 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/termup/base.rb

@@ -3,6 +3,9 @@ require 'yaml'
 
 module Termup
   class Base
+    ITERM1 = /^0\.10/
+    ITERM2 = /^0\.20/
+
     include Appscript
 
     def initialize(project)
@@ -10,22 +13,21 @@ module Termup
       @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']
-      
+
+      # Split panes for iTerm 2
+      split_panes if iterm2? 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|
-          case @frontmost
-          when "Terminal"
+          if terminal?
             @terminal.do_script(cmd, :in => tab)
-          when "iTerm"
+          else
             @terminal.current_terminal.current_session.write(:text => "#{cmd}")
           end
         end
@@ -34,18 +36,17 @@ module Termup
 
     def new_tab
       if @got_first_tab_already
-        case @frontmost
-        when "Terminal"
-          @apps[@frontmost].keystroke("t", :using => :command_down)
-        when "iTerm"
+        if iterm2?
           @apps[@frontmost].keystroke("]", :using => :command_down)
+        else
+          @apps[@frontmost].keystroke("t", :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 if @frontmost == "Terminal"
+      @terminal.windows[1].tabs.last.get if terminal?
     end
-    
+
     def split_panes
       # Virtical splits
       (@project['options']['iterm']['width'] - 1).times do |i|
@@ -62,5 +63,17 @@ module Termup
         @apps[@frontmost].keystroke("]", :using => :command_down)
       end
     end
+
+    def terminal?
+      @frontmost == "Terminal"
+    end
+
+    def iterm1?
+      @frontmost == "iTerm" and @terminal.version.get =~ ITERM1
+    end
+
+    def iterm2?
+      @frontmost == "iTerm" and @terminal.version.get =~ ITERM2
+    end
   end
 end

data/lib/termup/cli.rb

@@ -29,19 +29,21 @@ module Termup
       say "please set $EDITOR in your .bash_profile." and return unless editor = ENV['EDITOR']
       system("#{editor} #{path(project)}")
     end
-    
+
     desc "list", "List termup projects (Shortcut: l)"
     def list
       projects = Dir["#{TERMUP_DIR}/*.yml"].map{|file| File.basename(file,'.yml') }
       say "Your projects: #{projects.join(', ')}"
     end
-    
+
     desc "start PROJECT", "Start termup project (Shortcut: s)"
     def start(project)
+      say "project \"#{project}\" doesn't exist!" and return unless File.exists?(path(project))
       Termup::Base.new(project)
     end
+
+    protected
     
-  protected
     def path(project)
       "#{TERMUP_DIR}/#{project}.yml"
     end

data/termup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{termup}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenn Ejima"]
-  s.date = %q{2011-05-15}
+  s.date = %q{2011-05-17}
   s.default_executable = %q{termup}
   s.description = %q{Initialize terminal tabs with preset commands}
   s.email = %q{kenn.ejima@gmail.com}
@@ -41,10 +41,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kenn/termup}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Initialize terminal tabs with preset commands}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: termup
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Kenn Ejima
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 -07:00
+date: 2011-05-17 00:00:00 -07:00
 default_executable: termup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,6 +24,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
   type: :runtime
   prerelease: false
@@ -31,6 +39,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
   prerelease: false
@@ -42,6 +54,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 13
         version: 1.0.13
   type: :development
   prerelease: false
@@ -53,6 +69,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
   type: :development
   prerelease: false
@@ -99,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1610649593229339461
+      hash: -2202960048524737384
       segments: 
       - 0
       version: "0"
@@ -108,11 +128,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Initialize terminal tabs with preset commands