sesh 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fd10e81833893c22f4e8f1e193c87a35c543ccc
-  data.tar.gz: cb2ec3a8c2b981fbb82827ea26bc62ecc126dad3
+  metadata.gz: 2f875d6884e48fd74d94b5874863ec94dfd556b0
+  data.tar.gz: d335a739f08b80202674a8f498ebd77df104d0e0
 SHA512:
-  metadata.gz: cc2a7c81fee985c1fd214a649bcf1e9dc51820bc2ec44a312d8fe2d0c6ec382620159b8cd0a351ba754092d9d86a117659ebdb40759125e09e3163dd67723536
-  data.tar.gz: 1ce39728bbb8f33bac01ffb09122f3ef6f8c981a78278cdd7f4d64968d43e5eeb7835d78e059b4f17d228b67b1e02959554435f28d4410447f9ae61a20b8f8f6
+  metadata.gz: 43d497088162f613abafb305bf4c2f2b4d84118b3860c67e5c9e314105e6e7a8e239e100e3fd70e4b7d4915ce7bb1a5818ae4e03da288a202973473827cd450a
+  data.tar.gz: 91cba2d50854c5bed3ac149ff3af1cf7e7b45c982157fe55ac0193e28f7c3637ef28e1272ff1a7fa1b47a452a4a4fad94613a0af11f147e1e9f526c8181c8005

data/bin/sesh

@@ -9,12 +9,12 @@ 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 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.
+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 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.
 
 Leave project blank to use the name of your current directory.
 
@@ -29,31 +29,29 @@ 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
+def get_local_username
+  `echo $USER`.strip
 end
+def get_local_hostname
+  `scutil --get LocalHostName`.strip.downcase + '.local'
+end
+@local_ssh_addr = "#{get_local_username}@#{get_local_hostname}"
 
 def get_project_name
   return if @command == 'list'
   new_project = @command == 'new'
+  remote_project = @command == 'connect' && @options.select{|o| o.include? '@' }.any?
   if @options.any? && !@options[0].include?('@')
-    return @options.shift if new_project || is_tmuxinator_project?(@options[0])
+    return @options.shift if new_project || remote_project || 
+                             Tmuxinator::Config.exists?(@options[0])
   end
   output = `printf '%q\n' "${PWD##*/}"`.strip
-  return output if new_project || is_tmuxinator_project?(output)
+  return output if new_project || Tmuxinator::Config.exists?(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
 
-def get_local_username
-  `echo $USER`.strip
-end
-def get_local_hostname
-  `scutil --get LocalHostName`.strip.downcase + '.local'
-end
-@local_ssh_addr = "#{get_local_username}@#{get_local_hostname}"
 
 @socket = "/tmp/#{@project_name}.sock"
 
@@ -204,10 +202,12 @@ if @command
     fatal("Sesh project '#{@project_name}' is not running!") unless already_running?
     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\\"')}"
+    # ssh #{@remote_address} "#{enter_slave_mode_command.gsub(/([^\\])"/, '\1\\"')}"
+    # puts <<-BASH
     output = format_and_run_command <<-BASH
-      #{enter_slave_mode_command} | ssh -T #{@remote_address} 1>/dev/null 2>&1 &
+      ssh #{@remote_address} "sesh connect #{@project_name} #{@local_ssh_addr}" 
     BASH
+  #  1>/dev/null 2>&1 &
     puts output
     if $?
       debug "Sesh client connected successfully."

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

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