teamocil 1.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e796389d4b59a72b6642f344e17ced9c0cb23c74
-  data.tar.gz: 06955132e6bb74b8a7aaf0d7d6d0d50223386143
+  metadata.gz: fbc2a7a64a9c84296d75836e76bde8167f824f6b
+  data.tar.gz: 0e60909ca4da8bca1f843f8ce505a0c85789954a
 SHA512:
-  metadata.gz: 7a060e6b0799fd16adf75dad62064ba7ec794c4fffba5188e1314705c9fdf16a5928033a9fbcf4eb223846bbd452bb8a10cb0e523f51538ce69653a194c8a0e1
-  data.tar.gz: bb07d7f9fcfddd7828bc155ab0dedff75264f57c69e60955d5b2ca2be699880ea4a44b0b523a338aa30b87d0818585415730d5659bbf9369e0bc4306511caba7
+  metadata.gz: b0711544e6cd410e1fe5a92e17d10028be600b23469bc26aed3ac89bae78f0533f2629de278dc25049c8bafb6fc12710b95ffd84a23cfda04882342e1ec5e64e
+  data.tar.gz: 21fc9ccf1157485e005a0267aa2a1ea15b8a3c133a5c0ee4bf4cbbcd3df06096a8654d4959c603d638e3ad7d9bd81304a4b527ba460ff891a2b90cb7a47d36c5

data/.travis.yml

@@ -1,6 +1,9 @@
+sudo: false
+
 rvm:
-  - 2.0.0
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
 
 script:
   - 'echo "Checking code style" && bundle exec phare'

data/LICENSE.md

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

@@ -79,7 +79,7 @@ The [`0.4-stable` branch](https://github.com/remiprev/teamocil/tree/0.4-stable)
 
 | Key       | Description
 |-----------|----------------------------
-| `name`    | The tmux window name
+| `name`    | The tmux window name _(required)_
 | `root`    | The path where all panes in the window will be started
 | `layout`  | The layout that will be set after all panes are created by Teamocil
 | `panes`   | An `Array` of panes
@@ -230,6 +230,16 @@ To get autocompletion when typing `teamocil <Tab>` in a bash session, add this l
 complete -W "$(teamocil --list)" teamocil
 ```
 
+### Fish autocompletion
+
+To get autocompletion when typing `teamocil <Tab>` in a fish session,
+add the following file `~/.config/fish/completions/teamocil.fish` with
+the following content:
+
+```fish
+complete -x -c teamocil -a '(teamocil --list)'
+```
+
 ## Contributors
 
 Feel free to contribute and submit issues/pull requests
@@ -244,6 +254,6 @@ folks did:
 
 ## License
 
-Teamocil is © 2011-2015 [Rémi Prévost](http://exomel.com) and may be freely
+Teamocil is © 2011-2016 [Rémi Prévost](http://exomel.com) and may be freely
 distributed under the [MIT license](https://github.com/remiprev/teamocil/blob/master/LICENSE.md).
 See the `LICENSE.md` file for more information.

data/lib/teamocil/tmux/window.rb

@@ -7,6 +7,7 @@ module Teamocil
         # Make sure paths like `~/foo/bar` work
         self.root = File.expand_path(root) if root
 
+        self.options ||= {}
         self.panes ||= []
         self.panes = panes.each_with_index.map do |pane, index|
           # Support single command instead of `commands` key in Hash
@@ -30,33 +31,18 @@ module Teamocil
 
       def as_tmux
         [].tap do |tmux|
-          # Rename the current window or create a new one
-          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
-
-          # Set window options
-          if options
-            tmux << options.map do |(option, value)|
-              Teamocil::Command::SetWindowOption.new(name: name, option: option, value: value)
-            end
-          end
+          # Create a new window or use the current one
+          tmux << spawn_window_commands
+
+          # Set specific window options
+          tmux << set_window_options_commands
 
           # Execute all panes commands
           tmux << panes.map(&:as_tmux).flatten
 
           # Set the focus on the right pane or the first one
-          focused_pane = panes.find(&:focus)
-          focused_index = focused_pane ? focused_pane.internal_index : "#{name}.#{Teamocil::Tmux::Pane.pane_base_index}"
-          tmux << Teamocil::Command::SelectPane.new(index: focused_index)
+          tmux << focus_pane_commands
+
         end.flatten
       end
 
@@ -78,6 +64,36 @@ module Teamocil
 
     protected
 
+      def spawn_window_commands
+        if Teamocil.options[:here] && first?
+          change_working_directory_commands << Teamocil::Command::RenameWindow.new(name: name)
+        else
+          Teamocil::Command::NewWindow.new(name: name, root: root)
+        end
+      end
+
+      def set_window_options_commands
+        options.map do |(option, value)|
+          Teamocil::Command::SetWindowOption.new(name: name, option: option, value: value)
+        end
+      end
+
+      def focus_pane_commands
+        focused_pane = panes.find(&:focus)
+        focused_index = focused_pane ? focused_pane.internal_index : "#{name}.#{Teamocil::Tmux::Pane.pane_base_index}"
+
+        Teamocil::Command::SelectPane.new(index: focused_index)
+      end
+
+      def change_working_directory_commands
+        return [] unless root
+        pane_index = panes.any? ? panes.first.internal_index : Teamocil::Tmux::Pane.pane_base_index
+
+        [%(cd "#{root}"), 'Enter'].map do |keys|
+          Teamocil::Command::SendKeysToPane.new(index: pane_index, keys: keys)
+        end
+      end
+
       def first?
         index.zero?
       end

data/lib/teamocil/version.rb

@@ -1,3 +1,3 @@
 module Teamocil
-  VERSION = '1.4'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teamocil
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.4.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Teamocil is a simple tool used to automatically create windows and panes