sesh 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 471da2a6d1c23302beb0858f3bcaf8dde2ea0730
-  data.tar.gz: 0c84359f0c8f57327e59cd7a81d4ad86187f56c4
+  metadata.gz: 17fc8871ceac325d5a9344163c1dbac6bfad4d0a
+  data.tar.gz: 7ae48a72c52d78d6b511e50a4c76878951c7786e
 SHA512:
-  metadata.gz: 478ed2e28e910409295fc525752f3d1f1a76c88d8e78b2d66874eb1195c226a6beff0b334db0be9e0abbffaa4e6ff03c4e2a7b912062f0fecbc5250305b03812
-  data.tar.gz: b308849d0a53fdf43fa86cc1e97c278c497cece0e2958b32ac8eefe562550c3a17587cbfe069bb1e6c14f06ca065348ed62de5c93881dc48a2876459057b5441
+  metadata.gz: 0514a6354033fe60c716a24e094a0e6bf464ba74628d03c089ce7915dce42c7b5bf0f1eab5838312b6b16a7b3105abefc719a25833ce4bc65645fd14a1d43081
+  data.tar.gz: 1c72f43d3b349a374d48a0fe640e9a4a6a45499ccb2ae9b86c481aec4cb041ce4e37c90687f2f3ee4b10ae4bad913214856f40fc6e3c96768ac1eae985e23524

data/bin/sesh

@@ -1,20 +1,22 @@
 #!/usr/bin/env ruby
 
-if ARGV.include? '-h' or ARGV.include? '--help' then puts <<-HELP
+if ARGV.empty? or ARGV.include? '-h' or ARGV.include? '--help' then puts <<-HELP
 Sesh: remote background sessions powered by tmux and tmuxinator.
 Runs a headless tmuxinator session for remote slave machines to connect to.
 
-Usage: #{File.basename $0} [command] [project]
+Usage: #{File.basename $0} command [project]
 
 Commands:
 
 sesh new                          Create a new tmuxinator configuration.
-sesh start [project_name]         Start a Sesh session for a project.
-sesh stop  [project_name]         Stop a Sesh session for a project.
+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 connect [project] user@host  Connect as a slave to a remote Sesh session.
 sesh enslave [project] user@host  Connect a slave to a local Sesh session.
 
+Leave project blank to use the name of your current directory.
+
 HELP
 exit; end
 
@@ -26,19 +28,19 @@ def debug(msg) $stderr.puts "> #{msg}" end
 @options = ARGV[1..-1] || []
 # debug("Options received: #{@options}") if @options.any?
 
+def is_tmuxinator_project?(name)
+  path = File.expand_path("~/.tmuxinator/#{name}.yml")
+  File.exist? path
+end
+
 def get_project_name
-  if @options.any?
-    pn_opt = if %w(connect enslave).include? @command
-               @options.shift if @options[1]
-             else
-               @options[0] 
-             end
-    if pn_opt
-      pn_opt_path = File.expand_path("~/.tmuxinator/#{pn_opt}.yml")
-      return pn_opt if File.exist? pn_opt_path
-    end
+  if @options.any? && !@options[0].include?('@')
+    return @options.shift if is_tmuxinator_project? @options[0]
   end
-  `printf '%q\n' "${PWD##*/}"`.strip
+  output = `printf '%q\n' "${PWD##*/}"`.strip
+  return output if is_tmuxinator_project?(output)
+  puts "Sesh project '#{output}' could not be found."
+  fatal "Hint: run sesh new or specify an existing project after your commmand."
 end
 @project_name = get_project_name
 
@@ -52,6 +54,16 @@ end
 
 @socket = "/tmp/#{@project_name}.sock"
 
+def get_remote_address
+  @options[@options.length>1 ? 1:0] if @options.any?
+end
+@remote_address = get_remote_address
+
+def get_term_app
+  output = `osascript -e 'try' -e 'get exists application "iTerm"' -e 'end try'`.strip
+  output.length > 0 ? 'iTerm' : fatal("iTerm 2 is not installed.") # 'Terminal'
+end
+
 def project_name_matcher
   pn = @project_name.gsub '-', '\-'
   "[t]mux.*[#{pn[0]}]#{pn[1..-1]}"
@@ -66,7 +78,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 -vvvv -S "#{@socket}" new-session -d "env TMUX='' mux start #{@project_name}"`
+  `tmux -S "#{@socket}" new-session -d "env TMUX='' mux start #{@project_name}"`
 end
 
 def issue_server_stop_command!
@@ -80,17 +92,24 @@ def connection_command(local=false)
 end
 
 def enter_slave_mode_command(local=false)
-  tell_iterm_app     = 'tell application "iTerm"'
-  tell_iterm_process = 'tell application "System Events" to tell process "iTerm"'
-  format_command <<-BASH
-    osascript \
-          -e '#{tell_iterm_app} to activate' \
-          -e '#{tell_iterm_process} to keystroke \"n\" using command down' \
-          -e 'delay 1' \
-          -e '#{tell_iterm_app} to tell session -1 of current terminal to \
-              write text "#{connection_command(local).gsub("'", '\\\\\'')}"' \
-          -e '#{tell_iterm_process} to keystroke return using command down'
-  BASH
+  @term_app ||= get_term_app
+  case @term_app
+  when 'iTerm'
+    tell_term_app     = 'tell application "' + @term_app + '"'
+    tell_term_process = 'tell application "System Events" to tell process "' + 
+                         @term_app + '"'
+    format_command <<-BASH
+      osascript \
+            -e '#{tell_term_app} to activate' \
+            -e '#{tell_term_process} to keystroke \"n\" using command down' \
+            -e 'delay 1' \
+            -e "#{tell_term_app.gsub('"', '\\"')} to tell session -1 of current \
+                terminal to write text \\"#{connection_command(local)}\\"" \
+            -e '#{tell_term_process} to keystroke return using command down'
+    BASH
+  when 'Terminal'
+    format_command connection_command(local)
+  end
 end
 
 def show_progress_until(condition_lambda, timeout=10)
@@ -160,21 +179,19 @@ if @command
       fatal "There are no Sesh projects currently running."
     end
   when 'connect'
-    slave_address = @options[0]
-    if (is_local=slave_address.nil?)
-      slave_address = @local_ssh_addr
+    if (is_local=@remote_address.nil?)
+      @remote_address = @local_ssh_addr
       fatal("Sesh project '#{@project_name}' is not running!") unless already_running?
     end
     command = enter_slave_mode_command(is_local)
-    puts command
     puts `#{command}`.strip
   when 'enslave'
     fatal("Sesh project '#{@project_name}' is not running!") unless already_running?
-    fatal("You must specify a machine to enslave! Eg: user@ip") unless @options.any?
-    slave_address = @options[0]
-    debug "Attempting to connect #{slave_address} to Sesh project '#{@project_name}'..."
+    fatal("You must specify a machine to enslave! Eg: user@ip") if @remote_address.nil?
+    debug "Attempting to connect #{@remote_address} to Sesh project '#{@project_name}'..."
+      # ssh #{@remote_address} "#{enter_slave_mode_command.gsub(/([^\\])"/, '\1\\"')}"
     output = format_and_run_command <<-BASH
-      ssh #{slave_address} "#{enter_slave_mode_command.gsub('"', '\"')}"
+      #{enter_slave_mode_command} | ssh -T #{@remote_address} 1>/dev/null 2>&1 &
     BASH
     puts output
     if $?

metadata

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