pssh 0.3.3 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDVmMzVhYTE2ZjRhMGZiMmE0NWM1ZjdmM2Q3ZTUyZjljYTJiOTc1Nw==
+    MDM1MzljMDVjYTk2ZjlkOWM5ZDhmY2Y0MzhmZWZjZTViMDI4ZTM4Zg==
   data.tar.gz: !binary |-
-    ZDE1MDQ0MTBkOTA4NzhlY2UwMDBmZmJmZTU5NmQ5NmJjZmYyNzZhZA==
+    ODI3MmViMDJhYjEwYjU2ZmMxNTMzMGQ2MjZlNmUzYzFjNWIwOGY1Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWQ4MTAxMTA1OGVjNzNmM2FkMWJjNDYzYjNiNGFhYzMzNzVmMTNlMDhiYjU0
-    MjkwN2I2ZmM5OTQ3MTNhMTZlZjVjNjkwZWUwNTEyMWMxM2RkMzNiODI5MDMz
-    ZTU2YTdkYjY2NzlhNmJlZmRhNmQ4OTI5YTM4ZjZkZDYwNTBmMTk=
+    NmEyNmQ4YmJlNDYxMzA1NWE5ZTA0ZmY4MjU2YjYzM2QxNTg4N2UyMTJlNzU4
+    MGM3NTIxNTg3YmJmZjk3NWFkOGRlYTkxOGUwZWU1MGE4YjU5Y2M3MDY0MWVj
+    NjJjZmIxNjdjMzVkOWFlNzRmNTYzMTY1NjA2NWQ3ZDFkOWJhNjM=
   data.tar.gz: !binary |-
-    OGRiZTE1OWQ4M2MyY2RkMWUxOGY2MGQ5ZjVmMzBlOTE3ODVlMzZjOGFmNjM0
-    ZDIzZjM2ODMzNGM4ODJiYmI5YjM4MzkyZTJjMWYyY2JkYjY1OTk0ZjdjOWU1
-    MDZmNjQzMmI1ZGM0Yzg4MzE2ZmE4NzQ0OWZhYWIxZjJlNDg3Njc=
+    Y2FkNzZjZmQyNjNmM2U5NDk1MzI3MjRkODYyNzQ2MTIwOTllNmFiY2UxMzM3
+    OTdiOTA0ZDZhN2QyNGZjODcyMmI1ZWU5NTUwY2E5NDJjNzgzOTZlMGQxMDE2
+    NjI3ZjYxNDNiNTAyMWQ4MzBmODBmMTcyZDI1ODhhMmNiY2E5YzI=

data/lib/pssh.rb

@@ -103,8 +103,6 @@ module Pssh
         (ENV['TMUX'] && :tmux) ||
         (ENV['STY'] && :screen) ||
         :shell
-        #(`which tmux` && :tmux) ||
-        #(`which screen` && :screen) ||
     end
 
     # Public: Allow configuring details of Pssh by making use of a block.

data/lib/pssh/cli.rb

@@ -29,10 +29,6 @@ module Pssh
           options[:port] = port.to_i
         end
 
-        opts.on('-c PATH', '--command COMMAND', [:tmux, :screen, :shell], 'Set the tool that will be used to initialize the web session (tmux, screen, or shell)') do |command|
-          options[:command] = command
-        end
-
         opts.on('-s NAME', '--socket NAME', String, 'Set the socket that will be used for connecting (socket-name)') do |socket|
           options[:socket_path] = socket
         end

data/lib/pssh/pty.rb

@@ -29,38 +29,33 @@ BANNER
             end
             system("stty raw -echo")
           end
-          @active = true
-          while @active do
-            begin
-              io = [@read]
-              io << $stdin if new?
-              rs, ws = IO.select(io)
-              r = rs[0]
-              while (data = r.read_nonblock(2048)) do
-                if new? && r == $stdin
-                  @write.write_nonblock data
-                else
-                  $stdout.write_nonblock data if new?
-                  data.encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '')
-                  data.encode!('UTF-8', 'UTF-16')
-                  if data.valid_encoding?
-                    store data
-                    Pssh.socket.write data
-                  end
-                end
-              end
-            rescue Exception => e
-              if @active
-                if e.is_a?(Errno::EAGAIN)
-                  retry
-                else
-                  system("stty -raw echo") if new?
-                  puts 'Terminating Pssh.'
-                  Kernel.exit!
-                  @active = false
+
+          begin
+            io = [@read]
+            io << $stdin if new?
+            rs, ws = IO.select(io)
+            r = rs[0]
+            while (data = r.read_nonblock(2048)) do
+              if new? && r == $stdin
+                @write.write_nonblock data
+              else
+                $stdout.write_nonblock data if new?
+                data.encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '')
+                data.encode!('UTF-8', 'UTF-16')
+                if data.valid_encoding?
+                  store data
+                  Pssh.socket.write data
                 end
               end
             end
+          rescue Exception => e
+            if e.is_a?(Errno::EAGAIN)
+              retry
+            else
+              system("stty -raw echo") if new?
+              puts 'Terminating Pssh.'
+              Kernel.exit!
+            end
           end
         end
       end

data/lib/pssh/version.rb

@@ -1,4 +1,4 @@
 module Pssh
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pssh
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Kelly Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json