tmuxinator 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6587a026202194be3546a45c7e3c5a32c98afc51351634073172c2cb9790a8a6
-  data.tar.gz: ad1ab050b9659fbd3200aa9dee1b4387861e85179133d6dec7569a1f62d51695
+  metadata.gz: fdb588afecf5c7476cef68fdd5c22348d83a64b027d3371d2b74d18edab1a66b
+  data.tar.gz: 7babd7dcaa43db5efde616c9b8b4fa3c2cc4325270b7565bea652bd7c4cd63cf
 SHA512:
-  metadata.gz: e8f9b85f6be3b04a44fa4f84c54ca6edc4cd6e75fa593c4aeee9af4de1a163fd391288e11694898aae25a88e022700e3d6dba42330c13636f6a2d2db2a65d390
-  data.tar.gz: 516cbf3516f27cdf4e6e4474d1fd0a6048ad18338db68fabd9a85fb62f5bc66fdb1f4e6d2e1c74d39d8496e31f3408a6185b8f8244a1b092e79b7b22bbb778bb
+  metadata.gz: 01011f43c1aa4380d6cd2489518b49e6d46cfbfa57838dfb2f0ff2f93c74250ea51e864130f60a5b7696823d126f9f519dc0f1f268cac17e97418269e81ba077
+  data.tar.gz: 689b130644b46a2e49204acb15f4785e313a5bd606c7dc47ad0f7605ba5cf3b35625485eed884f6e6720c713ef46a936cee68c627718e9ad412b53cf156e40ab

data/lib/tmuxinator.rb

@@ -20,7 +20,8 @@ module Tmuxinator
     2.4,
     2.5,
     2.6,
-    2.7
+    2.7,
+    2.8
   ].freeze
 end
 

data/lib/tmuxinator/cli.rb

@@ -226,6 +226,13 @@ module Tmuxinator
                                     desc: "Path to project config file"
 
     def start(name = nil, *args)
+      # project-config takes precedence over a named project in the case that
+      # both are provided.
+      if options["project-config"]
+        args.unshift name if name
+        name = nil
+      end
+
       params = {
         args: args,
         attach: options[:attach],
@@ -256,20 +263,31 @@ module Tmuxinator
       render_project(create_project(attach: options[:attach]))
     end
 
+    desc "debug [PROJECT] [ARGS]", COMMANDS[:debug]
     method_option :attach, type: :boolean,
                            aliases: "-a",
                            desc: "Attach to tmux session after creation."
     method_option :name, aliases: "-n",
                          desc: "Give the session a different name"
-    desc "debug [PROJECT] [ARGS]", COMMANDS[:debug]
+    method_option "project-config", aliases: "-p",
+                                    desc: "Path to project config file"
+
+    def debug(name = nil, *args)
+      # project-config takes precedence over a named project in the case that
+      # both are provided.
+      if options["project-config"]
+        args.unshift name if name
+        name = nil
+      end
 
-    def debug(name, *args)
       params = {
-        name: name,
-        custom_name: options[:name],
+        args: args,
         attach: options[:attach],
-        args: args
+        custom_name: options[:name],
+        name: name,
+        project_config: options["project-config"]
       }
+
       project = create_project(params)
       say project.render
     end

data/lib/tmuxinator/version.rb

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

data/spec/fixtures/sample_with_project_config.yml

@@ -0,0 +1,4 @@
+# ~/.tmuxinator/sample-with-project-config.yml
+name: sample_with_project_config
+windows:
+  - editor: echo sample-with-project-config

data/spec/lib/tmuxinator/cli_spec.rb

@@ -23,7 +23,13 @@ describe Tmuxinator::Cli do
       File.delete(local_project_path)
     end
   end
+
   let(:cli) { Tmuxinator::Cli }
+  let(:fixtures_dir) { File.expand_path("../../../fixtures/", __FILE__) }
+  let(:project) { FactoryBot.build(:project) }
+  let(:project_config) do
+    File.join(fixtures_dir, "sample_with_project_config.yml")
+  end
 
   before do
     ARGV.clear
@@ -210,8 +216,6 @@ describe Tmuxinator::Cli do
     end
 
     context "no deprecations" do
-      let(:project) { FactoryBot.build(:project) }
-
       it "starts the project" do
         expect(Kernel).to receive(:exec)
         capture_io { cli.start }
@@ -262,8 +266,6 @@ describe Tmuxinator::Cli do
     end
 
     context "with project name" do
-      let(:project) { FactoryBot.build(:project) }
-
       it "stop the project" do
         expect(Kernel).to receive(:exec)
         out, err = capture_io { cli.start }
@@ -281,8 +283,6 @@ describe Tmuxinator::Cli do
         allow(Kernel).to receive(:exec)
       end
 
-      let(:project) { FactoryBot.build(:project) }
-
       it "starts the project" do
         expect(Kernel).to receive(:exec)
         out, err = capture_io { cli.start }
@@ -315,8 +315,6 @@ describe Tmuxinator::Cli do
     end
 
     context "no deprecations" do
-      let(:project) { FactoryBot.build(:project) }
-
       it "starts the project" do
         expect(Kernel).to receive(:exec)
         capture_io { cli.start }
@@ -324,24 +322,39 @@ describe Tmuxinator::Cli do
     end
   end
 
-  describe "#start(with project config flag)" do
+  describe "#start(with project config file)" do
     before do
+      allow(Tmuxinator::Config).to receive(:validate).and_call_original
       allow(Tmuxinator::Config).to receive_messages(version: 1.9)
+      allow(Kernel).to receive(:exec)
     end
 
-    let(:fixtures_dir) { File.expand_path("../../../fixtures/", __FILE__) }
-    let(:project_config) { File.join(fixtures_dir, "sample.yml") }
-
     context "no deprecations" do
-      it "doesn't start the project if given a bogus project config" do
+      it "starts the project if given a valid project config file" do
+        ARGV.replace(["start", "--project-config=#{project_config}"])
+        expect(Kernel).to receive(:exec)
+        capture_io { cli.start }
+      end
+
+      it "does not start the project if given a bogus project config file" do
         ARGV.replace(["start", "--project-config=bogus.yml"])
         expect(Kernel).not_to receive(:exec)
         expect { capture_io { cli.start } }.to raise_error(SystemExit)
       end
 
-      it "starts the project if given a project config" do
+      it "passes additional arguments through" do
+        ARGV.replace(["start", "--project-config=#{project_config}", "extra"])
+        expect(Tmuxinator::Config).
+          to(receive(:validate).
+             with(hash_including(args: array_including("extra"))))
+        capture_io { cli.start }
+      end
+
+      it "does not set the project name" do
         ARGV.replace(["start", "--project-config=#{project_config}"])
-        expect(Kernel).to receive(:exec)
+        expect(Tmuxinator::Config).
+          to(receive(:validate).
+             with(hash_including(name: nil)))
         capture_io { cli.start }
       end
     end
@@ -538,42 +551,60 @@ describe Tmuxinator::Cli do
   end
 
   describe "#debug" do
-    let(:project) { FactoryBot.build(:project) }
-    let(:project_with_force_attach) do
-      FactoryBot.build(:project_with_force_attach)
-    end
-    let(:project_with_force_detach) do
-      FactoryBot.build(:project_with_force_detach)
-    end
+    context "named project" do
+      let(:project_with_force_attach) do
+        FactoryBot.build(:project_with_force_attach)
+      end
+      let(:project_with_force_detach) do
+        FactoryBot.build(:project_with_force_detach)
+      end
 
-    before do
-      allow(Tmuxinator::Config).to receive_messages(validate: project)
-      expect(project).to receive(:render)
-    end
+      before do
+        allow(Tmuxinator::Config).to receive_messages(validate: project)
+        expect(project).to receive(:render)
+      end
 
-    it "renders the project" do
-      ARGV.replace(["debug", "foo"])
-      capture_io { cli.start }
-    end
+      it "renders the project" do
+        ARGV.replace(["debug", "foo"])
+        capture_io { cli.start }
+      end
 
-    it "force attach renders the project with attach code" do
-      ARGV.replace(["debug", "--attach=true", "sample"])
-      capture_io { cli.start }
-      # Currently no project is rendered at all,
-      #   because the project file is not found
-      # expect(out).to include "attach-session"
-    end
+      it "force attach renders the project with attach code" do
+        ARGV.replace(["debug", "--attach=true", "sample"])
+        capture_io { cli.start }
+        # Currently no project is rendered at all,
+        #   because the project file is not found
+        # expect(out).to include "attach-session"
+      end
 
-    it "force detach renders the project without attach code" do
-      ARGV.replace(["debug", "--attach=false", "sample"])
-      capture_io { cli.start }
-      # Currently no project is rendered at all
-      # expect(out).to_not include "attach-session"
+      it "force detach renders the project without attach code" do
+        ARGV.replace(["debug", "--attach=false", "sample"])
+        capture_io { cli.start }
+        # Currently no project is rendered at all
+        # expect(out).to_not include "attach-session"
+      end
+
+      it "renders the project with custom session" do
+        ARGV.replace(["debug", "sample", "bar"])
+        capture_io { cli.start }
+      end
     end
 
-    it "renders the project with custom session" do
-      ARGV.replace(["debug", "sample", "bar"])
-      capture_io { cli.start }
+    context "project config file" do
+      before do
+        allow(Tmuxinator::Config).to receive_messages(version: 1.9)
+        expect(Tmuxinator::Config).to receive(:validate).and_call_original
+      end
+
+      it "renders the project if given a valid project config file" do
+        ARGV.replace(["debug", "--project-config=#{project_config}"])
+        expect { cli.start }.to output(/sample_with_project_config/).to_stdout
+      end
+
+      it "does not render the project if given a bogus project config file" do
+        ARGV.replace(["start", "--project-config=bogus.yml"])
+        expect { capture_io { cli.start } }.to raise_error(SystemExit)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Allen Bargi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -254,6 +254,7 @@ files:
 - spec/fixtures/sample_literals_as_window_name.yml
 - spec/fixtures/sample_number_as_name.yml
 - spec/fixtures/sample_wemux.yml
+- spec/fixtures/sample_with_project_config.yml
 - spec/fixtures/xdg-tmuxinator/both.yml
 - spec/fixtures/xdg-tmuxinator/xdg.yml
 - spec/lib/tmuxinator/cli_spec.rb
@@ -316,6 +317,7 @@ test_files:
 - spec/fixtures/sample_literals_as_window_name.yml
 - spec/fixtures/sample_number_as_name.yml
 - spec/fixtures/sample_wemux.yml
+- spec/fixtures/sample_with_project_config.yml
 - spec/fixtures/xdg-tmuxinator/both.yml
 - spec/fixtures/xdg-tmuxinator/xdg.yml
 - spec/lib/tmuxinator/cli_spec.rb