sesh 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45fa82a9c47d0cbdeef3e2e4559be075213997bb
-  data.tar.gz: efc1cbf7895f51e8f22233159d1c9f010ce71c83
+  metadata.gz: 36c6a8e5a1802215f8320befafd49f5db4434be4
+  data.tar.gz: c6af33a578de3319671b4393b5608c66c3af5ed2
 SHA512:
-  metadata.gz: e89fbf514e3327e0705f314511aafd0c5704f218e604f8f36d071ce97f581c079b922f958617e577e3dd12232fce642e6297b46b7600c027fb8e26fb2978e57d
-  data.tar.gz: ee54d777d081611fd467cff0bc448352b7d9a8a2286a911d86fdc563cfbbfc27c4d5f2c01abcf7666a0223412f5d8e4a6f53e4e6863af2e480b65bb02b2e1bad
+  metadata.gz: adfaf130ee276f65aa942f2d388836ff4137196218e5e66c7878b492d00f51c4ee9171f82e368e762fb46af25ece9a8ee16434b29965c2b052fb88ad651db9b0
+  data.tar.gz: 390b4d6a19e0895ff3057b0ac2f6527d42a5f88b2675b9cb3a89f4533135502fe8b26e2775d93e34515bc780ea686ae731fb32c42061f583230e251b227e9686

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sesh (0.3.4)
+    sesh (0.3.5)
       awesome_print (~> 1.6)
       colorize (~> 0.7.7)
       deep_merge (~> 1.0)

data/Session.vim

@@ -8,6 +8,53 @@ if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
   let s:wipebuf = bufnr('%')
 endif
 set shortmess=aoO
+badd +13 ~/Sites/zip_search/zip_search.gemspec
+badd +1 ~/Sites/zip_search/app/models/zip_search/zip_search.rb
+badd +1 ~/Sites/zip_search/app/models/zip_search/location.rb
+badd +8 ~/Sites/zip_search/lib/zip_search.rb
+badd +7 ~/Sites/zip_search/lib/zip_search/engine.rb
+badd +1 ~/Sites/zip_search/lib/zip_search/railtie.rb
+badd +4 ~/Sites/zip_search/lib/zip_search/model_helpers.rb
+badd +5 ~/Sites/zip_search/lib/zip_search/acts_as_location.rb
+badd +5 ~/Sites/zip_search/lib/zip_search/strong_params_helper.rb
+badd +4 ~/Sites/zip_search/test/dummy/config/routes.rb
+badd +1 ~/Sites/zip_search/test/dummy/app/views/main/home.html.erb
+badd +1 ~/Sites/zip_search/lib/zip_search/view_helpers.rb
+badd +1 \'/Users/smit1625/Sites/zip_search/app/views/zip_search/locations/_search_field.html.erb\'
+badd +9 ~/Sites/zip_search/app/views/zip_search/locations/_search_field.html.erb
+badd +8 ~/Sites/zip_search/Gemfile
+badd +8 ~/Sites/zip_search/app/assets/javascripts/zip_search/locations.coffee
+badd +3 ~/Sites/zip_search/config/routes.rb
+badd +1 ~/Sites/zip_search/test/dummy/app/assets/javascripts/application.js
+badd +1 ~/Sites/zip_search/app/views/layouts/zip_search/application.html.erb
+badd +1 ~/Sites/zip_search/test/dummy/app/views/layouts/application.html.erb
+badd +1 \'/Users/smit1625/Sites/zip_search/app/assets/javascripts/zip_search/init.js\'
+badd +3 ~/Sites/zip_search/app/controllers/zip_search/locations_controller.rb
+badd +1 ~/Sites/zip_search/test/dummy/config/database.yml
+badd +17 ~/Sites/zip_search/app/assets/stylesheets/zip_search/typeahead.scss
+badd +1 ~/Sites/zip_search/test/dummy/app/models/house.rb
+badd +14 ~/Sites/zip_search/test/dummy/app/controllers/houses_controller.rb
+badd +1 ~/Sites/zip_search/test/dummy/app/views/houses/new.html.erb
+badd +7 ~/Sites/zip_search/test/dummy/app/views/houses/_form.html.erb
+badd +5 ~/Sites/zip_search/lib/zip_search/has_locations.rb
+badd +1 ~/Sites/zip_search/test/dummy/config/environments/development.rb
+badd +1 \'/Users/smit1625/Sites/zip_search/config/spring.rb\'
+badd +1 ~/Sites/zip_search/config/spring.rb
+badd +1 ~/Sites/zip_search/test/dummy/config/spring.rb
+badd +1 ~/Sites/zip_search/config/application.rb
+badd +1 ~/Sites/zip_search/test/dummy/config/application.rb
+badd +1 ~/Sites/zip_search/test/dummy/Guardfile
+badd +82 ~/Sites/zip_search/Guardfile
+badd +1 \'/Users/smit1625/Sites/zip_search/zeus.json\'
+badd +1 ~/Sites/zip_search/zeus.json
+badd +1 \'/Users/smit1625/Sites/zip_search/engine_plan.rb\'
+badd +1 ~/Sites/zip_search/engine_plan.rb
+badd +10 ~/Sites/zip_search/lib/zip_search/controller_helpers.rb
+badd +14 ~/Sites/zip_search/test/dummy/app/views/houses/show.html.erb
+badd +1 ~/Sites/zip_search/app/assets/javascripts/zip_search/init.js
+badd +6 ~/Sites/zip_search/lib/zip_search/simple_form_helper.rb
+badd +1 \'/Users/smit1625/Sites/zip_search/app/views/zip_search/_simple_fields.html.erb\'
+badd +1 ~/Sites/zip_search/app/views/zip_search/_simple_fields.html.erb
 badd +3 lib/sesh/version.rb
 badd +1 ~/Sites/energy_innovation_award/index.html
 badd +1 ~/Sites/energy_innovation_award/css/custom.css
@@ -274,9 +321,13 @@ badd +74 lib/sesh/tmux_control.rb
 badd +15 lib/sesh/ssh_control.rb
 badd +1 lib/sesh.rb
 badd +32 sesh.gemspec
+badd +18 exe/return_to_sesh.applescript
+badd +1 \'/Users/smit1625/Sites/sesh/exe/return_to_sesh.applescript\'
+badd +2 exe/return_to_sesh
+badd +0 exe/sesh
 argglobal
 silent! argdel *
-edit lib/sesh/version.rb
+edit exe/sesh
 set splitbelow splitright
 wincmd _ | wincmd |
 split
@@ -302,18 +353,18 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe '1resize ' . ((&lines * 16 + 25) / 50)
-exe 'vert 1resize ' . ((&columns * 72 + 73) / 146)
-exe '2resize ' . ((&lines * 15 + 25) / 50)
-exe 'vert 2resize ' . ((&columns * 72 + 73) / 146)
-exe '3resize ' . ((&lines * 16 + 25) / 50)
-exe 'vert 3resize ' . ((&columns * 73 + 73) / 146)
-exe '4resize ' . ((&lines * 15 + 25) / 50)
-exe 'vert 4resize ' . ((&columns * 73 + 73) / 146)
-exe '5resize ' . ((&lines * 15 + 25) / 50)
-exe 'vert 5resize ' . ((&columns * 73 + 73) / 146)
-exe '6resize ' . ((&lines * 15 + 25) / 50)
-exe 'vert 6resize ' . ((&columns * 72 + 73) / 146)
+exe '1resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 1resize ' . ((&columns * 102 + 136) / 272)
+exe '2resize ' . ((&lines * 20 + 31) / 62)
+exe 'vert 2resize ' . ((&columns * 102 + 136) / 272)
+exe '3resize ' . ((&lines * 20 + 31) / 62)
+exe 'vert 3resize ' . ((&columns * 169 + 136) / 272)
+exe '4resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 4resize ' . ((&columns * 169 + 136) / 272)
+exe '5resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 5resize ' . ((&columns * 101 + 136) / 272)
+exe '6resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 6resize ' . ((&columns * 170 + 136) / 272)
 argglobal
 setlocal fdm=manual
 setlocal fde=0
@@ -324,12 +375,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 3 - ((1 * winheight(0) + 8) / 16)
+let s:l = 1 - ((0 * winheight(0) + 9) / 19)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-3
-normal! 03|
+1
+normal! 0
 wincmd w
 argglobal
 edit lib/sesh/tmux_control.rb
@@ -342,12 +393,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 113 - ((11 * winheight(0) + 7) / 15)
+let s:l = 185 - ((9 * winheight(0) + 10) / 20)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-113
-normal! 018|
+185
+normal! 09|
 wincmd w
 argglobal
 edit lib/sesh/ssh_control.rb
@@ -360,7 +411,7 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 38 - ((10 * winheight(0) + 8) / 16)
+let s:l = 38 - ((1 * winheight(0) + 10) / 20)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -378,12 +429,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 22 - ((9 * winheight(0) + 7) / 15)
+let s:l = 10 - ((9 * winheight(0) + 9) / 19)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-22
-normal! 068|
+10
+normal! 044|
 wincmd w
 argglobal
 edit lib/sesh.rb
@@ -396,12 +447,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 41 - ((11 * winheight(0) + 7) / 15)
+let s:l = 45 - ((8 * winheight(0) + 9) / 19)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-41
-normal! 023|
+45
+normal! 031|
 wincmd w
 argglobal
 edit lib/sesh/cli.rb
@@ -414,26 +465,26 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 210 - ((1 * winheight(0) + 7) / 15)
+let s:l = 94 - ((18 * winheight(0) + 9) / 19)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-210
+94
 normal! 032|
 wincmd w
 2wincmd w
-exe '1resize ' . ((&lines * 16 + 25) / 50)
-exe 'vert 1resize ' . ((&columns * 72 + 73) / 146)
-exe '2resize ' . ((&lines * 15 + 25) / 50)
-exe 'vert 2resize ' . ((&columns * 72 + 73) / 146)
-exe '3resize ' . ((&lines * 16 + 25) / 50)
-exe 'vert 3resize ' . ((&columns * 73 + 73) / 146)
-exe '4resize ' . ((&lines * 15 + 25) / 50)
-exe 'vert 4resize ' . ((&columns * 73 + 73) / 146)
-exe '5resize ' . ((&lines * 15 + 25) / 50)
-exe 'vert 5resize ' . ((&columns * 73 + 73) / 146)
-exe '6resize ' . ((&lines * 15 + 25) / 50)
-exe 'vert 6resize ' . ((&columns * 72 + 73) / 146)
+exe '1resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 1resize ' . ((&columns * 102 + 136) / 272)
+exe '2resize ' . ((&lines * 20 + 31) / 62)
+exe 'vert 2resize ' . ((&columns * 102 + 136) / 272)
+exe '3resize ' . ((&lines * 20 + 31) / 62)
+exe 'vert 3resize ' . ((&columns * 169 + 136) / 272)
+exe '4resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 4resize ' . ((&columns * 169 + 136) / 272)
+exe '5resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 5resize ' . ((&columns * 101 + 136) / 272)
+exe '6resize ' . ((&lines * 19 + 31) / 62)
+exe 'vert 6resize ' . ((&columns * 170 + 136) / 272)
 tabnext 1
 if exists('s:wipebuf')
   silent exe 'bwipe ' . s:wipebuf

data/exe/return_to_sesh

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+system File.expand_path(File.join(__dir__, 'return_to_sesh.applescript'))

data/exe/return_to_sesh.applescript

@@ -0,0 +1,24 @@
+#!/usr/bin/env osascript
+
+tell application "System Events"
+  set frontApp to the name of the first application process whose frontmost is true
+end tell
+if frontApp is "iTerm"
+  tell application "iTerm" to set frontWindow to the index of the front window
+  set loops to 0
+  tell application "System Events"
+    repeat until (loops > 20) or (name of first application process whose frontmost is true) is "Google Chrome"
+      set loops to (loops + 1)
+      delay 0.5
+    end repeat
+  end tell
+  if loops < 21
+    delay 0.5
+    tell application "iTerm"
+      activate
+      set index of window frontWindow to 1
+    end tell
+    tell application "System Events" to tell process "iTerm" to perform action "AXRaise" of the first window
+  end if
+end if
+

data/lib/sesh/cli.rb

@@ -81,6 +81,10 @@ module Sesh
           parsed_options[:shell][:pane] = v }
         opts.on('--spec-path=path', 'Path to Spec File to Run') {|v|
           parsed_options[:shell][:spec] = v }
+        opts.on('--rspec-prefix=prefix', 'Prefix for rspec command') {|v|
+          parsed_options[:shell][:rspec_prefix] = v }
+        opts.on('--and-return', 'Return after Execution') {|v|
+          parsed_options[:shell][:and_return] = true }
 
         # # target_opts = DEPLOYMENT_TARGETS.join '|'
         # opts.on("-T", "--target=target", 'Titanium Deployment Target') do |v|
@@ -160,6 +164,11 @@ module Sesh
         end
       end
       # TODO: parse a spec file
+      if @command == 'rspec' && @options[:shell][:spec].nil?
+        ARGV.each{|a| if a =~ /spec\//
+          @options[:shell][:spec] = a; break end } if ARGV.any?
+        @options[:shell][:spec] ||= 'spec'
+      end
       # 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?
@@ -233,10 +242,8 @@ module Sesh
             Logger.success "Sesh client connected successfully."
           else Logger.fatal 'Sesh client failed to connect.' end
         when 'begin' then @tmux_control.begin_tmuxinator_session!
-        when 'run'
+        when 'run', 'rspec'
           @tmux_control.do_shell_operation! @options[:shell]
-        when 'rspec'
-          puts "Spec: #{@options[:shell][:spec]}"
         when 'detach' then @tmux_control.disconnect_client! ARGV.join(' ')
         else
           Logger.fatal "Command not recognized!"

data/lib/sesh/tmux_control.rb

@@ -176,7 +176,13 @@ module Sesh
       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
+        rspec_cmd = if options[:rspec_prefix].nil? then 'rspec'
+                    else "#{options[:rspec_prefix]} rspec" end
+        options[:command] ||= "#{rspec_cmd} #{options[:spec]}"
+      end
+      if options[:and_return]
+        options[:command] = "return_to_sesh &; #{options[:command]}"
+      end
       if options[:pane].nil?
         interrupt_and_send_command_to_project! options[:command]
       else

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/lib/sesh.rb

@@ -34,7 +34,9 @@ module Sesh
     shell: {
       command: nil,
       pane: nil,
-      spec: nil
+      spec: nil,
+      rspec_prefix: nil,
+      and_return: false
     },
     ssh: {
       local_addr: nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sesh
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - MacKinley Smith
@@ -111,6 +111,8 @@ dependencies:
 description: Remote background sessions powered by tmux and tmuxinator.
 email: smithmackinley@gmail.com
 executables:
+- return_to_sesh
+- return_to_sesh.applescript
 - sesh
 extensions: []
 extra_rdoc_files: []
@@ -124,6 +126,8 @@ files:
 - Session.vim
 - bin/console
 - bin/setup
+- exe/return_to_sesh
+- exe/return_to_sesh.applescript
 - exe/sesh
 - lib/sesh.rb
 - lib/sesh/assets/sample.yml