tmuxinator 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5de7720390215b793f31f51f77dbe10c522378c
-  data.tar.gz: 1c2c93aad4563f698c2eeb06bcf5be2ebb1b7cd1
+  metadata.gz: 28b230df62265cc9e7487c362882d6724503c430
+  data.tar.gz: 2e4aa507c3a1e5d0918244b0147c54d0b8dcca3e
 SHA512:
-  metadata.gz: 3ecbcccfdc487684a71e64824f6249f8a36faf0bd52543e1cb6a28a1c58f01632212d427ea0de70c273c845f886a41c0257cb9b76b68cdc0dfaafa2175d852b2
-  data.tar.gz: 1c90f9b5e57663e9afb95f726c8d2fcc684061f3b8bb5c3f43296acf9dde912a77b54b06b290905586743f866775b2a4afdad9e133e71bfbd72d9fc0522821fe
+  metadata.gz: e397db0f981a7524b9106c4b47f2616aa5aff1486079c023ae8feacb936e8ee37b5617c60af5bebdfb03f354fd13063ccf6ca4cda9fd033dacacb01d5184f46f
+  data.tar.gz: 0540b6d4bf2a5c1ab271368ad4d64393a469e380bdab750fefe8957fd3a14764c8cad5fa71be59ad61a9c7a15576453cffa1762a3a221729353fe7d32bda4585

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
+  - "2.1.2"
 env:
   - TMUX_VERSION=master
   - TMUX_VERSION=1.9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.6.8
+- Remove some duplication #212
+- Add wemux support #88 - Thanks to Andrew Thal (@athal7)
+- Fix typos in readme #217, #216
+- Fix encoding bug #229
+- Fix specs not running due to changes in thor
+
 ## 0.6.7
 - Remove use of grep for base-index #171
 - Fix bugs in `Tmuxinator::Config.default?` #169

data/README.md

@@ -115,7 +115,7 @@ windows:
 
 ## Windows
 
-The windows option allows the specfication of any number of tmux windows. Each window is denoted by a YAML array entry, followed by a name
+The windows option allows the specification of any number of tmux windows. Each window is denoted by a YAML array entry, followed by a name
 and command to be run.
 
 ```
@@ -125,8 +125,8 @@ windows:
 
 ## Panes
 
-**_Note that if you wish to use panes, make sure that you do not have `.` in your project name. tmux uses `.` to delimit between window and pane indicies,
-and tmuxinator uses the project name in combination with these indicies to target the correct pane or window._**
+**_Note that if you wish to use panes, make sure that you do not have `.` in your project name. tmux uses `.` to delimit between window and pane indices,
+and tmuxinator uses the project name in combination with these indices to target the correct pane or window._**
 
 Panes are optional and are children of window entries, but unlike windows, they do not need a name. In the following example, the `editor` window has 2 panes, one running vim, the other guard.
 
@@ -188,7 +188,7 @@ tmuxinator start [project]
 
 ## Shorthand
 
-An shorthand alias for tmuxinator can also be used.
+A shorthand alias for tmuxinator can also be used.
 
 ```
 mux [command]

data/lib/tmuxinator.rb

@@ -5,6 +5,7 @@ require "thor"
 
 require "tmuxinator/util"
 require "tmuxinator/deprecations"
+require "tmuxinator/wemux_support"
 require "tmuxinator/cli"
 require "tmuxinator/config"
 require "tmuxinator/pane"

data/lib/tmuxinator/assets/wemux_template.erb

@@ -0,0 +1,54 @@
+#!<%= ENV["SHELL"] || "/bin/bash" %>
+wemux ls 2>/dev/null
+
+if [ "$?" -eq 127 ]; then
+  cd <%= root || "." %>
+
+  # Run pre command.
+  <%= pre %>
+
+  # Create the session and the first window.
+  TMUX= <%= tmux %> new-session -d -s <%= name %> -n <%= windows.first.name %>
+
+  # Set the default path.
+  <%= tmux %> set-option -t <%= name %> default-path <%= root.shellescape -%> 1>/dev/null
+
+  # Create other windows.
+  <%- windows.drop(1).each do |window| -%>
+  <%= window.tmux_new_window_command %>
+  <%- end -%>
+
+  <%- windows.each do |window| -%>
+
+  # Window "<%= window.name %>"
+    <%- unless window.panes? -%>
+  <%= window.tmux_pre_window_command %>
+    <%- window.commands.each do |command| -%>
+  <%= command %>
+    <%- end -%>
+    <%- else -%>
+      <%- window.panes.each do |pane| -%>
+  <%= pane.tmux_pre_window_command %>
+  <%= pane.tmux_pre_command %>
+    <%- if pane.multiple_commands? %>
+          <%- pane.commands.each do |command| -%>
+  <%= pane.tmux_main_command(command) %>
+          <%- end -%>
+        <%- else -%>
+  <%= pane.tmux_main_command(commands.first) %>
+        <%- end -%>
+
+      <%- unless pane.last? -%>
+  <%= pane.tmux_split_command %>
+      <%- end -%>
+  <%= window.tmux_layout_command %>
+    <%- end -%>
+
+  <%= window.tmux_select_first_pane %>
+    <%- end -%>
+  <%- end -%>
+
+  <%= tmux %> select-window -t <%= base_index %>
+fi
+
+wemux attach

data/lib/tmuxinator/cli.rb

@@ -121,11 +121,7 @@ module Tmuxinator
     def list
       say "tmuxinator projects:"
 
-      configs = Dir["#{Tmuxinator::Config.root}/*.yml"].sort.map do |path|
-        path.gsub("#{Tmuxinator::Config.root}/", "").gsub(".yml", "")
-      end
-
-      print_in_columns configs
+      print_in_columns Tmuxinator::Config.configs
     end
 
     desc "version", "Display installed tmuxinator version"

data/lib/tmuxinator/config.rb

@@ -52,9 +52,13 @@ module Tmuxinator
         "#{File.dirname(__FILE__)}/assets/template.erb"
       end
 
+      def wemux_template
+        "#{File.dirname(__FILE__)}/assets/wemux_template.erb"
+      end
+
       def configs
         Dir["#{Tmuxinator::Config.root}/*.yml"].sort.map do |path|
-          path.gsub("#{Tmuxinator::Config.root}/", "").gsub(".yml", "")
+          File.basename(path, ".yml")
         end
       end
 

data/lib/tmuxinator/project.rb

@@ -2,11 +2,13 @@ module Tmuxinator
   class Project
     include Tmuxinator::Util
     include Tmuxinator::Deprecations
+    include Tmuxinator::WemuxSupport
 
     attr_reader :yaml
 
     def initialize(yaml)
       @yaml = yaml
+      load_wemux_overrides if wemux?
     end
 
     def render
@@ -157,7 +159,7 @@ module Tmuxinator
       options_hash = {}
 
       options_string = `#{show_tmux_options}`
-
+      options_string.encode!("UTF-8", :invalid => :replace)
       options_string.split("\n").map do |entry|
         key, value = entry.split("\s")
         options_hash[key] = value

data/lib/tmuxinator/version.rb

@@ -1,3 +1,3 @@
 module Tmuxinator
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/lib/tmuxinator/wemux_support.rb

@@ -0,0 +1,24 @@
+module Tmuxinator
+  module WemuxSupport
+    def wemux?
+      yaml["tmux_command"] == "wemux"
+    end
+
+    def load_wemux_overrides
+      self.instance_eval do
+        def render
+          template = File.read(Tmuxinator::Config.wemux_template)
+          Erubis::Eruby.new(template).result(binding)
+        end
+
+        def name
+          "wemux"
+        end
+
+        def tmux
+          "wemux"
+        end
+      end
+    end
+  end
+end

data/spec/factories/projects.rb

@@ -14,4 +14,12 @@ FactoryGirl.define do
 
     initialize_with { Tmuxinator::Project.new(file) }
   end
+
+  factory :wemux_project, :class => Tmuxinator::Project do
+    ignore do
+      file { YAML.load(File.read("#{File.expand_path("spec/fixtures/sample_wemux.yml")}")) }
+    end
+
+    initialize_with { Tmuxinator::Project.new(file) }
+  end
 end

data/spec/fixtures/sample_wemux.yml

@@ -0,0 +1,37 @@
+# ~/.tmuxinator/sample_wemux.yml
+# you can make as many tabs as you wish...
+
+name: sample
+root: ~/test
+pre: sudo /etc/rc.d/mysqld start # Runs before everything
+pre_window: rbenv shell 2.0.0-p247 # Runs in each tab and pane
+tmux_options: -f ~/.tmux.mac.conf # Pass arguments to tmux
+tmux_command: wemux
+windows:
+  - editor:
+      pre:
+        - echo "I get run in each pane, before each pane command!"
+        -
+      layout: main-vertical
+      panes:
+        - vim
+        - #empty, will just run plain bash
+        - top
+  - shell:
+    - git pull
+    - git merge
+  - guard:
+      layout: tiled
+      pre:
+        - echo "I get run in each pane."
+        - echo "Before each pane command!"
+      panes:
+        -
+        - #empty, will just run plain bash
+        -
+  - database: bundle exec rails db
+  - server: bundle exec rails s
+  - logs: tail -f log/development.log
+  - console: bundle exec rails c
+  - capistrano:
+  - server: ssh user@example.com

data/spec/lib/tmuxinator/cli_spec.rb

@@ -110,7 +110,7 @@ describe Tmuxinator::Cli do
 
     context "new project already exists" do
       before do
-        $stdin.stub(:gets => "y")
+        Thor::LineEditor.stub(:readline => "y")
       end
 
       it "prompts user to confirm overwrite" do
@@ -152,7 +152,7 @@ describe Tmuxinator::Cli do
   describe "#delete" do
     before do
       ARGV.replace(["delete", "foo"])
-      $stdin.stub(:gets => "y")
+      Thor::LineEditor.stub(:readline => "y")
     end
 
     context "project exists" do
@@ -160,10 +160,6 @@ describe Tmuxinator::Cli do
         Tmuxinator::Config.stub(:exists?) { true }
       end
 
-      it "confirms deletion" do
-        capture_io { cli.start }
-      end
-
       it "deletes the project" do
         expect(FileUtils).to receive(:rm)
         capture_io { cli.start }
@@ -172,7 +168,7 @@ describe Tmuxinator::Cli do
 
     context "project doesn't exist" do
       before do
-        $stdin.stub(:gets => "y")
+        Thor::LineEditor.stub(:readline => "y")
       end
 
       it "exits with error message" do
@@ -184,11 +180,11 @@ describe Tmuxinator::Cli do
   describe "#implode" do
     before do
       ARGV.replace(["implode"])
-      $stdin.stub(:gets => "y")
+      Thor::LineEditor.stub(:readline => "y")
     end
 
     it "confirms deletion of all projects" do
-      expect($stdin).to receive(:gets).and_return("y")
+      expect(Thor::LineEditor).to receive(:readline).and_return("y")
       capture_io { cli.start }
     end
 

data/spec/lib/tmuxinator/project_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 describe Tmuxinator::Project do
   let(:project) { FactoryGirl.build(:project) }
   let(:project_with_deprecations) { FactoryGirl.build(:project_with_deprecations) }
+  let(:wemux_project) { FactoryGirl.build(:wemux_project) }
 
   describe "#initialize" do
     context "valid yaml" do
@@ -16,6 +17,12 @@ describe Tmuxinator::Project do
     it "renders the tmux config" do
       expect(project.render).to_not be_empty
     end
+
+    context "wemux" do
+      it "renders the wemux config" do
+        expect(wemux_project.render).to_not be_empty
+      end
+    end
   end
 
   describe "#windows" do
@@ -58,6 +65,12 @@ describe Tmuxinator::Project do
         expect(project_with_deprecations.name).to eq "sample"
       end
     end
+
+    context "wemux" do
+      it "is wemux" do
+        expect(wemux_project.name).to eq "wemux"
+      end
+    end
   end
 
   describe "#pre_window" do

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ end
 require "tmuxinator"
 require "factory_girl"
 
+
 FactoryGirl.find_definitions
 
 RSpec.configure do |config|
@@ -21,18 +22,21 @@ end
 
 # Copied from minitest.
 def capture_io
-  require 'stringio'
+  begin
+    require 'stringio'
+
+    captured_stdout, captured_stderr = StringIO.new, StringIO.new
 
-  orig_stdout, orig_stderr = $stdout, $stderr
-  captured_stdout, captured_stderr = StringIO.new, StringIO.new
-  $stdout, $stderr = captured_stdout, captured_stderr
+    orig_stdout, orig_stderr = $stdout, $stderr
+    $stdout, $stderr         = captured_stdout, captured_stderr
 
-  yield
+    yield
 
-  return captured_stdout.string, captured_stderr.string
-ensure
-  $stdout = orig_stdout
-  $stderr = orig_stderr
+    return captured_stdout.string, captured_stderr.string
+  ensure
+    $stdout = orig_stdout
+    $stderr = orig_stderr
+  end
 end
 
 def tmux_config(options = {})

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Allen Bargi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Create and manage complex tmux sessions easily.
@@ -159,9 +159,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -176,6 +176,7 @@ files:
 - lib/tmuxinator.rb
 - lib/tmuxinator/assets/sample.yml
 - lib/tmuxinator/assets/template.erb
+- lib/tmuxinator/assets/wemux_template.erb
 - lib/tmuxinator/cli.rb
 - lib/tmuxinator/config.rb
 - lib/tmuxinator/deprecations.rb
@@ -183,10 +184,12 @@ files:
 - lib/tmuxinator/project.rb
 - lib/tmuxinator/util.rb
 - lib/tmuxinator/version.rb
+- lib/tmuxinator/wemux_support.rb
 - lib/tmuxinator/window.rb
 - spec/factories/projects.rb
 - spec/fixtures/sample.deprecations.yml
 - spec/fixtures/sample.yml
+- spec/fixtures/sample_wemux.yml
 - spec/lib/tmuxinator/cli_spec.rb
 - spec/lib/tmuxinator/config_spec.rb
 - spec/lib/tmuxinator/pane_spec.rb
@@ -210,17 +213,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Create and manage complex tmux sessions easily.
@@ -228,6 +231,7 @@ test_files:
 - spec/factories/projects.rb
 - spec/fixtures/sample.deprecations.yml
 - spec/fixtures/sample.yml
+- spec/fixtures/sample_wemux.yml
 - spec/lib/tmuxinator/cli_spec.rb
 - spec/lib/tmuxinator/config_spec.rb
 - spec/lib/tmuxinator/pane_spec.rb