teamocil 0.3.9 → 0.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjUwMTBkNTkxZjQyMjMzOTU5ZTAxYmZlN2EyZDdlMDNjZmFmOWRlZQ==
+  data.tar.gz: !binary |-
+    NTY4Nzc1ZjAzMjQzZTYyOTA4NzhhNWRiNjI4NGE0NzFiNWZhYzMzOQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZmVhMDQ3ZWUyOGZkOGYwZWE4NzdlNTcwZjkxNTZmYmEyZjYwMDg1MzBjYjEz
+    MjU5MGEwZmQ5YWM0ZjI0MzJmMDFjYzM3Y2M1ZjVhMGJmMTQxNjk1ZWE5N2Q3
+    ZjZhZjExNDEyZDlhOWQ2MmRjMmQxMDJlYWQ3M2UyYWE4MWMxNjY=
+  data.tar.gz: !binary |-
+    NTZjOWZmMTFmMDNkNGFkNGFhZjkxNTdlZjY2MDhiNWYyNWI0ZGYwOTExMTgx
+    MzY4NjYyYWVhOWZlNGViMmQ3ZGJjMWZiY2QyZTliMjExOTdhMjQxNDcxMGM2
+    ZDgwY2EzOTcwNzE5NzdlZDgxNWQ4Yjg0YjU2M2IyNzNiY2IyZWE=

data/README.md

@@ -51,9 +51,25 @@ If you are not using a top-level `session` key, then the first key of your layou
 * `root` (the directory in which every split will be created)
 * `filters` (a hash of `before` and `after` commands to run for each split)
 * `clear` (whether or not to prepend a `clear` command before the `before` filters list)
-* `layout` (a layout name or serialized string supported by `tmux`’s `select-layout` command)
+* `layout` (a layout name or serialized string supported by the `tmux select-layout` command)
 * `splits` (an array of split items)
-* `options` (a hash of tmux options, see `man tmux` for a list)
+* `options` (a hash of `tmux` options, see `man tmux` for a list)
+
+#### Notes
+
+If you want to use a custom value for the `layout` key, running this command will give you the layout of the current window:
+
+```bash
+$ tmux list-windows -F "#{window_active} #{window_layout}" | grep "^1" | cut -d " " -f 2
+```
+
+You can then use the value as a string, like so:
+
+```yaml
+  - name: "a-window-with-weird-layout"
+    layout: "4d71,204x51,0,0{101x51,0,0,114,102x51,102,0[102x10,102,0,118,102x40,102,11,115]}"
+    splits: …
+```
 
 #### Example
 
@@ -66,15 +82,17 @@ windows:
     root: "~/Projects/foo-www"
     filters:
       before:
-        - "echo 'Let’s use ruby-1.9.2 for each split in this window.'"
-        - "rvm use 1.9.2"
+        - "echo 'Let’s use ruby-1.9.3 for each split in this window.'"
+        - "rbenv local 1.9.3-p374"
     splits:
       [splits list]
   - name: "my-second-window"
+    layout: tiled
     root: "~/Projects/foo-api"
     splits:
       [splits list]
   - name: "my-third-window"
+    layout: main-vertical
     root: "~/Projects/foo-daemons"
     splits:
       [splits list]
@@ -82,7 +100,7 @@ windows:
 
 ### Splits
 
-Every window must define an array of splits that will be created within it. A vertical or horizontal split will be created, depending on whether the `width` or `height` parameter is used.
+Every window must define an array of splits that will be created within it. A vertical or horizontal split will be created, depending on whether the `width` or `height` parameter is used. If a `layout` option is used for the window, the `width` and `height` attributes won’t have any effect.
 
 #### Item keys
 
@@ -98,18 +116,17 @@ Every window must define an array of splits that will be created within it. A ve
 windows:
   - name: "my-first-window"
     root: "~/Projects/foo-www"
+    layout: even-vertical
     filters:
-      before: "rvm use 1.9.2"
+      before: "rbenv local 2.0.0-p0"
       after: "echo 'I am done initializing this split.'"
     splits:
       - cmd: "git status"
       - cmd: "bundle exec rails server --port 4000"
         focus: true
-        width: 50
       - cmd:
           - "sudo service memcached start"
           - "sudo service mongodb start"
-        height: 50
 ```
 
 ## Layout examples
@@ -124,10 +141,10 @@ See more example files in the `examples` directory.
 windows:
   - name: "sample-two-splits"
     root: "~/Code/sample/www"
+    layout: even-horizontal
     splits:
       - cmd: ["pwd", "ls -la"]
       - cmd: "rails server --port 3000"
-        width: 50
 ```
         
 
@@ -153,16 +170,12 @@ windows:
 windows:
   - name: "sample-four-splits"
     root: "~/Code/sample/www"
+    layout: tiled
     splits:
       - cmd: "pwd"
       - cmd: "pwd"
-        width: 50
       - cmd: "pwd"
-        height: 50
-        target: "bottom-right"
       - cmd: "pwd"
-        height: 50
-        target: "bottom-left"
 ```
 
 #### Result of `$ teamocil sample-2`
@@ -226,4 +239,4 @@ Take a look at the `spec` folder before you do, and make sure `bundle exec rake
 
 ## License
 
-Teamocil is © 2011-2012 [Rémi Prévost](http://exomel.com) and may be freely distributed under the [MIT license](https://github.com/remiprev/teamocil/blob/master/LICENSE). See the `LICENSE` file.
+Teamocil is © 2011-2013 [Rémi Prévost](http://exomel.com) and may be freely distributed under the [MIT license](https://github.com/remiprev/teamocil/blob/master/LICENSE). See the `LICENSE` file.

data/Rakefile

@@ -7,13 +7,13 @@ require "rspec/core/rake_task"
 task :default => :spec
 
 desc "Run all specs"
-RSpec::Core::RakeTask.new(:spec) do |task| # {{{
+RSpec::Core::RakeTask.new(:spec) do |task|
   task.pattern = "spec/**/*_spec.rb"
   task.rspec_opts = "--colour --format=documentation"
-end # }}}
+end
 
 desc "Generate YARD Documentation"
-YARD::Rake::YardocTask.new do |task| # {{{
+YARD::Rake::YardocTask.new do |task|
   task.options = [
     "-o", File.expand_path("../doc", __FILE__),
     "--readme=README.md",
@@ -25,4 +25,4 @@ YARD::Rake::YardocTask.new do |task| # {{{
     "--title=Teamocil",
   ]
   task.files   = ["lib/**/*.rb"]
-end # }}}
+end

data/examples/four-splits.yml

@@ -0,0 +1,8 @@
+windows:
+  - name: simple-four-splits
+    layout: tiled
+    splits:
+      - cmd: echo 'first split'
+      - cmd: echo 'second split'
+      - cmd: echo 'fourth split'
+      - cmd: echo 'third split'

data/examples/one-and-three-splits.yml

@@ -0,0 +1,8 @@
+windows:
+  - name: simple-one-and-three-splits
+    layout: main-vertical
+    splits:
+      - cmd: echo 'first split'
+      - cmd: echo 'second split'
+      - cmd: echo 'third split'
+      - cmd: echo 'fourth split'

data/examples/six-splits.yml

@@ -0,0 +1,10 @@
+windows:
+  - name: simple-six-splits
+    layout: tiled
+    splits:
+      - cmd: echo 'first split'
+      - cmd: echo 'second split'
+      - cmd: echo 'fourth split'
+      - cmd: echo 'third split'
+      - cmd: echo 'sixth split'
+      - cmd: echo 'fifth split'

data/examples/two-horizontal-splits.yml

@@ -0,0 +1,6 @@
+windows:
+  - name: simple-two-vertical-splits
+    layout: even-horizontal
+    splits:
+      - cmd: echo 'first split'
+      - cmd: echo 'second split'

data/examples/two-vertical-splits.yml

@@ -0,0 +1,6 @@
+windows:
+  - name: simple-two-horizontal-splits
+    layout: even-vertical
+    splits:
+      - cmd: echo 'first split'
+      - cmd: echo 'second split'

data/lib/teamocil.rb

@@ -1,6 +1,7 @@
+require "teamocil/layout"
+require "teamocil/cli"
+require "teamocil/error"
+
 module Teamocil
-  VERSION = "0.3.9"
-  autoload :Layout, "teamocil/layout"
-  autoload :CLI,    "teamocil/cli"
-  autoload :Error,  "teamocil/error"
+  VERSION = "0.4"
 end

data/lib/teamocil/cli.rb

@@ -5,14 +5,13 @@ require 'erb'
 module Teamocil
   # This class handles interaction with the `tmux` utility.
   class CLI
-
     attr_accessor :layout, :layouts
 
     # Initialize a new run of `tmux`
     #
     # @param argv [Hash] the command line parameters hash (usually `ARGV`).
     # @param env [Hash] the environment variables hash (usually `ENV`).
-    def initialize(argv, env) # {{{
+    def initialize(argv, env)
       parse_options! argv
       layout_path = env["TEAMOCIL_PATH"] || File.join("#{env["HOME"]}", ".teamocil")
 
@@ -44,10 +43,10 @@ module Teamocil
         end
         @layout.execute_commands(@layout.generate_commands)
       end
-    end # }}}
+    end
 
     # Parse the command line options
-    def parse_options!(args) # {{{
+    def parse_options!(args)
       @options = {}
       opts = ::OptionParser.new do |opts|
         opts.banner = "Usage: teamocil [options] <layout>
@@ -76,28 +75,27 @@ module Teamocil
 
       end
       opts.parse! args
-    end # }}}
+    end
 
     # Return an array of available layouts
     #
     # @param path [String] the path used to look for layouts
-    def get_layouts(path) # {{{
+    def get_layouts(path)
       Dir.glob(File.join(path, "*.yml")).map { |file| File.basename(file).gsub(/\..+$/, "") }.sort
-    end # }}}
+    end
 
     # Print each layout on a single line
-    def print_layouts # {{{
+    def print_layouts
       STDOUT.puts @layouts.join("\n")
       exit 0
-    end # }}}
+    end
 
     # Print an error message and exit the utility
     #
     # @param msg [Mixed] something to print before exiting.
-    def bail(msg) # {{{
+    def bail(msg)
       STDERR.puts "[teamocil] #{msg}"
       exit 1
-    end # }}}
-
+    end
   end
 end

data/lib/teamocil/layout.rb

@@ -1,46 +1,44 @@
-module Teamocil
+require "teamocil/layout/session"
+require "teamocil/layout/window"
+require "teamocil/layout/split"
 
+module Teamocil
   # This class act as a wrapper around a tmux YAML layout file
   class Layout
-    autoload :Session, "teamocil/layout/session"
-    autoload :Window,  "teamocil/layout/window"
-    autoload :Split,   "teamocil/layout/split"
-
     attr_reader :session
 
     # Initialize a new layout from a hash
     #
     # @param layout [Hash] the parsed layout
     # @param options [Hash] some options
-    def initialize(layout, options={}) # {{{
+    def initialize(layout, options={})
       @layout = layout
       @options = options
-    end # }}}
+    end
 
     # Generate tmux commands based on the data found in the layout file
     #
     # @return [Array] an array of shell commands to send
-    def generate_commands # {{{
+    def generate_commands
       @session.generate_commands
-    end # }}}
+    end
 
     # Compile the layout into objects
     #
     # @return [Session]
-    def compile! # {{{
+    def compile!
       if @layout["session"].nil?
         @session = Session.new @options, "windows" => @layout["windows"]
       else
         @session = Session.new @options, @layout["session"]
       end
-    end # }}}
+    end
 
     # Execute each command in the shell
     #
     # @param commands [Array] an array of complete commands to send to the shell
-    def execute_commands(commands) # {{{
+    def execute_commands(commands)
       `#{commands.join("; ")}`
-    end # }}}
-
+    end
   end
 end

data/lib/teamocil/layout/session.rb

@@ -1,6 +1,5 @@
 module Teamocil
   class Layout
-
     # This class represents a session within tmux
     class Session
       attr_reader :options, :windows, :name
@@ -9,22 +8,21 @@ module Teamocil
       #
       # @param options [Hash] the options, mostly passed by the CLI
       # @param attrs [Hash] the session data from the layout file
-      def initialize(options, attrs={}) # {{{
+      def initialize(options, attrs={})
         raise Teamocil::Error::LayoutError.new("You must specify a `windows` or `session` key for your layout.") unless attrs["windows"]
         @name = attrs["name"] || "teamocil-session"
         @windows = attrs["windows"].each_with_index.map { |window, window_index| Window.new(self, window_index, window) }
         @options = options
-      end # }}}
+      end
 
       # Generate commands to send to tmux
       #
       # @return [Array]
-      def generate_commands # {{{
+      def generate_commands
         commands = []
         commands << "tmux rename-session \"#{@name}\"" unless @name.nil?
         commands << @windows.map(&:generate_commands)
-      end # }}}
-
+      end
     end
   end
 end

data/lib/teamocil/layout/split.rb

@@ -1,6 +1,5 @@
 module Teamocil
   class Layout
-
     # This class represents a split within a tmux window
     class Split
       attr_reader :width, :height, :cmd, :index, :target, :focus
@@ -10,7 +9,7 @@ module Teamocil
       # @param session [Session] the window where the split is initialized
       # @param index [Fixnnum] the split index
       # @param attrs [Hash] the split data from the layout file
-      def initialize(window, index, attrs={}) # {{{
+      def initialize(window, index, attrs={})
         raise Teamocil::Error::LayoutError.new("You cannot have empty splits") if attrs.nil?
         @height = attrs["height"]
         @width = attrs["width"]
@@ -20,17 +19,17 @@ module Teamocil
 
         @window = window
         @index = index
-      end # }}}
+      end
 
       # Generate commands to send to tmux
       #
       # @return [Array]
-      def generate_commands # {{{
+      def generate_commands
         commands = []
 
         # Is it a vertical or horizontal split?
         init_command = ""
-        unless @index == 0
+        unless @index == @window.pane_base_index
           if !@width.nil?
             init_command = "tmux split-window -h -p #{@width}"
           elsif !@height.nil?
@@ -56,9 +55,7 @@ module Teamocil
         commands << "tmux send-keys -t #{@index} Enter"
 
         commands
-      end # }}}
-
+      end
     end
-
   end
 end

data/lib/teamocil/layout/window.rb

@@ -1,6 +1,5 @@
 module Teamocil
   class Layout
-
     # This class represents a window within tmux
     class Window
       attr_reader :filters, :root, :splits, :options, :index, :name, :clear, :layout
@@ -10,7 +9,7 @@ module Teamocil
       # @param session [Session] the session where the window is initialized
       # @param index [Fixnnum] the window index
       # @param attrs [Hash] the window data from the layout file
-      def initialize(session, index, attrs={}) # {{{
+      def initialize(session, index, attrs={})
         @name = attrs["name"] || "teamocil-window-#{index+1}"
         @root = attrs["root"] || "."
         @clear = attrs["clear"] == true ? "clear" : nil
@@ -19,7 +18,7 @@ module Teamocil
 
         @splits = attrs["splits"] || []
         raise Teamocil::Error::LayoutError.new("You must specify a `splits` key for every window.") if @splits.empty?
-        @splits = @splits.each_with_index.map { |split, split_index| Split.new(self, split_index, split) }
+        @splits = @splits.each_with_index.map { |split, split_index| Split.new(self, split_index + pane_base_index, split) }
 
         @filters = attrs["filters"] || {}
         @filters["before"] ||= []
@@ -27,12 +26,12 @@ module Teamocil
 
         @index = index
         @session = session
-      end # }}}
+      end
 
       # Generate commands to send to tmux
       #
       # @return [Array]
-      def generate_commands # {{{
+      def generate_commands
         commands = []
 
         if @session.options.include?(:here) and @index == 0
@@ -53,9 +52,18 @@ module Teamocil
         commands << "tmux select-pane -t #{@splits.map(&:focus).index(true) || 0}"
 
         commands
-      end # }}}
+      end
 
+      # Return the `pane-base-index` option for the current window
+      #
+      # @return [Fixnum]
+      def pane_base_index
+        @pane_base_index ||= begin
+          global_setting = `tmux show-window-option -g pane-base-index`.split(/\s/).last
+          local_setting = `tmux show-window-option pane-base-index`.split(/\s/).last
+          (local_setting || global_setting || "0").to_i
+        end
+      end
     end
-
   end
 end

data/spec/cli_spec.rb

@@ -2,77 +2,70 @@
 require File.join(File.dirname(__FILE__), "spec_helper.rb")
 
 describe Teamocil::CLI do
-
   context "executing" do
-
-      before do # {{{
-        @fake_env = { "TMUX" => 1, "HOME" => File.join(File.dirname(__FILE__), "fixtures") }
-      end # }}}
+    before do
+      @fake_env = { "TMUX" => 1, "HOME" => File.join(File.dirname(__FILE__), "fixtures") }
+    end
 
     context "not in tmux" do
-
-      it "should allow editing" do # {{{
+      it "should allow editing" do
         FileUtils.stub(:touch)
         Kernel.should_receive(:system).with("$EDITOR #{File.join(@fake_env["HOME"], ".teamocil", "my-layout.yml").inspect}")
         Teamocil::CLI.new(["--edit", "my-layout"], @fake_env)
-      end # }}}
-
+      end
     end
 
     context "in tmux" do
-
-      before :each do # {{{
+      before :each do
         Teamocil::CLI.messages = []
-      end # }}}
+      end
 
-      it "creates a layout from a name" do # {{{
+      it "creates a layout from a name" do
         @cli = Teamocil::CLI.new(["sample"], @fake_env)
         @cli.layout.session.name.should == "sample"
         @cli.layout.session.windows.length.should == 2
         @cli.layout.session.windows.first.name.should == "foo"
         @cli.layout.session.windows.last.name.should == "bar"
-      end # }}}
+      end
 
-      it "fails to create a layout from a layout that doesn’t exist" do # {{{
-        lambda { @cli = Teamocil::CLI.new(["i-do-not-exist"], @fake_env) }.should raise_error SystemExit
+      it "fails to create a layout from a layout that doesn’t exist" do
+        expect { @cli = Teamocil::CLI.new(["i-do-not-exist"], @fake_env) }.to raise_error SystemExit
         Teamocil::CLI.messages.should include("There is no file \"#{File.join(File.dirname(__FILE__), "fixtures", ".teamocil", "i-do-not-exist.yml")}\"")
-      end # }}}
+      end
 
-      it "creates a layout from a specific file" do # {{{
+      it "creates a layout from a specific file" do
         @cli = Teamocil::CLI.new(["--layout", "./spec/fixtures/.teamocil/sample.yml"], @fake_env)
         @cli.layout.session.name.should == "sample"
         @cli.layout.session.windows.length.should == 2
         @cli.layout.session.windows.first.name.should == "foo"
         @cli.layout.session.windows.last.name.should == "bar"
-      end # }}}
+      end
 
-      it "fails to create a layout from a file that doesn’t exist" do # {{{
-        lambda { @cli = Teamocil::CLI.new(["--layout", "./spec/fixtures/.teamocil/i-do-not-exist.yml"], @fake_env) }.should raise_error SystemExit
+      it "fails to create a layout from a file that doesn’t exist" do
+        expect { @cli = Teamocil::CLI.new(["--layout", "./spec/fixtures/.teamocil/i-do-not-exist.yml"], @fake_env) }.to raise_error SystemExit
         Teamocil::CLI.messages.should include("There is no file \"./spec/fixtures/.teamocil/i-do-not-exist.yml\"")
-      end # }}}
+      end
 
-      it "lists available layouts" do # {{{
+      it "lists available layouts" do
         @cli = Teamocil::CLI.new(["--list"], @fake_env)
         @cli.layouts.should == ["sample", "sample-2"]
-      end # }}}
+      end
 
-      it "should show the content" do # {{{
+      it "should show the content" do
         FileUtils.stub(:touch)
         Kernel.should_receive(:system).with("cat #{File.join(@fake_env["HOME"], ".teamocil", "sample.yml").inspect}")
         Teamocil::CLI.new(["--show", "sample"], @fake_env)
-      end # }}}
+      end
 
-      it "looks only in the $TEAMOCIL_PATH environment variable for layouts" do # {{{
+      it "looks only in the $TEAMOCIL_PATH environment variable for layouts" do
         @fake_env = { "TMUX" => 1, "HOME" => File.join(File.dirname(__FILE__), "fixtures"), "TEAMOCIL_PATH" => File.join(File.dirname(__FILE__), "fixtures/.my-fancy-layouts-directory") }
 
         @cli = Teamocil::CLI.new(["sample-3"], @fake_env)
         @cli.layout.session.name.should == "sample-3"
 
-        lambda { @cli = Teamocil::CLI.new(["sample"], @fake_env) }.should raise_error SystemExit
+        expect { @cli = Teamocil::CLI.new(["sample"], @fake_env) }.to raise_error SystemExit
         Teamocil::CLI.messages.should include("There is no file \"#{@fake_env["TEAMOCIL_PATH"]}/sample.yml\"")
-      end # }}}
-
+      end
     end
-
   end
 end

data/spec/layout_spec.rb

@@ -2,149 +2,149 @@
 require File.join(File.dirname(__FILE__), "spec_helper.rb")
 
 describe Teamocil::Layout do
+  let(:window_pane_base_index) { 0 }
+  before { Teamocil::Layout::Window.any_instance.stub(:pane_base_index).and_return(window_pane_base_index) }
 
   context "compiling" do
-    before do # {{{
+    before do
       @layout = Teamocil::Layout.new(layouts["two-windows"], {})
-    end # }}}
+    end
 
-    describe "handles bad layouts" do # {{{
-      it "does not compile without windows" do # {{{
+    describe "handles bad layouts" do
+      it "does not compile without windows" do
         @layout = Teamocil::Layout.new({ "name" => "foo" }, {})
-        lambda { @layout.compile! }.should raise_error Teamocil::Error::LayoutError
-      end # }}}
+        expect { @layout.compile! }.to raise_error Teamocil::Error::LayoutError
+      end
 
-      it "does not compile without splits" do # {{{
+      it "does not compile without splits" do
         @layout = Teamocil::Layout.new({ "windows" => [{ "name" => "foo" }] }, {})
-        lambda { @layout.compile! }.should raise_error Teamocil::Error::LayoutError
-      end # }}}
+        expect { @layout.compile! }.to raise_error Teamocil::Error::LayoutError
+      end
 
-      it "does not compile with empty splits" do # {{{
+      it "does not compile with empty splits" do
         @layout = Teamocil::Layout.new({ "windows" => [{ "name" => "foo", "splits" => [nil, nil] }] }, {})
-        lambda { @layout.compile! }.should raise_error Teamocil::Error::LayoutError
-      end # }}}
-    end # }}}
+        expect { @layout.compile! }.to raise_error Teamocil::Error::LayoutError
+      end
+    end
 
-    describe "windows" do # {{{
-      it "creates windows" do # {{{
+    describe "windows" do
+      it "creates windows" do
         session = @layout.compile!
         session.windows.each do |window|
           window.should be_an_instance_of Teamocil::Layout::Window
         end
-      end # }}}
+      end
 
-      it "creates windows with names" do # {{{
+      it "creates windows with names" do
         session = @layout.compile!
         session.windows[0].name.should == "foo"
         session.windows[1].name.should == "bar"
-      end # }}}
+      end
 
-      it "creates windows with root paths" do # {{{
+      it "creates windows with root paths" do
         session = @layout.compile!
         session.windows[0].root.should == "/foo"
         session.windows[1].root.should == "/bar"
-      end # }}}
+      end
 
-      it "creates windows with clear option" do # {{{
+      it "creates windows with clear option" do
         session = @layout.compile!
         session.windows[0].clear.should == "clear"
         session.windows[1].clear.should be_nil
-      end # }}}
+      end
 
-      it "creates windows with layout option" do # {{{
+      it "creates windows with layout option" do
         session = @layout.compile!
         session.windows[0].layout.should == "tiled"
         session.windows[1].layout.should be_nil
-      end # }}}
-    end # }}}
+      end
+    end
 
-    describe "splits" do # {{{
-      it "creates splits" do # {{{
+    describe "splits" do
+      it "creates splits" do
         session = @layout.compile!
         session.windows.first.splits.each do |split|
           split.should be_an_instance_of Teamocil::Layout::Split
         end
-      end # }}}
+      end
 
-      it "creates splits with dimensions" do # {{{
+      it "creates splits with dimensions" do
         session = @layout.compile!
         session.windows.first.splits[0].width.should == nil
         session.windows.first.splits[1].width.should == 50
-      end # }}}
+      end
 
-      it "creates splits with commands specified in strings" do # {{{
+      it "creates splits with commands specified in strings" do
         session = @layout.compile!
         session.windows.first.splits[0].cmd.should == "echo 'foo'"
-      end # }}}
+      end
 
-      it "creates splits with commands specified in an array" do # {{{
+      it "creates splits with commands specified in an array" do
         session = @layout.compile!
         session.windows.last.splits[0].cmd.length.should == 2
         session.windows.last.splits[0].cmd.first.should == "echo 'bar'"
         session.windows.last.splits[0].cmd.last.should == "echo 'bar in an array'"
-      end # }}}
+      end
 
-      it "handles focused splits" do # {{{
+      it "handles focused splits" do
         session = @layout.compile!
         session.windows.last.splits[1].focus.should be_true
         session.windows.last.splits[0].focus.should be_false
-      end # }}}
-    end # }}}
+      end
+    end
 
-    describe "filters" do # {{{
-      it "creates windows with before filters" do # {{{
+    describe "filters" do
+      it "creates windows with before filters" do
         layout = Teamocil::Layout.new(layouts["two-windows-with-filters"], {})
         session = layout.compile!
         session.windows.first.filters["before"].length.should == 2
         session.windows.first.filters["before"].first.should == "echo first before filter"
         session.windows.first.filters["before"].last.should == "echo second before filter"
-      end # }}}
+      end
 
-      it "creates windows with after filters" do # {{{
+      it "creates windows with after filters" do
         layout = Teamocil::Layout.new(layouts["two-windows-with-filters"], {})
         session = layout.compile!
         session.windows.first.filters["after"].length.should == 2
         session.windows.first.filters["after"].first.should == "echo first after filter"
         session.windows.first.filters["after"].last.should == "echo second after filter"
-      end # }}}
+      end
 
-      it "should handle blank filters" do # {{{
+      it "should handle blank filters" do
         session = @layout.compile!
         session.windows.first.filters.should have_key "after"
         session.windows.first.filters.should have_key "before"
         session.windows.first.filters["after"].should be_empty
         session.windows.first.filters["before"].should be_empty
-      end # }}}
-    end # }}}
+      end
+    end
 
-    describe "targets" do # {{{
-      it "should handle splits without a target" do # {{{
+    describe "targets" do
+      it "should handle splits without a target" do
         session = @layout.compile!
         session.windows.last.splits.last.target.should == nil
-      end # }}}
+      end
 
-      it "should handle splits with a target" do # {{{
+      it "should handle splits with a target" do
         session = @layout.compile!
         session.windows.last.splits.first.target.should == "bottom-right"
-      end # }}}
-    end # }}}
+      end
+    end
 
-    describe "sessions" do # {{{
-      it "should handle windows within a session" do # {{{
+    describe "sessions" do
+      it "should handle windows within a session" do
         layout = Teamocil::Layout.new(layouts["three-windows-within-a-session"], {})
         session = layout.compile!
         session.windows.length.should == 3
         session.name.should == "my awesome session"
-      end # }}}
-    end # }}}
+      end
+    end
   end
 
   context "generating commands" do
-    before do # {{{
-      @layout = Teamocil::Layout.new(layouts["two-windows"], {})
-    end # }}}
+    before { @layout = Teamocil::Layout.new(layouts["two-windows"], {}) }
 
-    it "should generate split commands" do #{{{
+    it "should generate split commands" do
       session = @layout.compile!
       commands = session.windows.last.splits[0].generate_commands
       commands.length.should == 2
@@ -156,14 +156,25 @@ describe Teamocil::Layout do
       commands.length.should == 2
       commands.first.should == "tmux send-keys -t 0 \"export TEAMOCIL=1 && cd \"/foo\" && clear && echo 'foo'\""
       commands.last.should == "tmux send-keys -t 0 Enter"
-    end # }}}
+    end
 
-    it "should generate window commands" do #{{{
+    it "should generate window commands" do
       session = @layout.compile!
       commands = session.windows.last.generate_commands
       commands.first.should == "tmux new-window -n \"bar\""
       commands.last.should == "tmux select-pane -t 1"
-    end # }}}
-  end
+    end
+
+    context "with custom pane-base-index option" do
+      let(:window_pane_base_index) { 2 }
 
+      it "should generate split commands" do
+        session = @layout.compile!
+        commands = session.windows.last.splits[0].generate_commands
+        commands.length.should == 2
+        commands.first.should == "tmux send-keys -t 2 \"export TEAMOCIL=1 && cd \"/bar\" && echo 'bar' && echo 'bar in an array'\""
+        commands.last.should == "tmux send-keys -t 2 Enter"
+      end
+    end
+  end
 end

data/spec/mock/cli.rb

@@ -1,36 +1,33 @@
 module Teamocil
   module Mock
     module CLI
-
-      def self.included(base) # {{{
+      def self.included(base)
         base.class_eval do
 
           # Return all messages
-          def self.messages # {{{
+          def self.messages
             @@messages
-          end # }}}
+          end
 
           # Change messages
-          def self.messages=(messages) # {{{
+          def self.messages=(messages)
             @@messages = messages
-          end # }}}
+          end
 
           # Do not print anything
-          def print_layouts # {{{
+          def print_layouts
             # Nothing
-          end # }}}
+          end
 
           # Print an error message and exit the utility
           #
           # @param msg [Mixed] something to print before exiting.
-          def bail(msg) # {{{
+          def bail(msg)
             Teamocil::CLI.messages << msg
             exit 1
-          end # }}}
-
+          end
         end
-      end # }}}
-
+      end
     end
   end
 end

data/spec/mock/layout.rb

@@ -1,18 +1,14 @@
 module Teamocil
   module Mock
     module Layout
-
-      def self.included(base) # {{{
+      def self.included(base)
         base.class_eval do
-
           # Do not execute anything
           def execute_commands(commands)
             # Nothing
           end
-
         end
-      end # }}}
-
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,12 +6,10 @@ require File.join(File.dirname(__FILE__), "./mock/layout.rb")
 require File.join(File.dirname(__FILE__), "./mock/cli.rb")
 
 module Helpers
-
-  def layouts # {{{
+  def layouts
     return @@examples if defined?(@@examples)
     @@examples = YAML.load_file(File.join(File.dirname(__FILE__), "fixtures/layouts.yml"))
-  end # }}}
-
+  end
 end
 
 RSpec.configure do |c|

data/teamocil.gemspec

@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
 
   # Dependencies
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", '~> 2.13'
   s.add_development_dependency "yard"
   s.add_development_dependency "maruku"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: teamocil
 version: !ruby/object:Gem::Version
-  version: 0.3.9
-  prerelease: 
+  version: '0.4'
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,11 +81,11 @@ files:
 - README.md
 - Rakefile
 - bin/teamocil
-- examples/simple-four-splits.yml
-- examples/simple-one-and-three-splits.yml
-- examples/simple-six-splits.yml
-- examples/simple-two-horitonzal-splits.yml
-- examples/simple-two-vertical-splits.yml
+- examples/four-splits.yml
+- examples/one-and-three-splits.yml
+- examples/six-splits.yml
+- examples/two-horizontal-splits.yml
+- examples/two-vertical-splits.yml
 - lib/teamocil.rb
 - lib/teamocil/cli.rb
 - lib/teamocil/error.rb
@@ -115,33 +106,26 @@ files:
 homepage: http://remiprev.github.com/teamocil
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2208554246657691212
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2208554246657691212
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy window and split layouts for tmux
 test_files:
 - spec/cli_spec.rb

data/examples/simple-four-splits.yml

@@ -1,13 +0,0 @@
-windows:
-  - name: simple-four-splits
-    splits:
-      - cmd: "echo 'first split'"
-      - cmd: "echo 'second split'"
-        width: 50
-        focus: true
-      - cmd: "echo 'fourth split'"
-        height: 50
-        target: bottom-right
-      - cmd: "echo 'third split'"
-        height: 50
-        target: bottom-left

data/examples/simple-one-and-three-splits.yml

@@ -1,12 +0,0 @@
-windows:
-  - name: simple-one-and-three-splits
-    splits:
-      - cmd: "echo 'first split'"
-      - cmd: "echo 'second split'"
-        width: 50
-      - cmd: "echo 'third split'"
-        height: 66
-        target: bottom-right
-      - cmd: "echo 'fourth split'"
-        height: 50
-        target: bottom-right

data/examples/simple-six-splits.yml

@@ -1,18 +0,0 @@
-windows:
-  - name: simple-six-splits
-    splits:
-      - cmd: "echo 'first split'"
-      - cmd: "echo 'second split'"
-        width: 50
-      - cmd: "echo 'fourth split'"
-        height: 66
-        target: bottom-right
-      - cmd: "echo 'third split'"
-        height: 66
-        target: bottom-left
-      - cmd: "echo 'sixth split'"
-        height: 50
-        target: bottom-right
-      - cmd: "echo 'fifth split'"
-        height: 50
-        target: bottom-left

data/examples/simple-two-horitonzal-splits.yml

@@ -1,6 +0,0 @@
-windows:
-  - name: simple-two-horizontal-splits
-    splits:
-      - cmd: "echo 'first split'"
-      - cmd: "echo 'second split'"
-        height: 50

data/examples/simple-two-vertical-splits.yml

@@ -1,6 +0,0 @@
-windows:
-  - name: simple-two-vertical-splits
-    splits:
-      - cmd: "echo 'first split'"
-      - cmd: "echo 'second split'"
-        width: 50