sesh 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c1bef49d5e6f451dc54a69ced4686389444b924
-  data.tar.gz: 64aa0590655e071ca971b879b43491ae8bac003b
+  metadata.gz: 45fa82a9c47d0cbdeef3e2e4559be075213997bb
+  data.tar.gz: efc1cbf7895f51e8f22233159d1c9f010ce71c83
 SHA512:
-  metadata.gz: 30fdfbf7979f17ddc1af7ac36b3c32a9e58835140c21e9e41cdc3acfe045793285aa59b0a5ba397cc37913f50f37ed7f67cf1087f7ccaa81ee5cfdac6b9ff2fc
-  data.tar.gz: f417dec87b40588935f2363bdae6208eceee0f67cdc786f4e3771db2e595ee671f555529a7a25f4c7838e2b84f926c640cffecb945fcbcd2e4f82be182cda25b
+  metadata.gz: e89fbf514e3327e0705f314511aafd0c5704f218e604f8f36d071ce97f581c079b922f958617e577e3dd12232fce642e6297b46b7600c027fb8e26fb2978e57d
+  data.tar.gz: ee54d777d081611fd467cff0bc448352b7d9a8a2286a911d86fdc563cfbbfc27c4d5f2c01abcf7666a0223412f5d8e4a6f53e4e6863af2e480b65bb02b2e1bad

data/Gemfile.lock

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

data/Session.vim

@@ -8,7 +8,7 @@ if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
   let s:wipebuf = bufnr('%')
 endif
 set shortmess=aoO
-badd +2 lib/sesh/version.rb
+badd +3 lib/sesh/version.rb
 badd +1 ~/Sites/energy_innovation_award/index.html
 badd +1 ~/Sites/energy_innovation_award/css/custom.css
 badd +1 ~/Sites/energy_innovation_award/about.html
@@ -269,10 +269,10 @@ badd +7 ~/Sites/polygallery/lib/polygallery.rb
 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 +13 lib/sesh/assets/sample.yml
 badd +74 lib/sesh/tmux_control.rb
 badd +15 lib/sesh/ssh_control.rb
-badd +0 lib/sesh.rb
+badd +1 lib/sesh.rb
 badd +32 sesh.gemspec
 argglobal
 silent! argdel *
@@ -302,18 +302,18 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe '1resize ' . ((&lines * 20 + 31) / 62)
-exe 'vert 1resize ' . ((&columns * 136 + 136) / 272)
-exe '2resize ' . ((&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 * 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)
+exe '1resize ' . ((&lines * 16 + 25) / 50)
+exe 'vert 1resize ' . ((&columns * 72 + 73) / 146)
+exe '2resize ' . ((&lines * 15 + 25) / 50)
+exe 'vert 2resize ' . ((&columns * 72 + 73) / 146)
+exe '3resize ' . ((&lines * 16 + 25) / 50)
+exe 'vert 3resize ' . ((&columns * 73 + 73) / 146)
+exe '4resize ' . ((&lines * 15 + 25) / 50)
+exe 'vert 4resize ' . ((&columns * 73 + 73) / 146)
+exe '5resize ' . ((&lines * 15 + 25) / 50)
+exe 'vert 5resize ' . ((&columns * 73 + 73) / 146)
+exe '6resize ' . ((&lines * 15 + 25) / 50)
+exe 'vert 6resize ' . ((&columns * 72 + 73) / 146)
 argglobal
 setlocal fdm=manual
 setlocal fde=0
@@ -324,12 +324,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 1 - ((0 * winheight(0) + 10) / 20)
+let s:l = 3 - ((1 * winheight(0) + 8) / 16)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-1
-normal! 0
+3
+normal! 03|
 wincmd w
 argglobal
 edit lib/sesh/tmux_control.rb
@@ -342,12 +342,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 74 - ((6 * winheight(0) + 9) / 19)
+let s:l = 113 - ((11 * winheight(0) + 7) / 15)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-74
-normal! 033|
+113
+normal! 018|
 wincmd w
 argglobal
 edit lib/sesh/ssh_control.rb
@@ -360,12 +360,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 37 - ((15 * winheight(0) + 10) / 20)
+let s:l = 38 - ((10 * winheight(0) + 8) / 16)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-37
-normal! 09|
+38
+normal! 036|
 wincmd w
 argglobal
 edit lib/sesh/inferences.rb
@@ -378,12 +378,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 13 - ((0 * winheight(0) + 9) / 19)
+let s:l = 22 - ((9 * winheight(0) + 7) / 15)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-13
-normal! 033|
+22
+normal! 068|
 wincmd w
 argglobal
 edit lib/sesh.rb
@@ -396,12 +396,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 42 - ((7 * winheight(0) + 9) / 19)
+let s:l = 41 - ((11 * winheight(0) + 7) / 15)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-42
-normal! 032|
+41
+normal! 023|
 wincmd w
 argglobal
 edit lib/sesh/cli.rb
@@ -414,25 +414,26 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 44 - ((18 * winheight(0) + 9) / 19)
+let s:l = 210 - ((1 * winheight(0) + 7) / 15)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-44
-normal! 025|
+210
+normal! 032|
 wincmd w
-exe '1resize ' . ((&lines * 20 + 31) / 62)
-exe 'vert 1resize ' . ((&columns * 136 + 136) / 272)
-exe '2resize ' . ((&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 * 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)
+2wincmd w
+exe '1resize ' . ((&lines * 16 + 25) / 50)
+exe 'vert 1resize ' . ((&columns * 72 + 73) / 146)
+exe '2resize ' . ((&lines * 15 + 25) / 50)
+exe 'vert 2resize ' . ((&columns * 72 + 73) / 146)
+exe '3resize ' . ((&lines * 16 + 25) / 50)
+exe 'vert 3resize ' . ((&columns * 73 + 73) / 146)
+exe '4resize ' . ((&lines * 15 + 25) / 50)
+exe 'vert 4resize ' . ((&columns * 73 + 73) / 146)
+exe '5resize ' . ((&lines * 15 + 25) / 50)
+exe 'vert 5resize ' . ((&columns * 73 + 73) / 146)
+exe '6resize ' . ((&lines * 15 + 25) / 50)
+exe 'vert 6resize ' . ((&columns * 72 + 73) / 146)
 tabnext 1
 if exists('s:wipebuf')
   silent exe 'bwipe ' . s:wipebuf

data/lib/sesh/cli.rb

@@ -68,11 +68,11 @@ module Sesh
           parsed_options[:ssh][:remote_addr] = v }
 
         # Tmux options
-        opts.on('-S', '--tmux-socket-file=path', 'Path to Tmux Socket File') {|v|
-          # fatal("Socket file #{v} does not exist.") unless File.exist?(v)
-          parsed_options[:tmux][:socket_file] = v }
-        opts.on('--tmux-pids-file=path', 'Path to Tmux Pids File') {|v|
-          parsed_options[:tmux][:pids_file] = v }
+        # opts.on('-S', '--tmux-socket-file=path', 'Path to Tmux Socket File') {|v|
+        #   # fatal("Socket file #{v} does not exist.") unless File.exist?(v)
+        #   parsed_options[:tmux][:socket_file] = v }
+        # opts.on('--tmux-pids-file=path', 'Path to Tmux Pids File') {|v|
+        #   parsed_options[:tmux][:pids_file] = v }
 
         # Shell options for remote commands
         opts.on('-C', '--shell-command=cmd', 'Shell Command to Execute') {|v|
@@ -139,8 +139,8 @@ module Sesh
         @options[:template] ||= File.join(
           File.dirname(File.expand_path(__FILE__)), 'assets', 'sample.yml' )
       end
-      @options[:tmux][:socket_file] ||= "/tmp/#{@options[:project]}.sock"
-      @options[:tmux][:pids_file]   ||= "/tmp/#{@options[:project]}.pids.txt"
+      # @options[:tmux][:socket_file] ||= "/tmp/#{@options[:project]}.sock"
+      # @options[:tmux][:pids_file]   ||= "/tmp/#{@options[:project]}.pids.txt"
       if %w(enslave connect).include? @command
         @options[:ssh][:local_addr] ||= Sesh::Inferences.infer_local_ssh_addr
         if @options[:ssh][:remote_addr].nil? && ARGV.any?
@@ -205,8 +205,7 @@ module Sesh
             Logger.success "#{pcount} project#{pcount>1 ? 's':''} currently running:"
             running_projects.each do |rp|
               puts; Logger.info "Project: #{rp}", 1
-              # TODO: handle the socket file better
-              tc = TmuxControl.new rp, socket_file: "/tmp/#{rp}.sock"
+              tc = TmuxControl.new rp
               tc_clients = tc.connected_client_devices
               if tc_clients.any?
                 Logger.success "Connected Client Devices:", 2

data/lib/sesh/tmux_control.rb

@@ -1,20 +1,21 @@
 require 'sesh'
+# require 'tmuxinator'
+# require 'yaml'
 
 module Sesh
   class TmuxControl
     def initialize(project, options={})
       @project = project || Inferences::infer_project_from_current_directory
-      @options = {}.merge(DEFAULT_OPTIONS[:tmux]).merge(options)
-      @socket_file = @options[:socket_file]
+      @options = {}.merge(DEFAULT_OPTIONS[:tmux]).merge options
+      @socket_file = @options[:socket_file] || "/tmp/#{@project}.sock"
     end
 
     def self.get_running_projects
-      # TODO: handle custom socket paths
       output = Sesh.format_and_run_command <<-BASH
         ps aux | grep tmux | grep "sesh begin" | grep -v "[g]rep" \
                | sed -e "s/.*\\/tmp\\/\\(.*\\)\\.sock.*/\\1/"
       BASH
-      output.lines
+      output.lines.map(&:strip)
     end
     def already_running?; self.class.get_running_projects.include? @project end
       # `ps aux | grep "#{project_name_matcher}"`.strip.length > 0 end
@@ -60,10 +61,6 @@ module Sesh
       output += output.map{|cpid| obtain_child_pids_from_pid(cpid) - [pid] }.flatten
       output.reverse
     end
-    def store_pids_from_session!
-      File.open(@options[:pids_file], 'w') {|f|
-        obtain_pids_from_session.each{|pid| f.puts pid } }
-    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
@@ -89,7 +86,6 @@ module Sesh
       if issue_start_command! && Logger.show_progress_until(-> { already_running? })
         sleep 1
         if already_running?
-          store_pids_from_session!
           Logger.success 'Sesh started successfully.'
           puts
         else Logger.fatal 'Sesh failed to start!' end
@@ -108,7 +104,7 @@ module Sesh
     def restart_project!; stop_project!; sleep 0.5; start_project! end
 
     def connected_client_devices
-      `tmux -S "#{@socket_file}" list-clients | cut -d : -f 1 | cut -d / -f 3`.strip.lines.map(&:strip)
+      `tmux -S "#{@socket_file}" list-clients 2>/dev/null | cut -d : -f 1 | cut -d / -f 3`.strip.lines.map(&:strip)
     end
     def get_ip_from_device(devname)
       ip_line = `who -a 2> /dev/null | grep " #{devname} "`.strip
@@ -117,9 +113,9 @@ module Sesh
     end
     def get_device_from_ip(ip)
       return if ( connected_devs = connected_client_devices ).length == 0
-      who_lines = 
-        `who -a 2> /dev/null | grep #{ip == '127.0.0.1' ? ' -v "\\([.*]\\)\\$' :
-                                '"' + Regexp.escape("(#{ip})") }"`.strip.lines
+      return connected_devs.find{|d| get_ip_from_device(ip) == ip } if ip == '127.0.0.1'
+      who_lines = `who -a 2> /dev/null | grep "#{ Regexp.escape("(#{ip})") }"`.strip.lines
+      puts connected_devs.inspect
       return if who_lines.length == 0
       connected_devs.find{|d| who_lines.find{|l| l =~ / #{d} / } }
     end
@@ -145,7 +141,7 @@ module Sesh
           resolved_ip = ping_output[1].split(' from ')[1].split(': ')[0]
           disconnect_client_by_ip! resolved_ip
         else
-          puts ping_output
+          puts "Ping output: #{ping_output}"
         end
       else
         ssh_identifier =

data/lib/sesh/version.rb

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

data/lib/sesh.rb

@@ -42,10 +42,7 @@ module Sesh
       connect_in_new_window: false,
       connect_fullscreen: false
     },
-    tmux: {
-      socket_file: nil,
-      pids_file: nil
-    }
+    tmux: { socket_file: nil }
   }
   POSSIBLE_CONFIG_LOCATIONS = %w( sesh_config.yml config/sesh.yml )
 

metadata

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