sesh 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4929cebd5f39bea69099a5f370be728e11b857ec
-  data.tar.gz: 729f4674d93f0ed4696363df5fdad0ccd8cb2d9e
+  metadata.gz: 606d7765a67aab4f949da18b6892991d91c64340
+  data.tar.gz: 6a3bdfce44d732a03276dbc76026795dc5611465
 SHA512:
-  metadata.gz: a92d024cf5ca5a118c39da928ccbcfa2ab8d9dc3ce6d038c0825c8ba5e939ce0d4dd963c35fac9b81780d66fb20cd2bc55422c9f3e1e18035f011d5a6f3383a3
-  data.tar.gz: ff7be128d9111086872cb9751d9b328a5c83516575f2256c3434f8851a93800bcdd47eb173465e57aa786a3f96cec31a62d3e9aef5151ff3a06002181026e566
+  metadata.gz: d9b2a52b1404207b5888ec94183bc35161a630136590a99eb061b58b01c6012756e15a3279fd752dac83daab2f72d8d696e5e7dfe94ffa0c6e2504580a77b1bc
+  data.tar.gz: 81fe0e9c936be0d1195d20a0c592f409e5d125d0a16f68d7116531d935644310514f3c17ae24940b707130f714ca9b01b5e5cdab39ea756ea2a495c1420c979c

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    sesh (0.4.0)
+    sesh (0.4.2)
       awesome_print (~> 1.6)
       colorize (~> 0.7.7)
       deep_merge (~> 1.0)
+      open4 (~> 1.3.4)
       tmuxinator (~> 0.6.9)
 
 GEM
@@ -15,6 +16,7 @@ GEM
     deep_merge (1.0.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
+    open4 (1.3.4)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)

data/lib/sesh/tmux_control.rb

@@ -1,4 +1,5 @@
 require 'sesh'
+require 'open4'
 # require 'tmuxinator'
 # require 'yaml'
 
@@ -190,17 +191,33 @@ module Sesh
       # puts "Inferred location: #{inferred_location}"
       if options[:pane].nil?
         # puts inferred_location.inspect
-        if inferred_location[:project] == @project then system options[:command]
-        else interrupt_and_send_command_to_project! options[:command] end
+        if inferred_location[:project] != @project
+          interrupt_and_send_command_to_project! options[:command]
+          return 0
+        else do_shell_operation_here! options[:command] end
       else
-        if inferred_location == { project: @project, pane: options[:pane] }
-          system options[:command]
-          return $?.exitstatus
-        else
+        if inferred_location != { project: @project, pane: options[:pane] }
           interrupt_and_send_command_to_pane! options[:pane], options[:command]
           return 0
-        end
+        else do_shell_operation_here! options[:command] end
+      end
+    end
+    def do_shell_operation_here!(cmd)
+      # system cmd
+      # STDOUT.sync = true
+      # stdin, stdout, stderr, wait_thr = Open3.popen3(*cmd.split(' '))
+      # stdin.close
+      # stdout.close
+      output = ''
+      status = Open4::popen4(cmd) do |pid, stdin, stdout, stderr|
+        stdin.close
+        puts o = stdout.read.strip; output << o
+        puts o = stderr.read.strip; output << o
       end
+      puts "Full output: #{output}"
+      puts "Status: #{status.inspect}"
+      status.exitstatus
+      # $?.exitstatus
     end
 
     # Getter methods for passthru to SshControl class

data/lib/sesh/version.rb

@@ -1,3 +1,3 @@
 module Sesh
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/sesh.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'deep_merge', '~> 1.0'
   s.add_dependency 'awesome_print', '~> 1.6'
   s.add_dependency 'colorize', '~> 0.7.7'
+  s.add_dependency 'open4', '~> 1.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sesh
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - MacKinley Smith
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 description: Remote background sessions powered by tmux and tmuxinator.
 email: smithmackinley@gmail.com
 executables: