sesh 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b86406a5da72abaef21548fc671547938682d3
-  data.tar.gz: e9dc1a0e96b952d81f8e657e2949a027601118e5
+  metadata.gz: 1c1bef49d5e6f451dc54a69ced4686389444b924
+  data.tar.gz: 64aa0590655e071ca971b879b43491ae8bac003b
 SHA512:
-  metadata.gz: 1fc49b1c47e4f9374f8607be20673efb7356aafe0c1e10e203aa5783b876efd9250487417ab05182b394ba8c683e719b2b1d84248bbeef86970707205503a6aa
-  data.tar.gz: f68fa4999d3abe476f5a88489771238947c1d0b7a0811079351f2563ead3581279cd3de2d4ec3482e57000592bfc452770d1a55002d6ace51b93d942d2902c0c
+  metadata.gz: 30fdfbf7979f17ddc1af7ac36b3c32a9e58835140c21e9e41cdc3acfe045793285aa59b0a5ba397cc37913f50f37ed7f67cf1087f7ccaa81ee5cfdac6b9ff2fc
+  data.tar.gz: f417dec87b40588935f2363bdae6208eceee0f67cdc786f4e3771db2e595ee671f555529a7a25f4c7838e2b84f926c640cffecb945fcbcd2e4f82be182cda25b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sesh (0.3.2)
+    sesh (0.3.3)
       awesome_print (~> 1.6)
       colorize (~> 0.7.7)
       deep_merge (~> 1.0)

data/Session.vim

@@ -270,13 +270,13 @@ badd +12 ~/Sites/polygallery/lib/polygallery/paperclip_integration.rb
 badd +172 lib/sesh/cli.rb
 badd +18 lib/sesh/inferences.rb
 badd +22 lib/sesh/assets/sample.yml
-badd +0 lib/sesh/tmux_control.rb
+badd +74 lib/sesh/tmux_control.rb
 badd +15 lib/sesh/ssh_control.rb
 badd +0 lib/sesh.rb
 badd +32 sesh.gemspec
 argglobal
 silent! argdel *
-edit lib/sesh/tmux_control.rb
+edit lib/sesh/version.rb
 set splitbelow splitright
 wincmd _ | wincmd |
 split
@@ -284,6 +284,10 @@ split
 wincmd _ | wincmd |
 vsplit
 1wincmd h
+wincmd _ | wincmd |
+split
+1wincmd k
+wincmd w
 wincmd w
 wincmd _ | wincmd |
 split
@@ -298,16 +302,18 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe '1resize ' . ((&lines * 39 + 31) / 62)
+exe '1resize ' . ((&lines * 20 + 31) / 62)
 exe 'vert 1resize ' . ((&columns * 136 + 136) / 272)
 exe '2resize ' . ((&lines * 19 + 31) / 62)
-exe 'vert 2resize ' . ((&columns * 135 + 136) / 272)
-exe '3resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 2resize ' . ((&columns * 136 + 136) / 272)
+exe '3resize ' . ((&lines * 20 + 31) / 62)
 exe 'vert 3resize ' . ((&columns * 135 + 136) / 272)
-exe '4resize ' . ((&lines * 20 + 31) / 62)
-exe 'vert 4resize ' . ((&columns * 136 + 136) / 272)
-exe '5resize ' . ((&lines * 20 + 31) / 62)
-exe 'vert 5resize ' . ((&columns * 135 + 136) / 272)
+exe '4resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 4resize ' . ((&columns * 135 + 136) / 272)
+exe '5resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 5resize ' . ((&columns * 136 + 136) / 272)
+exe '6resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 6resize ' . ((&columns * 135 + 136) / 272)
 argglobal
 setlocal fdm=manual
 setlocal fde=0
@@ -318,12 +324,30 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 57 - ((19 * winheight(0) + 19) / 39)
+let s:l = 1 - ((0 * winheight(0) + 10) / 20)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-57
-normal! 058|
+1
+normal! 0
+wincmd w
+argglobal
+edit lib/sesh/tmux_control.rb
+setlocal fdm=manual
+setlocal fde=0
+setlocal fmr={{{,}}}
+setlocal fdi=#
+setlocal fdl=0
+setlocal fml=1
+setlocal fdn=20
+setlocal fen
+silent! normal! zE
+let s:l = 74 - ((6 * winheight(0) + 9) / 19)
+if s:l < 1 | let s:l = 1 | endif
+exe s:l
+normal! zt
+74
+normal! 033|
 wincmd w
 argglobal
 edit lib/sesh/ssh_control.rb
@@ -336,12 +360,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 14 - ((13 * winheight(0) + 9) / 19)
+let s:l = 37 - ((15 * winheight(0) + 10) / 20)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-14
-normal! 019|
+37
+normal! 09|
 wincmd w
 argglobal
 edit lib/sesh/inferences.rb
@@ -372,7 +396,7 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 42 - ((7 * winheight(0) + 10) / 20)
+let s:l = 42 - ((7 * winheight(0) + 9) / 19)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -390,23 +414,25 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 44 - ((19 * winheight(0) + 10) / 20)
+let s:l = 44 - ((18 * winheight(0) + 9) / 19)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
 44
 normal! 025|
 wincmd w
-exe '1resize ' . ((&lines * 39 + 31) / 62)
+exe '1resize ' . ((&lines * 20 + 31) / 62)
 exe 'vert 1resize ' . ((&columns * 136 + 136) / 272)
 exe '2resize ' . ((&lines * 19 + 31) / 62)
-exe 'vert 2resize ' . ((&columns * 135 + 136) / 272)
-exe '3resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 2resize ' . ((&columns * 136 + 136) / 272)
+exe '3resize ' . ((&lines * 20 + 31) / 62)
 exe 'vert 3resize ' . ((&columns * 135 + 136) / 272)
-exe '4resize ' . ((&lines * 20 + 31) / 62)
-exe 'vert 4resize ' . ((&columns * 136 + 136) / 272)
-exe '5resize ' . ((&lines * 20 + 31) / 62)
-exe 'vert 5resize ' . ((&columns * 135 + 136) / 272)
+exe '4resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 4resize ' . ((&columns * 135 + 136) / 272)
+exe '5resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 5resize ' . ((&columns * 136 + 136) / 272)
+exe '6resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 6resize ' . ((&columns * 135 + 136) / 272)
 tabnext 1
 if exists('s:wipebuf')
   silent exe 'bwipe ' . s:wipebuf

data/lib/sesh/ssh_control.rb

@@ -34,7 +34,6 @@ module Sesh
           # TODO: come up with a non-toggling way to ensure fullscreen
           cmd += %Q[ -e '#{tell_term_process} to keystroke return using command down']
         end
-        puts "Command: #{cmd}"
         Sesh.format_command cmd
       when 'Terminal' then Sesh.format_command connection_command(addr)
       end

data/lib/sesh/tmux_control.rb

@@ -35,7 +35,7 @@ module Sesh
       Logger.warn "Tmux failed to start with the following error: #{output}"; false
     end
 
-    def issue_stop_command!;
+    def issue_stop_command!
       `ps -ef | grep "[t]mux -u attach-session -t #{Regexp.escape(@project)}\\$" | grep -v grep | awk '{print $2}' | xargs kill -9`
     end
 
@@ -66,6 +66,8 @@ module Sesh
     end
 
     def kill_running_processes
+      pane_count = `tmux list-panes -s -F "\#{pane_pid} \#{pane_current_command}" -t "#{@project}" 2>/dev/null`.strip.lines.count
+      pane_count.times{|i| move_cursor_to_pane_and_interrupt! i; sleep 0.1 }
       obtain_pids_from_session.each{|pid| kill_process! pid }
       # if File.exists? @options[:pids_file]
       #   File.readlines(@options[:pids_file]).each{|pid|

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

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