tmuxinator 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b82c1fce5acc4afbea3917be671204b8ec18ce24
-  data.tar.gz: '06860d74aa9ccabd291d0f4e996fdfdf803600d9'
+  metadata.gz: 7855a8b99f46048a0d44b79346cd87fee6364c4a
+  data.tar.gz: 7676ef2c515adec3a19b15a056eb8e69b2f9ecde
 SHA512:
-  metadata.gz: e240783bffcbabaa05f371944a7e6654117b9ca1840e7cb2cdf736171943e740973ce8d38506d67c8cd5a8b2ebab360727f3d67b84587c2241c4850e568118ef
-  data.tar.gz: ca0fc2c809ead67680c77cbb2fff2a43d917ffaa6a89c40ed9ef2c46eef2f517611814c2b385979c18401709158e4695d602bec448d599d70148a0789d916012
+  metadata.gz: 47fba1ba5c244c5381ee93a94e48d15aaff6b8bdb36490f2897de3759c7fea3f90395868dc2194c61d86cc4458a648aba7359d6fa2b7232f334900cadf774ee5
+  data.tar.gz: bd71de3f1b6144b69d42a0d20b5900ed8d6112fb4ee608113ca71ecb2f8a6384fa7ca13fe1609715303cb7a47c5fb5921a0f7f475c2f88915d8e0fda08ab4113

data/lib/tmuxinator.rb

@@ -6,6 +6,23 @@ require "thor/version"
 require "xdg"
 require "yaml"
 
+module Tmuxinator
+  SUPPORTED_TMUX_VERSIONS = [
+    1.5,
+    1.6,
+    1.7,
+    1.8,
+    1.9,
+    2.0,
+    2.1,
+    2.2,
+    2.3,
+    2.4,
+    2.5,
+    2.6
+  ].freeze
+end
+
 require "tmuxinator/util"
 require "tmuxinator/deprecations"
 require "tmuxinator/wemux_support"
@@ -18,6 +35,3 @@ require "tmuxinator/pane"
 require "tmuxinator/project"
 require "tmuxinator/window"
 require "tmuxinator/version"
-
-module Tmuxinator
-end

data/lib/tmuxinator/config.rb

@@ -3,6 +3,7 @@ module Tmuxinator
     LOCAL_DEFAULT = "./.tmuxinator.yml".freeze
     NO_LOCAL_FILE_MSG =
       "Project file at ./.tmuxinator.yml doesn't exist.".freeze
+    TMUX_MASTER_VERSION = Float::INFINITY
 
     class << self
       # The directory (created if needed) in which to store new projects
@@ -45,7 +46,15 @@ module Tmuxinator
       end
 
       def version
-        `tmux -V`.split(" ")[1].to_f if Tmuxinator::Doctor.installed?
+        if Tmuxinator::Doctor.installed?
+          tmux_version = `tmux -V`.split(" ")[1]
+
+          if tmux_version == "master"
+            TMUX_MASTER_VERSION
+          else
+            tmux_version.to_f
+          end
+        end
       end
 
       def default_path_option

data/lib/tmuxinator/pane.rb

@@ -38,7 +38,7 @@ module Tmuxinator
     end
 
     def pane_index
-      index + tab.project.base_index
+      index + tab.project.pane_base_index
     end
 
     def tmux_split_command

data/lib/tmuxinator/project.rb

@@ -34,6 +34,11 @@ module Tmuxinator
     DEPRECATION: the post option has been replaced by project hooks and will
     not be supported anymore.
     M
+    TMUX_MASTER_DEP_MSG = <<-M
+    DEPRECATION: You are running tmuxinator with an unsupported version of tmux.
+    Please consider using a supported version:
+    (#{Tmuxinator::SUPPORTED_TMUX_VERSIONS.join(', ')})
+    M
 
     attr_reader :yaml
     attr_reader :force_attach
@@ -49,7 +54,7 @@ module Tmuxinator
         @args = args
 
         content = Erubis::Eruby.new(raw_content).result(binding)
-        YAML.load(content)
+        YAML.safe_load(content)
       rescue SyntaxError, StandardError => error
         raise "Failed to parse config file: #{error.message}"
       end
@@ -172,7 +177,14 @@ module Tmuxinator
       # if no tmux sessions exist.
       # Please see issues #402 and #414.
       sessions = `#{tmux_command} ls 2> /dev/null`
-      !!sessions.match("^#{name}:")
+
+      # Remove any escape sequences added by `shellescape` in Project#name.
+      # Escapes can result in: "ArgumentError: invalid multibyte character"
+      # when attempting to match `name` against `sessions`.
+      # Please see issue #564.
+      unescaped_name = name.shellsplit.join("")
+
+      !(sessions !~ /^#{unescaped_name}:/)
     end
 
     def socket
@@ -264,7 +276,8 @@ module Tmuxinator
         cli_args?,
         legacy_synchronize?,
         pre?,
-        post?
+        post?,
+        unsupported_version?
       ]
     end
 
@@ -275,7 +288,8 @@ module Tmuxinator
         CLIARGS_DEP_MSG,
         SYNC_DEP_MSG,
         PRE_DEP_MSG,
-        POST_DEP_MSG
+        POST_DEP_MSG,
+        TMUX_MASTER_DEP_MSG
       ]
     end
 
@@ -307,6 +321,10 @@ module Tmuxinator
       yaml["post"]
     end
 
+    def unsupported_version?
+      !Tmuxinator::SUPPORTED_TMUX_VERSIONS.include?(Tmuxinator::Config.version)
+    end
+
     def get_pane_base_index
       tmux_config["pane-base-index"]
     end

data/lib/tmuxinator/version.rb

@@ -1,3 +1,3 @@
 module Tmuxinator
-  VERSION = "0.10.0".freeze
+  VERSION = "0.10.1".freeze
 end

data/lib/tmuxinator/window.rb

@@ -129,7 +129,7 @@ module Tmuxinator
     end
 
     def tmux_select_first_pane
-      "#{project.tmux} select-pane -t #{tmux_window_target}.#{panes.first.index + project.base_index}"
+      "#{project.tmux} select-pane -t #{tmux_window_target}.#{panes.first.index + project.pane_base_index}"
     end
 
     def synchronize_before?

data/spec/factories/projects.rb

@@ -1,6 +1,7 @@
 def yaml_load(file)
-  YAML.load(File.read(File.expand_path(file)))
+  YAML.safe_load(File.read(File.expand_path(file)))
 end
+
 FactoryGirl.define do
   factory :project, class: Tmuxinator::Project do
     transient do
@@ -41,6 +42,14 @@ FactoryGirl.define do
     initialize_with { Tmuxinator::Project.new(file) }
   end
 
+  factory :project_with_emoji_as_name, class: Tmuxinator::Project do
+    transient do
+      file { yaml_load("spec/fixtures/sample_emoji_as_name.yml") }
+    end
+
+    initialize_with { Tmuxinator::Project.new(file) }
+  end
+
   factory :project_with_literals_as_window_name, class: Tmuxinator::Project do
     transient do
       file { yaml_load("spec/fixtures/sample_literals_as_window_name.yml") }

data/spec/fixtures/sample_emoji_as_name.yml

@@ -0,0 +1,5 @@
+# ~/.tmuxinator/sample_emoji_as_name.yml
+
+name: 🍩
+windows:
+  - emoji: echo 🍩

data/spec/lib/tmuxinator/config_spec.rb

@@ -143,6 +143,26 @@ describe Tmuxinator::Config do
     end
   end
 
+  describe "#version" do
+    subject { Tmuxinator::Config.version }
+
+    before do
+      expect(Tmuxinator::Doctor).to receive(:installed?).and_return(true)
+      allow_any_instance_of(Kernel).to receive(:`).with(/tmux\s\-V/).
+        and_return("tmux #{version}")
+    end
+
+    context "master" do
+      let(:version) { "master" }
+      it { is_expected.to eq Float::INFINITY }
+    end
+
+    context "installed" do
+      let(:version) { "2.4" }
+      it { is_expected.to eq version.to_f }
+    end
+  end
+
   describe "#default_path_option" do
     context ">= 1.8" do
       before do

data/spec/lib/tmuxinator/pane_spec.rb

@@ -15,6 +15,7 @@ describe Tmuxinator::Pane do
   before do
     allow(project).to receive(:name).and_return "foo"
     allow(project).to receive(:base_index).and_return 0
+    allow(project).to receive(:pane_base_index).and_return 1
 
     allow(window).to receive(:project).and_return project
     allow(window).to receive(:index).and_return 0
@@ -26,5 +27,5 @@ describe Tmuxinator::Pane do
     expect(subject).to be_a(Tmuxinator::Pane)
   end
 
-  it { expect(subject.tmux_window_and_pane_target).to eql "foo:0.0" }
+  it { expect(subject.tmux_window_and_pane_target).to eql "foo:0.1" }
 end

data/spec/lib/tmuxinator/project_spec.rb

@@ -8,6 +8,9 @@ describe Tmuxinator::Project do
   let(:project_with_number_as_name) do
     FactoryGirl.build(:project_with_number_as_name)
   end
+  let(:project_with_emoji_as_name) do
+    FactoryGirl.build(:project_with_emoji_as_name)
+  end
   let(:project_with_literals_as_window_name) do
     FactoryGirl.build(:project_with_literals_as_window_name)
   end
@@ -165,6 +168,14 @@ describe Tmuxinator::Project do
       end
     end
 
+    context "as emoji" do
+      it "will gracefully handle a name given as an emoji" do
+        rendered = project_with_emoji_as_name
+        # needs to allow for \\ present in shellescape'd project name
+        expect(rendered.name).to match(/^\\*🍩/)
+      end
+    end
+
     context "window as non-string literal" do
       it "will gracefully handle a window name given as a non-string literal" do
         rendered = project_with_literals_as_window_name

data/spec/lib/tmuxinator/window_spec.rb

@@ -60,6 +60,7 @@ describe Tmuxinator::Window do
       tmux: "tmux",
       name: "test",
       base_index: 1,
+      pane_base_index: 0,
       root: "/project/tmuxinator",
       root?: true
     )
@@ -369,4 +370,10 @@ describe Tmuxinator::Window do
       end
     end
   end
+
+  describe "#tmux_select_first_pane" do
+    it "targets the pane based on the configured pane_base_index" do
+      expect(window.tmux_select_first_pane).to eq("tmux select-pane -t test:1.0")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Allen Bargi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -183,14 +183,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.48.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.48.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,7 @@ files:
 - spec/fixtures/nowindows.yml
 - spec/fixtures/sample.deprecations.yml
 - spec/fixtures/sample.yml
+- spec/fixtures/sample_emoji_as_name.yml
 - spec/fixtures/sample_literals_as_window_name.yml
 - spec/fixtures/sample_number_as_name.yml
 - spec/fixtures/sample_wemux.yml
@@ -309,6 +310,7 @@ test_files:
 - spec/fixtures/nowindows.yml
 - spec/fixtures/sample.deprecations.yml
 - spec/fixtures/sample.yml
+- spec/fixtures/sample_emoji_as_name.yml
 - spec/fixtures/sample_literals_as_window_name.yml
 - spec/fixtures/sample_number_as_name.yml
 - spec/fixtures/sample_wemux.yml