sesh 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b3f87282f5252856e6cd89895a40144e9f0ea3
-  data.tar.gz: 14c8da3d3a2e8ca8ae0719818ea839ff2393f6cb
+  metadata.gz: 874c4775437a219acbe216d2f96876483e81f38d
+  data.tar.gz: 292433cee503cfe8458341acf001b0c87b3c39c3
 SHA512:
-  metadata.gz: 358f35e691af07194d7759c90791fff24810f0ebae616b0450f01191bd9421efd4d34517ed79a2c69d8b95d8b8fd85dc04dada85ccde28cc5493fa48f8d5dea4
-  data.tar.gz: c730cb2453dc3225f834507b9c2e13bb2c740833af18f393965738175b909948c16e3170c7029480bbf1bf44b88c26d63fe10a843f86758c0a75d11e7fb4d29a
+  metadata.gz: 0e5f7543613803df60a7acb83f2802fd6791caf9c7e994a2190b1a65207702abd13ba1aadefb74e53fcbd916d908d1280d9de472edbae59f5e01bfa1deead3aa
+  data.tar.gz: f317cfcdace6ddc0f0f7dda8911a49cff671a7a43ff0f87e850b41a01059b4428b702bb61a1e30ec9e25f77ed89b2b576bed7633a2ef9a534a26a22b8a5fd727

data/Gemfile.lock

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

data/lib/sesh/cli.rb

@@ -183,7 +183,19 @@ module Sesh
           pcount = running_projects.count
           if pcount > 0
             Logger.success "#{pcount} project#{pcount>1 ? 's':''} currently running:"
-            puts; running_projects.each {|rp| Logger.info rp, 1 }
+            running_projects.each do |rp|
+              puts; Logger.info "Project: #{rp}", 1
+              tc = TmuxControl.new rp, socket_file: "/tmp/#{rp}.sock"
+              tc_clients = tc.connected_client_devices
+              if tc_clients.any?
+                Logger.success "Connected Client Devices:", 2
+                tc_clients.each_with_index do |c, i|
+                  Logger.info "#{i+1}: #{c}: #{tc.get_ip_from_device(c)}", 3
+                end
+              else
+                Logger.warn 'No clients connected.', 2
+              end
+            end
             puts
           else Logger.fatal "There are no Sesh projects currently running." end
         when 'connect'
@@ -205,6 +217,7 @@ module Sesh
           @tmux_control.do_shell_operation! @options[:shell]
         when 'rspec'
           puts "Spec: #{@options[:shell][:spec]}"
+        when 'detach' then @tmux_control.disconnect_client! ARGV.join(' ')
         else
           Logger.fatal "Command not recognized!"
         end

data/lib/sesh/tmux_control.rb

@@ -4,7 +4,8 @@ module Sesh
   class TmuxControl
     def initialize(project, options={})
       @project = project || Inferences::infer_project_from_current_directory
-      @options = DEFAULT_OPTIONS[:tmux].merge(options)
+      @options = {}.merge(DEFAULT_OPTIONS[:tmux]).merge(options)
+      @socket_file = @options[:socket_file]
     end
 
     def self.get_running_projects
@@ -26,7 +27,7 @@ module Sesh
     def issue_start_command!
       # Add bundle exec to the sesh begin command for dev purposes.
       cmd = Sesh.format_command <<-BASH
-      tmux -S "#{@options[:socket_file]}" new-session -d "eval \\"\$SHELL -l -c 'rvm use default; sesh begin #{@project}'\\"" 2>&1
+      tmux -S "#{@socket_file}" new-session -d "eval \\"\$SHELL -l -c 'rvm use default; sesh begin #{@project}'\\"" 2>&1
       BASH
       output = `#{cmd}`.strip
       return true if $? && output.length == 0
@@ -37,12 +38,12 @@ module Sesh
       `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 connection_command; "tmux -S #{@socket_file} a" end
 
     def obtain_pids_from_session
       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
+        `tmux -S "#{@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
@@ -95,8 +96,55 @@ module Sesh
     end
     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)
+    end
+    def get_ip_from_device(devname)
+      ip_line = `who -a 2> /dev/null | grep " #{devname} "`.strip
+      return '127.0.0.1' unless ip_line.length > 0 && ip_line =~ /\)$/
+      ip_line.split('(')[-1][0..-2]
+    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 if who_lines.length == 0
+      connected_devs.find{|d| who_lines.find{|l| l =~ / #{d} / } }
+    end
+    def connected_clients
+      connected_client_devices.map{|devname| get_ip_from_device(devname) } end
+    def disconnect_client_by_device!(devname)
+      `tmux -S "#{@socket_file}" detach-client -t "/dev/#{devname}"`.strip.length == 0 end
+    def disconnect_client_by_ip!(ip)
+      device = get_device_from_ip(ip)
+      Logger.fatal("#{ip} is not connected to project \"#{@project}\".") if device.nil?
+      disconnect_client_by_device! device end
+    def disconnect_client_by_index!(index)
+      disconnect_client_by_device! connected_client_devices[index] end
+    def disconnect_client!(identifier)
+      if identifier.to_i.to_s == identifier.to_s # It's an integer
+        disconnect_client_by_index! identifier.to_i - 1
+      elsif identifier =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/ # It's an ip
+        disconnect_client_by_ip! identifier
+      elsif identifier =~ /.*@.*/ || identifier =~ /\.local$/
+        ping_output = `ping -a -c 1 #{identifier} 2>&1`.strip.lines
+        if $? && ping_output.length > 1 && ping_output[1] =~ / from /
+          resolved_ip = ping_output[1].split(' from ')[1].split(': ')[0]
+          disconnect_client_by_ip! resolved_ip
+        else
+          puts ping_output
+        end
+      else
+        ssh_identifier =
+          `awk '/Host #{identifier}/ {getline; print $2}' ~/.ssh/config`.strip
+        return disconnect_client!(ssh_identifier) if ssh_identifier.length > 0
+        fatal("Client")
+      end
+    end
+
     def send_keys_to_project!(keys)
-      `tmux -S "#{@options[:socket_file]}" send-keys #{keys}`.strip.length == 0
+      `tmux -S "#{@socket_file}" send-keys #{keys}`.strip.length == 0
     end
     def send_interrupt!; send_keys_to_project! 'C-c' end
     def interrupt_and_send_keys_to_project!(keys)

data/lib/sesh/version.rb

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

metadata

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