sesh 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d0337c695c990ec335062762013468a25119a3
-  data.tar.gz: 61b01a4d0b26b2800f823a18bdf92492610c6670
+  metadata.gz: d2b2b6726a4931f7ab2b379307da2ad4f8759a10
+  data.tar.gz: db3e61656ca079e4eab18dc29f0a1bb4caa31cca
 SHA512:
-  metadata.gz: ad89b3a4554eafea4dfee6afb22f38ef431a0e1c5d489b2f7360e06790dddbf793ad3b6ab86e58fb55b1eca663503f2a585794d0ecdebeb639882494663e0f71
-  data.tar.gz: 7bb6c2853b64a6986aaf713efca677fe188296f04d437c16235cc6022d9c0f4c00206f1f4e49c15ff1dd2333c5d482d72bc3c7de46722187bedb3306f9aa1cc9
+  metadata.gz: 0d9153dced581cae190f0849a1e14bec49fb26ef7dbd83f6a2d501f62ae106b901349a9b7d7038ff32deb9e86e66fa6e05e9d09c5356e2ca386725096cdb64e6
+  data.tar.gz: 1f0ef9b03d59840014684d59ae16cbba97e96afe4455b37034392903c321867c4d24432fad62a8314f5dc83ba12a7ee74183817b192ae8361ce4b4e85b641d78

data/bin/sesh

@@ -10,8 +10,9 @@ Usage: #{File.basename $0} command [project]
 Commands:
 
 sesh new                           Create a new tmuxinator configuration.
-sesh start [project]               Start a Sesh session for a project.
-sesh stop  [project]               Stop a Sesh session for a project.
+sesh edit    [project]             Edit an existing tmuxinator configuration.
+sesh start   [project]             Start a Sesh session for a project.
+sesh stop    [project]             Stop a Sesh session for a project.
 sesh list                          List running Sesh sessions on this machine.
 sesh enslave [project] user@host   Connect a slave to a local Sesh session.
 sesh connect [project] [user@host] Connect as a slave to a Sesh session.
@@ -53,7 +54,8 @@ end
 @project_name = get_project_name
 
 
-@socket = "/tmp/#{@project_name}.sock"
+@socket_file = "/tmp/#{@project_name}.sock"
+@pids_file   = "/tmp/#{@project_name}.pids.txt"
 
 def get_remote_address
   @options[@options.length>1 ? 1:0] if @options.any?
@@ -65,6 +67,12 @@ def get_term_app
   output.length > 0 ? 'iTerm' : fatal("iTerm 2 is not installed.") # 'Terminal'
 end
 
+def get_editor
+  editor = `echo $EDITOR`.strip
+  editor = 'vim' unless editor.length > 0
+  editor
+end
+
 def project_name_matcher
   pn = @project_name.gsub '-', '\-'
   "[t]mux.*[#{pn[0]}]#{pn[1..-1]}"
@@ -79,7 +87,7 @@ def format_command(command) command.gsub(/\ [ ]+/, ' ').strip end
 def format_and_run_command(command) `#{format_command(command)}`.strip end
 
 def issue_server_start_command!
-  `tmux -S "#{@socket}" new-session -d "env TMUX='' mux start #{@project_name}"`
+  `tmux -S "#{@socket_file}" new-session -d "env TMUX='' mux start #{@project_name}"`
 end
 
 def issue_server_stop_command!
@@ -88,7 +96,7 @@ end
 
 def connection_command(local=false, addr=nil)
   addr ||= @local_ssh_addr
-  local_command = "tmux -S #{@socket} a"
+  local_command = "tmux -S #{@socket_file} a"
   return local_command if local
   "ssh #{addr} -t '#{local_command}'"
 end
@@ -127,18 +135,33 @@ def show_progress_until(condition_lambda, timeout=10)
   return condition_lambda.call
 end
 
+def kill_running_processes
+  if File.exists? @pids_file
+    File.readlines(@pids_file).each{|pid| kill_process! pid }
+    File.delete @pids_file
+  end
+end
+def kill_process!(pid)
+  `kill -9 #{pid}`
+end
+
 if @command
   case @command
   when 'start'
     fatal("Sesh project '#{@project_name}' is already running!") if already_running?
     debug "Starting Sesh project '#{@project_name}'..."
+    kill_running_processes
     output = issue_server_start_command!
     success = show_progress_until ->{ already_running? }
     if success
       sleep 1
       if $? && already_running?
+        pids = `tmux list-panes -s -F "\#{pane_pid} \#{pane_current_command}" | grep -v tmux | awk '{print $1}'`.strip.lines
+        File.open(@pids_file, 'w') {|f| pids.each{|pid| f.puts pid } }
         debug 'Sesh started successfully.'
         debug "To connect: #{connection_command}"
+        # TODO: show other sesh commands (connect, enslave), specify full
+        #       command as what is needed for machines without sesh.
         puts
       else
         fatal 'Sesh failed to start!'
@@ -149,6 +172,7 @@ if @command
   when 'stop'
     fatal("Sesh project '#{@project_name}' is not running!") unless already_running?
     debug "Stopping Sesh project '#{@project_name}'..."
+    kill_running_processes
     output = issue_server_stop_command!
     success = show_progress_until ->{ !already_running? }
     if success && $?
@@ -172,12 +196,16 @@ if @command
       File.open(config, "w") { |f| f.write(erb) }
     end
 
-    editor = `echo $EDITOR`.strip
-    editor = 'vim' unless editor.length > 0
-    Kernel.system("#{editor} #{config}") || Tmuxinator::Cli.new.doctor
-    # command = "env EDITOR='vim' tmuxinator new #{@project_name}"
-    # output = exec command
+    Kernel.system("#{get_editor} #{config}") || Tmuxinator::Cli.new.doctor
     puts
+  when 'edit'
+    config = Tmuxinator::Config.project(@project_name)
+    if Tmuxinator::Config.exists? @project_name
+      Kernel.system("#{get_editor} #{config}") || Tmuxinator::Cli.new.doctor
+      puts
+    else
+      fatal "Sesh project '#{@project_name}' does not exist yet!"
+    end
   when 'list'
     output = format_and_run_command <<-BASH
       ps aux | grep tmux | grep "env TMUX='' mux start" \

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

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