teamocil 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 091deeb28007d69a9455c585912c8b3d221cc319
-  data.tar.gz: 1967badb6034dcc1863a8cc7bc2389134d9fc4b0
+  metadata.gz: 7dcef230e6b52430c6fd283000e6ecffd28e45d9
+  data.tar.gz: 6359ec6cb545a88e2325f16449d07302f346fb6a
 SHA512:
-  metadata.gz: e75c6ee981986b7aa1a7acba303bd513ce32a824041b1b90b4f35efc8f0f6911f3ef723692362fd34b68d120e373cb9d9ab198d502f81bec82f07d3d795c65c9
-  data.tar.gz: 6bd7bb1932a23ac163f2fca2f7b4b716739dc8cd7c42bc0c2ea932abcc96b7c3d5c2b3352aadaa5c18a6d5f12ab9e5fdae075d1e445dd040761a927b3794adf4
+  metadata.gz: e80f9d9750d444a6323d146d48c074f33dde63fd0cdf7e674d924fb03d72912109f8092eac2fd98a83e07f64d5c259173d859b05ba38a05018370ed4624c095e
+  data.tar.gz: 3e90ff56c60c676f8616f33b896849bc4c912d3878f11af411b0845f6dc3caaa30b460716f8afc80b1f3d1787e943a403af5913eee6b5f9f24355798896c1adb

data/README.md

@@ -60,8 +60,11 @@ The downside of that is that several features were dropped during the rewrite
 process, mostly because I didn’t actually use/need them and I got tired of
 maintaining features I don’t think are useful.
 
-But hey, that’s just my opinion. Feel free to fork the repository and add as
-many features as you want :smile:.
+You *might* have to clean up your layout files after upgrading to 1.0. I’m
+sorry about that. The documentation in `README.md` should help you find which
+keys are now supported.
+
+Feel free to fork the repository and add back as many features as you want :)
 
 ## Configuration
 
@@ -122,8 +125,10 @@ windows:
     layout: main-vertical
     panes:
       - vim
+      - commands:
+        - git pull
+        - git status
       - rails server
-      - git status
 ```
 
 ```

data/lib/teamocil.rb

@@ -27,6 +27,7 @@ require 'teamocil/command/split_window'
 require 'teamocil/tmux/session'
 require 'teamocil/tmux/window'
 require 'teamocil/tmux/pane'
+require 'teamocil/tmux/options'
 
 module Teamocil
   class << self
@@ -47,6 +48,10 @@ module Teamocil
     Kernel.system(*args)
   end
 
+  def self.query_system(command)
+    `#{command}`
+  end
+
   def self.parse_options!(arguments: nil)
     parser = OptionParser.new(arguments: arguments)
     @options = parser.parsed_options

data/lib/teamocil/cli.rb

@@ -6,10 +6,10 @@ module Teamocil
       Teamocil.parse_options!(arguments: arguments)
 
       # List available layouts
-      return Layout.print_available_layouts(directory: root) if Teamocil.options[:list]
+      return Teamocil::Layout.print_available_layouts(directory: root) if Teamocil.options[:list]
 
       # Fetch the Layout object
-      layout = Layout.new(path: layout_file_path)
+      layout = Teamocil::Layout.new(path: layout_file_path)
 
       # Open layout file in $EDITOR
       return layout.edit! if Teamocil.options[:edit]

data/lib/teamocil/layout.rb

@@ -46,7 +46,7 @@ module Teamocil
       end
 
       if valid?
-        Session.new(yaml_content)
+        Teamocil::Tmux::Session.new(yaml_content)
       else
         Teamocil.bail("The layout at `#{path}` is not valid.")
       end

data/lib/teamocil/tmux/options.rb

@@ -0,0 +1,15 @@
+module Teamocil
+  module Tmux
+    class Options
+      def self.fetch_option(option, default: nil)
+        value = Teamocil.query_system("tmux show-options -gv #{option}").chomp
+        value.empty? ? default : value.to_i
+      end
+
+      def self.fetch_window_option(option, default: nil)
+        value = Teamocil.query_system("tmux show-window-options -gv #{option}").chomp
+        value.empty? ? default : value.to_i
+      end
+    end
+  end
+end

data/lib/teamocil/tmux/pane.rb

@@ -1,15 +1,13 @@
 module Teamocil
-  class Pane < ClosedStruct.new(:index, :root, :commands, :focus)
-    def as_tmux
-      [].tap do |tmux|
-        tmux << Command::SplitWindow.new(root: root) unless first?
-        tmux << Command::SendKeysToPane.new(index: index, keys: commands.join('; '))
-        tmux << Command::SendKeysToPane.new(index: index, keys: 'Enter')
+  module Tmux
+    class Pane < ClosedStruct.new(:index, :root, :commands, :focus, :first)
+      def as_tmux
+        [].tap do |tmux|
+          tmux << Teamocil::Command::SplitWindow.new(root: root) unless first
+          tmux << Teamocil::Command::SendKeysToPane.new(index: index, keys: commands.join('; '))
+          tmux << Teamocil::Command::SendKeysToPane.new(index: index, keys: 'Enter')
+        end
       end
     end
-
-    def first?
-      index == 1
-    end
   end
 end

data/lib/teamocil/tmux/session.rb

@@ -1,27 +1,34 @@
 module Teamocil
-  class Session < ClosedStruct.new(:name, :windows)
-    def initialize(object)
-      super
+  module Tmux
+    class Session < ClosedStruct.new(:name, :windows)
+      def initialize(object)
+        super
 
-      # Sessions need a name
-      self.name = "teamocil-session-#{rand(1_000_000)}" unless name
+        # Sessions need a name
+        self.name = "teamocil-session-#{rand(1_000_000)}" unless name
 
-      self.windows = windows.each_with_index.map do |window, index|
-        # Windows need to know their position
-        window.merge! index: index + 1
+        self.windows = windows.each_with_index.map do |window, index|
+          # Windows need to know their position
+          window.merge! index: index + window_base_index
+          window.merge! first: index.zero?
 
-        Window.new(window)
+          Teamocil::Tmux::Window.new(window)
+        end
       end
-    end
 
-    def as_tmux
-      [].tap do |tmux|
-        tmux << Command::RenameSession.new(name: name)
-        tmux << windows.map(&:as_tmux)
+      def as_tmux
+        [].tap do |tmux|
+          tmux << Teamocil::Command::RenameSession.new(name: name)
+          tmux << windows.map(&:as_tmux)
+
+          # Set the focus on the right window or do nothing
+          focused_window = windows.find(&:focus)
+          tmux << Teamocil::Command::SelectWindow.new(index: focused_window.index) if focused_window
+        end
+      end
 
-        # Set the focus on the right window or do nothing
-        focused_window = windows.find(&:focus)
-        tmux << Command::SelectWindow.new(index: focused_window.index) if focused_window
+      def window_base_index
+        @window_base_index ||= Teamocil::Tmux::Options.fetch_option('base-index', default: 0)
       end
     end
   end

data/lib/teamocil/tmux/window.rb

@@ -1,46 +1,49 @@
 module Teamocil
-  class Window < ClosedStruct.new(:index, :root, :focus, :layout, :name, :panes)
-    def initialize(object)
-      super
+  module Tmux
+    class Window < ClosedStruct.new(:index, :root, :focus, :layout, :name, :panes, :first)
+      def initialize(object)
+        super
 
-      self.panes ||= splits
-      self.panes = panes.each_with_index.map do |pane, index|
-        # Support single command instead of `commands` key in Hash
-        pane = { commands: [pane] } if pane.is_a?(String)
+        self.panes ||= splits
+        self.panes = panes.each_with_index.map do |pane, index|
+          # Support single command instead of `commands` key in Hash
+          pane = { commands: [pane] } if pane.is_a?(String)
 
-        # Panes need to know their position
-        pane.merge! index: index + 1
+          # Panes need to know their position
+          pane.merge! index: index + pane_base_index
+          pane.merge! first: index.zero?
 
-        # Panes need know the window root directory
-        pane.merge! root: root
+          # Panes need know the window root directory
+          pane.merge! root: root
 
-        Pane.new(pane)
+          Teamocil::Tmux::Pane.new(pane)
+        end
       end
-    end
-
-    def first?
-      index == 1
-    end
 
-    def as_tmux
-      [].tap do |tmux|
-        # Rename the current window or create a new one
-        if Teamocil.options[:here] && first?
-          tmux << Command::RenameWindow.new(name: name)
-        else
-          tmux << Command::NewWindow.new(name: name, root: root)
+      def as_tmux
+        [].tap do |tmux|
+          # Rename the current window or create a new one
+          if Teamocil.options[:here] && first
+            tmux << Teamocil::Command::RenameWindow.new(name: name)
+          else
+            tmux << Teamocil::Command::NewWindow.new(name: name, root: root)
+          end
+
+          # Execute all panes commands
+          tmux << panes.map(&:as_tmux)
+
+          # Select the window layout
+          tmux << Teamocil::Command::SelectLayout.new(layout: layout)
+
+          # Set the focus on the right pane or the first one
+          focused_pane = panes.find(&:focus)
+          focused_index = focused_pane ? focused_pane.index : pane_base_index
+          tmux << Teamocil::Command::SelectPane.new(index: focused_index)
         end
+      end
 
-        # Execute all panes commands
-        tmux << panes.map(&:as_tmux)
-
-        # Select the window layout
-        tmux << Command::SelectLayout.new(layout: layout)
-
-        # Set the focus on the right pane or the first one
-        focused_pane = panes.find(&:focus)
-        focused_index = focused_pane ? focused_pane.index : 0
-        tmux << Command::SelectPane.new(index: focused_index)
+      def pane_base_index
+        @pane_base_index ||= Teamocil::Tmux::Options.fetch_window_option('pane-base-index', default: 0)
       end
     end
   end

data/lib/teamocil/version.rb

@@ -1,3 +1,3 @@
 module Teamocil
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teamocil
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,7 @@ files:
 - lib/teamocil/command/send_keys_to_pane.rb
 - lib/teamocil/command/split_window.rb
 - lib/teamocil/layout.rb
+- lib/teamocil/tmux/options.rb
 - lib/teamocil/tmux/pane.rb
 - lib/teamocil/tmux/session.rb
 - lib/teamocil/tmux/window.rb