teamocil 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd9c25b9a34c7f2b8efa0b353640523a9c6ad8f4
-  data.tar.gz: 4e4db6b9d019b46b0820d8d7a8d583afdb1250e9
+  metadata.gz: a3243fbfc89942819b6f281a12b5618ef90bb408
+  data.tar.gz: 598b276ff2b771918704058021d5264e5864348a
 SHA512:
-  metadata.gz: 30df185031fc3ef4f5c530bc29b10f525312ca12f34d6590732f315ddf6b62cca9214b8ae5639cfb7d815bc4446181789f7f07a57ecf1fb73fa5969118cd5d13
-  data.tar.gz: 70d528fc0064ae4ec5f2409737fe21ff0b2aac5dfd2f4cfbf26b6bbf1406594c09d5b9677d30573222f681d14ff3d24f7dc6a2ac4e7f15df7c50d3382a19fa37
+  metadata.gz: c6506fa11e9cbb7a1a0de10ac307caac52b1844132e005fd8a6763a39b780edb2c0c7c5c4d92e3234494f80d4c2723b0b11b586aad09f601d4d64be1535bb93a
+  data.tar.gz: 91a84c4b94ce363dc0736da6a9908cd30060af64debc49dd72af0d90d222a4e698582ee6b7d232541c5e538aba6d8a2c132d5160f5efdbe7d1a95713086b1941

data/.rspec

@@ -0,0 +1 @@
+--colour

data/.travis.yml

@@ -1,2 +1,7 @@
-rvm: 2.1.2
-script: bundle exec phare
+rvm:
+  - 2.0.0
+  - 2.1.2
+
+script:
+  - 'echo "Checking code style" && bundle exec phare'
+  - 'echo "Running specs" && bundle exec rspec'

data/README.md

@@ -68,6 +68,13 @@ Feel free to fork the repository and add back as many features as you want :)
 
 ## Configuration
 
+### Session
+
+| Key       | Description
+|-----------|----------------------------
+| `name`    | The tmux session name
+| `windows` | An `Array` of windows
+
 ### Windows
 
 | Key      | Description
@@ -183,6 +190,9 @@ To get autocompletion when typing `teamocil <Tab>` in a zsh session, add this li
 compctl -g '~/.teamocil/*(:t:r)' teamocil
 ```
 
+[zsh-completions](https://github.com/zsh-users/zsh-completions) also provides
+additional completion definitions for Teamocil.
+
 ### Bash autocompletion
 
 To get autocompletion when typing `teamocil <Tab>` in a bash session, add this line to your `~/.bashrc` file:

data/lib/teamocil.rb

@@ -12,7 +12,13 @@ require 'teamocil/utils/option_parser'
 require 'teamocil/layout'
 require 'teamocil/cli'
 
+# Errors
+require 'teamocil/error/layout_not_found'
+require 'teamocil/error/invalid_yaml_layout'
+
 # Command classes
+require 'teamocil/command/list_panes'
+require 'teamocil/command/list_windows'
 require 'teamocil/command/new_window'
 require 'teamocil/command/rename_session'
 require 'teamocil/command/rename_window'
@@ -21,13 +27,15 @@ require 'teamocil/command/select_pane'
 require 'teamocil/command/select_window'
 require 'teamocil/command/send_keys'
 require 'teamocil/command/send_keys_to_pane'
+require 'teamocil/command/show_options'
+require 'teamocil/command/show_window_options'
 require 'teamocil/command/split_window'
 
 # Tmux classes
+require 'teamocil/tmux'
 require 'teamocil/tmux/session'
 require 'teamocil/tmux/window'
 require 'teamocil/tmux/pane'
-require 'teamocil/tmux/options'
 
 module Teamocil
   class << self
@@ -49,7 +57,7 @@ module Teamocil
   end
 
   def self.query_system(command)
-    `#{command}`
+    `tmux #{command.to_s}`
   end
 
   def self.parse_options!(arguments: nil)

data/lib/teamocil/command/list_panes.rb

@@ -0,0 +1,15 @@
+module Teamocil
+  module Command
+    class ListPanes < ClosedStruct.new(:index)
+      def to_s
+        "list-panes #{options.join(' ')}"
+      end
+
+      def options
+        [].tap do |options|
+          options << "-t '#{index}'" if index
+        end
+      end
+    end
+  end
+end

data/lib/teamocil/command/list_windows.rb

@@ -0,0 +1,9 @@
+module Teamocil
+  module Command
+    class ListWindows < ClosedStruct.new(:foo)
+      def to_s
+        'list-windows'
+      end
+    end
+  end
+end

data/lib/teamocil/command/show_options.rb

@@ -0,0 +1,9 @@
+module Teamocil
+  module Command
+    class ShowOptions < ClosedStruct.new(:name)
+      def to_s
+        "show-options -gv #{name}"
+      end
+    end
+  end
+end

data/lib/teamocil/command/show_window_options.rb

@@ -0,0 +1,9 @@
+module Teamocil
+  module Command
+    class ShowWindowOptions < ClosedStruct.new(:name)
+      def to_s
+        "show-window-options -gv #{name}"
+      end
+    end
+  end
+end

data/lib/teamocil/error/invalid_yaml_layout.rb

@@ -0,0 +1,13 @@
+module Teamocil
+  module Error
+    class InvalidYAMLLayout < StandardError
+      def initialize(path)
+        @path = path
+      end
+
+      def to_s
+        "There was a YAML error when parsing `#{@path}`"
+      end
+    end
+  end
+end

data/lib/teamocil/error/layout_not_found.rb

@@ -0,0 +1,13 @@
+module Teamocil
+  module Error
+    class LayoutNotFound < StandardError
+      def initialize(path)
+        @path = path
+      end
+
+      def to_s
+        "Cannot find a layout at `#{@path}`"
+      end
+    end
+  end
+end

data/lib/teamocil/layout.rb

@@ -1,5 +1,5 @@
 module Teamocil
-  class Layout < ClosedStruct.new(:path, :options)
+  class Layout < ClosedStruct.new(:path)
     def execute!
       if Teamocil.options[:debug]
         Teamocil.puts(shell_commands.join("\n"))
@@ -34,33 +34,23 @@ module Teamocil
   private
 
     def shell_commands
-      commands = parsed_layout.as_tmux
-      commands.flatten.map { |command| "tmux #{command}" }
+      session.as_tmux.map { |command| "tmux #{command}" }
     end
 
-    def parsed_layout
-      begin
-        yaml_content = YAML.load(raw_content)
-      rescue
-        Teamocil.bail("There was a YAML error when parsing `#{path}`")
-      end
-
-      if valid?
-        Teamocil::Tmux::Session.new(yaml_content)
-      else
-        Teamocil.bail("The layout at `#{path}` is not valid.")
-      end
+    def session
+      Teamocil::Tmux::Session.new(parsed_content)
     end
 
-    def valid?
-      # TODO: Actually validate if the layout is valid
-      true
+    def parsed_content
+      YAML.load(raw_content)
+    rescue Psych::SyntaxError
+      raise Teamocil::Error::InvalidYAMLLayout, path
     end
 
     def raw_content
       File.read(path)
-    rescue
-      Teamocil.bail("Cannot find a layout at `#{path}`")
+    rescue Errno::ENOENT
+      raise Teamocil::Error::LayoutNotFound, path
     end
   end
 end

data/lib/teamocil/tmux.rb

@@ -0,0 +1,25 @@
+module Teamocil
+  module Tmux
+    def self.option(option, default: nil)
+      command = Teamocil::Command::ShowOptions.new(name: option)
+      value = Teamocil.query_system(command).chomp
+      value.empty? ? default : value.to_i
+    end
+
+    def self.window_option(option, default: nil)
+      command = Teamocil::Command::ShowWindowOptions.new(name: option)
+      value = Teamocil.query_system(command).chomp
+      value.empty? ? default : value.to_i
+    end
+
+    def self.window_count
+      command = Teamocil::Command::ListWindows.new
+      Teamocil.query_system(command).chomp.split("\n").size
+    end
+
+    def self.pane_count(index: nil)
+      command = Teamocil::Command::ListPanes.new(index: index)
+      Teamocil.query_system(command).chomp.split("\n").size
+    end
+  end
+end

data/lib/teamocil/tmux/pane.rb

@@ -1,13 +1,27 @@
 module Teamocil
   module Tmux
-    class Pane < ClosedStruct.new(:index, :root, :commands, :focus, :first)
+    class Pane < ClosedStruct.new(:index, :root, :commands, :focus)
       def as_tmux
         [].tap do |tmux|
-          tmux << Teamocil::Command::SplitWindow.new(root: root) unless first
-          tmux << Teamocil::Command::SendKeysToPane.new(index: index, keys: commands.join('; '))
-          tmux << Teamocil::Command::SendKeysToPane.new(index: index, keys: 'Enter')
+          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')
         end
       end
+
+      def internal_index
+        index + self.class.pane_base_index
+      end
+
+      def self.pane_base_index
+        @pane_base_index ||= Teamocil::Tmux.window_option('pane-base-index', default: 0)
+      end
+
+    private
+
+      def first?
+        index.zero?
+      end
     end
   end
 end

data/lib/teamocil/tmux/session.rb

@@ -9,8 +9,7 @@ module Teamocil
 
         self.windows = windows.each_with_index.map do |window, index|
           # Windows need to know their position
-          window.merge! index: index + window_base_index
-          window.merge! first: index.zero?
+          window.merge! index: index
 
           Teamocil::Tmux::Window.new(window)
         end
@@ -23,12 +22,8 @@ module Teamocil
 
           # Set the focus on the right window or do nothing
           focused_window = windows.find(&:focus)
-          tmux << Teamocil::Command::SelectWindow.new(index: focused_window.index) if focused_window
-        end
-      end
-
-      def window_base_index
-        @window_base_index ||= Teamocil::Tmux::Options.fetch_option('base-index', default: 0)
+          tmux << Teamocil::Command::SelectWindow.new(index: focused_window.internal_index) if focused_window
+        end.flatten
       end
     end
   end

data/lib/teamocil/tmux/window.rb

@@ -1,20 +1,19 @@
 module Teamocil
   module Tmux
-    class Window < ClosedStruct.new(:index, :root, :focus, :layout, :name, :panes, :first)
+    class Window < ClosedStruct.new(:index, :root, :focus, :layout, :name, :panes)
       def initialize(object)
         super
 
         # Make sure paths like `~/foo/bar` work
         self.root = File.expand_path(root) if root
 
-        self.panes ||= splits
+        self.panes ||= []
         self.panes = panes.each_with_index.map do |pane, index|
           # Support single command instead of `commands` key in Hash
           pane = { commands: [pane] } if pane.is_a?(String)
 
           # Panes need to know their position
-          pane.merge! index: index + pane_base_index
-          pane.merge! first: index.zero?
+          pane.merge! index: index
 
           # Panes need know the window root directory
           pane.merge! root: root
@@ -26,27 +25,51 @@ module Teamocil
       def as_tmux
         [].tap do |tmux|
           # Rename the current window or create a new one
-          if Teamocil.options[:here] && first
+          if Teamocil.options[:here] && first?
+            if root
+              first_pane_index = panes.first.internal_index
+              tmux << Teamocil::Command::SendKeysToPane.new(index: first_pane_index, keys: %(cd "#{root}"))
+              tmux << Teamocil::Command::SendKeysToPane.new(index: first_pane_index, keys: 'Enter')
+            end
+
             tmux << Teamocil::Command::RenameWindow.new(name: name)
           else
             tmux << Teamocil::Command::NewWindow.new(name: name, root: root)
           end
 
           # Execute all panes commands
-          tmux << panes.map(&:as_tmux)
+          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.index : pane_base_index
+          focused_index = focused_pane ? focused_pane.internal_index : Teamocil::Tmux::Pane.pane_base_index
           tmux << Teamocil::Command::SelectPane.new(index: focused_index)
+        end.flatten
+      end
+
+      def internal_index
+        index + self.class.window_base_index
+      end
+
+      def self.window_base_index
+        @window_base_index ||= begin
+          base_index = Teamocil::Tmux.option('base-index', default: 0)
+          current_window_count = Teamocil::Tmux.window_count
+
+          # If `--here` is specified, treat the current window as a new one
+          current_window_count -= 1 if Teamocil.options[:here]
+
+          base_index + current_window_count
         end
       end
 
-      def pane_base_index
-        @pane_base_index ||= Teamocil::Tmux::Options.fetch_window_option('pane-base-index', default: 0)
+    protected
+
+      def first?
+        index.zero?
       end
     end
   end

data/lib/teamocil/utils/closed_struct.rb

@@ -5,7 +5,7 @@ module Teamocil
 
       args.first.each_pair do |key, value|
         # Make sure we only set values to defined arguments
-        if members.map { |x| x.intern }.include?(key.to_sym)
+        if members.map(&:intern).include?(key.to_sym)
           send "#{key}=", value
         else
           raise ArgumentError, "#{self.class.name} doesn’t support the `#{key}` keyword, only #{members.join(', ')}"

data/lib/teamocil/version.rb

@@ -1,3 +1,3 @@
 module Teamocil
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+
+# Ruby stdlib dependencies
+require 'tmpdir'
+require 'fileutils'
+
+# RSpec testing framework
+require 'rspec'
+
+# Teamocil
+require 'teamocil'
+
+RSpec.configure do |config|
+  # Disable `should` syntax
+  config.expect_with(:rspec) { |c| c.syntax = :expect }
+end

data/spec/teamocil/cli_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+RSpec.describe Teamocil::CLI do
+  describe :run! do
+    let(:cli) { Teamocil::CLI.new(arguments: arguments, environment: environment) }
+    let(:environment) { { 'HOME' => Dir.tmpdir } }
+    let(:root) { File.join(environment['HOME'], '.teamocil') }
+
+    describe 'with --list option' do
+      let(:arguments) { ['--list'] }
+
+      before do
+        expect(Teamocil::Layout).to receive(:print_available_layouts).with(directory: root)
+      end
+
+      specify { cli.run! }
+    end
+
+    describe 'with --show option' do
+      let(:arguments) { ['--show', 'foo'] }
+      let(:layout) { double(Teamocil::Layout) }
+      let(:path) { File.join(root, 'foo.yml') }
+
+      before do
+        expect(Teamocil::Layout).to receive(:new).with(path: path).and_return(layout)
+        expect(layout).to receive(:show!)
+      end
+
+      specify { cli.run! }
+    end
+
+    describe 'with --edit option' do
+      let(:arguments) { ['--edit', 'foo'] }
+      let(:layout) { double(Teamocil::Layout) }
+      let(:path) { File.join(root, 'foo.yml') }
+
+      before do
+        expect(Teamocil::Layout).to receive(:new).with(path: path).and_return(layout)
+        expect(layout).to receive(:edit!)
+      end
+
+      specify { cli.run! }
+    end
+
+    describe 'with implicit execution' do
+      context 'with --layout option' do
+        let(:arguments) { ['--layout', path] }
+        let(:layout) { double(Teamocil::Layout) }
+        let(:path) { File.join(root, 'bar.yml') }
+
+        before do
+          expect(Teamocil::Layout).to receive(:new).with(path: path).and_return(layout)
+          expect(layout).to receive(:execute!)
+        end
+
+        specify { cli.run! }
+      end
+
+      context 'without --layout option' do
+        let(:arguments) { ['foo'] }
+        let(:layout) { double(Teamocil::Layout) }
+        let(:path) { File.join(root, 'foo.yml') }
+
+        before do
+          expect(Teamocil::Layout).to receive(:new).with(path: path).and_return(layout)
+          expect(layout).to receive(:execute!)
+        end
+
+        specify { cli.run! }
+      end
+    end
+  end
+end

data/spec/teamocil/layout_spec.rb

@@ -0,0 +1,126 @@
+require 'spec_helper'
+
+RSpec.describe Teamocil::Layout do
+  describe :execute! do
+    let(:layout) { Teamocil::Layout.new(path: path) }
+    let(:execute!) { layout.execute! }
+    let(:path) { double('Path') }
+
+    let(:options) { {} }
+    before { allow(Teamocil).to receive(:options).and_return(options) }
+
+    context 'without errors' do
+      let(:raw_content) { double('Raw content') }
+      let(:parsed_content) { double('Parsed content') }
+      let(:session) { instance_double(Teamocil::Tmux::Session) }
+      let(:commands) { %w(foo bar omg) }
+
+      before do
+        allow(Teamocil::Tmux::Session).to receive(:new).and_return(session)
+
+        expect(File).to receive(:read).with(path).and_return(raw_content)
+        expect(YAML).to receive(:load).with(raw_content).and_return(parsed_content)
+
+        expect(session).to receive(:as_tmux).and_return(commands)
+      end
+
+      context 'without --debug option' do
+        before do
+          expect(Teamocil).to receive(:system).with('tmux foo; tmux bar; tmux omg')
+        end
+
+        specify { layout.execute! }
+      end
+
+      context 'with --debug option' do
+        let(:options) { { debug: true } }
+
+        before do
+          expect(Teamocil).to receive(:puts).with("tmux foo\ntmux bar\ntmux omg")
+        end
+
+        specify { execute! }
+      end
+    end
+
+    context 'with not-found layout' do
+      before do
+        # Let’s simulate an error from `File.read`
+        expect(File).to receive(:read).with(path) { raise Errno::ENOENT }
+      end
+
+      it { expect { execute! }.to raise_error(Teamocil::Error::LayoutNotFound) }
+    end
+
+    context 'with invalid YAML layout' do
+      let(:raw_content) { double('Raw content') }
+
+      before do
+        expect(File).to receive(:read).with(path).and_return(raw_content)
+
+        # Let’s simulate an error from `YAML.load`
+        expect(YAML).to receive(:load).with(raw_content) { raise Psych::SyntaxError.new(nil, 0, 0, 0, nil, nil) }
+      end
+
+      it { expect { execute! }.to raise_error(Teamocil::Error::InvalidYAMLLayout) }
+    end
+  end
+
+  describe :show! do
+    let(:layout) { Teamocil::Layout.new(path: path) }
+    let(:show!) { layout.show! }
+    let(:path) { double('Path') }
+    let(:raw_content) { double('Raw content') }
+
+    context 'with found layout' do
+      before do
+        expect(File).to receive(:read).with(path).and_return(raw_content)
+        expect(Teamocil).to receive(:puts).with(raw_content)
+      end
+
+      specify { show! }
+    end
+
+    context 'with not-found layout' do
+      before do
+        # Let’s simulate an error from `File.read`
+        expect(File).to receive(:read).with(path) { raise Errno::ENOENT }
+      end
+
+      it { expect { show! }.to raise_error(Teamocil::Error::LayoutNotFound) }
+    end
+  end
+
+  describe :edit! do
+    let(:layout) { Teamocil::Layout.new(path: path) }
+    let(:edit!) { layout.edit! }
+    let(:path) { double('Path') }
+
+    before do
+      expect(Teamocil).to receive(:system).with("$EDITOR #{path}")
+    end
+
+    specify { edit! }
+  end
+
+  describe :ClassMethods do
+    describe :print_available_layouts do
+      let(:tmpdir) { Dir.mktmpdir }
+      let(:directory) { File.join(tmpdir, '.teamocil') }
+      after { FileUtils.remove_entry(tmpdir) }
+
+      before do
+        FileUtils.mkdir_p(directory)
+        FileUtils.touch(File.join(directory, 'foo.yml'))
+        FileUtils.touch(File.join(directory, 'bar.yml'))
+        FileUtils.touch(File.join(directory, 'omg.txt'))
+
+        expect(Teamocil).to receive(:puts).with(%w(bar foo))
+      end
+
+      specify do
+        Teamocil::Layout.print_available_layouts(directory: directory)
+      end
+    end
+  end
+end

data/spec/teamocil/tmux/pane_spec.rb

@@ -0,0 +1,41 @@
+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(:as_tmux) { pane.as_tmux }
+    let(:pane_base_index) { Random.rand(0..100) }
+
+    before do
+      allow(Teamocil::Tmux::Pane).to receive(:pane_base_index).and_return(pane_base_index)
+    end
+
+    # Pane attributes
+    let(:commands) { %w(foo bar) }
+    let(:root) { '/tmp' }
+    let(:focus) { true }
+
+    context 'for first pane' do
+      let(:index) { 0 }
+
+      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')
+        ]
+      end
+    end
+
+    context 'for not-first pane' do
+      let(:index) { 1 }
+
+      it 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')
+        ]
+      end
+    end
+  end
+end

data/spec/teamocil/tmux/session_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+RSpec.describe Teamocil::Tmux::Session do
+  pending
+end

data/spec/teamocil/tmux/window_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+RSpec.describe Teamocil::Tmux::Window do
+  let(:window) { Teamocil::Tmux::Window.new(index: index, root: root, layout: layout, name: name, panes: panes) }
+  let(:as_tmux) { window.as_tmux }
+
+  before do
+    allow(Teamocil::Tmux::Pane).to receive(:pane_base_index).and_return(pane_base_index)
+    allow(Teamocil::Tmux::Window).to receive(:window_base_index).and_return(window_base_index)
+    allow(Teamocil).to receive(:options).and_return(options)
+  end
+
+  # Tmux options
+  let(:pane_base_index) { Random.rand(0..100) }
+  let(:window_base_index) { Random.rand(0..100) }
+
+  # Window attributes
+  let(:options) { {} }
+  let(:index) { 0 }
+  let(:name) { 'foo' }
+  let(:layout) { nil }
+  let(:root) { nil }
+  let(:panes) do
+    [
+      { commands: %w(foo omg) },
+      { commands: %w(bar), focus: true }
+    ]
+  end
+
+  it do
+    expect(as_tmux).to eql [
+      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::SplitWindow.new,
+      Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'bar'),
+      Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'Enter'),
+      Teamocil::Command::SelectPane.new(index: pane_base_index + 1)
+    ]
+  end
+
+  context 'with root attribute' do
+    let(:root) { '/tmp' }
+
+    it do
+      expect(as_tmux).to eql [
+        Teamocil::Command::NewWindow.new(name: name, root: root),
+        Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'foo; omg'),
+        Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'Enter'),
+        Teamocil::Command::SplitWindow.new(root: root),
+        Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'bar'),
+        Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'Enter'),
+        Teamocil::Command::SelectPane.new(index: pane_base_index + 1)
+      ]
+    end
+  end
+
+  context 'without panes' do
+    let(:panes) { nil }
+
+    it do
+      expect(as_tmux).to eql [
+        Teamocil::Command::NewWindow.new(name: name, root: root),
+        Teamocil::Command::SelectPane.new(index: pane_base_index)
+      ]
+    end
+  end
+
+  context 'with layout attribute' do
+    let(:layout) { 'tiled' }
+
+    it do
+      expect(as_tmux).to eql [
+        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::SplitWindow.new,
+        Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'bar'),
+        Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'Enter'),
+        Teamocil::Command::SelectLayout.new(layout: layout),
+        Teamocil::Command::SelectPane.new(index: pane_base_index + 1)
+      ]
+    end
+  end
+
+  context 'with --here option' do
+    context 'without root' do
+      let(:options) { { here: true } }
+
+      it do
+        expect(as_tmux).to eql [
+          Teamocil::Command::RenameWindow.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::SplitWindow.new,
+          Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'bar'),
+          Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'Enter'),
+          Teamocil::Command::SelectPane.new(index: pane_base_index + 1)
+        ]
+      end
+    end
+
+    context 'with root' do
+      let(:root) { '/tmp' }
+      let(:options) { { here: true } }
+
+      it do
+        expect(as_tmux).to eql [
+          Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'cd "/tmp"'),
+          Teamocil::Command::SendKeysToPane.new(index: pane_base_index, keys: 'Enter'),
+          Teamocil::Command::RenameWindow.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::SplitWindow.new(root: root),
+          Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'bar'),
+          Teamocil::Command::SendKeysToPane.new(index: pane_base_index + 1, keys: 'Enter'),
+          Teamocil::Command::SelectPane.new(index: pane_base_index + 1)
+        ]
+      end
+    end
+  end
+end

data/teamocil.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |s|
   # Dependencies
   s.add_development_dependency 'rake'
   s.add_development_dependency 'phare', '~> 0.6'
-  s.add_development_dependency 'rubocop', '~> 0.24'
+  s.add_development_dependency 'rubocop', '0.26.1'
+  s.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teamocil
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,18 +40,32 @@ dependencies:
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.26.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.26.1
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '3.0'
 description: Teamocil helps you set up window and pane layouts for tmux using YAML
   configuration files.
 email: remi@exomel.com
@@ -61,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
@@ -70,6 +85,8 @@ files:
 - bin/teamocil
 - lib/teamocil.rb
 - lib/teamocil/cli.rb
+- lib/teamocil/command/list_panes.rb
+- lib/teamocil/command/list_windows.rb
 - lib/teamocil/command/new_window.rb
 - lib/teamocil/command/rename_session.rb
 - lib/teamocil/command/rename_window.rb
@@ -78,15 +95,25 @@ files:
 - lib/teamocil/command/select_window.rb
 - lib/teamocil/command/send_keys.rb
 - lib/teamocil/command/send_keys_to_pane.rb
+- lib/teamocil/command/show_options.rb
+- lib/teamocil/command/show_window_options.rb
 - lib/teamocil/command/split_window.rb
+- lib/teamocil/error/invalid_yaml_layout.rb
+- lib/teamocil/error/layout_not_found.rb
 - lib/teamocil/layout.rb
-- lib/teamocil/tmux/options.rb
+- lib/teamocil/tmux.rb
 - lib/teamocil/tmux/pane.rb
 - lib/teamocil/tmux/session.rb
 - lib/teamocil/tmux/window.rb
 - lib/teamocil/utils/closed_struct.rb
 - lib/teamocil/utils/option_parser.rb
 - lib/teamocil/version.rb
+- spec/spec_helper.rb
+- spec/teamocil/cli_spec.rb
+- spec/teamocil/layout_spec.rb
+- spec/teamocil/tmux/pane_spec.rb
+- spec/teamocil/tmux/session_spec.rb
+- spec/teamocil/tmux/window_spec.rb
 - teamocil.gemspec
 homepage: http://remiprev.github.com/teamocil
 licenses:
@@ -112,4 +139,10 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy session, window and pane layouts for tmux
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/teamocil/cli_spec.rb
+- spec/teamocil/layout_spec.rb
+- spec/teamocil/tmux/pane_spec.rb
+- spec/teamocil/tmux/session_spec.rb
+- spec/teamocil/tmux/window_spec.rb

data/lib/teamocil/tmux/options.rb

@@ -1,15 +0,0 @@
-module Teamocil
-  module Tmux
-    class Options
-      def self.fetch_option(option, default: nil)
-        value = Teamocil.query_system("tmux show-options -gv #{option}").chomp
-        value.empty? ? default : value.to_i
-      end
-
-      def self.fetch_window_option(option, default: nil)
-        value = Teamocil.query_system("tmux show-window-options -gv #{option}").chomp
-        value.empty? ? default : value.to_i
-      end
-    end
-  end
-end