moved tmuxinator_completion to bin directory

.gitignore

@@ -5,6 +5,6 @@ doc
 .bundle
 pkg
 TODO
-
+.rake_tasks~
 # vim swaps
 .*.sw[a-z]

README.md

@@ -1,10 +1,10 @@
 # Tmuxinator
 
-Create and manage tmux sessions easily. Inspired by Jon Druse's ([Screeninator](https://github.com/jondruse/screeninator)) and Arthur Chiu's ([Terminitor](http://github.com/achiu/terminitor))
+Create and manage tmux sessions easily.
 
 ## Example
 
-![Sample](http://f.cl.ly/items/3e3I1l1t3D2U472n1h0h/Screen%20shot%202010-12-10%20at%2010.59.17%20PM.png)
+![Screenshot](http://f.cl.ly/items/3e3I1l1t3D2U472n1h0h/Screen%20shot%202010-12-10%20at%2010.59.17%20PM.png)
 
 
 ## Installation
@@ -29,20 +29,16 @@ Add this to your ~/.bashrc (or similar)
 
 [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
 
-For command line completion you can put the `tmuxinator_completion` file somewhere in your `$HOME` path and add the following to your `~/.bashrc`
+For command line completion you can put the `tmuxinator_completion` file somewhere in your `$HOME` path and add the
+ following to your `~/.bashrc`
 
     source ~/bin/completions/tmuxinator_completion
 
 That will auto-complete `tmuxinator` commands, plus your `.yml` config files.
 
-It will also add a couple of aliases to your environment:
-
-* `mux` or `tmuxinator` + Tab: for commands.
-* `muxo` + Tab: for `.yml` configs.
 
 ## Usage
 
-
 ### Create a project ###
 
     $ tmuxinator new project_name
@@ -54,6 +50,7 @@ Create or edit your projects with this command, for editing you can also use `tm
 
     project_name: Tmuxinator
     project_root: ~/code/rails_project
+    socket_name: foo # Not needed. Remove to use default socket
     rvm: 1.9.2@rails_project
     pre: sudo /etc/rc.d/mysqld start
     tabs:
@@ -87,7 +84,6 @@ you can define your own panes inside a window likes this:
           - #empty, will just run plain bash
           - top
 
-
 ## Starting a project
 
     $ start_[project_name]
@@ -137,22 +133,18 @@ shows tmuxinator's help. aliased to `h`
 
 ## Questions? Comments? Feature Request?
 
-I would love to hear your feedback on this project!  Send me a message!
+I would love to hear your feedback on this project! head over to [issues](https://github.com/aziz/tmuxinator/issues) and
+lets
 
-## Contributors:
-
-* [Aaron Spiegel](https://github.com/spiegela)
-* [Jay Adkisson](https://github.com/jayferd)
-* [Chris Lerum](https://github.com/chrislerum)
-* [David Bolton](https://github.com/lightningdb)
-* [Thibault Duplessis](https://github.com/ornicar)
-* [Ian Yang](https://github.com/doitian)
-* [Bjørn Arild Mæland](https://github.com/bmaland)
-* [Dane O'Connor](https://github.com/thedeeno)
-* [Eric Marden](https://github.com/xentek)
+## Contributors
 
+[See the full list of contributors](https://github.com/aziz/tmuxinator/contributors)
 
 ## History
+### v. 0.5.0
+* Added optional socket name support (Thanks to Adam Walters)
+* Added auto completion (Thanks to Jose Pablo Barrantes)
+
 ###v. 0.4.0
 * Does not crash if given an invalid yaml file format. report it and exit gracefully.
 * Removed clunky scripts & shell aliases (Thanks to Dane O'Connor)
@@ -169,6 +161,10 @@ I would love to hear your feedback on this project!  Send me a message!
 * added pane support (Thanks to Aaron Spiegel)
 * RVM support (Thanks to Jay Adkisoon)
 
+## Inspiration and Thanks
+
+Inspired by Jon Druse's ([Screeninator](https://github.com/jondruse/screeninator)) and Arthur Chiu's ([Terminitor](http://github.com/achiu/terminitor))
+
 ## Contributing to tmuxinator
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
@@ -177,8 +173,9 @@ I would love to hear your feedback on this project!  Send me a message!
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is
+  otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 ## Copyright
 
-Copyright (c) 2010 Allen Bargi. See LICENSE.txt for further details.
+Copyright (c) 2010--2011 Allen Bargi. See LICENSE.txt for further details.

VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

bin/tmuxinator_completion

@@ -25,8 +25,5 @@ _tmuxinator_open_complete()
   return 0
 }
 
-alias mux='tmuxinator'
-alias muxo='tmuxinator open'
-
 complete -F _tmuxinator_commands_complete -o default tmuxinator mux
 complete -F _tmuxinator_open_complete -o default muxo

lib/tmuxinator/cli.rb

@@ -35,11 +35,11 @@ module Tmuxinator
   list [-v]
       list all existing projects
   doctor
-	  look for problems in your configuration
+    look for problems in your configuration
   help
       shows this help document
   version
-
+      shows tmuxinator version number
 }
       end
       alias :help :usage
@@ -52,7 +52,7 @@ module Tmuxinator
         @name = args.shift
         config_path = "#{root_dir}#{@name}.yml"
         unless File.exists?(config_path)
-          template = File.exists?(user_config) ? user_config : "#{File.dirname(__FILE__)}/assets/sample.yml"
+          template = File.exists?(user_config) ? user_config : sample_config
           erb      = ERB.new(File.read(template)).result(binding)
           tmp      = File.open(config_path, 'w') {|f| f.write(erb) }
         end
@@ -155,6 +155,8 @@ module Tmuxinator
       private #==============================
 
       def root_dir
+        # create ~/.tmuxinator directory if it doesn't exist
+        Dir.mkdir("#{ENV["HOME"]}/.tmuxinator/") unless File.directory?(File.expand_path("~/.tmuxinator"))
         "#{ENV["HOME"]}/.tmuxinator/"
       end