teamocil 0.4.4 → 0.4.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTQxYzAwZGYwNjUxOWM0NmFkNjVkZmIzZjZjNTlmOTZmMjhkNWM5OQ==
-  data.tar.gz: !binary |-
-    OTEzOGEyZmQ0N2UxYjU4OTNmMTQyZTBlZjZiOWY1ZmJiMDA3NDYwMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODgwOTgyYmFlMjUzMTA4ZjNlNTlhZmJlYzEyNTdkYmQ5OTQyOGY5ZjMwMzdi
-    NzQ3ZDE2NzRjNTA3NjAwNGU2NWNhOTA0ZWU2YjY3MjAyY2I3NWRmZjljN2M1
-    Nzg5ODJhMmE4YTI3YTE4YzA3MDU0ZmRkZGE3ZDEyMTk0ZjhjNjc=
-  data.tar.gz: !binary |-
-    NDFhZjFmYWIyNTMzNjAyMTYyNjI2ODhkNDBmMWJlOGU0NjkzMGY5NTliMzA3
-    MjI5NGEzMmExOWQ3M2QzYzNiN2QwMDA3YTdiZjNhN2JjMDM5NjQ1MjRjZjY3
-    ODk1MDNhZWI0MjMyMDc3ZmJhMjM0MjIzZTYyMmFlZGViNjQyOGE=
+SHA1:
+  metadata.gz: ae4d2a262a756ec11e9a2e0f2be1c6bc8ecdfafe
+  data.tar.gz: 4e5afa56cb394b6d433d16680e304b2776ae91e2
+SHA512:
+  metadata.gz: 5373b8ca262482ad3166bd046565bf8a96f68d7ac8c93d0cc8f9ba0ca3cff1ef40c036951e656cb518d1cf7c174f4936c67159f7d8a46eae5a33ac8643cbdea8
+  data.tar.gz: d589b51c3cb65f77e3d4a78fa072a2c0206ecf7551e48d1b1a9bbd5a5358aac1fbdcc86c59a1fef3e0d66b93f4a2497539e5ca6f836d42fead7a24c2fd2c6eda

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Rémi Prévost
+Copyright (c) 2011-2014 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:
 

data/README.md

@@ -1,4 +1,7 @@
-# Teamocil [![Build Status](https://secure.travis-ci.org/remiprev/teamocil.png?branch=master)](http://travis-ci.org/remiprev/teamocil)
+# Teamocil
+
+<a href="https://rubygems.org/gems/teamocil"><img src="http://img.shields.io/gem/v/teamocil.svg" /></a>
+<a href="https://travis-ci.org/remiprev/teamocil"><img src="http://img.shields.io/travis/remiprev/teamocil.svg" /></a>
 
 Teamocil is a simple tool used to automatically create sessions, windows and panes in [tmux](http://tmux.sourceforge.net/) with YAML files.
 
@@ -241,4 +244,4 @@ Take a look at the `spec` folder before you do, and make sure `bundle exec rake
 
 ## License
 
-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.
+Teamocil is © 2011-2014 [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/cli.rb

@@ -20,6 +20,10 @@ module Teamocil
         return print_layouts
       end
 
+      if @options[:layout].nil? && argv[0].nil?
+        bail "You must supply a layout for teamocil to use. See `teamocil --help` for more options."
+      end
+
       file = @options[:layout] || ::File.join(layout_path, "#{argv[0]}.yml")
 
       if @options[:edit]
@@ -29,8 +33,8 @@ module Teamocil
         ::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"]
+        bail "There is no file \"#{file}\"." unless File.exists?(file)
+        bail "You must be in a tmux session to use teamocil." unless env["TMUX"]
 
         yaml = ERB.new(File.read(file)).result
 

data/lib/teamocil/layout/pane.rb

@@ -50,13 +50,13 @@ module Teamocil
         # Set the TEAMOCIL environment variable
         # depending on the shell set in ENV
         if ENV['SHELL'].scan(/fish/).empty?
-          @cmd.unshift "export TEAMOCIL=1"
+          @cmd.unshift "export TEAMOCIL=1" if @window.with_env_var
         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(@window.cmd_separator)}\""
         commands << "tmux send-keys -t #{@index} Enter"
 
         commands

data/lib/teamocil/layout/session.rb

@@ -22,6 +22,8 @@ module Teamocil
         commands = []
         commands << "tmux rename-session \"#{@name}\"" unless @name.nil?
         commands << @windows.map(&:generate_commands)
+        @windows.each { |w| commands << "tmux select-window -t:#{w.name}" && break if w.focus }
+        commands
       end
     end
   end

data/lib/teamocil/layout/window.rb

@@ -2,7 +2,7 @@ module Teamocil
   class Layout
     # This class represents a window within tmux
     class Window
-      attr_reader :filters, :root, :panes, :options, :index, :name, :clear, :layout
+      attr_reader :filters, :focus, :root, :panes, :options, :index, :name, :clear, :layout, :with_env_var, :cmd_separator
 
       # Initialize a new tmux window
       #
@@ -12,9 +12,12 @@ module Teamocil
       def initialize(session, index, attrs={})
         @name = attrs["name"] || "teamocil-window-#{index+1}"
         @root = attrs["root"] || "."
+        @with_env_var = attrs["with_env_var"] || (true if attrs["with_env_var"].nil?)
+        @cmd_separator = attrs["cmd_separator"] || "; "
         @clear = attrs["clear"] == true ? "clear" : nil
         @options = attrs["options"] || {}
         @layout = attrs["layout"]
+        @focus = attrs["focus"]
 
         @panes = attrs["panes"] || attrs["splits"] || []
         raise Teamocil::Error::LayoutError.new("You must specify a `panes` (or legacy `splits`) key for every window.") if @panes.empty?

data/lib/teamocil/version.rb

@@ -1,3 +1,3 @@
 module Teamocil
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/cli_spec.rb

@@ -31,9 +31,14 @@ describe Teamocil::CLI do
         @cli.layout.session.windows.last.name.should == "bar"
       end
 
+      it "fails to launch if no layout is provided" do
+        expect { @cli = Teamocil::CLI.new([], @fake_env) }.to raise_error SystemExit
+        Teamocil::CLI.messages.should include("You must supply a layout for teamocil to use. See `teamocil --help` for more options.")
+      end
+
       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")}\"")
+        Teamocil::CLI.messages.should include("There is no file \"#{File.join(File.dirname(__FILE__), "fixtures", ".teamocil", "i-do-not-exist.yml")}\".")
       end
 
       it "creates a layout from a specific file" do
@@ -46,7 +51,7 @@ describe Teamocil::CLI do
 
       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\"")
+        Teamocil::CLI.messages.should include("There is no file \"./spec/fixtures/.teamocil/i-do-not-exist.yml\".")
       end
 
       it "lists available layouts" do
@@ -67,7 +72,7 @@ describe Teamocil::CLI do
         @cli.layout.session.name.should == "sample-3"
 
         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\"")
+        Teamocil::CLI.messages.should include("There is no file \"#{@fake_env["TEAMOCIL_PATH"]}/sample.yml\".")
       end
     end
   end

data/spec/fixtures/layouts.yml

@@ -4,6 +4,7 @@ two-windows:
     - name: "foo"
       clear: true
       root: "/foo"
+      focus: true
       layout: "tiled"
       panes:
         - cmd: "echo 'foo'"
@@ -36,6 +37,30 @@ two-windows-with-filters:
         - cmd: "echo 'foo again'"
           width: 50
 
+two-windows-with-custom-command-options:
+  windows:
+    - name: "foo"
+      cmd_separator: "\n"
+      with_env_var: false
+      clear: true
+      root: "/foo"
+      layout: "tiled"
+      panes:
+        - cmd: "echo 'foo'"
+        - cmd: "echo 'foo again'"
+    - name: "bar"
+      cmd_separator: " && "
+      with_env_var: true
+      root: "/bar"
+      splits:
+        - cmd:
+          - "echo 'bar'"
+          - "echo 'bar in an array'"
+          target: bottom-right
+        - cmd: "echo 'bar again'"
+          focus: true
+          width: 50
+
 three-windows-within-a-session:
   session:
     name: "my awesome session"

data/spec/layout_spec.rb

@@ -61,6 +61,11 @@ describe Teamocil::Layout do
         session.windows[0].layout.should == "tiled"
         session.windows[1].layout.should be_nil
       end
+
+      it "handles focused windows" do
+        session = @layout.compile!
+        session.windows.first.focus.should be_true
+      end
     end
 
     describe "panes" do
@@ -208,5 +213,17 @@ describe Teamocil::Layout do
         commands.last.should == "tmux send-keys -t 2 Enter"
       end
     end
+
+    it "should not export TEAMOCIL = 1 env variable if disabled" do
+      @layout = Teamocil::Layout.new(layouts["two-windows-with-custom-command-options"], {})
+
+      session = @layout.compile!
+      commands = session.windows.first.generate_commands
+      commands[1][0].should == ["tmux send-keys -t 0 \"cd \"/foo\"\nclear\necho 'foo'\"", "tmux send-keys -t 0 Enter", "tmux select-layout \"tiled\""]
+      commands[1][1].should == ["tmux split-window", "tmux send-keys -t 1 \"cd \"/foo\"\nclear\necho 'foo again'\"", "tmux send-keys -t 1 Enter", "tmux select-layout \"tiled\""]
+
+      commands = session.windows[1].generate_commands
+      commands[1][0].should == ["tmux send-keys -t 0 \"export TEAMOCIL=1 && cd \"/bar\" && echo 'bar' && echo 'bar in an array'\"", "tmux send-keys -t 0 Enter"]
+    end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: teamocil
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Teamocil helps you set up window and pane layouts for tmux using YAML
@@ -74,8 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -114,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy session, window and pane layouts for tmux