termup 2.0.3 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8702c31b85da161fafb1b949d630708e70502a61
+  data.tar.gz: 750ecb147eafa0f15e370dd9fb0116f0dcd3451d
+SHA512:
+  metadata.gz: 95d9c08e02a3db81ecf7b6b220835b2a8271b889d501ff836b3f22181542547f554ad298f42fd6c2703779b0fb776728575b64e12d1a1b984b9437df19fdb87e
+  data.tar.gz: 06d58b6a0a0576dadde3cc187385bdf269a4ee48f191cc300279d32ef690c5e41711307a3deb5756a853d2b58a84f6e34017acb359d0a2821a233a8b615773cb

data/README.md

@@ -5,11 +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 and iTerm 2 on Mac OS X 10.6 - 10.8 and Ruby 1.8.7 - 1.9.3.
+Compatible with Terminal.app and iTerm2 v3 on OSX Yosemite or later.
 
 ![Split Panes](https://github.com/kenn/termup/raw/master/images/split_panes.png)
 
-**iTerm 1 users:** Termup 2.0 and up is not compatible with iTerm 1. Install 1.3.1 by `gem install termup -v=1.3.1`
+**For iTerm2 v2 or earlier:** Termup 3.0 and up is not compatible with iTerm2 v2. Install Termup 2 by `gem install termup -v=2.0.3`
+**For iTerm 1:** Termup 2.0 and up is not compatible with iTerm 1. Install 1.3.1 by `gem install termup -v=1.3.1`
 
 Installation
 ------------
@@ -20,6 +21,11 @@ $ gem install termup
 
 Note that you need to prepend `sudo` if you're using the OSX pre-installed Ruby.
 
+Changelog
+---------
+
+Termup v3.0 is a complete rewrite using the new JavaScript for Automation which was introduced with OSX Yosemite.
+
 Usage
 -----
 

data/lib/templates/iterm_advanced.yml

@@ -20,6 +20,6 @@ tabs:
     commands:
       - echo pane4
     properties:
-      foreground_color: yellow
-      background_color: blue
+      foreground_color: [65535,0,0]
+      background_color: [0,0,65535]
       transparency: 0.1

data/lib/termup.rb

@@ -1,5 +1,15 @@
+require 'yaml'
+require 'pathname'
+require 'execjs/runtimes/jxa'
+
+ExecJS.runtime = ExecJS::Runtimes::JXA
+
 module Termup
+  Dir = Pathname.new(ENV['HOME']).join('.config/termup')
+
   autoload :Base,     'termup/base'
   autoload :Cli,      'termup/cli'
-  autoload :Handler,  'termup/handler'
+  autoload :Iterm,    'termup/iterm'
+  autoload :Process,  'termup/process'
+  autoload :Terminal, 'termup/terminal'
 end

data/lib/termup/base.rb

@@ -1,90 +1,34 @@
-require 'yaml'
-
 module Termup
   class Base
-    def initialize(project)
-      @handler = Termup::Handler.new
-
-      config = YAML.load(File.read("#{TERMUP_DIR}/#{project}.yml"))
-      @tabs = config['tabs']
-
-      # 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
-
-      @options = config['options'] || {}
-      @iterm_options = @options['iterm']
-
-      # Split panes for iTerm 2
-      split_panes if @handler.iterm? and @iterm_options
-
-      # 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
-
-        # 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
-          # 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
+    def initialize(project, process)
+      @config = YAML.load_file(Termup::Dir.join("#{project}.yml"))
+      @options = @config['options'] || {}
+      @tabs = @config['tabs'] || {}
+      @process = process
+      @lines = []
     end
 
-    def split_panes
-      width, height = @iterm_options['width'], @iterm_options['height']
-      return unless width and height
-
-      (width - 1).times do
-        layout :split_vertically
-      end
-      layout :goto_next_pane # Back home
-      width.times do
-        (height - 1).times do
-          layout :split_horizontally
-        end
-        layout :goto_next_pane # Move to next, or back home
-      end
+    def start
+      script = <<-JS
+        var app = Application(#{@process.pid});
+        var se = Application('System Events');
+        app.activate();
+        #{@lines.join(';')}
+      JS
+      ExecJS.exec script
     end
 
-    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
+    protected
 
-    def layout(command)
-      @handler.layout(command)
+    def hit(key, *using)
+      # activate
+      using = using.map{|i| i.to_s.gsub(/_/,' ') }
+      case key
+      when Integer
+        @lines << "se.keyCode(#{key}, { using: #{using} })"
+      when String
+        @lines << "se.keystroke('#{key}', { using: #{using} })"
+      end
     end
   end
 end

data/lib/termup/cli.rb

@@ -1,8 +1,6 @@
 require 'thor'
 
 module Termup
-  TERMUP_DIR = File.join(ENV['HOME'],'.config','termup')
-
   class Cli < Thor
     include Thor::Actions
 
@@ -26,8 +24,8 @@ module Termup
 
     desc 'edit PROJECT', 'Edit termup project (Shortcut: e)'
     def edit(project)
-      unless File.exists?(path(project))
-        empty_directory TERMUP_DIR
+      unless path(project).exist?
+        empty_directory Termup::Dir
         if options['iterm_advanced']
           template 'templates/iterm_advanced.yml', path(project)
         elsif options['iterm_basic']
@@ -42,20 +40,25 @@ module Termup
 
     desc 'list', 'List termup projects (Shortcut: l)'
     def list
-      projects = Dir["#{TERMUP_DIR}/*.yml"].map{|file| File.basename(file,'.yml') }
+      projects = Pathname.glob(Termup::Dir.join('*.yml')).map{|f| f.basename('.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)
+      say "project \"#{project}\" doesn't exist!" and return unless path(project).exist?
+      process = Termup::Process.new
+      if process.iterm?
+        Termup::Iterm.new(project, process).start
+      else
+        Termup::Terminal.new(project, process).start
+      end
     end
 
     protected
     
     def path(project)
-      "#{TERMUP_DIR}/#{project}.yml"
+      Termup::Dir.join("#{project}.yml")
     end
   end
 end

data/lib/termup/iterm.rb

@@ -0,0 +1,96 @@
+module Termup
+  class Iterm < Base
+    def start
+      split_panes if @options['iterm']
+
+      # Setting up tabs
+      @tabs.each.with_index do |(tabname, values), index|
+        set_property(:name, tabname) # Set tab title
+
+        if advanced_iterm?
+          values['commands'].each do |command|
+            run(command)
+          end
+
+          values['properties'].each do |key, value|
+            set_property(key, value)
+          end if values['properties']
+
+          values['layout'].each do |command|
+            layout command
+          end if values['layout']
+        else
+          values.each do |command|
+            run(command)
+          end
+
+          layout :goto_next_pane
+        end
+      end
+
+      super
+    end
+
+    private
+
+    def split_panes
+      width, height = @options['iterm']['width'], @options['iterm']['height']
+      return unless width && height
+
+      (width - 1).times do
+        layout :split_vertically
+      end
+      layout :goto_next_pane # Back home
+      width.times do
+        (height - 1).times do
+          layout :split_horizontally
+        end
+        layout :goto_next_pane # Move to next, or back home
+      end
+    end
+
+    def run(command)
+      @lines << "app.currentWindow().currentSession().write({'text':'#{command}'})"
+    end
+
+    def set_property(key, value)
+      value = value.inspect if value.is_a?(String)
+      @lines << "app.currentWindow().currentSession().#{camelize(key)}.set(#{value})"
+    end
+
+    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
+      end
+      @advanced_iterm
+    end
+
+    def camelize(string)
+      string.to_s.split('_').map.with_index{|s,index| index.zero? ? s : s.slice(0).upcase + s.slice(1..-1) }.join
+    end
+
+    def layout(command)
+      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
+    end
+  end
+end

data/lib/termup/process.rb

@@ -0,0 +1,40 @@
+module Termup
+  class Process
+    attr_reader :pid
+
+    def initialize
+      lookup_pid
+    end
+
+    def terminal?
+      app_name == 'Terminal'
+    end
+
+    def iterm?
+      app_name == 'iTerm'
+    end
+
+    def app_name
+      @app_name ||= ExecJS.eval "Application(#{@pid}).name()"
+    end
+
+    def lookup_pid
+      pid = ::Process.ppid
+      pids = []
+
+      # Go up the process tree to find term-like process
+      while pid > 1 do
+        pids << pid if term_like_pids.include?(pid)
+        pid = `ps -p #{pid} -o ppid=`.strip.to_i
+      end
+
+      abort 'terminal pid not found!' if pids.empty?
+
+      @pid = pids.last
+    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
+  end
+end

data/lib/termup/terminal.rb

@@ -0,0 +1,32 @@
+module Termup
+  class Terminal < Base
+    def start
+      # Setting up tabs / panes
+      @tabs.each.with_index do |(tabname, values), index|
+        values.each do |command|
+          @lines << "app.doScript('#{command}', { in: app.windows[0].tabs.last() })"
+        end
+
+        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
+
+      super
+    end
+
+    def layout(command)
+      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

data/lib/termup/version.rb

@@ -1,3 +1,3 @@
 module Termup
-  VERSION = '2.0.3'
+  VERSION = '3.0.0'
 end

data/termup.gemspec

@@ -2,19 +2,19 @@
 require File.expand_path('../lib/termup/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Kenn Ejima"]
-  gem.email         = ["kenn.ejima@gmail.com"]
+  gem.authors       = ['Kenn Ejima']
+  gem.email         = ['kenn.ejima@gmail.com']
   gem.description   = %q{Setup terminal tabs with preset commands for your projects}
   gem.summary       = %q{Setup terminal tabs with preset commands for your projects}
-  gem.homepage      = "https://github.com/kenn/termup"
+  gem.homepage      = 'https://github.com/kenn/termup'
 
   gem.files         = `git ls-files`.split($\).reject{|f| f =~ /^images/ } # Exclude images
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "termup"
-  gem.require_paths = ["lib"]
+  gem.name          = 'termup'
+  gem.require_paths = ['lib']
   gem.version       = Termup::VERSION
 
-  gem.add_runtime_dependency 'rb-appscript', '~> 0.6.1'
-  gem.add_runtime_dependency 'thor', '~> 0.16.0'
+  gem.add_dependency 'execjs-runtimes-jxa', '~> 0.1'
+  gem.add_dependency 'thor', '~> 0.16'
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: termup
 version: !ruby/object:Gem::Version
-  version: 2.0.3
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rb-appscript
-  prerelease: false
+  name: execjs-runtimes-jxa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
-    none: false
+        version: '0.1'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
-    none: false
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
-    none: false
+        version: '0.16'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
-    none: false
+        version: '0.16'
 description: Setup terminal tabs with preset commands for your projects
 email:
 - kenn.ejima@gmail.com
@@ -51,7 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -63,32 +58,32 @@ files:
 - lib/termup.rb
 - lib/termup/base.rb
 - lib/termup/cli.rb
-- lib/termup/handler.rb
+- lib/termup/iterm.rb
+- lib/termup/process.rb
+- lib/termup/terminal.rb
 - lib/termup/version.rb
 - termup.gemspec
 homepage: https://github.com/kenn/termup
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  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
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Setup terminal tabs with preset commands for your projects
 test_files: []
-has_rdoc: 

data/lib/termup/handler.rb

@@ -1,111 +0,0 @@
-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').processes[app_name].key_code key, using && { :using => using }
-      when String
-        app('System Events').processes[app_name].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