teamocil 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46d4e7dfd40099eb4d9608e073dbec836de271a
-  data.tar.gz: 50ed377cef4dede65b0456ab16a33d6529e2d5a3
+  metadata.gz: f1c86cb621b8cdae9e6c88da35691a7b609ed820
+  data.tar.gz: 23f172c3824cd34f2e1dcf87ae1e828005b0dd27
 SHA512:
-  metadata.gz: 2c7bb6851b529949014fd40c2fcbdfb2f4ed178329982aec7885b6e5d690d469f9fa30277c9d6720ff9f4c7789c4cd042ffccd6ffb1090c5dae20050884b3c52
-  data.tar.gz: 86e519e8d603a9aa3474ddb0c3b9a675ad3a50f4cd5fd2ce437e51984613163c76002ba8e79c247c7f69e893260b50a46e65ebf234cfee8a3e7a91c4fc8ee3ad
+  metadata.gz: 8b5692ccafb09e0eb382f39af977a976a73774fb57be39e906e55f8fe1aef6ba691c1a0f2a68c184bd273a9312a2e143fb8054d92cd6c3da16c1d0a3f4e20116
+  data.tar.gz: 05621fd704bbf8dcf9d3d4a5103a308bdc95086b23a3fcd2dcd92121d5af8524ec8e105ec3af0e283f1e75782169f9cb3625dff6905fc639da9373a8c528d42d

data/README.md

@@ -3,7 +3,7 @@
     <img src="http://i.imgur.com/NX2eV2X.png" alt="Teamocil" />
   </a>
   <br />
-  Teamocil is a simple tool used to automatically create sessions,<br /> windows and panes in <a href="http://tmux.sourceforge.net">tmux</a> with YAML files.
+  Teamocil is a simple tool used to automatically create<br /> windows and panes in <a href="http://tmux.sourceforge.net">tmux</a> with YAML files.
   <br /><br />
   <a href="https://rubygems.org/gems/teamocil"><img src="http://img.shields.io/gem/v/teamocil.svg" /></a>
   <a href="https://travis-ci.org/remiprev/teamocil"><img src="http://img.shields.io/travis/remiprev/teamocil.svg" /></a>
@@ -64,7 +64,7 @@ You *might* have to clean up your layout files after upgrading to 1.0. I’m
 sorry about that. The documentation in `README.md` should help you find which
 keys are now supported.
 
-Feel free to fork the repository and add back as many features as you want :)
+The [`0.4-stable` branch](https://github.com/remiprev/teamocil/tree/0.4-stable) is still available with the old code. Feel free to fork the repository and add back as many features as you want :)
 
 ## Configuration
 
@@ -156,7 +156,7 @@ windows:
 
 ```yaml
 windows:
-  - name: sample-two-panes
+  - name: sample-four-panes
     root: ~/Code/sample/www
     layout: tiled
     panes:
@@ -180,6 +180,34 @@ windows:
 '------------------'------------------'
 ```
 
+### Two pane window with focus in second pane
+
+```yaml
+windows:
+  - name: sample-two-panes
+    root: ~/Code/sample/www
+    layout: even-horizontal
+    panes:
+      - rails server
+      - commands:
+          - rails console
+        focus: true
+```
+
+```
+.------------------.------------------.
+| (0)              | (1) <focus here> |
+|                  |                  |
+|                  |                  |
+|                  |                  |
+|                  |                  |
+|                  |                  |
+|                  |                  |
+|                  |                  |
+|                  |                  |
+'------------------'------------------'
+```
+
 ## Extras
 
 ### Zsh autocompletion

data/lib/teamocil/tmux/pane.rb

@@ -1,11 +1,12 @@
 module Teamocil
   module Tmux
-    class Pane < ClosedStruct.new(:index, :root, :commands, :focus)
+    class Pane < ClosedStruct.new(:index, :root, :commands, :focus, :layout)
       def as_tmux
         [].tap do |tmux|
           tmux << Teamocil::Command::SplitWindow.new(root: root) unless first?
           tmux << Teamocil::Command::SendKeysToPane.new(index: internal_index, keys: commands.join('; ')) if commands
           tmux << Teamocil::Command::SendKeysToPane.new(index: internal_index, keys: 'Enter')
+          tmux << Teamocil::Command::SelectLayout.new(layout: layout) if layout
         end
       end
 

data/lib/teamocil/tmux/window.rb

@@ -18,6 +18,9 @@ module Teamocil
           # Panes need know the window root directory
           pane.merge! root: root
 
+          # Panes need know the window layout
+          pane.merge! layout: layout
+
           Teamocil::Tmux::Pane.new(pane)
         end
       end
@@ -40,9 +43,6 @@ module Teamocil
           # Execute all panes commands
           tmux << panes.map(&:as_tmux).flatten
 
-          # Select the window layout
-          tmux << Teamocil::Command::SelectLayout.new(layout: layout) if layout
-
           # Set the focus on the right pane or the first one
           focused_pane = panes.find(&:focus)
           focused_index = focused_pane ? focused_pane.internal_index : Teamocil::Tmux::Pane.pane_base_index

data/lib/teamocil/version.rb

@@ -1,3 +1,3 @@
 module Teamocil
-  VERSION = '1.1'
+  VERSION = '1.2'
 end

data/spec/teamocil/tmux/pane_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Teamocil::Tmux::Pane do
   describe :as_tmux do
-    let(:pane) { Teamocil::Tmux::Pane.new(commands: commands, root: root, index: index, focus: focus) }
+    let(:pane) { Teamocil::Tmux::Pane.new(commands: commands, root: root, index: index, focus: focus, layout: layout) }
     let(:as_tmux) { pane.as_tmux }
     let(:pane_base_index) { Random.rand(0..100) }
 
@@ -13,6 +13,7 @@ RSpec.describe Teamocil::Tmux::Pane do
     # Pane attributes
     let(:commands) { %w(foo bar) }
     let(:root) { '/tmp' }
+    let(:layout) { 'tiled' }
     let(:focus) { true }
 
     context 'for first pane' do
@@ -21,7 +22,8 @@ RSpec.describe Teamocil::Tmux::Pane do
       it do
         expect(as_tmux).to eql [
           Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'foo; bar'),
-          Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'Enter')
+          Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'Enter'),
+          Teamocil::Command::SelectLayout.new(layout: layout)
         ]
       end
     end
@@ -33,7 +35,8 @@ RSpec.describe Teamocil::Tmux::Pane do
         expect(as_tmux).to eql [
           Teamocil::Command::SplitWindow.new(root: root),
           Teamocil::Command::SendKeysToPane.new(index: pane_base_index + index, keys: 'foo; bar'),
-          Teamocil::Command::SendKeysToPane.new(index: pane_base_index + index, keys: 'Enter')
+          Teamocil::Command::SendKeysToPane.new(index: pane_base_index + index, keys: 'Enter'),
+          Teamocil::Command::SelectLayout.new(layout: layout)
         ]
       end
     end

data/spec/teamocil/tmux/window_spec.rb

@@ -74,6 +74,7 @@ RSpec.describe Teamocil::Tmux::Window do
         Teamocil::Command::NewWindow.new(name: name),
         Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'foo; omg'),
         Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'Enter'),
+        Teamocil::Command::SelectLayout.new(layout: layout),
         Teamocil::Command::SplitWindow.new,
         Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'bar'),
         Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'Enter'),

data/teamocil.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |s|
   s.platform     = Gem::Platform::RUBY
   s.authors      = 'Rémi Prévost'
   s.email        = 'remi@exomel.com'
-  s.homepage     = 'http://remiprev.github.com/teamocil'
+  s.homepage     = 'http://www.teamocil.com'
   s.license      = 'MIT'
-  s.summary      = 'Easy session, window and pane layouts for tmux'
-  s.description  = 'Teamocil helps you set up window and pane layouts for tmux using YAML configuration files.'
+  s.description  = 'Teamocil is a simple tool used to automatically create windows and panes in tmux with YAML files.'
+  s.summary      = s.description
 
   # Manifest
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teamocil
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,8 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Teamocil helps you set up window and pane layouts for tmux using YAML
-  configuration files.
+description: Teamocil is a simple tool used to automatically create windows and panes
+  in tmux with YAML files.
 email: remi@exomel.com
 executables:
 - teamocil
@@ -115,7 +115,7 @@ files:
 - spec/teamocil/tmux/session_spec.rb
 - spec/teamocil/tmux/window_spec.rb
 - teamocil.gemspec
-homepage: http://remiprev.github.com/teamocil
+homepage: http://www.teamocil.com
 licenses:
 - MIT
 metadata: {}
@@ -138,7 +138,8 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Easy session, window and pane layouts for tmux
+summary: Teamocil is a simple tool used to automatically create windows and panes
+  in tmux with YAML files.
 test_files:
 - spec/spec_helper.rb
 - spec/teamocil/cli_spec.rb