termrc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fcb14299cfde27760c6dfa122bda333155246e1
-  data.tar.gz: e453a10c68003872229394eaef5d654dc37f259e
+  metadata.gz: fb96a3064c8c5a0f871c01ccd774a2ba87496723
+  data.tar.gz: 975c01579b724e0e619605c01d2f2ed712b17ef0
 SHA512:
-  metadata.gz: 688a2d7b691bdff513ac81b37fd7e7bc2a31530cffe8e172f0a836df2e1e939110b09d58809447bfaea21ba3202c6725dd5be1d56b77eca4f66c0314b5931b74
-  data.tar.gz: ab8cfa03d40e366e8570ff25c49dc965e63c4b5dbf28f32c0b20b59eb2e6a7e4eea41b11987addae0766d42e035b0baeff12c374ca04b362dc28e9e3aebe8259
+  metadata.gz: ce0de338003dd475d15aca399c9812faec70f3471e1254d5296beab79ddb815416f2bb16e9627dd3266d01e1e8beb30f92a7f586f00c3052213b9304b9210896
+  data.tar.gz: ba52abd1de34154e9a878832746d4386506bad01d6a151f4dbff271bf62c81643655c84b921662d01525eff9a32a79dd47a1ce9dfec1a49628b209b12e2ea5da

data/README.md

@@ -14,8 +14,8 @@ $ termrc create
 $ termrc start
 ```
 
-.termrc file
-----------
+The Termfile
+------------
 The `Termfile` file is a [YAML](http://en.wikipedia.org/wiki/YAML) file which stores information about your project's environment. An environment, in this context, is an iTerm2 window with various panes, each with a different default command that is run when the pane opens. The `layout` dictates what your window looks like, while `commands` gives you a set of commands you can call for each pane.
 
 Place the `Termfile` file at your project's root, then call `termrc start`. Voila!
@@ -42,11 +42,13 @@ A `Termfile` file is a YAML file which requires two keys: `commands` and a `layo
 
 <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/Termfile.test)`Termfile` file for an example.
+You can supply an optional key, `root`, which indicates the root directory you'd like each command to be run inside of. Have a look at [this project's Termfile](https://github.com/briangonzalez/termrc/blob/master/Termfile.test) for an example.
+
+You can also supply a `layout_type` value, either `row` or `column`, which denotes whether to use rows or columns as the means for splitting the window. This defaults to `layout_type: row`.
 
 **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](https://github.com/briangonzalez/termrc/blob/master/lib/template/termrc_with_tabs.template) for an example.
+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](https://github.com/briangonzalez/termrc/blob/master/lib/template/termfile_with_tabs.template) for an example.
 
 CLI
 ---

data/lib/template/run.osascript

@@ -9,13 +9,13 @@ tell application "iTerm"
       -- Create a new session.
       [session]
 
-      -- Create rows.
-      [rows]
+      -- Create primary divider (rows or columns).
+      [primary]
 
       -- Sleep for a bit while we catch up.
       [sleep]
 
-      -- Create panes within each row.
+      -- Create panes within each primary divider.
       [panes]
 
       -- Terminate first or last session, which are unused.
@@ -32,4 +32,4 @@ tell application "iTerm"
     -- Reposition window.
     -- set the bounds of the first window to {10, 10, 600, 600}
 
-end tell
+end tell

data/lib/template/termfile_columns.template

@@ -0,0 +1,16 @@
+root:
+  ~
+
+layout_type: column
+
+commands:
+  here:       echo "Hello, here."
+  there:      echo "Hello, there."
+  world:      echo "Hello, world."
+  me:         echo "Hello, me."
+  you:        echo "Hello, you."
+
+layout:
+  - [ here, there, 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

@@ -17,6 +17,7 @@ module Termrc
       @root       = yml['root']
       @commands   = yml['commands']
       @layout     = yml['layout']
+      @columns    = yml['layout_type'] == 'column' || false
       @cmd_index  = 1
     end
 
@@ -38,13 +39,18 @@ module Termrc
     end
 
     def applescript_file(layout_array, index)
+      t = generateContents(layout_array, index)
+      writeTempFile(t)
+    end
+
+    def generateContents(layout_array, index)
       t = TEMPLATE
 
       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'))
+        t = t.gsub("[terminate_unused]",  terminate_session('last'))
       else
         # First tab.
         t = t.gsub("[window_or_tab]",     new_window)
@@ -52,19 +58,22 @@ module Termrc
         t = t.gsub("[terminate_unused]",  terminate_session)
       end
 
-      t = t.gsub("[rows]",      rows(layout_array))
+      t = t.gsub("[primary]",   primary(layout_array))
       t = t.gsub("[sleep]",     rest)
       t = t.gsub("[panes]",     panes(layout_array))
       t = t.gsub("[commands]",  commands(layout_array))
+      t
+    end
 
+    def writeTempFile(contents)
       file = Tempfile.new('termrc.osascript')
-      file.write(t)
+      file.write(contents)
       file.close
       file
     end
 
-    def rows(layout_array)
-      Array.new( row_count(layout_array), new_row ).join("\n")
+    def primary(layout_array)
+      Array.new( primary_count(layout_array), @columns ? new_column : new_row ).join("\n")
     end
 
     def panes(layout_array)
@@ -72,7 +81,7 @@ module Termrc
       cmd =   next_pane     # back to the top
 
       layout_array.each do |cmds|
-        cmd << Array.new( cmds.length - 1, new_column ).join("\n")
+        cmd << Array.new( cmds.length - 1, @columns ? new_row : new_column ).join("\n")
         cmd << next_pane
         cmd << "\n"
       end
@@ -85,7 +94,12 @@ module Termrc
 
       layout_array.each do |commands|
         commands.each do |name|
-          cmd << execute_command( @cmd_index, @commands[name], name )
+          command = @commands[name]
+          if command
+            cmd << execute_command( @cmd_index, command, name )
+          else
+            puts "unknown command: #{name}"
+          end
           @cmd_index += 1
         end
       end
@@ -93,7 +107,7 @@ module Termrc
       cmd
     end
 
-    def row_count(layout_array)
+    def primary_count(layout_array)
       layout_array.length
     end
 
@@ -161,4 +175,4 @@ module Termrc
 
   end
 
-end
+end

data/lib/termrc/cli.rb

@@ -8,11 +8,12 @@ module Termrc
   class Cli < Thor
     include Thor::Actions
 
-    map 'c' => :create
-    map 'l' => :list
-    map 's' => :start
+    map 'c'     => :create
+    map 'init'  => :create
+    map 'l'     => :list
+    map 's'     => :start
 
-    desc 'create', 'Create Termfile (Shortcut: c)'
+    desc 'create', 'Create Termfile (Shortcut: c / init)'
     def create
       if (File.exist? '.termrc' or File.exists? 'Termfile')
         say_this "Error: 'Termfile' already exists!"
@@ -66,4 +67,4 @@ module Termrc
     end
 
   end
-end
+end

data/termrc.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termrc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Brian Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-09-19 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/termfile.template
+- lib/template/termfile_columns.template
 - lib/template/termfile_with_tabs.template
 - lib/termrc.rb
 - lib/termrc/base.rb