sesh 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a613d7067baa2fea1feaa59c2aeb0f50ef62c78
-  data.tar.gz: a4b76a0a66a7a9c18806240cf0c0dee791391d23
+  metadata.gz: e2379d1360354f9a664392fa0563f7f8c29e3cd3
+  data.tar.gz: 0e3f996071b819445f1c8f25681087cfc30cebf0
 SHA512:
-  metadata.gz: e12d86c3a8fe8e8c6b81968f2ee47788627d28e9b2702e3c2ebb70192e8e03923bc921ae25c3e7d7812791bae309b830e2eeda3621620d8d6fe55d60af8d5e1f
-  data.tar.gz: 7c914966416ad8e4891f4628b3f0765edb7d17a95b122048c7c07aacafe48dc77fd9a62acad47fa7a6dc23994bedcc84cfcd048ef144275a5dba8f6f4666e7d1
+  metadata.gz: 14cee1076c7d257fc6eb7efbd940071f1201720b485f12b719f820a54181dcb0c3c7871198c68ed266803c9d989c5a6573e40be9284c08eaed5777e73161cd3a
+  data.tar.gz: 11aff5ce1e417617c4dd6d691e5a30e1a50c451d9c75418eb1d495c831ee696c26bcb911c0769f2218ea51efcfbbc5b3db0908f26737a9ff19e1139b8675445f

data/Gemfile.lock

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

data/lib/sesh/cli.rb

@@ -9,7 +9,7 @@ require 'deep_merge'
 module Sesh
   class Cli
     def self.start
-      puts "Sesh v#{Sesh::VERSION}".green
+      puts; puts "  Sesh v#{VERSION}".green; puts '  ==========='.green; puts
       if ARGV.empty? or ARGV.include? '-h' or ARGV.include? '--help'
         puts HELP_BANNER.blue; exit end
 
@@ -23,7 +23,7 @@ module Sesh
           if @tmux_control.already_running?
             Logger.fatal "Sesh project '#{@options[:project]}' is already running!"
           else
-            Logger.debug "Starting Sesh project '#{@options[:project]}'..."
+            Logger.info "Starting Sesh project '#{@options[:project]}'..."
           end
           @tmux_control.kill_running_processes
           if @tmux_control.issue_start_command! &&
@@ -31,20 +31,20 @@ module Sesh
             sleep 1
             if @tmux_control.already_running?
               @tmux_control.store_pids_from_session!
-              Logger.debug 'Sesh started successfully.'
+              Logger.success 'Sesh started successfully.'
               puts
             else Logger.fatal 'Sesh failed to start!' end
           else Logger.fatal 'Sesh failed to start after ten seconds!' end
         when 'stop'
           if @tmux_control.already_running?
-            Logger.debug "Stopping Sesh project '#{@options[:project]}'..."
+            Logger.info "Stopping Sesh project '#{@options[:project]}'..."
           else
             Logger.fatal "Sesh project '#{@options[:project]}' is not running!"
           end
           @tmux_control.kill_running_processes
           @tmux_control.issue_stop_command!
           if $? && Logger.show_progress_until(-> { !@tmux_control.already_running? })
-            Logger.debug 'Sesh stopped successfully.'
+            Logger.success 'Sesh stopped successfully.'
             puts
           else
             Logger.fatal 'Sesh failed to stop after ten seconds!'
@@ -83,8 +83,8 @@ module Sesh
           running_projects = output.split("\n")
           pcount = running_projects.count
           if pcount > 0
-            Logger.info "#{pcount} project#{pcount>1 ? 's':''} currently running:"
-            puts running_projects
+            Logger.success "#{pcount} project#{pcount>1 ? 's':''} currently running:"
+            running_projects.each {|rp| Logger.info rp, 1 }
             puts
           else
             Logger.fatal "There are no Sesh projects currently running."
@@ -99,13 +99,13 @@ module Sesh
         when 'enslave'
           Logger.fatal("Sesh project '#{@options[:project]}' is not running!") unless @tmux_control.already_running?
           Logger.fatal("You must specify a machine to enslave! Eg: user@ip") if @options[:ssh][:remote_addr].nil?
-          Logger.debug "Attempting to connect #{@options[:ssh][:remote_addr]} to Sesh project '#{@options[:project]}'..."
+          Logger.info "Attempting to connect #{@options[:ssh][:remote_addr]} to Sesh project '#{@options[:project]}'..."
           if @ssh_control.enslave_peer!
-            Logger.debug "Sesh client connected successfully."
-            puts
+            Logger.success "Sesh client connected successfully."
           else
             Logger.fatal 'Sesh client failed to start.'
           end
+        when 'begin' then @tmux_control.begin_tmuxinator_session!
         when 'run'
           unless ARGV.any?
             Logger.fatal 'A second command is required!'

data/lib/sesh/logger.rb

@@ -4,8 +4,8 @@ require 'colorize'
 module Sesh
   class Logger
     def self.debug(msg) $stderr.puts "> #{msg}" end
-    def self.fatal(msg)
-      $stderr.puts msg.red; $stderr.puts; exit 1 end
+    def self.fatal(msg, nest_level=0)
+      $stderr.puts "#{' ' * nest_level * 2}> #{msg}".red; $stderr.puts; exit 1 end
     def self.warn(msg, nest_level=0)
       $stderr.puts "#{' ' * nest_level * 2}> #{msg}".yellow end
     def self.info(msg, nest_level=0)

data/lib/sesh/ssh_control.rb

@@ -36,10 +36,9 @@ module Sesh
     end
 
     def enslave_peer!
-      output = Sesh.format_and_run_command <<-BASH
-      ssh #{@options[:remote_addr]} "sesh connect #{@project} #{@options[:local_addr]}" 
+      puts Sesh.format_and_run_command <<-BASH
+      ssh #{@options[:remote_addr]} -t "sesh connect #{@project} #{@options[:local_addr]}" 
       BASH
-      puts output
       $?
     end
   end

data/lib/sesh/tmux_control.rb

@@ -16,10 +16,11 @@ module Sesh
 
     def issue_start_command!
       cmd = Sesh.format_command <<-BASH
-      tmux -S "#{@options[:socket_file]}" new-session -d "eval \$SHELL -l; env TMUX='' mux start #{@project}" 2>&1
+      tmux -S "#{@options[:socket_file]}" new-session -d "eval \\"\$SHELL -l -c 'rvm use default; bundle exec sesh begin'\\"" 2>&1
       BASH
+      # puts cmd
       output = `#{cmd}`.strip
-      return true if output.length == 0
+      return true if $? && output.length == 0
       Logger.warn "Tmux failed to start with the following error: #{output}"; false
     end
 
@@ -29,7 +30,8 @@ module Sesh
 
     def obtain_pids_from_session
       # TODO: grep this to just those pids from the current project
-      `tmux list-panes -s -F "\#{pane_pid} \#{pane_current_command}" | grep -v tmux | awk '{print $1}'`.strip.lines end
+      `tmux -S "#{@options[:socket_file]}" list-panes -s -F "\#{pane_pid} \#{pane_current_command}" | grep -v tmux | awk '{print $1}'`.strip.lines
+    end
     def store_pids_from_session!
       File.open(@options[:pids_file], 'w') {|f|
         obtain_pids_from_session.each{|pid| f.puts pid } }
@@ -43,6 +45,9 @@ module Sesh
     end
     def kill_process!(pid); `kill -9 #{pid}` end
 
+    def begin_tmuxinator_session!
+      %x[env TMUX='' mux start #{@project}] end
+
     # Getter methods for passthru to SshControl class
     def project; @project end
     def options; @options end

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

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