sesh 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b5f1db52bde7aeb52c772263c225b37bc313853
-  data.tar.gz: fc33dfa2ff73a5222da0adebabf3b853a1831769
+  metadata.gz: 74b3f87282f5252856e6cd89895a40144e9f0ea3
+  data.tar.gz: 14c8da3d3a2e8ca8ae0719818ea839ff2393f6cb
 SHA512:
-  metadata.gz: 23390a6b2979915e6c802cfd4a2e6b3f98047e57ab08bbbc5d62b9f9d576a3651d421937d9d3051d3feb7978f6101a352440bd1c1397f4bd2380762d0a59d56c
-  data.tar.gz: eff0a26db44e6ed23c023a8d3f8c428c932f8ef9ae6b9f9442aeda95e6704cdcadab2ee32bfd5ba41c4471e1c0eac49182389a754b8c786d8eeecb3c5f779401
+  metadata.gz: 358f35e691af07194d7759c90791fff24810f0ebae616b0450f01191bd9421efd4d34517ed79a2c69d8b95d8b8fd85dc04dada85ccde28cc5493fa48f8d5dea4
+  data.tar.gz: c730cb2453dc3225f834507b9c2e13bb2c740833af18f393965738175b909948c16e3170c7029480bbf1bf44b88c26d63fe10a843f86758c0a75d11e7fb4d29a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sesh (0.1.8)
+    sesh (0.2.0)
       awesome_print
       colorize
       deep_merge

data/lib/sesh/cli.rb

@@ -14,7 +14,6 @@ module Sesh
         puts HELP_BANNER.blue; exit end
       parse_options!
       @tmux_control = TmuxControl.new @options[:project], @options[:tmux]
-      
       @ssh_control  = SshControl.new @tmux_control, @options[:ssh]
       handle_command!
     end

data/lib/sesh/tmux_control.rb

@@ -34,12 +34,21 @@ module Sesh
     end
 
     def issue_stop_command!;
-      `pkill -f "[t]mux .*#{Regexp.escape(@project)}"` end
+      `ps -ef | grep "[t]mux -u attach-session -t #{Regexp.escape(@project)}\\$" | grep -v grep | awk '{print $2}' | xargs kill -9`
+    end
 
     def connection_command; "tmux -S #{@options[:socket_file]} a" end
 
     def obtain_pids_from_session
-      `tmux -S "#{@options[:socket_file]}" list-panes -s -F "\#{pane_pid} \#{pane_current_command}" | grep -v tmux | awk '{print $1}'`.strip.lines
+      tmux_processes =
+        `tmux list-panes -s -F "\#{pane_pid} \#{pane_current_command}" -t "#{@project}" 2> /dev/null | grep -v tmux | awk '{print $1}'`.strip.lines +
+        `tmux -S "#{@options[:socket_file]}" list-panes -s -F "\#{pane_pid} \#{pane_current_command}" 2> /dev/null | grep -v tmux | awk '{print $1}'`.strip.lines
+      return [] unless tmux_processes.any?
+      spring_processes = []
+      spring_app_pid = `ps -ef | grep "[s]pring app .*| #{@project} |" | grep -v grep | awk '{print $2}'`.strip
+      spring_processes += `ps -ef | grep #{spring_app_pid} | grep -v grep | grep -v "[s]pring app" | awk '{print $2}'`.strip.lines if spring_app_pid.length > 0
+      spring_processes += `ps -ef | grep "[s]pring.*| #{@project} |" | grep -v grep | awk '{print $2}'`.strip.lines
+      spring_processes + tmux_processes
     end
     def store_pids_from_session!
       File.open(@options[:pids_file], 'w') {|f|
@@ -47,12 +56,15 @@ module Sesh
     end
 
     def kill_running_processes
-      if File.exists? @options[:pids_file]
-        File.readlines(@options[:pids_file]).each{|pid| kill_process! pid }
-        File.delete @options[:pids_file]
-      end
+      obtain_pids_from_session.each{|pid| kill_process! pid }
+      # if File.exists? @options[:pids_file]
+      #   File.readlines(@options[:pids_file]).each{|pid|
+      #     puts "Killing #{pid}"
+      #     kill_process! pid }
+      #   File.delete @options[:pids_file]
+      # end
     end
-    def kill_process!(pid); `kill -9 #{pid}` end
+    def kill_process!(pid); `kill -9 #{pid} 2>&1` end
 
     def begin_tmuxinator_session!
       %x[env TMUX='' mux start #{@project}] end

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.1.8'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sesh
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - MacKinley Smith