termrc 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1a78e12e43b40860409e8eb4350ad140baa85ab
-  data.tar.gz: 6759c63e3ff8804eeae89109f21338c74f6c9676
+  metadata.gz: 6d06e86ff71c380bb240d0d2f60a64cc71a3775f
+  data.tar.gz: 25e8812bffe0288f4a46e10a1b8941eec36cee9d
 SHA512:
-  metadata.gz: 917c9dc5975ca098dbd8f097836fefe8bb8344ff49d3bc9f10b473f9f28357a4a2f9918c5a21824e131ae9718ab53326801f9d8a7b6310d82fd35a10db0b739b
-  data.tar.gz: f0564b6c2288586dad11ad41d9a1f2631159239f022a52233a82a1e19e2e5f22b359f9d85762141b75526368c1d716cb6c4e5f54c8b9454453bc66aba772b765
+  metadata.gz: 8c2b0a2c8053326bcd400d0e921494244fcab4e5e29e130fb5685c9e95d0c685c6587bd241973d4bf89160e5cfe16c48bcc19d9724e5d626436dd60ebd01e24f
+  data.tar.gz: b411d51211d9a4372568aff51c56dd7d4eaff1a47f9b7023db934408ea3d6024131193626310298e78c864565b39d6a682d4e7c710e1de5c8dd24331b2596104

data/.termrc

@@ -7,5 +7,5 @@ commands:
   rake:     rake -T
 
 layout:
-  - [ 'gs' ]
-  - [ 'rake' ]
+  - [ gs ]
+  - [ rake ]

data/README.md

@@ -1,4 +1,3 @@
-
 <img src="https://rawgithub.com/briangonzalez/termrc/master/images/osx.svg" width=25 style="margin-right: 10px"> termrc
 ======
 Take your [iTerm2](http://www.iterm2.com/) environments with you wherever you go.
@@ -22,7 +21,6 @@ The `.termrc` file is a [YAML](http://en.wikipedia.org/wiki/YAML) file which sto
 Place the `.termrc file` at your project's root, then call `termrc start`. Voila!
 
 **Example .termrc**
-
 ```yaml
 commands:
   here:       echo "Hello, here."
@@ -32,18 +30,20 @@ commands:
   you:        echo "Hello, you."
 
 layout:
-  - [ 'here', 'there' ]       # row 1, with 2 panes
-  - [ 'world' ]               # row 2, with 1 pane
-  - [ 'me', 'you' ]           # row 3, with 2 panes
+  - [ here, there ]       # row 1, with 2 panes
+  - [ world ]             # row 2, with 1 pane
+  - [ me, you ]           # row 3, with 2 panes
 ``` 
 
 **The Result**
-
 A `.termrc` file is a YAML file which requires two keys: `commands` and a `layout`. Each item in `layout` corresponds to a row of panes in iTerm2. So, for instance, the example `.termrc` file above would produce a new iTerm2 window with the following commands running inside each pane:
 
 <img src="https://rawgithub.com/briangonzalez/termrc/master/images/termrc-screen.png">
 
-You can supply an optional third key, `root`, which indicates the root directory you'd like each command to be run inside of. Have a look at [this project's](https://github.com/briangonzalez/termrc/blob/master/.termrc) `.termrc` file for an example.
+You can supply an optional third key, `root`, which indicates the root directory you'd like each command to be run inside of. Have a look at [this project's](https://github.com/briangonzalez/termrc/blob/master/.termrc)`.termrc` file for an example.
+
+** Tabs **
+You can automate tabs by providing an array of arrays, each array denoting a new tab and the layout within it. See [this template file]() for an example. 
 
 CLI
 ---
@@ -66,4 +66,4 @@ Find me on [Twitter](http://twitter.com/brianmgonzalez).
 Resources
 ---------
 - [iTerm2 - Scripting with Applescript](https://code.google.com/p/iterm2/wiki/AppleScript)
-- [iTerm2 - Working with panes](https://code.google.com/p/iterm2/issues/detail?id=559)
+- [iTerm2 - Working with panes](https://code.google.com/p/iterm2/issues/detail?id=559)

data/lib/template/run.osascript

@@ -1,13 +1,13 @@
 
 tell application "iTerm"
 
-    -- Create a new terminal window.
-    set myterm to (make new terminal)
+    -- Create a new terminal window or tab.
+    [window_or_tab]
 
     tell myterm
 
       -- Create a new session.
-      set mysession to (make new session at the end of sessions)
+      [session]
 
       -- Create rows.
       [rows]
@@ -18,8 +18,8 @@ tell application "iTerm"
       -- Create panes within each row.
       [panes]
 
-      -- Terminate session 1, which is unused.
-      terminate the first session
+      -- Terminate first or last session, which are unused.
+      [terminate_unused]
 
       -- Sleep for a bit while we catch up.
       [sleep]
@@ -30,6 +30,6 @@ tell application "iTerm"
     end tell
 
     -- Reposition window.
-    set the bounds of the first window to {10, 10, 600, 600}
+    -- set the bounds of the first window to {10, 10, 600, 600}
 
 end tell

data/lib/template/termrc_base.template

@@ -9,6 +9,6 @@ commands:
   you:        echo "Hello, you."
 
 layout:
-  - [ 'here', 'there' ]       # row 1, with 2 panes
-  - [ 'world' ]               # row 2, with 1 pane
-  - [ 'me', 'you' ]           # row 3, with 2 panes
+  - [ here, there ]       # row 1, with 2 panes
+  - [ world ]             # row 2, with 1 pane
+  - [ me, you ]           # row 3, with 2 panes

data/lib/template/termrc_with_tabs.template

@@ -0,0 +1,27 @@
+root:
+  ~
+
+commands:
+  here:       echo "Hello, here."
+  there:      echo "Hello, there."
+  world:      echo "Hello, world."
+  me:         echo "Hello, me."
+  you:        echo "Hello, you."
+
+layout:
+  - [ 
+      # Tab 1 **
+      [ here, there ]         # row 1, with 2 panes
+    ]
+  - [ 
+      # Tab 2 **
+      [ here, there ],        # row 1, with 2 panes
+      [ world ],              # row 2, with 1 pane
+      [ me, you ]             # row 3, with 2 panes
+    ]
+  - [ 
+      # Tab 3 **
+      [ here, there ],        # row 1, with 2 panes
+      [ world ],              # row 2, with 1 pane
+      [ me, you ]             # row 3, with 2 panes
+    ]

data/lib/termrc/builder.rb

@@ -10,25 +10,52 @@ module Termrc
     TEMPLATE_FILE   = File.join( File.expand_path('../..', __FILE__),  'template', 'run.osascript' )
     TEMPLATE        = File.read( TEMPLATE_FILE )
 
+    attr_accessor :layout
+    attr_accessor :commands
+
     def initialize(yml)
       @root       = yml['root']
       @commands   = yml['commands']
       @layout     = yml['layout']
+      @cmd_index  = 1
     end
 
     def run!
-      f = applescript_file
-      puts `/usr/bin/osascript #{f.path}`
-      f.unlink
+      applescript_files.each do |f|
+        puts `/usr/bin/osascript #{f.path}`
+        f.unlink
+      end
+    end
+
+    def applescript_files
+      if tabs?
+        return @layout.each_with_index.map{ |layout_array, index|
+          applescript_file(layout_array, index) 
+        }
+      else
+        return [ applescript_file(@layout, 0) ]
+      end
     end
 
-    def applescript_file
+    def applescript_file(layout_array, index)
       t = TEMPLATE
-      t = t.gsub("[rows]",      rows)
-      t = t.gsub("[sleep]",     sleep)
-      t = t.gsub("[panes]",     panes)
-      t = t.gsub("[commands]",  commands)
-      t
+           
+      if index > 0
+        # All other tabs.
+        t = t.gsub("[window_or_tab]",     new_tab)
+        t = t.gsub("[session]",           current_session)     
+        t = t.gsub("[terminate_unused]", terminate_session('last'))
+      else
+        # First tab.
+        t = t.gsub("[window_or_tab]",     new_window)
+        t = t.gsub("[session]",           new_session)     
+        t = t.gsub("[terminate_unused]",  terminate_session)
+      end
+
+      t = t.gsub("[rows]",      rows(layout_array))
+      t = t.gsub("[sleep]",     rest)
+      t = t.gsub("[panes]",     panes(layout_array))
+      t = t.gsub("[commands]",  commands(layout_array))
 
       file = Tempfile.new('termrc.osascript')
       file.write(t)
@@ -36,15 +63,15 @@ module Termrc
       file
     end
 
-    def rows
-      Array.new( row_count, new_row ).join("\n")
+    def rows(layout_array)
+      Array.new( row_count(layout_array), new_row ).join("\n")
     end
 
-    def panes
+    def panes(layout_array)
       cmd =   next_pane     # back to the top
       cmd =   next_pane     # back to the top
       
-      @layout.each do |cmds|
+      layout_array.each do |cmds|
         cmd << Array.new( cmds.length - 1, new_column ).join("\n")
         cmd << next_pane
         cmd << "\n"
@@ -53,28 +80,31 @@ module Termrc
       cmd
     end
 
-    def commands
+    def commands(layout_array)
       cmd = ""
 
-      index = 1
-      @layout.each do |commands|
+      layout_array.each do |commands|
         commands.each do |name|
-          cmd << execute_command(index, @commands[name] )
-          index += 1
+          cmd << execute_command( @cmd_index, @commands[name] )
+          @cmd_index += 1
         end
       end  
 
       cmd
     end
 
-    def row_count
-      @row_count ||= @layout.length
+    def row_count(layout_array)
+      layout_array.length
+    end
+
+    def tabs?
+      @layout[0].is_a?(Array) and @layout[0][0].is_a? Array
     end
 
     protected
 
-    def sleep
-      "do shell script \"sleep #{SLEEP_INTERVAL}\" \n"
+    def rest(i=SLEEP_INTERVAL)
+      "do shell script \"sleep #{i}\" \n"
     end
 
     def new_row
@@ -89,6 +119,29 @@ module Termrc
       keystroke("]", "command down")
     end
 
+    def new_tab
+      [
+        keystroke("t", "command down"),
+        "set myterm to (current terminal)",
+      ].join("\n")
+    end
+
+    def new_window
+      [ "set myterm to (make new terminal)" ].join("\n")
+    end
+
+    def new_session
+      "set mysession to (make new session at the end of sessions) "
+    end
+
+    def current_session
+      "set mysession to (current session) "
+    end
+
+    def terminate_session(which='first')
+      "terminate the #{which} session"
+    end
+
     def execute_command(item, command)
       command = command.gsub('"', '\\"')
       command = command.gsub("'", "\\'")
@@ -98,7 +151,7 @@ module Termrc
 
     def keystroke(key, using="")
       cmd =   "tell application \"System Events\" to keystroke \"#{key}\" "
-      cmd <<  "using #{using} \n" if  using
+      cmd <<  "using {#{using}} \n" if  using
       cmd <<  "\n"                if !using
       cmd
     end

data/lib/termrc/cli.rb

@@ -43,7 +43,8 @@ module Termrc
       file = file || '.termrc'
       raise Thor::Error.new "File '#{file}'' does not exist!" unless File.exist? file
 
-      say "Starting termrc file: '#{file}'", :yellow
+      say "Starting termrc file: '#{file}'.", :yellow
+      say "[ Please wait until fully launched! ]", :red
       begin
         Termrc::Base.new( File.expand_path(file) )
       rescue Exception => e

data/termrc.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.executables   << 'termrc'
   gem.name          = "termrc"
-  gem.version       = '0.1.2'
+  gem.version       = '0.2.0'
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'thor', '~> 0.18.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termrc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -39,6 +39,7 @@ files:
 - bin/termrc
 - lib/template/run.osascript
 - lib/template/termrc_base.template
+- lib/template/termrc_with_tabs.template
 - lib/termrc.rb
 - lib/termrc/base.rb
 - lib/termrc/builder.rb