tmuxinator 0.6.10.pre → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf9390018701842df43e662ae82659def0a7493
-  data.tar.gz: 57c891da937c5418bec18526d553fb2e1c6c7953
+  metadata.gz: ab460ec84cf4b9f4c3d6cbb6e80e21533657708b
+  data.tar.gz: 3afe10dbb7aef84ffca0703f6b5a91f6ba42af95
 SHA512:
-  metadata.gz: eeabb93033c3714f2fe4778e7c6a1da3b29fa4256163364bf6009807176f422d49233d7a4e61aee6448acb96682f1f1cebdeadef9b262fbc3365d050c684780c
-  data.tar.gz: 1907c39aab69f71534513707cd437d04cf06c042bf021a0cd5e0b1135bb03fbdca440d00fdabb11a158d7cb6f4e1d40bdea7d4f6c0e922ffb7552478a94b5cde
+  metadata.gz: 5ae774646eaa73bd3c08439a0ca6c9df1cbcac3e845e9d276a77a76759f2e6496c4eaa5f9bed078a9c3fb46d80f7c261d8327eb58652592d5663350c20204bc2
+  data.tar.gz: aadf6b72458ea3808703b46fa95fbda6958c8e8cf9d683ddcfe4dff8558bf63bfea7dec282685c2b32e6da49840b400173187fff5b91888d75f424ed13c409a9

data/bin/mux

@@ -7,7 +7,7 @@ require "tmuxinator"
 if ARGV.length == 1
   name = ARGV[0]
 
-  if Tmuxinator::Cli.new.command_hash.keys.include?(name.to_sym)
+  if Tmuxinator::Cli::COMMANDS.keys.include?(name.to_sym)
     Tmuxinator::Cli.start
   elsif Tmuxinator::Config.exists?(name)
     Tmuxinator::Cli.new.start(name)

data/bin/tmuxinator

@@ -7,7 +7,7 @@ require "tmuxinator"
 if ARGV.length == 1
   name = ARGV[0]
 
-  if Tmuxinator::Cli.new.command_hash.keys.include?(name.to_sym)
+  if Tmuxinator::Cli::COMMANDS.keys.include?(name.to_sym)
     Tmuxinator::Cli.start
   elsif Tmuxinator::Config.exists?(name)
     Tmuxinator::Cli.new.start(name)

data/lib/tmuxinator/assets/sample.yml

@@ -18,6 +18,9 @@ root: ~/
 # Change the command to call tmux.  This can be used by derivatives/wrappers like byobu.
 # tmux_command: byobu
 
+# Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used.
+# startup_window: logs
+
 windows:
   - editor:
       layout: main-vertical

data/lib/tmuxinator/assets/template.erb

@@ -13,7 +13,11 @@ if [ "$?" -eq 1 ]; then
   <%= pre %>
 
   # Create the session and the first window.
+  <%- if windows.first.root? -%>
+  TMUX= <%= tmux %> new-session -d -s <%= name %> -n <%= windows.first.name %> <%= Tmuxinator::Config.default_path_option %> <%= windows.first.root %>
+  <%- else -%>
   TMUX= <%= tmux %> new-session -d -s <%= name %> -n <%= windows.first.name %>
+  <%- end -%>
 
   <%- if Tmuxinator::Config.version < 1.7 -%>
   # Set the default path for versions prior to 1.7
@@ -57,7 +61,7 @@ if [ "$?" -eq 1 ]; then
     <%- end -%>
   <%- end -%>
 
-  <%= tmux %> select-window -t <%= base_index %>
+  <%= tmux %> select-window -t <%= startup_window %>
 fi
 
 if [ -z "$TMUX" ]; then

data/lib/tmuxinator/assets/wemux_template.erb

@@ -50,7 +50,7 @@ if [ "$?" -eq 127 ]; then
     <%- end -%>
   <%- end -%>
 
-  <%= tmux %> select-window -t <%= base_index %>
+  <%= tmux %> select-window -t <%= startup_window %>
 fi
 
 wemux attach

data/lib/tmuxinator/cli.rb

@@ -2,44 +2,38 @@ module Tmuxinator
   class Cli < Thor
     include Tmuxinator::Util
 
-    attr_reader :command_hash
-
-    def initialize(*args)
-      super
-
-      @command_hash = {
-        commands: "Lists commands available in tmuxinator",
-        completions: "Used for shell completion",
-        new: "Create a new project file and open it in your editor",
-        open: "Alias of new",
-        start: "Start a tmux session using a project's tmuxinator config",
-        debug: "Output the shell commands that are generated by tmuxinator",
-        copy: "Copy an existing project to a new project and open it in your editor",
-        delete: "Deletes given project",
-        implode: "Deletes all tmuxinator projects",
-        version: "Display installed tmuxinator version",
-        doctor: "Look for problems in your configuration"
-      }
-
-    end
+    COMMANDS = {
+      commands: "Lists commands available in tmuxinator",
+      completions: "Used for shell completion",
+      new: "Create a new project file and open it in your editor",
+      open: "Alias of new",
+      start: "Start a tmux session using a project's tmuxinator config",
+      debug: "Output the shell commands that are generated by tmuxinator",
+      copy: "Copy an existing project to a new project and open it in your editor",
+      delete: "Deletes given project",
+      implode: "Deletes all tmuxinator projects",
+      version: "Display installed tmuxinator version",
+      doctor: "Look for problems in your configuration",
+      list: "Lists all tmuxinator projects"
+    }
 
     package_name "tmuxinator" unless Gem::Version.create(Thor::VERSION) < Gem::Version.create("0.18")
 
-    desc "commands", "Lists commands available in tmuxinator"
+    desc "commands", COMMANDS[:commands]
 
     def commands(shell = nil)
       out = if shell == "zsh"
-        command_hash.map do |command, desc|
+        COMMANDS.map do |command, desc|
           "#{command}:#{desc}"
         end.join("\n")
       else
-        command_hash.keys.join("\n")
+        COMMANDS.keys.join("\n")
       end
 
       puts out
     end
 
-    desc "completions [arg1 arg2]", "Used for shell completion"
+    desc "completions [arg1 arg2]", COMMANDS[:completions]
 
     def completions(arg)
       if %w(start open copy delete).include?(arg)
@@ -48,9 +42,11 @@ module Tmuxinator
       end
     end
 
-    desc "new [PROJECT]", "Create a new project file and open it in your editor"
+    desc "new [PROJECT]", COMMANDS[:new]
     map "open" => :new
+    map "edit" => :new
     map "o" => :new
+    map "e" => :new
     map "n" => :new
 
     def new(name)
@@ -65,7 +61,7 @@ module Tmuxinator
       Kernel.system("$EDITOR #{config}") || doctor
     end
 
-    desc "start [PROJECT]", "Start a tmux session using a project's tmuxinator config"
+    desc "start [PROJECT]", COMMANDS[:start]
     map "s" => :start
 
     def start(name)
@@ -81,14 +77,14 @@ module Tmuxinator
       Kernel.exec(project.render)
     end
 
-    desc "debug [PROJECT]", "Output the shell commands that are generated by tmuxinator"
+    desc "debug [PROJECT]", COMMANDS[:debug]
 
     def debug(name)
       project = Tmuxinator::Config.validate(name)
       puts project.render
     end
 
-    desc "copy [EXISTING] [NEW]", "Copy an existing project to a new project and open it in your editor"
+    desc "copy [EXISTING] [NEW]", COMMANDS[:copy]
     map "c" => :copy
     map "cp" => :copy
 
@@ -106,7 +102,7 @@ module Tmuxinator
       Kernel.system("$EDITOR #{new_config_path}")
     end
 
-    desc "delete [PROJECT]", "Deletes given project"
+    desc "delete [PROJECT]", COMMANDS[:delete]
     map "d" => :delete
     map "rm" => :delete
 
@@ -123,7 +119,7 @@ module Tmuxinator
       end
     end
 
-    desc "implode", "Deletes all tmuxinator projects"
+    desc "implode", COMMANDS[:implode]
     map "i" => :implode
 
     def implode
@@ -133,7 +129,7 @@ module Tmuxinator
       end
     end
 
-    desc "list", "Lists all tmuxinator projects"
+    desc "list", COMMANDS[:list]
     map "l" => :list
     map "ls" => :list
 
@@ -143,14 +139,14 @@ module Tmuxinator
       print_in_columns Tmuxinator::Config.configs
     end
 
-    desc "version", "Display installed tmuxinator version"
+    desc "version", COMMANDS[:version]
     map "-v" => :version
 
     def version
       say "tmuxinator #{Tmuxinator::VERSION}"
     end
 
-    desc "doctor", "Look for problems in your configuration"
+    desc "doctor", COMMANDS[:doctor]
 
     def doctor
       say "Checking if tmux is installed ==> "

data/lib/tmuxinator/config.rb

@@ -44,7 +44,7 @@ module Tmuxinator
 
       def project(name)
         projects = Dir.glob("#{root}/**/*.yml")
-        project_file = projects.detect { |project| project =~ /^#{name}.yml$/ }
+        project_file = projects.detect { |project| File.basename(project, ".yml") == name }
         project_file || "#{root}/#{name}.yml"
       end
 
@@ -71,7 +71,7 @@ module Tmuxinator
         config_path = Tmuxinator::Config.project(name)
 
         yaml = begin
-          YAML.load(File.read(config_path))
+          YAML.load(Erubis::Eruby.new(File.read(config_path)).result(binding))
         rescue SyntaxError, StandardError
           puts "Failed to parse config file. Please check your formatting."
           exit!

data/lib/tmuxinator/pane.rb

@@ -26,7 +26,8 @@ module Tmuxinator
     end
 
     def tmux_split_command
-      "#{project.tmux} splitw -t #{tab.tmux_window_target}"
+      path = tab.root? ? "#{Tmuxinator::Config.default_path_option} #{tab.root}" : nil
+      "#{project.tmux} splitw #{path} -t #{tab.tmux_window_target}"
     end
 
     def last?

data/lib/tmuxinator/project.rb

@@ -95,6 +95,10 @@ module Tmuxinator
       get_pane_base_index ? get_pane_base_index.to_i : get_base_index.to_i
     end
 
+    def startup_window
+      yaml["startup_window"] || base_index
+    end
+
     def tmux_options?
       yaml["tmux_options"]
     end

data/lib/tmuxinator/version.rb

@@ -1,3 +1,3 @@
 module Tmuxinator
-  VERSION = "0.6.10.pre"
+  VERSION = "0.6.10"
 end

data/lib/tmuxinator/window.rb

@@ -2,10 +2,11 @@ module Tmuxinator
   class Window
     include Tmuxinator::Util
 
-    attr_reader :name, :panes, :layout, :commands, :index, :project
+    attr_reader :name, :root, :panes, :layout, :commands, :index, :project
 
     def initialize(window_yaml, index, project)
       @name = !window_yaml.keys.first.nil? ? window_yaml.keys.first.shellescape : nil
+      @root = nil
       @panes = []
       @layout = nil
       @pre = nil
@@ -17,6 +18,7 @@ module Tmuxinator
       if value.is_a?(Hash)
         @layout = value["layout"] ? value["layout"].shellescape : nil
         @pre = value["pre"] if value["pre"]
+        @root = value["root"] ? File.expand_path(value["root"]).shellescape : project.root? ? project.root : nil
 
         @panes = build_panes(value["panes"])
       else
@@ -58,6 +60,10 @@ module Tmuxinator
       end
     end
 
+    def root?
+      !root.nil?
+    end
+
     def panes?
       panes.any?
     end
@@ -75,7 +81,7 @@ module Tmuxinator
     end
 
     def tmux_new_window_command
-      path = project.root? ? "#{Tmuxinator::Config.default_path_option} #{File.expand_path(project.root)}" : nil
+      path = root? ? "#{Tmuxinator::Config.default_path_option} #{root}" : nil
       "#{project.tmux} new-window #{path} -t #{tmux_window_target} -n #{name}"
     end
 

data/spec/factories/projects.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :project, :class => Tmuxinator::Project do
-    ignore do
+    transient do
       file { YAML.load(File.read("#{File.expand_path("spec/fixtures/sample.yml")}")) }
     end
 
@@ -8,7 +8,7 @@ FactoryGirl.define do
   end
 
   factory :project_with_deprecations, :class => Tmuxinator::Project do
-    ignore do
+    transient do
       file { YAML.load(File.read("#{File.expand_path("spec/fixtures/sample.deprecations.yml")}")) }
     end
 
@@ -16,7 +16,7 @@ FactoryGirl.define do
   end
 
   factory :wemux_project, :class => Tmuxinator::Project do
-    ignore do
+    transient do
       file { YAML.load(File.read("#{File.expand_path("spec/fixtures/sample_wemux.yml")}")) }
     end
 

data/spec/lib/tmuxinator/cli_spec.rb

@@ -36,7 +36,7 @@ describe Tmuxinator::Cli do
 
     it "lists the commands" do
       out, _ = capture_io { cli.start }
-      expect(out).to eq "#{%w(commands completions new open start debug copy delete implode version doctor).join("\n")}\n"
+      expect(out).to eq "#{%w(commands completions new open start debug copy delete implode version doctor list).join("\n")}\n"
     end
   end
 

data/spec/lib/tmuxinator/project_spec.rb

@@ -206,6 +206,24 @@ describe Tmuxinator::Project do
     end
   end
 
+  describe "#startup_window" do
+    context "startup window specified" do
+      it "gets the startup window from project config" do
+        project.yaml["startup_window"] = "logs"
+
+	expect(project.startup_window).to eq("logs")
+      end
+    end
+
+    context "startup window not specified" do
+      it "returns base index instead" do
+        allow(project).to receive_messages(:base_index => 8)
+
+	expect(project.startup_window).to eq 8
+      end
+    end
+  end
+
   describe "#window" do
     it "gets the window and index for tmux" do
       expect(project.window(1)).to eq "sample:1"

data/spec/lib/tmuxinator/window_spec.rb

@@ -12,11 +12,29 @@ describe Tmuxinator::Window do
       }
     }
   end
+  let(:yaml_root) do
+    {
+      "editor" => {
+        "root" => "/project/override",
+        "root?" => true,
+        "pre" => ["echo 'I get run in each pane.  Before each pane command!'", nil],
+        "layout" => "main-vertical",
+        "panes" => panes
+      }
+    }
+  end
 
   let(:window) { Tmuxinator::Window.new(yaml, 0, project) }
+  let(:window_root) { Tmuxinator::Window.new(yaml_root, 0, project) }
 
   before do
-    allow(project).to receive_messages(:tmux => "tmux", :name => "test", :base_index => 1)
+    allow(project).to receive_messages(
+       :tmux => "tmux",
+       :name => "test",
+       :base_index => 1,
+       :root => "/project/tmuxinator",
+       :root? => true
+     )
   end
 
   describe "#initialize" do
@@ -25,6 +43,20 @@ describe Tmuxinator::Window do
     end
   end
 
+  describe "#root" do
+    context "without window root" do
+      it "gets the project root" do
+        expect(window.root).to include("/project/tmuxinator")
+      end
+    end
+
+    context "with window root" do
+      it "gets the window root" do
+        expect(window_root.root).to include("/project/override")
+      end
+    end
+  end
+
   describe "#panes" do
     let(:pane) { double(:pane) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.6.10.pre
+  version: 0.6.10
 platform: ruby
 authors:
 - Allen Bargi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor