sesh 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc06146a5e15fe6189868ccaa713a1b3ac3cc1d
-  data.tar.gz: 1289b53289bdaa7e0d2f62411f4216f83399e92d
+  metadata.gz: 519e114e15fb6c5fea66d92a8a696ce80308ff4c
+  data.tar.gz: fe5045bde290d181b8d8d395b721914a7fd87b17
 SHA512:
-  metadata.gz: 5aaa76f37ea82defb160e0bad181f257920cc8fb8dec2036df2f457e8b314fedf4b18c0e0e067dd44e61b1253c2660f7573cb1fa9b6cbea6cb4ba879109951ab
-  data.tar.gz: 5aed87ec071af36d523f74a96131e8fecfca731e203195073132f042c5722dd0f53324836e972998513251e82d6dab581f1729351f4ed220ce71fa267d1ea860
+  metadata.gz: c8ea6c0cf3cf02d4b642bd7cfcd950f990cadafd973f30a02e530c419f038eb12566edd79b69c254608a26d3bf1345ae7c2f17ebf3a6397c5c4fd7e33cca0fa1
+  data.tar.gz: 205abe6b579f35abc141abd18b377698914125d3a6ce6758aab73c9e47c5d3da5697ef83cfc834848171369abd5c27854d69e9772926f00c908d4104c3df6514

data/Gemfile.lock

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

data/lib/sesh.rb

@@ -30,6 +30,11 @@ module Sesh
 
   DEFAULT_OPTIONS = {
     project: nil,
+    shell: {
+      command: nil,
+      pane: nil,
+      spec: nil
+    },
     ssh: {
       local_addr: nil,
       remote_addr: nil

data/lib/sesh/cli.rb

@@ -12,119 +12,10 @@ module Sesh
       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
-
       parse_options!
       @tmux_control = TmuxControl.new @options[:project], @options[:tmux]
       @ssh_control  = SshControl.new @tmux_control, @options[:ssh]
-
-      if @command
-        case @command
-        when 'start'
-          if @tmux_control.already_running?
-            Logger.fatal "Sesh project '#{@options[:project]}' is already running!"
-          else
-            Logger.info "Starting Sesh project '#{@options[:project]}'..."
-          end
-          @tmux_control.kill_running_processes
-          if @tmux_control.issue_start_command! &&
-             Logger.show_progress_until(-> { @tmux_control.already_running? })
-            sleep 1
-            if @tmux_control.already_running?
-              @tmux_control.store_pids_from_session!
-              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.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.success 'Sesh stopped successfully.'
-            puts
-          else
-            Logger.fatal 'Sesh failed to stop after ten seconds!'
-          end
-        when 'restart'
-          Logger.fatal("Sesh project '#{@options[:project]}' is not running!") unless already_running?
-          puts `sesh stop #{@options[:project]} #{@options if @options.any?}`.strip
-          sleep 0.5
-          puts `sesh start #{@options[:project]} #{@options if @options.any?}`.strip
-        when 'new'
-          config = Tmuxinator::Config.project(@options[:project])
-          unless Tmuxinator::Config.exists?(@options[:project])
-            template = File.join(File.dirname(File.expand_path(__FILE__)),
-                                 "../lib/sesh/assets/sample.yml")
-            erb  = Erubis::Eruby.new(File.read(template)).result(binding)
-            File.open(config, "w") { |f| f.write(erb) }
-          end
-
-          Kernel.system("#{Inferences.infer_default_editor} #{config}") ||
-                           Tmuxinator::Cli.new.doctor
-          puts
-        when 'edit'
-          config = Tmuxinator::Config.project(@options[:project])
-          if Tmuxinator::Config.exists? @options[:project]
-            Kernel.system("#{Inferences.infer_default_editor} #{config}") ||
-                           Tmuxinator::Cli.new.doctor
-            puts
-          else
-            Logger.fatal "Sesh project '#{@options[:project]}' does not exist yet!"
-          end
-        when 'list'
-          output = Sesh.format_and_run_command <<-BASH
-            ps aux | grep tmux | grep "sesh begin" | grep -v "[g]rep" \
-                   | sed -e "s/.*\\/tmp\\/\\(.*\\)\\.sock.*/\\1/"
-          BASH
-          running_projects = output.split("\n")
-          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 }
-            puts
-          else
-            Logger.fatal "There are no Sesh projects currently running."
-          end
-        when 'connect'
-          if @options[:ssh][:local_addr] == @options[:ssh][:remote_addr]
-            unless @tmux_control.already_running?
-              Logger.fatal "Sesh project '#{@options[:project]}' is not running!"
-            end
-          end
-          system @ssh_control.enter_slave_mode_command
-        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.info "Attempting to connect #{@options[:ssh][:remote_addr]} to Sesh project '#{@options[:project]}'..."
-          if @ssh_control.enslave_peer!
-            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!'
-          end
-          @shell_command = ARGV.join(' ')
-          puts "Subcommand: #{@shell_command}"
-        when 'rspec'
-          unless ARGV.any?
-            Logger.fatal 'A path to a spec is required!'
-          end
-          @shell_command = ARGV.join(' ')
-          puts "Spec: #{@shell_command}"
-        else
-          Logger.fatal "Command not recognized!"
-        end
-        exit 0
-      end
-
-      Logger.fatal 'You must specify a command.'
+      handle_command!
     end
 
     def self.parse_options!
@@ -164,9 +55,16 @@ module Sesh
         opts.on('-S', '--tmux-socket-file=path', 'Path to Tmux Socket File') {|v|
           # fatal("Socket file #{v} does not exist.") unless File.exist?(v)
           parsed_options[:tmux][:socket_file] = v }
-        opts.on('-P', '--tmux-pids-file=path', 'Path to Tmux Pids File') {|v|
+        opts.on('--tmux-pids-file=path', 'Path to Tmux Pids File') {|v|
           parsed_options[:tmux][:pids_file] = v }
 
+        opts.on('-C', '--shell-command=cmd', 'Shell Command to Execute') {|v|
+          parsed_options[:shell][:command] = v }
+        opts.on('-P', '--shell-pane=pane', 'Pane to Execute Shell Command in') {|v|
+          parsed_options[:shell][:pane] = v }
+        opts.on('--spec-path=path', 'Path to Spec File to Run') {|v|
+          parsed_options[:shell][:spec] = v }
+
         # # target_opts = DEPLOYMENT_TARGETS.join '|'
         # opts.on("-T", "--target=target", 'Titanium Deployment Target') do |v|
         #   if DEPLOYMENT_TARGETS.include? v
@@ -221,9 +119,9 @@ module Sesh
       end
       @options[:tmux][:socket_file] ||= "/tmp/#{@options[:project]}.sock"
       @options[:tmux][:pids_file]   ||= "/tmp/#{@options[:project]}.pids.txt"
-      @options[:ssh][:local_addr]   ||= Sesh::Inferences.infer_local_ssh_addr
-      if @options[:ssh][:remote_addr].nil?
-        if ARGV.any?
+      if %w(enslave connect).include? @command
+        @options[:ssh][:local_addr] ||= Sesh::Inferences.infer_local_ssh_addr
+        if @options[:ssh][:remote_addr].nil? && ARGV.any?
           ARGV.each {|a|
             if a =~ /\.local$/ || a =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/ || a =~ /^(.+)@(.+)$/
               @options[:ssh][:remote_addr] = a
@@ -231,7 +129,7 @@ module Sesh
           @options[:ssh][:remote_addr] ||= ARGV.shift
         end
         if @options[:ssh][:remote_addr].nil?
-          if %w(enslave run rspec).include? @command
+          if %w(enslave).include? @command
             Logger.warn 'A remote address is required.'
             Logger.fatal 'Hint: specify a remote ssh address using the -R flag.'
           elsif %w(connect).include? @command
@@ -239,6 +137,85 @@ module Sesh
           end
         end
       end
+      # TODO: parse a spec file
+      # This block should always go at the end because it eats the rest of ARGV.
+      if %w(run).include?(@command) && @options[:shell][:command].nil?
+        if ARGV.any?
+          argv_cmd_parts = []
+          argv_cmd_parts << ARGV.shift while ARGV.any?
+          @options[:shell][:command] = argv_cmd_parts.join(' ')
+        end
+        if @options[:shell][:command].nil? || @options[:shell][:command].length == 0
+          Logger.fatal 'You must specify a command to run.'
+        end
+      end
+    end
+
+    def self.handle_command!
+      if @command
+        case @command
+        when 'start'   then @tmux_control.start_project!
+        when 'stop'    then @tmux_control.stop_project!
+        when 'restart' then @tmux_control.restart_project!
+        when 'new'
+          config = Tmuxinator::Config.project(@options[:project])
+          unless Tmuxinator::Config.exists?(@options[:project])
+            template = File.join(File.dirname(File.expand_path(__FILE__)),
+                                 "../lib/sesh/assets/sample.yml")
+            erb  = Erubis::Eruby.new(File.read(template)).result(binding)
+            File.open(config, "w") { |f| f.write(erb) }
+          end
+
+          Kernel.system("#{Inferences.infer_default_editor} #{config}") ||
+                           Tmuxinator::Cli.new.doctor
+          puts
+        when 'edit'
+          config = Tmuxinator::Config.project(@options[:project])
+          if Tmuxinator::Config.exists? @options[:project]
+            Kernel.system("#{Inferences.infer_default_editor} #{config}") ||
+                           Tmuxinator::Cli.new.doctor
+            puts
+          else
+            Logger.fatal "Sesh project '#{@options[:project]}' does not exist yet!"
+          end
+        when 'list'
+          output = Sesh.format_and_run_command <<-BASH
+            ps aux | grep tmux | grep "sesh begin" | grep -v "[g]rep" \
+                   | sed -e "s/.*\\/tmp\\/\\(.*\\)\\.sock.*/\\1/"
+          BASH
+          running_projects = output.split("\n")
+          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 }
+            puts
+          else Logger.fatal "There are no Sesh projects currently running." end
+        when 'connect'
+          if @options[:ssh][:local_addr] == @options[:ssh][:remote_addr]
+            unless @tmux_control.already_running?
+              Logger.fatal "Sesh project '#{@options[:project]}' is not running!"
+            end
+          end
+          system @ssh_control.enter_slave_mode_command
+        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.info "Attempting to connect #{@options[:ssh][:remote_addr]} to Sesh project '#{@options[:project]}'..."
+          if @ssh_control.enslave_peer!
+            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'
+          @tmux_control.do_shell_operation! @options[:shell]
+        when 'rspec'
+          puts "Spec: #{@options[:shell][:spec]}"
+        else
+          Logger.fatal "Command not recognized!"
+        end
+        exit 0
+      end
+
+      Logger.fatal 'You must specify a command.'
     end
   end
 end

data/lib/sesh/tmux_control.rb

@@ -19,7 +19,6 @@ module Sesh
       cmd = Sesh.format_command <<-BASH
       tmux -S "#{@options[:socket_file]}" new-session -d "eval \\"\$SHELL -l -c 'rvm use default; sesh begin'\\"" 2>&1
       BASH
-      # puts cmd
       output = `#{cmd}`.strip
       return true if $? && output.length == 0
       Logger.warn "Tmux failed to start with the following error: #{output}"; false
@@ -30,7 +29,6 @@ module Sesh
     def connection_command; "tmux -S #{@options[:socket_file]} a" end
 
     def obtain_pids_from_session
-      # TODO: grep this to just those pids from the current project
       `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!
@@ -49,6 +47,66 @@ module Sesh
     def begin_tmuxinator_session!
       %x[env TMUX='' mux start #{@project}] end
 
+    def start_project!
+      if already_running?
+        Logger.fatal "Sesh project '#{@project}' is already running!" end
+      Logger.info "Starting Sesh project '#{@project}'..."
+      kill_running_processes
+      if issue_start_command! && Logger.show_progress_until(-> { already_running? })
+        sleep 1
+        if already_running?
+          store_pids_from_session!
+          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
+    end
+    def stop_project!
+      unless already_running?
+        Logger.fatal "Sesh project '#{@project}' is not running!" end
+      Logger.info "Stopping Sesh project '#{@project}'..."
+      kill_running_processes
+      issue_stop_command!
+      if $? && Logger.show_progress_until(-> { !already_running? })
+        Logger.success 'Sesh stopped successfully.'
+        puts
+      else Logger.fatal 'Sesh failed to stop after ten seconds!' end
+    end
+    def restart_project!; stop_project!; sleep 0.5; start_project! end
+
+    def send_keys_to_project!(keys)
+      `tmux -S "#{@options[: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)
+      send_interrupt!; send_keys_to_project! keys end
+    def send_keys_to_pane!(pane, keys)
+      move_cursor_to_pane! pane
+      send_keys_to_project! keys end
+    def interrupt_and_send_keys_to_pane!(pane, keys)
+      move_cursor_to_pane_and_interrupt! pane
+      send_keys_to_project! keys end
+    def send_command_to_project!(command)
+      send_keys_to_project! "\"#{command}\" Enter" end 
+    def interrupt_and_send_command_to_project!(command)
+      send_interrupt!; send_command_to_project!(command) end
+    def send_command_to_pane!(pane, command)
+      send_keys_to_pane! pane, "\"#{command}\" Enter" end
+    def interrupt_and_send_command_to_pane!(pane, command)
+      interrupt_and_send_keys_to_pane!(pane, "\"#{command}\" Enter") end
+    def move_cursor_to_pane!(pane); send_keys_to_project! "C-a q #{pane}" end
+    def move_cursor_to_pane_and_interrupt!(pane)
+      move_cursor_to_pane!(pane); send_interrupt! end
+    def do_shell_operation!(options=DEFAULT_OPTIONS[:shell])
+      unless options[:spec].nil?
+        options[:command] ||= "spring rspec #{options[:spec]}" end
+      if options[:pane].nil?
+        interrupt_and_send_command_to_project! options[:command]
+      else
+        interrupt_and_send_command_to_pane! options[:pane], options[:command]
+      end
+    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.4'
+  VERSION = '0.1.5'
 end

metadata

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