sesh 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c6a8e5a1802215f8320befafd49f5db4434be4
-  data.tar.gz: c6af33a578de3319671b4393b5608c66c3af5ed2
+  metadata.gz: 778297769aa09cf17f59f199a3d60d39fc05e6f9
+  data.tar.gz: ccb02fbe907590287018b237d5df85d66b36828b
 SHA512:
-  metadata.gz: adfaf130ee276f65aa942f2d388836ff4137196218e5e66c7878b492d00f51c4ee9171f82e368e762fb46af25ece9a8ee16434b29965c2b052fb88ad651db9b0
-  data.tar.gz: 390b4d6a19e0895ff3057b0ac2f6527d42a5f88b2675b9cb3a89f4533135502fe8b26e2775d93e34515bc780ea686ae731fb32c42061f583230e251b227e9686
+  metadata.gz: 8c2a2200deaf1ed97de80198ce860137fcb6dde1f87ffec819666e75dbb7546e65b0cda7e1b43d577ef246c4f31987d9ba059a39000c7eeaaf2da8ec11188ab0
+  data.tar.gz: d1d3d10d95a64720f2eb665ee689473078703ad8e7c436bcfba864cf07c2b380d5ad6e77395513856afbecda17d73a2126b95341cea1cb271f07ae604d34fd3c

data/Gemfile.lock

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

data/Session.vim

@@ -324,10 +324,10 @@ badd +32 sesh.gemspec
 badd +18 exe/return_to_sesh.applescript
 badd +1 \'/Users/smit1625/Sites/sesh/exe/return_to_sesh.applescript\'
 badd +2 exe/return_to_sesh
-badd +0 exe/sesh
+badd +3 exe/sesh
 argglobal
 silent! argdel *
-edit exe/sesh
+edit lib/sesh/version.rb
 set splitbelow splitright
 wincmd _ | wincmd |
 split
@@ -337,7 +337,10 @@ vsplit
 1wincmd h
 wincmd _ | wincmd |
 split
-1wincmd k
+wincmd _ | wincmd |
+split
+2wincmd k
+wincmd w
 wincmd w
 wincmd w
 wincmd _ | wincmd |
@@ -353,18 +356,20 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe '1resize ' . ((&lines * 19 + 31) / 62)
+exe '1resize ' . ((&lines * 15 + 31) / 62)
 exe 'vert 1resize ' . ((&columns * 102 + 136) / 272)
-exe '2resize ' . ((&lines * 20 + 31) / 62)
+exe '2resize ' . ((&lines * 14 + 31) / 62)
 exe 'vert 2resize ' . ((&columns * 102 + 136) / 272)
-exe '3resize ' . ((&lines * 20 + 31) / 62)
-exe 'vert 3resize ' . ((&columns * 169 + 136) / 272)
-exe '4resize ' . ((&lines * 19 + 31) / 62)
+exe '3resize ' . ((&lines * 14 + 31) / 62)
+exe 'vert 3resize ' . ((&columns * 102 + 136) / 272)
+exe '4resize ' . ((&lines * 22 + 31) / 62)
 exe 'vert 4resize ' . ((&columns * 169 + 136) / 272)
-exe '5resize ' . ((&lines * 19 + 31) / 62)
-exe 'vert 5resize ' . ((&columns * 101 + 136) / 272)
-exe '6resize ' . ((&lines * 19 + 31) / 62)
-exe 'vert 6resize ' . ((&columns * 170 + 136) / 272)
+exe '5resize ' . ((&lines * 22 + 31) / 62)
+exe 'vert 5resize ' . ((&columns * 169 + 136) / 272)
+exe '6resize ' . ((&lines * 14 + 31) / 62)
+exe 'vert 6resize ' . ((&columns * 101 + 136) / 272)
+exe '7resize ' . ((&lines * 14 + 31) / 62)
+exe 'vert 7resize ' . ((&columns * 170 + 136) / 272)
 argglobal
 setlocal fdm=manual
 setlocal fde=0
@@ -375,7 +380,7 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 1 - ((0 * winheight(0) + 9) / 19)
+let s:l = 1 - ((0 * winheight(0) + 7) / 15)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -383,6 +388,24 @@ normal! zt
 normal! 0
 wincmd w
 argglobal
+edit exe/sesh
+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 = 3 - ((1 * winheight(0) + 7) / 14)
+if s:l < 1 | let s:l = 1 | endif
+exe s:l
+normal! zt
+3
+normal! 015|
+wincmd w
+argglobal
 edit lib/sesh/tmux_control.rb
 setlocal fdm=manual
 setlocal fde=0
@@ -393,12 +416,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 185 - ((9 * winheight(0) + 10) / 20)
+let s:l = 192 - ((12 * winheight(0) + 7) / 14)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-185
-normal! 09|
+192
+normal! 033|
 wincmd w
 argglobal
 edit lib/sesh/ssh_control.rb
@@ -411,7 +434,7 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 38 - ((1 * winheight(0) + 10) / 20)
+let s:l = 38 - ((1 * winheight(0) + 11) / 22)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -429,12 +452,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 10 - ((9 * winheight(0) + 9) / 19)
+let s:l = 41 - ((15 * winheight(0) + 11) / 22)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-10
-normal! 044|
+41
+normal! 058|
 wincmd w
 argglobal
 edit lib/sesh.rb
@@ -447,7 +470,7 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 45 - ((8 * winheight(0) + 9) / 19)
+let s:l = 45 - ((6 * winheight(0) + 7) / 14)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -465,26 +488,27 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 94 - ((18 * winheight(0) + 9) / 19)
+let s:l = 94 - ((13 * winheight(0) + 7) / 14)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
 94
 normal! 032|
 wincmd w
-2wincmd w
-exe '1resize ' . ((&lines * 19 + 31) / 62)
+exe '1resize ' . ((&lines * 15 + 31) / 62)
 exe 'vert 1resize ' . ((&columns * 102 + 136) / 272)
-exe '2resize ' . ((&lines * 20 + 31) / 62)
+exe '2resize ' . ((&lines * 14 + 31) / 62)
 exe 'vert 2resize ' . ((&columns * 102 + 136) / 272)
-exe '3resize ' . ((&lines * 20 + 31) / 62)
-exe 'vert 3resize ' . ((&columns * 169 + 136) / 272)
-exe '4resize ' . ((&lines * 19 + 31) / 62)
+exe '3resize ' . ((&lines * 14 + 31) / 62)
+exe 'vert 3resize ' . ((&columns * 102 + 136) / 272)
+exe '4resize ' . ((&lines * 22 + 31) / 62)
 exe 'vert 4resize ' . ((&columns * 169 + 136) / 272)
-exe '5resize ' . ((&lines * 19 + 31) / 62)
-exe 'vert 5resize ' . ((&columns * 101 + 136) / 272)
-exe '6resize ' . ((&lines * 19 + 31) / 62)
-exe 'vert 6resize ' . ((&columns * 170 + 136) / 272)
+exe '5resize ' . ((&lines * 22 + 31) / 62)
+exe 'vert 5resize ' . ((&columns * 169 + 136) / 272)
+exe '6resize ' . ((&lines * 14 + 31) / 62)
+exe 'vert 6resize ' . ((&columns * 101 + 136) / 272)
+exe '7resize ' . ((&lines * 14 + 31) / 62)
+exe 'vert 7resize ' . ((&columns * 170 + 136) / 272)
 tabnext 1
 if exists('s:wipebuf')
   silent exe 'bwipe ' . s:wipebuf

data/lib/sesh/inferences.rb

@@ -27,6 +27,18 @@ module Sesh
       if OS.windows? then 'notepad.exe'
       else o = `echo $EDITOR`.strip; o = 'vim' unless o.length > 0; o end
     end
+    def self.infer_tmux_project
+      tmux_session_pid = `echo $TMUX | cut -d , -f 2`.strip
+      return if tmux_session_pid.length == 0
+      tmux_process_line =
+        `ps aux | grep tmux | grep #{tmux_session_pid}`.strip.lines.first
+      return if tmux_process_line.nil?
+      tmux_process_line.split('-s ')[-1].split(' -n')[0]
+    end
+    def self.infer_tmux_pane
+      return if ( o = `echo $TMUX_PANE`.strip ).nil?; o[1..-1].to_i end
+    def self.infer_tmux_location; {
+      project: infer_tmux_project, pane: infer_tmux_pane } end
 
     module OS
       def OS.windows?

data/lib/sesh/tmux_control.rb

@@ -183,10 +183,16 @@ module Sesh
       if options[:and_return]
         options[:command] = "return_to_sesh &; #{options[:command]}"
       end
+      inferred_location = Inferences.infer_tmux_location
       if options[:pane].nil?
-        interrupt_and_send_command_to_project! options[:command]
+        if inferred_location[:project] == @project then system options[:command]
+        else interrupt_and_send_command_to_project! options[:command] end
       else
-        interrupt_and_send_command_to_pane! options[:pane], options[:command]
+        if inferred_location == { project: @project, pane: options[:pane] }
+          system options[:command]
+        else
+          interrupt_and_send_command_to_pane! options[:pane], options[:command]
+        end
       end
     end
 

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

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