tmuxinator 0.3.3 → 0.3.4

data/README.md

@@ -116,6 +116,10 @@ Remove a project
 
 Remove all tmuxinator configs, aliases and scripts. aliased to `i`
 
+	$ tmuxinator doctor
+
+Examines your environment and identifies problems with your configuration
+
 
     $ tmuxinator version
 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/tmuxinator/assets/tmux_config.tmux

@@ -4,9 +4,8 @@ tmux start-server
 if ! $(tmux has-session -t <%=s @project_name %>); then
 cd <%= @project_root || "." %>
 <%= @pre.kind_of?(Array) ? @pre.join(" && ") : @pre %>
-tmux new-session -d -s <%=s @project_name %> -n <%=s @tabs[0].name %>
-tmux set default-path <%= @project_root %>
-tmux set-option base-index 1
+env TMUX= tmux start-server \; set-option -g base-index 1 \; new-session -d -s <%=s @project_name %> -n <%=s @tabs[0].name %>
+tmux set-option -t <%=s @project_name %> default-path <%= @project_root %>
 
 <% @tabs[1..-1].each_with_index do |tab, i| %>
 tmux new-window -t <%= window(i+2) %> -n <%=s tab.name %>
@@ -35,4 +34,4 @@ if [ -z $TMUX ]; then
     tmux -u attach-session -t <%=s @project_name %>
 else
     tmux -u switch-client -t <%=s @project_name %>
-fi
+fi

data/lib/tmuxinator/cli.rb

@@ -26,10 +26,14 @@ module Tmuxinator
       copy source_project project file to a new project called new_project
   delete [project_name]
       deletes the project called project_name
+  update_scripts
+	  re-create the tmux scripts and aliases from the configs
   implode
       deletes all existing projects!
   list [-v]
       list all existing projects
+  doctor
+	  look for problems in your configuration
   help
       shows this help document
   version

data/lib/tmuxinator/config_writer.rb

@@ -47,30 +47,22 @@ module Tmuxinator
       @project_name = yaml["project_name"]
       @project_root = yaml["project_root"]
       @rvm          = yaml["rvm"]
-      @pre          = yaml["pre"]
+      @pre          = build_command(yaml["pre"])
       @tabs         = []
 
       yaml["tabs"].each do |tab|
         t       = OpenStruct.new
         t.name  = tab.keys.first
         value   = tab.values.first
+
         case value
-        when Array
-          value.unshift "rvm use #{@rvm}" if @rvm
-          t.command = value.join(" && ")
-        when String
-          value = "rvm use #{@rvm} && #{value}" if @rvm
-          t.command = value
         when Hash
           t.panes = (value["panes"] || ['']).map do |pane|
-            if pane.is_a? Array
-              pane.unshift! "rvm use #{@rvm}" if @rvm
-              pane = pane.join(' && ')
-            end
-            pane = "rvm use #{@rvm} && #{pane}" if @rvm
-            pane
+            build_command(pane)
           end
           t.layout = value["layout"]
+        else
+          t.command = build_command(value)
         end
         @tabs << t
       end
@@ -96,6 +88,15 @@ module Tmuxinator
       return '' unless cmd
       "tmux send-keys -t #{window(window_number)} #{s cmd} C-m"
     end
+
+    def build_command(value)
+      commands = [value].flatten.compact.reject { |c| c.strip.empty? }
+      if @rvm
+        commands.unshift "rvm use #{@rvm}"
+      end
+
+      commands.join ' && '
+    end
   end
 
 end

data/tmuxinator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tmuxinator}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Allen Bargi"]
-  s.date = %q{2011-05-24}
+  s.date = %q{2011-06-20}
   s.default_executable = %q{tmuxinator}
   s.description = %q{Create and manage complex tmux sessions easily.}
   s.email = %q{allen.bargi@gmail.com}

metadata

@@ -2,7 +2,7 @@
 name: tmuxinator
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Allen Bargi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 +02:00
+date: 2011-06-20 00:00:00 +02:00
 default_executable: tmuxinator
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4535080839714727474
+      hash: -2643811095432789154
       segments: 
       - 0
       version: "0"