sesh 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 519e114e15fb6c5fea66d92a8a696ce80308ff4c
-  data.tar.gz: fe5045bde290d181b8d8d395b721914a7fd87b17
+  metadata.gz: 58f85d808ef26b90decd533d3ee960e9a6b2b155
+  data.tar.gz: de8a3d1ccb614156e8c6938a72750e7ffd3e28db
 SHA512:
-  metadata.gz: c8ea6c0cf3cf02d4b642bd7cfcd950f990cadafd973f30a02e530c419f038eb12566edd79b69c254608a26d3bf1345ae7c2f17ebf3a6397c5c4fd7e33cca0fa1
-  data.tar.gz: 205abe6b579f35abc141abd18b377698914125d3a6ce6758aab73c9e47c5d3da5697ef83cfc834848171369abd5c27854d69e9772926f00c908d4104c3df6514
+  metadata.gz: 71624d8a3a5911255a1d93bfdcf433edce65acea0b146193955ac99eaa57bcc49ab46e5816923a7d076e83f8c175353e4b10baf74402c06f812ab7ee9e482675
+  data.tar.gz: a9450662b2e2fd435bccc20d4635eb5cb9e301b56169e1b7140f7371116e9198986e12c3d3d46a60106ed104829b719a9e8ae6244c88f88afa1f3f46938e020b

data/Gemfile.lock

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

data/lib/sesh/cli.rb

@@ -179,11 +179,7 @@ module Sesh
             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")
+          running_projects = TmuxControl.get_running_projects
           pcount = running_projects.count
           if pcount > 0
             Logger.success "#{pcount} project#{pcount>1 ? 's':''} currently running:"

data/lib/sesh/tmux_control.rb

@@ -7,12 +7,21 @@ module Sesh
       @options = DEFAULT_OPTIONS[:tmux].merge(options)
     end
 
-    def already_running?
-      `ps aux | grep "#{project_name_matcher}"`.strip.length > 0 end
+    def self.get_running_projects
+      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
+      output.split("\n")
+    end
+    def already_running?; self.class.get_running_projects.include? @project end
+      # `ps aux | grep "#{project_name_matcher}"`.strip.length > 0 end
 
     def project_name_matcher
-      pn = @project.gsub '-', '\-'
-      "[t]mux.*[#{pn[0]}]#{pn[1..-1]}" end
+      "[t]mux.*[t]mp\\/#{Regexp.escape(@options[:socket_file].split('/')[2..-1].join('/'))}.*"
+    end
+      # pn = @project.gsub '-', '\-'
+      # "[t]mux.*[#{pn[0]}]#{pn[1..-1]}" end
 
     def issue_start_command!
       # Add bundle exec to the sesh begin command for dev purposes.
@@ -66,8 +75,7 @@ module Sesh
         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? })
+      if issue_stop_command! && Logger.show_progress_until(-> { !already_running? })
         Logger.success 'Sesh stopped successfully.'
         puts
       else Logger.fatal 'Sesh failed to stop after ten seconds!' end

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

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