tmuxinator 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69776676073ac64ed73dd6f12141c6c3d7b3d9bc
-  data.tar.gz: a8fbc49a81682d255042d28c9c73ccc5303147d7
+  metadata.gz: 9f98c0bb5c7a176cd11d7e1720ea199ee655ead7
+  data.tar.gz: 590c2abe675cab0d44289fc4409c2b0cce93e0a5
 SHA512:
-  metadata.gz: a22f37e133c2bea7f2b3b2b3c62d1291ed364bc7eb1b302fb8814cc86bd29269c132e3eb30bdbb0bc34c7e5b3ef023eb355b20112233dccd6a31d1a8060466b1
-  data.tar.gz: 1f83b909c1539eb9b8c1d40b78836a1e4a1b9b269130ed8379be287e4e791166f5425ed5ae5fb6b2f2d92631e4a898b80cf487c16a30efa7f43cbe066ac86f59
+  metadata.gz: 3c6225eb4aa956911383348621e96977c2558d2bfff0052c0134b690c5e06fafde850586789c23de3f4364f61c20f8cda599de4f577c730a9d11455e5053574f
+  data.tar.gz: 64df154916353b5626d67b5452caf2b275add6f0b24023e29523b1a7e2bf8994713afaf22d23661558072994484601acdd8532360a42f72ef0ed658653743324

data/completion/tmuxinator.bash

@@ -8,7 +8,7 @@ _tmuxinator() {
     if [ "$COMP_CWORD" -eq 1 ]; then
         local commands="$(compgen -W "$(tmuxinator commands)" -- "$word")"
         local projects="$(compgen -W "$(tmuxinator completions start)" -- "$word")"
- 
+
         COMPREPLY=( $commands $projects )
     elif [ "$COMP_CWORD" -eq 2 ]; then
         local words

data/completion/tmuxinator.zsh

@@ -1,5 +1,3 @@
-#compdef tmuxinator mux
-
 _tmuxinator() {
   local commands projects
   commands=(${(f)"$(tmuxinator commands zsh)"})
@@ -19,7 +17,7 @@ _tmuxinator() {
   return
 }
 
-_tmuxinator
+compdef _tmuxinator tmuxinator mux
 
 # Local Variables:
 # mode: Shell-Script

data/lib/tmuxinator/assets/template.erb

@@ -4,9 +4,9 @@
 unset RBENV_VERSION
 unset RBENV_DIR
 
-<%= tmux %> start-server\; has-session = <%= name %> 2>/dev/null
+<%= tmux %> start-server;
 
-if [ "$?" -eq 1 ]; then
+<%- if !tmux_has_session? name -%>
   cd <%= root || "." %>
 
   # Run pre command.
@@ -69,7 +69,7 @@ if [ "$?" -eq 1 ]; then
   <% end %>
 
   <%= tmux %> select-window -t <%= startup_window %>
-fi
+<%- end -%>
 
 <%- if attach? -%>
   if [ -z "$TMUX" ]; then

data/lib/tmuxinator/cli.rb

@@ -17,6 +17,9 @@ module Tmuxinator
         Start a tmux session using a project's tmuxinator config,
         with an optional [ALIAS] for project reuse
       DESC
+      stop: <<-DESC,
+        Stop a tmux session using a project's tmuxinator config.
+      DESC
       local: "Start a tmux session using ./.tmuxinator.yml",
       debug: "Output the shell commands that are generated by tmuxinator",
       copy: <<-DESC,
@@ -44,15 +47,15 @@ module Tmuxinator
               COMMANDS.keys.join("\n")
             end
 
-      puts out
+      say out
     end
 
     desc "completions [arg1 arg2]", COMMANDS[:completions]
 
     def completions(arg)
-      if %w(start open copy delete).include?(arg)
+      if %w(start stop open copy delete).include?(arg)
         configs = Tmuxinator::Config.configs
-        puts configs
+        say configs
       end
     end
 
@@ -116,13 +119,17 @@ module Tmuxinator
       def render_project(project)
         if project.deprecations.any?
           project.deprecations.each { |deprecation| say deprecation, :red }
-          puts
+          say
           print "Press ENTER to continue."
           STDIN.getc
         end
 
         Kernel.exec(project.render)
       end
+
+      def kill_project(project)
+        Kernel.exec(project.tmux_kill_session_command)
+      end
     end
 
     desc "start [PROJECT] [ARGS]", COMMANDS[:start]
@@ -144,6 +151,17 @@ module Tmuxinator
       render_project(project)
     end
 
+    desc "stop [PROJECT]", COMMANDS[:stop]
+    map "st" => :stop
+
+    def stop(name)
+      params = {
+        name: name
+      }
+      project = create_project(params)
+      kill_project(project)
+    end
+
     desc "local", COMMANDS[:local]
     map "." => :local
 
@@ -166,7 +184,7 @@ module Tmuxinator
         args: args
       }
       project = create_project(params)
-      puts project.render
+      say project.render
     end
 
     desc "copy [EXISTING] [NEW]", COMMANDS[:copy]
@@ -190,20 +208,22 @@ module Tmuxinator
       Kernel.system("$EDITOR #{new_config_path}")
     end
 
-    desc "delete [PROJECT]", COMMANDS[:delete]
+    desc "delete [PROJECT1] [PROJECT2] ...", COMMANDS[:delete]
     map "d" => :delete
     map "rm" => :delete
 
-    def delete(project)
-      if Tmuxinator::Config.exists?(project)
-        config = "#{Tmuxinator::Config.root}/#{project}.yml"
+    def delete(*projects)
+      projects.each do |project|
+        if Tmuxinator::Config.exists?(project)
+          config = Tmuxinator::Config.project(project)
 
-        if yes?("Are you sure you want to delete #{project}?(y/n)", :red)
-          FileUtils.rm(config)
-          say "Deleted #{project}"
+          if yes?("Are you sure you want to delete #{project}?(y/n)", :red)
+            FileUtils.rm(config)
+            say "Deleted #{project}"
+          end
+        else
+          say "#{project} does not exist!"
         end
-      else
-        exit!("That file doesn't exist.")
       end
     end
 

data/lib/tmuxinator/project.rb

@@ -147,6 +147,12 @@ module Tmuxinator
       yaml["tmux_command"] || "tmux"
     end
 
+    def tmux_has_session?(name)
+      sessions = `#{tmux_command} ls`
+
+      !!sessions.match("^#{name}:")
+    end
+
     def socket
       if socket_path
         " -S #{socket_path}"
@@ -242,6 +248,10 @@ module Tmuxinator
       "#{tmux} new-session -d -s #{name} #{window}"
     end
 
+    def tmux_kill_session_command
+      "#{tmux} kill-session -t #{name}"
+    end
+
     private
 
     def tmux_config

data/lib/tmuxinator/version.rb

@@ -1,3 +1,3 @@
 module Tmuxinator
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/lib/tmuxinator/window.rb

@@ -6,7 +6,7 @@ module Tmuxinator
 
     def initialize(window_yaml, index, project)
       @name = if !window_yaml.keys.first.nil?
-                window_yaml.keys.first.shellescape
+                window_yaml.keys.first.to_s.shellescape
               end
       @root = nil
       @panes = []

data/spec/factories/projects.rb

@@ -41,6 +41,14 @@ FactoryGirl.define do
     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") }
+    end
+
+    initialize_with { Tmuxinator::Project.new(file) }
+  end
+
   factory :project_with_deprecations, class: Tmuxinator::Project do
     transient do
       file { yaml_load("spec/fixtures/sample.deprecations.yml") }

data/spec/fixtures/sample_literals_as_window_name.yml

@@ -0,0 +1,15 @@
+# ~/.tmuxinator/sample_literals_as_window_name.yml
+
+name: sample
+windows:
+  - 222: echo Fixnum as window name fixture
+  - 222_333: echo Fixnum as window name fixture
+  - 111222333444555666777: echo BigNum as window name fixture
+  - 222.3: echo Float as window name fixture
+  - 4e5: echo Float as window name fixture
+  - 4E5: echo Float as window name fixture
+  - true: echo TrueClass as window name fixture
+  - false: echo FalseClass as window name fixture
+  - nil: echo NilClass as window name fixture
+  - //: echo RegExp as window name fixture
+  - /sample/: echo RegExp as window name fixture

data/spec/lib/tmuxinator/cli_spec.rb

@@ -41,6 +41,7 @@ describe Tmuxinator::Cli do
                     new
                     open
                     start
+                    stop
                     local
                     debug
                     copy
@@ -98,6 +99,26 @@ describe Tmuxinator::Cli do
     end
   end
 
+  describe "#stop" do
+    before do
+      ARGV.replace(["stop", "foo"])
+      allow(Tmuxinator::Config).to receive_messages(validate: project)
+      allow(Tmuxinator::Config).to receive_messages(version: 1.9)
+      allow(Kernel).to receive(:exec)
+    end
+
+    context "with project name" do
+      let(:project) { FactoryGirl.build(:project) }
+
+      it "stop the project" do
+        expect(Kernel).to receive(:exec)
+        out, err = capture_io { cli.start }
+        expect(err).to eq ""
+        expect(out).to eq ""
+      end
+    end
+  end
+
   describe "#local" do
     shared_examples_for :local_project do
       before do
@@ -324,30 +345,88 @@ describe Tmuxinator::Cli do
   end
 
   describe "#delete" do
-    before do
-      ARGV.replace(["delete", "foo"])
-      allow(Thor::LineEditor).to receive_messages(readline: "y")
-    end
-
-    context "project exists" do
+    context "with a single argument" do
       before do
-        allow(Tmuxinator::Config).to receive(:exists?) { true }
+        ARGV.replace(["delete", "foo"])
+        allow(Thor::LineEditor).to receive_messages(readline: "y")
       end
 
-      it "deletes the project" do
-        expect(FileUtils).to receive(:rm)
-        capture_io { cli.start }
+      context "project exists" do
+        before do
+          allow(Tmuxinator::Config).to receive(:exists?) { true }
+        end
+
+        it "deletes the project" do
+          expect(FileUtils).to receive(:rm)
+          capture_io { cli.start }
+        end
+      end
+
+      context "local project exists" do
+        before do
+          allow(Tmuxinator::Config).to receive(:exists?) { true }
+          expect(Tmuxinator::Config).to receive(:project) { "local" }
+        end
+
+        it "deletes the local project" do
+          expect(FileUtils).to receive(:rm).with("local")
+          capture_io { cli.start }
+        end
+      end
+
+      context "project doesn't exist" do
+        before do
+          allow(Tmuxinator::Config).to receive(:exists?) { false }
+        end
+
+        it "outputs an error message" do
+          expect(capture_io { cli.start }[0]).to match(/foo does not exist!/)
+        end
       end
     end
 
-    context "project doesn't exist" do
+    context "with multiple arguments" do
       before do
-        allow(Tmuxinator::Config).to receive(:exists?) { false }
+        ARGV.replace(["delete", "foo", "bar"])
         allow(Thor::LineEditor).to receive_messages(readline: "y")
       end
 
-      it "exits with error message" do
-        expect { capture_io { cli.start } }.to raise_error SystemExit
+      context "all projects exist" do
+        before do
+          allow(Tmuxinator::Config).to receive(:exists?).and_return(true)
+        end
+
+        it "deletes the projects" do
+          expect(FileUtils).to receive(:rm).exactly(2).times
+          capture_io { cli.start }
+        end
+      end
+
+      context "only one project exists" do
+        before do
+          allow(Tmuxinator::Config).to receive(:exists?).with("foo") { true }
+          allow(Tmuxinator::Config).to receive(:exists?).with("bar") { false }
+        end
+
+        it "deletes one project" do
+          expect(FileUtils).to receive(:rm)
+          capture_io { cli.start }
+        end
+
+        it "outputs an error message" do
+          expect(capture_io { cli.start }[0]).to match(/bar does not exist!/)
+        end
+      end
+
+      context "all projects do not exist" do
+        before do
+          allow(Tmuxinator::Config).to receive(:exists?).and_return(false)
+        end
+
+        it "outputs multiple error messages" do
+          expect(capture_io { cli.start }[0]).
+            to match(/foo does not exist!\nbar does not exist!/)
+        end
       end
     end
   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_literals_as_window_name) do
+    FactoryGirl.build(:project_with_literals_as_window_name)
+  end
   let(:project_with_deprecations) do
     FactoryGirl.build(:project_with_deprecations)
   end
@@ -51,13 +54,27 @@ describe Tmuxinator::Project do
         expect(rendered).to_not include("sample")
       end
     end
+  end
 
-    # Please see: https://github.com/tmuxinator/tmuxinator/issues/347
-    context "open sessions" do
-      it "uses 'has-session =' to avoid matching open session name prefixes" do
-        output = project.render
-        expect(output).to match %r{has-session =}
-      end
+  describe "#tmux_has_session?" do
+    before do
+      cmd = "#{project.tmux_command} ls"
+      resp = ""\
+        "foo: 1 window (created Sun May 25 10:12:00 1986) [50x50] (detached)\n"\
+        "bar: 1 window (created Sat Sept 01 00:00:00 1990) [50x50] (detached)"
+      call_tmux_ls = receive(:`).with(cmd).at_least(:once).and_return(resp)
+
+      expect(project).to call_tmux_ls
+    end
+
+    it "should return true only when `tmux ls` has the named session" do
+      expect(project.tmux_has_session?("foo")).to be true
+      expect(project.tmux_has_session?("bar")).to be true
+      expect(project.tmux_has_session?("quux")).to be false
+    end
+
+    it "should return false if a partial (prefix) match is found" do
+      expect(project.tmux_has_session?("foobar")).to be false
     end
   end
 
@@ -126,6 +143,15 @@ describe Tmuxinator::Project do
         expect(rendered.name.to_i).to_not equal 0
       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
+        expect(rendered.windows.map(&:name)).to match_array(
+          %w(222 222333 111222333444555666777 222.3 4e5 4E5
+             true false nil // /sample/))
+      end
+    end
   end
 
   describe "#pre_window" do
@@ -456,6 +482,18 @@ describe Tmuxinator::Project do
     end
   end
 
+  describe "tmux_kill_session_command" do
+    let(:command) { "#{executable} kill-session -t #{session}" }
+    let(:executable) { project.tmux }
+    let(:session) { project.name }
+
+    context "when first window has a name" do
+      it "returns command to start a new detatched session" do
+        expect(project.tmux_kill_session_command).to eq command
+      end
+    end
+  end
+
   describe "::load" do
     let(:path) { File.expand_path("../../../fixtures/sample.yml", __FILE__) }
     let(:options) { {} }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Allen Bargi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -95,6 +95,7 @@ files:
 - spec/fixtures/nowindows.yml
 - spec/fixtures/sample.deprecations.yml
 - spec/fixtures/sample.yml
+- spec/fixtures/sample_literals_as_window_name.yml
 - spec/fixtures/sample_number_as_name.yml
 - spec/fixtures/sample_wemux.yml
 - spec/lib/tmuxinator/cli_spec.rb
@@ -142,6 +143,7 @@ test_files:
 - spec/fixtures/nowindows.yml
 - spec/fixtures/sample.deprecations.yml
 - spec/fixtures/sample.yml
+- spec/fixtures/sample_literals_as_window_name.yml
 - spec/fixtures/sample_number_as_name.yml
 - spec/fixtures/sample_wemux.yml
 - spec/lib/tmuxinator/cli_spec.rb