tmuxinator 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb588afecf5c7476cef68fdd5c22348d83a64b027d3371d2b74d18edab1a66b
-  data.tar.gz: 7babd7dcaa43db5efde616c9b8b4fa3c2cc4325270b7565bea652bd7c4cd63cf
+  metadata.gz: cc5773ff4f15a7fe8845c86254fd30a2955fc2b27696868e011c3bd7270b5338
+  data.tar.gz: 3af29bcfbcb61b3cf0fc25ef750f5abe027ab227d87b7cdc232f43f3ed497097
 SHA512:
-  metadata.gz: 01011f43c1aa4380d6cd2489518b49e6d46cfbfa57838dfb2f0ff2f93c74250ea51e864130f60a5b7696823d126f9f519dc0f1f268cac17e97418269e81ba077
-  data.tar.gz: 689b130644b46a2e49204acb15f4785e313a5bd606c7dc47ad0f7605ba5cf3b35625485eed884f6e6720c713ef46a936cee68c627718e9ad412b53cf156e40ab
+  metadata.gz: c47cf13e6a6bf16dca8c92ed7c75717c15bb6c10e012ebb30b6ebe629fd93466f96c0add8d230bb4d42d0e37f7c4324aa76c7c39e63a15b4abda5124ae5dec42
+  data.tar.gz: f3f676e33b049051b264eaec47eaaca6ce4b3d3ce67e96a8857599216e60269ec3fe28c34bee490151fdfdc94269477904fa256fd9ff6ba58e53299a2ef82ebc

data/lib/tmuxinator.rb

@@ -7,24 +7,9 @@ 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,
-    2.7,
-    2.8
-  ].freeze
 end
 
+require "tmuxinator/tmux_version"
 require "tmuxinator/util"
 require "tmuxinator/deprecations"
 require "tmuxinator/wemux_support"

data/lib/tmuxinator/cli.rb

@@ -202,14 +202,27 @@ module Tmuxinator
       def render_project(project)
         if project.deprecations.any?
           project.deprecations.each { |deprecation| say deprecation, :red }
-          say
-          print "Press ENTER to continue."
-          STDIN.getc
+          show_continuation_prompt
         end
 
         Kernel.exec(project.render)
       end
 
+      def version_warning?(suppress_flag)
+        !Tmuxinator::TmuxVersion.supported? && !suppress_flag
+      end
+
+      def show_version_warning
+        say Tmuxinator::TmuxVersion::UNSUPPORTED_VERSION_MSG, :red
+        show_continuation_prompt
+      end
+
+      def show_continuation_prompt
+        say
+        print "Press ENTER to continue."
+        STDIN.getc
+      end
+
       def kill_project(project)
         Kernel.exec(project.kill)
       end
@@ -224,6 +237,8 @@ module Tmuxinator
                          desc: "Give the session a different name"
     method_option "project-config", aliases: "-p",
                                     desc: "Path to project config file"
+    method_option "suppress-tmux-version-warning",
+                  desc: "Don't show a warning for unsupported tmux versions"
 
     def start(name = nil, *args)
       # project-config takes precedence over a named project in the case that
@@ -241,25 +256,41 @@ module Tmuxinator
         project_config: options["project-config"]
       }
 
+      show_version_warning if version_warning?(
+        options["suppress-tmux-version-warning"]
+      )
+
       project = create_project(params)
       render_project(project)
     end
 
     desc "stop [PROJECT]", COMMANDS[:stop]
     map "st" => :stop
+    method_option "suppress-tmux-version-warning",
+                  desc: "Don't show a warning for unsupported tmux versions"
 
     def stop(name)
       params = {
         name: name
       }
+      show_version_warning if version_warning?(
+        options["suppress-tmux-version-warning"]
+      )
+
       project = create_project(params)
       kill_project(project)
     end
 
     desc "local", COMMANDS[:local]
     map "." => :local
+    method_option "suppress-tmux-version-warning",
+                  desc: "Don't show a warning for unsupported tmux versions"
 
     def local
+      show_version_warning if version_warning?(
+        options["suppress-tmux-version-warning"]
+      )
+
       render_project(create_project(attach: options[:attach]))
     end
 

data/lib/tmuxinator/project.rb

@@ -34,11 +34,6 @@ 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
@@ -276,8 +271,7 @@ module Tmuxinator
         cli_args?,
         legacy_synchronize?,
         pre?,
-        post?,
-        unsupported_version?
+        post?
       ]
     end
 
@@ -288,8 +282,7 @@ module Tmuxinator
         CLIARGS_DEP_MSG,
         SYNC_DEP_MSG,
         PRE_DEP_MSG,
-        POST_DEP_MSG,
-        TMUX_MASTER_DEP_MSG
+        POST_DEP_MSG
       ]
     end
 
@@ -321,10 +314,6 @@ 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/tmux_version.rb

@@ -0,0 +1,29 @@
+module Tmuxinator
+  module TmuxVersion
+    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,
+      2.7,
+      2.8
+    ].freeze
+    UNSUPPORTED_VERSION_MSG = <<-MSG.freeze
+    WARNING: You are running tmuxinator with an unsupported version of tmux.
+    Please consider using a supported version:
+    (#{SUPPORTED_TMUX_VERSIONS.join(', ')})
+    MSG
+
+    def self.supported?(version = Tmuxinator::Config.version)
+      SUPPORTED_TMUX_VERSIONS.include?(version)
+    end
+  end
+end

data/lib/tmuxinator/version.rb

@@ -1,3 +1,3 @@
 module Tmuxinator
-  VERSION = "0.13.0".freeze
+  VERSION = "0.14.0".freeze
 end

data/spec/lib/tmuxinator/cli_spec.rb

@@ -207,6 +207,47 @@ describe Tmuxinator::Cli do
     end
   end
 
+  shared_examples_for :unsupported_version_message do |*args|
+    before do
+      ARGV.replace([*args])
+    end
+
+    context "unsupported version" do
+      before do
+        allow($stdin).to receive_messages(getc: "y")
+        allow(Tmuxinator::TmuxVersion).to receive(:supported?).and_return(false)
+      end
+
+      it "prints the warning" do
+        out, _err = capture_io { cli.start }
+        expect(out).to include "WARNING"
+      end
+
+      context "with --suppress-tmux-version-warning flag" do
+        before do
+          ARGV.replace([*args, "--suppress-tmux-version-warning"])
+        end
+
+        it "does not print the warning" do
+          out, _err = capture_io { cli.start }
+          expect(out).not_to include "WARNING"
+        end
+      end
+    end
+
+    context "supported version" do
+      before do
+        allow($stdin).to receive_messages(getc: "y")
+        allow(Tmuxinator::TmuxVersion).to receive(:supported?).and_return(true)
+      end
+
+      it "does not print the warning" do
+        out, _err = capture_io { cli.start }
+        expect(out).not_to include "WARNING"
+      end
+    end
+  end
+
   describe "#start" do
     before do
       ARGV.replace(["start", "foo"])
@@ -255,6 +296,8 @@ describe Tmuxinator::Cli do
         expect(out).to include "DEPRECATION"
       end
     end
+
+    include_examples :unsupported_version_message, :start, :foo
   end
 
   describe "#stop" do
@@ -273,16 +316,18 @@ describe Tmuxinator::Cli do
         expect(out).to eq ""
       end
     end
+
+    include_examples :unsupported_version_message, :stop, :foo
   end
 
   describe "#local" do
-    shared_examples_for :local_project do
-      before do
-        allow(Tmuxinator::Config).to receive_messages(validate: project)
-        allow(Tmuxinator::Config).to receive_messages(version: 1.9)
-        allow(Kernel).to receive(:exec)
-      end
+    before do
+      allow(Tmuxinator::Config).to receive_messages(validate: project)
+      allow(Tmuxinator::Config).to receive_messages(version: 1.9)
+      allow(Kernel).to receive(:exec)
+    end
 
+    shared_examples_for :local_project do
       it "starts the project" do
         expect(Kernel).to receive(:exec)
         out, err = capture_io { cli.start }
@@ -304,6 +349,8 @@ describe Tmuxinator::Cli do
       end
       it_should_behave_like :local_project
     end
+
+    include_examples :unsupported_version_message, :local
   end
 
   describe "#start(custom_name)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Allen Bargi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -197,14 +197,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  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'
 description: Create and manage complex tmux sessions easily.
 email:
 - allen.bargi@gmail.com
@@ -232,6 +246,7 @@ files:
 - lib/tmuxinator/hooks/project.rb
 - lib/tmuxinator/pane.rb
 - lib/tmuxinator/project.rb
+- lib/tmuxinator/tmux_version.rb
 - lib/tmuxinator/util.rb
 - lib/tmuxinator/version.rb
 - lib/tmuxinator/wemux_support.rb
@@ -294,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Create and manage complex tmux sessions easily.