teamocil 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjRlMmZkZDgyZjIzYzMzOWE2YWRjZmFhNDBmMGQ0YjkxZTMxNThlNg==
+    ODJmMjkwMjQ4MmNjMzY2NjczMzBhNGI0NWFmOWRjMzVmNjFmZGQ1NA==
   data.tar.gz: !binary |-
-    NWNjNDBiNGEzOGNhYjc0OTUyN2YyZDQzOWZkMGY3ZTI3ZmI3NDU3OA==
+    NTgzZDZmMDkwNTlkOWY0NGU1MjQ5ZDJhY2FhMTExYTU4ZGY1ZmQ0YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGExNzQ2NDg4NmIzNzIyMWI0YTc1NDFlMmU3YmQ4Y2YwY2I2MGFmYTcyYTRk
-    NWZjZjQxYjIzNjg3OTc3YjNkN2ZkM2Q2ODQyOWQ3NjYwNWUzYWE2MjE1M2Nl
-    YmM3YmRkNWM1YjIyZWFiNTk1MGQ4YTI5ZWQyNWNkMGNiZjQ4MzY=
+    Y2YwMDYyNGM4ZmQ5ODQwMjA1MTBiZDUyNDVjYjE3MDQ4MWJkNmQ3NjAyZjcz
+    MGQ5MjE0NWYyNTUxMDRkMjBhMDFkYTdkMzFkMmUxNTI2YmJkOWJiNThlMTk2
+    NTZmYzViZjFiY2JkMTdmMWIxNmYwOWE0YWViNTM5Y2I5MDdkMWY=
   data.tar.gz: !binary |-
-    ZDY1MGFjMzE0YjZkMjkyZGU1NmM0NDg3MGNiZDkxZjU0MTEyOTI4MTQ5Y2Rj
-    MTg4OGJhMzUxMDA3MWM4NDY1NjM5OGI5YWVjZWU4YTBjYjJjNmFiMDQ4Mjll
-    NGMxMDQ5MTc3YzAxNjQ2ZTkzOTk2MmViMGViN2MwYTQzNjg1Mjg=
+    ODhkNDZkMWNmMTc5NzM3YTdiM2ViZjAxYmQyZTg0MmRiN2ZlY2U1MmQ4OTc1
+    ZWZjODE1MzEyNTIxNjhmMTA4ODc0NDM3NTQ2NDlhODlmMWIxOGQ3YmZlYTc1
+    YTYwMjkyMTNiYjVjNDBjMzcxMTJjYjdkNzBlMjFlZjY0NGZlNzI=

data/README.md

@@ -231,9 +231,11 @@ windows:
 
 Feel free to contribute and submit issues/pull requests [on GitHub](https://github.com/remiprev/teamocil/issues), just like these fine folks did:
 
-* Samuel Garneau ([garno](https://github.com/garno))
-* Jimmy Bourassa ([jbourassa](https://github.com/jbourassa))
-* Brandon Dimcheff ([bdimcheff](https://github.com/bdimcheff))
+* [@garno](https://github.com/garno)
+* [@jbourassa](https://github.com/jbourassa)
+* [@bdimcheff](https://github.com/bdimcheff)
+* [@jscheel](https://github.com/jscheel)
+* [@mklappstuhl](https://github.com/mklappstuhl)
 
 Take a look at the `spec` folder before you do, and make sure `bundle exec rake spec` passes after your modifications :)
 

data/lib/teamocil/cli.rb

@@ -24,7 +24,7 @@ module Teamocil
 
       if @options[:edit]
         ::FileUtils.touch file unless File.exists?(file)
-        Kernel.system("$EDITOR \"#{file}\"")
+        Kernel.system("${EDITOR:-vim} \"#{file}\"")
       elsif @options[:show]
         ::FileUtils.touch file unless File.exists?(file)
         Kernel.system("cat \"#{file}\"")

data/lib/teamocil/layout/pane.rb

@@ -48,10 +48,15 @@ module Teamocil
         @cmd.unshift "cd \"#{@window.root}\"" unless @window.root.nil?
 
         # Set the TEAMOCIL environment variable
-        @cmd.unshift "export TEAMOCIL=1"
+        # depending on the shell set in ENV
+        if ENV['SHELL'].scan(/fish/).empty?
+          @cmd.unshift "export TEAMOCIL=1"
+        else
+          @cmd.unshift "set -gx TEAMOCIL 1"
+        end
 
         # Execute each pane command
-        commands << "tmux send-keys -t #{@index} \"#{@cmd.flatten.compact.join(" && ")}\""
+        commands << "tmux send-keys -t #{@index} \"#{@cmd.flatten.compact.join("; ")}\""
         commands << "tmux send-keys -t #{@index} Enter"
 
         commands

data/lib/teamocil/layout/session.rb

@@ -10,7 +10,7 @@ module Teamocil
       # @param attrs [Hash] the session data from the layout file
       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"
+        @name = attrs["name"] || "teamocil-session-#{rand(10000) + 1}"
         @windows = attrs["windows"].each_with_index.map { |window, window_index| Window.new(self, window_index, window) }
         @options = options
       end

data/lib/teamocil/version.rb

@@ -1,3 +1,3 @@
 module Teamocil
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/cli_spec.rb

@@ -13,7 +13,7 @@ describe Teamocil::CLI do
     context "not in tmux" 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}")
+        Kernel.should_receive(:system).with("${EDITOR:-vim} #{File.join(@fake_env["HOME"], ".teamocil", "my-layout.yml").inspect}")
         Teamocil::CLI.new(["--edit", "my-layout"], @fake_env)
       end
     end

data/spec/layout_spec.rb

@@ -3,7 +3,10 @@ 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) }
+  before do
+    Teamocil::Layout::Window.any_instance.stub(:pane_base_index).and_return(window_pane_base_index)
+    ENV.stub(:[]).with("SHELL").and_return("/usr/bin/bash")
+  end
 
   context "compiling" do
     before do
@@ -145,6 +148,12 @@ describe Teamocil::Layout do
         session.windows.length.should == 3
         session.name.should == "my awesome session"
       end
+
+      it "should assign a random name if none is provided" do
+        layout = Teamocil::Layout.new(layouts["two-windows"], {})
+        session = layout.compile!
+        session.name.should match /teamocil-session-\d+/
+      end
     end
   end
 
@@ -155,13 +164,13 @@ describe Teamocil::Layout do
       session = @layout.compile!
       commands = session.windows.last.panes[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.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"
 
       session = @layout.compile!
       commands = session.windows.first.panes[0].generate_commands
       commands.length.should == 2
-      commands.first.should == "tmux send-keys -t 0 \"export TEAMOCIL=1 && cd \"/foo\" && clear && echo 'foo'\""
+      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
 
@@ -175,8 +184,17 @@ describe Teamocil::Layout do
     it "should apply the layout after each pane is created" do
       session = @layout.compile!
       commands = session.windows.first.generate_commands
-      commands[1][0].should == ["tmux send-keys -t 0 \"export TEAMOCIL=1 && cd \"/foo\" && clear && echo 'foo'\"", "tmux send-keys -t 0 Enter", "tmux select-layout \"tiled\""]
-      commands[1][1].should == ["tmux split-window", "tmux send-keys -t 1 \"export TEAMOCIL=1 && cd \"/foo\" && clear && echo 'foo again'\"", "tmux send-keys -t 1 Enter", "tmux select-layout \"tiled\""]
+      commands[1][0].should == ["tmux send-keys -t 0 \"export TEAMOCIL=1; cd \"/foo\"; clear; echo 'foo'\"", "tmux send-keys -t 0 Enter", "tmux select-layout \"tiled\""]
+      commands[1][1].should == ["tmux split-window", "tmux send-keys -t 1 \"export TEAMOCIL=1; cd \"/foo\"; clear; echo 'foo again'\"", "tmux send-keys -t 1 Enter", "tmux select-layout \"tiled\""]
+    end
+
+    it "should use fish syntax when fish shell is default shell" do
+      ENV.stub(:[]).with("SHELL").and_return("/usr/local/bin/fish")
+      session = @layout.compile!
+      commands = session.windows.last.panes[0].generate_commands
+      commands.length.should == 2
+      commands.first.should == "tmux send-keys -t 0 \"set -gx TEAMOCIL 1; cd \"/bar\"; echo 'bar'; echo 'bar in an array'\""
+      commands.last.should == "tmux send-keys -t 0 Enter"
     end
 
     context "with custom pane-base-index option" do
@@ -186,7 +204,7 @@ describe Teamocil::Layout do
         session = @layout.compile!
         commands = session.windows.last.panes[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.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teamocil
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake