tmuxinator 0.3.4 → 0.4.0

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
 group :development do
-  gem "rspec", "~> 2.1.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "rspec",   "~> 2.6.0"
+  gem "bundler", "~> 1.0.18"
+  gem "jeweler", "~> 1.6.4"
+  gem "rcov",    "~> 0.9.10"
 end

data/Gemfile.lock

@@ -1,28 +1,28 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rake (0.9.2)
+    rcov (0.9.10)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
-  rcov
-  rspec (~> 2.1.0)
+  bundler (~> 1.0.18)
+  jeweler (~> 1.6.4)
+  rcov (~> 0.9.10)
+  rspec (~> 2.6.0)

data/README.md

@@ -11,10 +11,6 @@ Create and manage tmux sessions easily. Inspired by Jon Druse's ([Screeninator](
 
     $ gem install tmuxinator
 
-Then follow the instructions.  You just have to drop a line in your ~/.bashrc file, similar to RVM if you've used that before:
-
-    [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
-
 ## Editor and Shell
 
 tmuxinator uses your shell's default editor for opening files.  If you're not sure what that is type:
@@ -26,7 +22,11 @@ If you want to change your default editor simple put a line in ~/.bashrc that ch
 
     export EDITOR='mate -w'
 
-It also uses $SHELL variable. which is always set by your shell.
+## Environment Integration
+
+Add this to your ~/.bashrc (or similar)
+
+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
 
 ## Usage
 
@@ -78,17 +78,15 @@ you can define your own panes inside a window likes this:
 
 ## Starting a project
 
-    $ start_project_name
+    $ start_[project_name]
 
-This will fire up tmux with all the tabs you configured.
+## Shorthand
 
-### Limitations ###
+You can also use this shorthand alias for tmuxinator 
 
-After you create a project, you will have to open a new shell window. This is because tmuxinator adds an
-alias to bash (or any other shell you use, like zsh) to open tmux with the project config. You can reload your shell rc file
-instead of openning a new window like this, for instance in bash you could do this:
+    $ mux [command/project_name]
 
-    $ source ~/.bashrc
+This will fire up tmux with all the tabs you configured.
 
 ## Other Commands
 
@@ -97,11 +95,6 @@ instead of openning a new window like this, for instance in bash you could do th
 Copy an existing project. aliased to `c`
 
 
-    $ tmuxinator update_scripts
-
-Re-create the tmux scripts and aliases from the configs. Use this only if you edit your project configs outside of tmuxinator, i.e. not using "tmuxinator open xxx".
-
-
     $ tmuxinator list
 
 List all the projects you have configured. aliased to `l`
@@ -143,14 +136,22 @@ I would love to hear your feedback on this project!  Send me a message!
 * [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)
 
 
 ## History
+###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)
+* Config files are now rendered JIT (Thanks to Dane O'Connor)
+* Can now start sessions from cli (Thanks to Dane O'Connor)
+
 ###v. 0.3.0
-* added pre command (Thanks to Ian Yang)
-* added multiple pre command (Thanks to Bjørn Arild Mæland)
-* using tmux set default-path for project root
-* new aliases
+* Added pre command (Thanks to Ian Yang)
+* Added multiple pre command (Thanks to Bjørn Arild Mæland)
+* Using tmux set default-path for project root
+* New aliases
 
 ###v. 0.2.0
 * added pane support (Thanks to Aaron Spiegel)

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/bin/mux

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+require 'tmuxinator'
+
+Tmuxinator::Cli.run(*ARGV)

data/bin/tmuxinator

@@ -3,4 +3,4 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(_
 
 require 'tmuxinator'
 
-Tmuxinator::Cli.start(*ARGV)
+Tmuxinator::Cli.run(*ARGV)

data/lib/tmuxinator/cli.rb

@@ -6,7 +6,7 @@ module Tmuxinator
     class << self
       include Tmuxinator::Helper
 
-      def start *args
+      def run *args
         if args.empty?
           self.usage
         else
@@ -17,17 +17,19 @@ module Tmuxinator
       # print the usage string, this is a fall through method.
       def usage
         puts %{
-  Usage: tmuxinator ACTION [Arg]
+  Usage: tmuxinator ACTION [Arg] 
+  or 
+  tmuxinator [project_name]
 
   ACTIONS:
+  start [project_name]
+      start a tmux session using project's tmuxinator config
   open [project_name]
       create a new project file and open it in your editor
   copy [source_project] [new_project]
       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]
@@ -48,7 +50,6 @@ module Tmuxinator
         exit!("You must specify a name for the new project") unless args.size > 0
         puts "warning: passing multiple arguments to open will be ignored" if args.size > 1
         @name = args.shift
-        FileUtils.mkdir_p(root_dir+"scripts")
         config_path = "#{root_dir}#{@name}.yml"
         unless File.exists?(config_path)
           template = File.exists?(user_config) ? user_config : "#{File.dirname(__FILE__)}/assets/sample.yml"
@@ -56,7 +57,6 @@ module Tmuxinator
           tmp      = File.open(config_path, 'w') {|f| f.write(erb) }
         end
         system("$EDITOR #{config_path}")
-        update_scripts
       end
       alias :o :open
       alias :new :open
@@ -125,33 +125,30 @@ module Tmuxinator
       end
       alias :v :version
 
-      def update_scripts
-        Dir["#{root_dir}*.tmux"].each {|p| FileUtils.rm(p) }
-        aliases = []
-        Dir["#{root_dir}*.yml"].each do |path|
-          aliases << Tmuxinator::ConfigWriter.new(path).write!
-        end
-        Tmuxinator::ConfigWriter.write_aliases(aliases)
-      end
-
       def doctor
-        print "  cheking if tmux is installed ==> "
+        print "  checking if tmux is installed ==> "
         puts system("which tmux > /dev/null") ?  "Yes" : "No"
-        print "  cheking if $EDITOR is set ==> "
+        print "  checking if $EDITOR is set ==> "
         puts ENV['EDITOR'] ? "Yes" : "No"
-        print "  cheking if $SHELL is set ==> "
+        print "  checking if $SHELL is set ==> "
         puts ENV['SHELL'] ? "Yes" : "No"
-        puts %{
-  make sure you have this line in your ~/.bashrc file:
-
-  [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
-
+      end
 
-}
+      # build script and run it
+      def start *args
+        exit!("You must specify a name for the new project") unless args.size > 0
+        puts "warning: passing multiple arguments to open will be ignored" if args.size > 1
+        project_name = args.shift
+        config_path = "#{root_dir}#{project_name}.yml"
+        config = Tmuxinator::ConfigWriter.new(config_path).render
+        # replace current proccess by running compiled tmux config
+        exec(config)
       end
+      alias :s :start
 
       def method_missing method, *args, &block
-        puts "There's no command called #{method} in tmuxinator"
+        start method if File.exists?("#{root_dir}#{method}.yml")
+        puts "There's no command or project '#{method}' in tmuxinator"
         usage
       end
 

data/lib/tmuxinator/config_writer.rb

@@ -5,10 +5,6 @@ module Tmuxinator
 
     include Tmuxinator::Helper
 
-    def self.write_aliases aliases
-      File.open("#{ENV["HOME"]}/.tmuxinator/scripts/tmuxinator", 'w') {|f| f.write(aliases.join("\n")) }
-    end
-
     def initialize this_full_path=nil
       self.file_path = this_full_path if this_full_path
     end
@@ -21,10 +17,11 @@ module Tmuxinator
 
     def write!
       raise "Unable to write with out a file_name defined" unless self.file_name
-      erb         = ERB.new(IO.read(TMUX_TEMPLATE)).result(binding)
-      tmp         = File.open(config_path, 'w') {|f| f.write(erb) }
+      tmp = File.open(config_path, 'w') {|f| f.write(render) }
+    end
 
-      "alias start_#{file_name}='$SHELL #{config_path}'"
+    def render
+      ERB.new(IO.read(TMUX_TEMPLATE)).result(binding)
     end
 
     def config_path
@@ -38,7 +35,11 @@ module Tmuxinator
     end
 
     def process_config!
-      yaml = YAML.load(File.read(file_path))
+      begin 
+        yaml = YAML.load(File.read(file_path))
+      rescue
+        exit!("Invalid YAML file format.")
+      end
 
       exit!("Your configuration file should include some tabs.")        if yaml["tabs"].nil?
       exit!("Your configuration file didn't specify a 'project_root'")  if yaml["project_root"].nil?
@@ -71,10 +72,6 @@ module Tmuxinator
     def parse_tabs tab_list
     end
 
-    def write_alias stuff
-      File.open("#{root_dir}scripts/#{@filename}", 'w') {|f| f.write(stuff) }
-    end
-
     def shell_escape str
       "'#{str.to_s.gsub("'") { %('\'') }}'"
     end

data/spec/tmuxinator_spec.rb

@@ -28,7 +28,7 @@ describe Tmuxinator::ConfigWriter do
     its(:project_root){ should eql '~/code/rails_project' }
     its(:rvm){ should eql '1.9.2@rails_project' }
     its(:tabs){ should be_an Array  }
-    its(:pre){ should eql 'sudo /etc/rc.d/mysqld start' }
+    its(:pre){ should eql 'rvm use 1.9.2@rails_project && sudo /etc/rc.d/mysqld start' }
 
     let(:first_tab){ subject.tabs[0] }
 

data/tmuxinator.gemspec

@@ -4,16 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{tmuxinator}
-  s.version = "0.3.4"
+  s.name = "tmuxinator"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Allen Bargi"]
-  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}
-  s.executables = ["tmuxinator"]
+  s.date = "2011-09-15"
+  s.description = "Create and manage complex tmux sessions easily."
+  s.email = "allen.bargi@gmail.com"
+  s.executables = ["mux", "tmuxinator"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md",
@@ -28,6 +27,7 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "bin/mux",
     "bin/tmuxinator",
     "lib/tmuxinator.rb",
     "lib/tmuxinator/assets/sample.yml",
@@ -39,56 +39,32 @@ Gem::Specification.new do |s|
     "spec/tmuxinator_spec.rb",
     "tmuxinator.gemspec"
   ]
-  s.homepage = %q{http://github.com/aziz/tmuxinator}
+  s.homepage = "http://github.com/aziz/tmuxinator"
   s.licenses = ["MIT"]
-  s.post_install_message = %q{
-  __________________________________________________________
-  ..........................................................
-
-  Thank you for installing tmuxinator
-  Please be sure to to drop a line in your ~/.bashrc file, similar 
-  to RVM if you've used that before:
-
-  [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
-  
-  also ensure that you've set these variables in your ENV:
-  
-  $EDITOR, $SHELL
-  
-  you can run `tmuxinator doctor` to make sure everything is set.
-  happy tmuxing with tmuxinator!
-
-  ..........................................................
-  __________________________________________________________
-  
-  }
+  s.post_install_message = "\n  __________________________________________________________\n  ..........................................................\n\n  Thank you for installing tmuxinator\n  Please be sure to to drop a line in your ~/.bashrc file, similar \n  to RVM if you've used that before:\n\n  [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator\n  \n  also ensure that you've set these variables in your ENV:\n  \n  $EDITOR, $SHELL\n  \n  you can run `tmuxinator doctor` to make sure everything is set.\n  happy tmuxing with tmuxinator!\n\n  ..........................................................\n  __________________________________________________________\n  \n  "
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Create and manage complex tmux sessions easily.}
-  s.test_files = [
-    "spec/spec_helper.rb",
-    "spec/tmuxinator_spec.rb"
-  ]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Create and manage complex tmux sessions easily."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.18"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, ["~> 0.9.10"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.18"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, ["~> 0.9.10"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.18"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, ["~> 0.9.10"])
   end
 end
 

metadata

@@ -1,73 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tmuxinator
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.4
 platform: ruby
-authors: 
+authors:
 - Allen Bargi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 +02:00
-default_executable: tmuxinator
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70303485891940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.1.0
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70303485891940
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70303485890000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70303485890000
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70303485888060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.1
+      - !ruby/object:Gem::Version
+        version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70303485888060
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70303485886260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *70303485886260
 description: Create and manage complex tmux sessions easily.
 email: allen.bargi@gmail.com
-executables: 
+executables:
+- mux
 - tmuxinator
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
 - TODO
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -76,6 +74,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/mux
 - bin/tmuxinator
 - lib/tmuxinator.rb
 - lib/tmuxinator/assets/sample.yml
@@ -87,37 +86,39 @@ files:
 - spec/tmuxinator_spec.rb
 - tmuxinator.gemspec
 - TODO
-has_rdoc: true
 homepage: http://github.com/aziz/tmuxinator
-licenses: 
+licenses:
 - MIT
-post_install_message: "\n  __________________________________________________________\n  ..........................................................\n\n  Thank you for installing tmuxinator\n  Please be sure to to drop a line in your ~/.bashrc file, similar \n  to RVM if you've used that before:\n\n  [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator\n  \n  also ensure that you've set these variables in your ENV:\n  \n  $EDITOR, $SHELL\n  \n  you can run `tmuxinator doctor` to make sure everything is set.\n  happy tmuxing with tmuxinator!\n\n  ..........................................................\n  __________________________________________________________\n  \n  "
+post_install_message: ! "\n  __________________________________________________________\n
+  \ ..........................................................\n\n  Thank you for
+  installing tmuxinator\n  Please be sure to to drop a line in your ~/.bashrc file,
+  similar \n  to RVM if you've used that before:\n\n  [[ -s $HOME/.tmuxinator/scripts/tmuxinator
+  ]] && source $HOME/.tmuxinator/scripts/tmuxinator\n  \n  also ensure that you've
+  set these variables in your ENV:\n  \n  $EDITOR, $SHELL\n  \n  you can run `tmuxinator
+  doctor` to make sure everything is set.\n  happy tmuxing with tmuxinator!\n\n  ..........................................................\n
+  \ __________________________________________________________\n  \n  "
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2643811095432789154
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3765836133335404318
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Create and manage complex tmux sessions easily.
-test_files: 
-- spec/spec_helper.rb
-- spec/tmuxinator_spec.rb
+test_files: []