teamocil 0.2 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    teamocil (0.1.11)
+    teamocil (0.2.1)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -173,9 +173,7 @@ To get autocompletion when typing `teamocil <Tab>` in a zsh session, add this li
 
 ## Todo list
 
-* Support tmux options for windows and splits (eg. `synchronize-panes`)
-* Making sure the layout is valid before executing it
-* Refactor the `Layout` class to make it “test-friendly”
+* Making sure the layout is valid before executing it (ie. throw exceptions).
 
 ## Contributors
 
@@ -184,6 +182,8 @@ Feel free to contribute and submit issues/pull requests [on GitHub](https://gith
 * Samuel Garneau ([garno](https://github.com/garno))
 * Jimmy Bourassa ([jbourassa](https://github.com/jbourassa))
 
+Take a look at the `spec` folder before you do, and make sure `bundle exec rake spec` passes after your modifications :)
+
 ## License
 
 Teamocil is © 2011 [Rémi Prévost](http://exomel.com) and may be freely distributed under the [LITL license](http://litl.info/). See the `LICENSE` file.

data/lib/teamocil.rb

@@ -1,5 +1,5 @@
 module Teamocil
-  VERSION = "0.2"
+  VERSION = "0.2.1"
   autoload :Layout, "teamocil/layout"
   autoload :CLI,    "teamocil/cli"
 end

data/lib/teamocil/layout.rb

@@ -44,7 +44,8 @@ module Teamocil
         @root = attrs["root"]
         @options = attrs["options"]
         @filters = attrs["filters"]
-        @splits = attrs["splits"].each_with_index.map { |split, index| Split.new(self, index, split) }
+        @splits = attrs["splits"] || []
+        @splits = @splits.each_with_index.map { |split, index| Split.new(self, index, split) }
         @index = index
         @session = session
 
@@ -104,15 +105,17 @@ module Teamocil
         commands = []
 
         # Is it a vertical or horizontal split?
+        init_command = ""
         unless @index == 0
           if !@width.nil?
-            commands << "tmux split-window -h -p #{@width}"
+            init_command = "tmux split-window -h -p #{@width}"
           elsif !@height.nil?
-            commands << "tmux split-window -p #{@height}"
+            init_command = "tmux split-window -p #{@height}"
           else
-            commands << "tmux split-window"
+            init_command = "tmux split-window"
           end
-          commands << " -t #{@target}" unless @target.nil?
+          init_command << " -t #{@target}" unless @target.nil?
+          commands << init_command
         end
 
         # Wrap all commands around filters

data/spec/fixtures/layouts.yml

@@ -13,6 +13,7 @@ two-windows:
         - cmd:
           - "echo 'bar'"
           - "echo 'bar in an array'"
+          target: bottom-right
         - cmd: "echo 'bar again'"
           width: 50
 
@@ -32,3 +33,11 @@ two-windows-with-filters:
         - cmd: "echo 'foo'"
         - cmd: "echo 'foo again'"
           width: 50
+
+three-windows-within-a-session:
+  session:
+    name: "my awesome session"
+    windows:
+      - name: "first window"
+      - name: "second window"
+      - name: "third window"

data/spec/layout_spec.rb

@@ -2,15 +2,19 @@ require File.join(File.dirname(__FILE__), "spec_helper.rb")
 
 describe Teamocil::Layout do
 
-  context "initializing" do
-  end
-
   context "compiling" do
 
-    before :each do # {{{
+    before do # {{{
       @layout = Teamocil::Layout.new(layouts["two-windows"], {})
     end # }}}
 
+    it "creates windows" do # {{{
+      session = @layout.compile!
+      session.windows.each do |window|
+        window.should be_an_instance_of Teamocil::Layout::Window
+      end
+    end # }}}
+
     it "creates windows with names" do # {{{
       session = @layout.compile!
       session.windows[0].name.should == "foo"
@@ -23,6 +27,13 @@ describe Teamocil::Layout do
       session.windows[1].root.should == "/bar"
     end # }}}
 
+    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 # }}}
+
     it "creates splits with dimensions" do # {{{
       session = @layout.compile!
       session.windows.first.splits[0].width.should == nil
@@ -57,5 +68,31 @@ describe Teamocil::Layout do
       session.windows.first.filters["after"].last.should == "echo second after filter"
     end # }}}
 
+    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 # }}}
+
+    it "should handle splits without a target" do # {{{
+      session = @layout.compile!
+      session.windows.last.splits.last.target.should == nil
+    end # }}}
+
+    it "should handle splits with a target" do # {{{
+      session = @layout.compile!
+      session.windows.last.splits.first.target.should == "bottom-right"
+    end # }}}
+
+    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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: teamocil
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - "R\xC3\xA9mi Pr\xC3\xA9vost"
@@ -14,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-23 00:00:00 Z
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,11 +30,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,11 +44,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,11 +58,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: maruku
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -71,7 +72,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  requirement: *id004
 description: Teamocil helps you set up window and splits layouts for tmux using YAML configuration files.
 email: remi@exomel.com
 executables: