teamocil 0.3.4 → 0.3.5

data/LICENSE

@@ -1,3 +1,7 @@
-Copyright 2011-2012 Rémi Prévost.
-You may use this work without restrictions, as long as this notice is included.
-The work is provided "as is" without warranty of any kind, neither express nor implied.
+Copyright (c) 2011-2012 Rémi Prévost
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -201,4 +201,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 [LITL license](http://litl.info/). See the `LICENSE` file.
+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.

data/lib/teamocil.rb

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

data/lib/teamocil/cli.rb

@@ -25,6 +25,9 @@ module Teamocil
       if @options[:edit]
         ::FileUtils.touch file unless File.exists?(file)
         Kernel.system("$EDITOR \"#{file}\"")
+      elsif @options[:show]
+        ::FileUtils.touch file unless File.exists?(file)
+        Kernel.system("cat \"#{file}\"")
       else
         bail "There is no file \"#{file}\"" unless File.exists?(file)
         bail "You must be in a tmux session to use teamocil" unless env["TMUX"]
@@ -59,6 +62,10 @@ module Teamocil
           @options[:list] = true
         end
 
+        opts.on("--show", "Show the content of the layout file instead of executing it") do
+          @options[:show] = true
+        end
+
       end
       opts.parse! args
     end # }}}

data/spec/cli_spec.rb

@@ -13,9 +13,8 @@ describe Teamocil::CLI do
 
       it "should allow editing" do # {{{
         FileUtils.stub(:touch)
-        Kernel.should_receive(:system).with(any_args())
-
-        @cli = Teamocil::CLI.new(["--edit", "my-layout"], @fake_env)
+        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
@@ -57,6 +56,12 @@ describe Teamocil::CLI do
         @cli.layouts.should == ["sample", "sample-2"]
       end # }}}
 
+      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
 
   end

data/spec/layout_spec.rb

@@ -4,13 +4,11 @@ require File.join(File.dirname(__FILE__), "spec_helper.rb")
 describe Teamocil::Layout do
 
   context "compiling" do
-
     before do # {{{
       @layout = Teamocil::Layout.new(layouts["two-windows"], {})
     end # }}}
 
-    describe "windows" do
-
+    describe "windows" do # {{{
       it "creates windows" do # {{{
         session = @layout.compile!
         session.windows.each do |window|
@@ -29,11 +27,9 @@ describe Teamocil::Layout do
         session.windows[0].root.should == "/foo"
         session.windows[1].root.should == "/bar"
       end # }}}
+    end # }}}
 
-    end
-
-    describe "splits" do
-
+    describe "splits" do # {{{
       it "creates splits" do # {{{
         session = @layout.compile!
         session.windows.first.splits.each do |split|
@@ -58,11 +54,9 @@ describe Teamocil::Layout do
         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 # }}}
 
-    end
-
-    describe "filters" do
-
+    describe "filters" do # {{{
       it "creates windows with before filters" do # {{{
         layout = Teamocil::Layout.new(layouts["two-windows-with-filters"], {})
         session = layout.compile!
@@ -86,11 +80,9 @@ describe Teamocil::Layout do
         session.windows.first.filters["after"].should be_empty
         session.windows.first.filters["before"].should be_empty
       end # }}}
+    end # }}}
 
-    end
-
-    describe "targets" do
-
+    describe "targets" do # {{{
       it "should handle splits without a target" do # {{{
         session = @layout.compile!
         session.windows.last.splits.last.target.should == nil
@@ -100,20 +92,30 @@ describe Teamocil::Layout do
         session = @layout.compile!
         session.windows.last.splits.first.target.should == "bottom-right"
       end # }}}
+    end # }}}
 
-    end
-
-    describe "sessions" 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
+  context "generating commands" do
+    before do # {{{
+      @layout = Teamocil::Layout.new(layouts["two-windows"], {})
+    end # }}}
 
+    it "should generate commands" do #{{{
+      session = @layout.compile!
+      commands = session.windows.last.splits[0].generate_commands
+      commands.length.should == 2
+      commands.first.should == "tmux send-keys -t 0 \"export TEAMOCIL=1 && cd \"/bar\" && echo 'bar' && echo 'bar in an array'\""
+      commands.last.should == "tmux send-keys -t 0 Enter"
+    end # }}}
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamocil
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000Z
+date: 2012-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4268793689318262582
+      hash: 83380787884678327
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4268793689318262582
+      hash: 83380787884678327
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.18