pytty 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 449a17a0c2d92d72ceddac8091af43e21e16d730d063458b58411385cd659fa2
-  data.tar.gz: db5e5b5446c3d18b16d886fcd5409380fcd49ed1f6d120bdc7f29f3e6740146a
+  metadata.gz: bdb07fa81c4837ef64e8bffa9abaed4abdb6b99caeff476a7d4b11b2b36be8f1
+  data.tar.gz: 979f05736d9f1ab607edf33371c6a3f1ffadcdd60ca05c8d6d57af2a401e1808
 SHA512:
-  metadata.gz: cc1f6302b922e313c85327d3348d116905d2f889260695f680c946eedcc769c84bf510a3b0439ed499e3f8528f2c8c8bde89cce0a5bb2e29a600ab04987a7631
-  data.tar.gz: 59553a444c16d811403ce3e288aaf44d454ed1bb100896b4b6a30645664554b6004dfc8e748ee66d81227ce7792a1a43c4c58d6d63a549f43a2ea45b879e2811
+  metadata.gz: 691018ead4ca0970d5ba99006e2931aa7da6b6d116adf6e2d041282c22d24f67985a0eb581659d82bb991c8f64e22b31f9bee6733b02de4fb54ca70187f0f791
+  data.tar.gz: 5c9c8a5cbea5e16a36332b3aab35f02472322b474d075bf923dd671c6d56f49a78677c6d77370f77eb80388ae1cfa0ffb8148232178433b201cd4e3da010e625

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pytty (0.4.0)
+    pytty (0.4.1)
       async-websocket
       clamp (~> 1.3)
       falcon

data/build/linux.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 set -e
 
-version=${TRAVIS_TAG#"v"}
+version=${1#"v"}
 package="tmp/pyttyd-linux-amd64-${version}"
 rubyc -o "$package" -d /tmp/pytty-build --make-args="-j16 --silent" pyttyd
 ./"$package" --version

data/lib/pytty/client/api/attach.rb

@@ -1,3 +1,5 @@
+require "io/console"
+
 module Pytty
   module Client
     module Api
@@ -8,17 +10,19 @@ module Pytty
             headers = [['accept', 'application/json']]
             body = {}.to_json
 
-            $stdin.raw!
-            $stdin.echo = false
+            # stdin_body = {
+            #   c: '\f'
+            # }.to_json
+            # response = internet.post("#{Pytty::Client.host_url}/v1/stdin/#{id}", headers, [stdin_body])
+
+            if interactive
+              $stdin.raw!
+              $stdin.echo = false
+            end
             async_stdin = Async::IO::Stream.new(
               Async::IO::Generic.new($stdin)
             )
 
-            stdin_body = {
-              c: "\f"
-            }.to_json
-            response = internet.post("#{Pytty::Client.host_url}/v1/stdin/#{id}", headers, [stdin_body])
-
             detach_sequence_started = false
             while c = async_stdin.read(1) do
               detach = false

data/lib/pytty/client/api/yield.rb

@@ -18,7 +18,7 @@ module Pytty
           }.to_json
 
           response = internet.post("#{Pytty::Client.host_url}/v1/yield", headers, [body])
-          JSON.parse(response.body.read)
+          [response, JSON.parse(response.body.read)]
         end
       end
     end

data/lib/pytty/client/cli.rb

@@ -1,15 +1,17 @@
 require "clamp"
 
 require_relative "../common/cli/version_command"
-require_relative "cli/run_command"
-require_relative "cli/stream_command"
-require_relative "cli/yield_command"
+
 require_relative "cli/ps_command"
-require_relative "cli/kill_command"
-require_relative "cli/rm_command"
+
+require_relative "cli/yield_command"
 require_relative "cli/spawn_command"
+
+require_relative "cli/rm_command"
 require_relative "cli/signal_command"
 require_relative "cli/attach_command"
 require_relative "cli/stdout_command"
 
+require_relative "cli/run_command"
+
 require_relative "cli/root_command"

data/lib/pytty/client/cli/ps_command.rb

@@ -16,7 +16,7 @@ module Pytty
           end.wait
 
           unless quiet?
-            puts "id\trunning\tcmd"
+            puts "id\trunning\tstatus\tcmd"
             puts "-"*40
           end
           for process_yield_json in process_yield_jsons do

data/lib/pytty/client/cli/root_command.rb

@@ -13,10 +13,8 @@ module Pytty
 
         subcommand ["version"], "Show version information", Pytty::Common::Cli::VersionCommand
         subcommand ["run"], "run", RunCommand
-        subcommand ["stream"], "stream", StreamCommand
         subcommand ["yield"], "yield", YieldCommand
         subcommand ["ps"], "ps", PsCommand
-        subcommand ["kill"], "kill", KillCommand
         subcommand ["rm"], "rm", RmCommand
         subcommand ["spawn"], "spawn", SpawnCommand
         subcommand ["signal"], "signal", SignalCommand

data/lib/pytty/client/cli/run_command.rb

@@ -16,8 +16,12 @@ module Pytty
 
         def execute
           Async.run do |task|
-            json = Pytty::Client::Api::Yield.run id: name, cmd: cmd_list, env: {}
-            process_yield = Pytty::Client::ProcessYield.from_json json
+            response, body = Pytty::Client::Api::Yield.run id: name, cmd: cmd_list, env: {}
+            unless response.status == 200
+              puts body
+              exit 1
+            end
+            process_yield = Pytty::Client::ProcessYield.from_json body
             unless detach?
               task.async do
                 process_yield.attach interactive: interactive?

data/lib/pytty/client/cli/yield_command.rb

@@ -12,12 +12,17 @@ module Pytty
         option ["--name"], "NAME", "name"
 
         def execute
-          process_yield = Async.run do
-            json = Pytty::Client::Api::Yield.run cmd: cmd_list, id: name, env: {}
-            ::Pytty::Client::ProcessYield.from_json json
+          response, json = Async.run do
+            Pytty::Client::Api::Yield.run cmd: cmd_list, id: name, env: {}
           end.wait
 
-          puts process_yield.id
+          if response.status == 200
+            process_yield = ::Pytty::Client::ProcessYield.from_json json
+            puts process_yield.id
+          else
+            puts json
+          end
+
         end
       end
     end

data/lib/pytty/client/process_yield.rb

@@ -1,11 +1,12 @@
 module Pytty
   module Client
     class ProcessYield
-      def initialize(id:, cmd:, env:, pid:)
+      def initialize(id:, cmd:, env:, pid:, status:)
         @cmd = cmd
         @env = env
         @pid = pid
         @id = id
+        @status = status
       end
 
       attr_reader :id
@@ -15,7 +16,8 @@ module Pytty
           id: json.fetch("id"),
           cmd: json.fetch("cmd"),
           env: json.fetch("env"),
-          pid: json.fetch("pid")
+          pid: json.fetch("pid"),
+          status: json.fetch("status")
         })
       end
       def running?
@@ -25,6 +27,7 @@ module Pytty
         fields = []
         fields << @id
         fields << running?
+        fields << @status
         fields << @cmd.join(" ")
         fields.join("\t")
       end

data/lib/pytty/daemon.rb

@@ -21,11 +21,8 @@ module Pytty
       objs.each do |k,obj|
         process_yield = ProcessYield.new obj["cmd"], id: obj["id"], env: obj["env"]
         @@yields[obj["id"]] = process_yield
-        print "spawning #{process_yield.cmd} ... "
         process_yield.spawn if obj["running"]
-        puts "done"
       end
-
     end
 
     def self.pytty_path

data/lib/pytty/daemon/api/router.rb

@@ -29,24 +29,25 @@ module Pytty
             rescue Exception => ex
               p ex
             ensure
-              puts "closing body"
               body.close
             end
 
             [200, {'content-type' => 'text/html; charset=utf-8'}, body]
           when "attach"
             process_yield = Pytty::Daemon.yields[params["id"]]
+            return [404, {'content-type' => 'text/html; charset=utf-8'}, ["does not exist"]] unless process_yield
+
+            puts "got attach: #{req.object_id}"
             body = Async::HTTP::Body::Writable.new
 
             Async::Task.current.async do |task|
               notification = process_yield.add_stdout body
-              p ["blocking", notification]
               notification.wait
-              p "got notification"
             rescue Exception => ex
-              p ex
+              puts "----"
+              p ["attach", ex]
             ensure
-              puts "closing body"
+              puts "closing attach: #{req.object_id}"
               body.close
             end
 

data/lib/pytty/daemon/api/server.rb

@@ -18,8 +18,8 @@ module Pytty
           bound_endpoint = Async::IO::SharedEndpoint.bound(endpoint)
 
           server = Falcon::Server.new(app, bound_endpoint, endpoint.protocol, endpoint.scheme)
-          puts "serving at #{url}"
           server.run
+          puts "serving at #{url}"
         end
       end
     end

data/lib/pytty/daemon/cli/serve_command.rb

@@ -25,9 +25,25 @@ module Pytty
             "1234"
           end
 
-          Async::Reactor.run do
+          Async::Reactor.run do |task|
             Pytty::Daemon.load
-            Pytty::Daemon::Api::Server.run url: url_parts.join("")
+            server_task = task.async do
+              Pytty::Daemon::Api::Server.run url: url_parts.join("")
+            end
+
+            shutdown = lambda do |signo|
+              puts "\r"
+              puts "Got: #{Signal.signame(signo)}"
+              server_task.stop
+              Pytty::Daemon.yields.each do |id,process_yield|
+                process_yield.signal "kill"
+                puts id
+              end
+              puts "bye."
+            end
+
+            Signal.trap "INT", shutdown
+            Signal.trap "TERM", shutdown
           end
         end
       end

data/lib/pytty/daemon/components/handler.rb

@@ -17,11 +17,14 @@ module Pytty
             env = params.dig "env"
             id = params.dig "id"
 
-            process_yield = Pytty::Daemon::ProcessYield.new cmd, id: id, env: env
-            Pytty::Daemon.yields[process_yield.id] = process_yield
-            Pytty::Daemon.dump
-
-            [200, process_yield]
+            if Pytty::Daemon.yields[id]
+              [500, "already exists"]
+            else
+              process_yield = Pytty::Daemon::ProcessYield.new cmd, id: id, env: env
+              Pytty::Daemon.yields[process_yield.id] = process_yield
+              Pytty::Daemon.dump
+              [200, process_yield]
+            end
           else
             raise "unknown: #{component}"
           end

data/lib/pytty/daemon/process_yield.rb

@@ -44,6 +44,7 @@ module Pytty
 
       def spawn
         return false if running?
+        @status = nil
 
         executable, args = @cmd
         # @env.merge!({
@@ -59,8 +60,6 @@ module Pytty
           File.open stdout_path, "r"
         )
         Async::Task.current.async do |task|
-          p ["spawn", executable, args, @env]
-
           real_stdout, real_stdin, pid = PTY.spawn @env, executable, *args
           @pid = pid
           async_stdout = Async::IO::Generic.new real_stdout
@@ -70,6 +69,7 @@ module Pytty
             while c = @stdin.dequeue do
               async_stdin.write c
             end
+          rescue Async::Stop => ex
           rescue Exception => ex
             puts "async_stdin.write: #{ex.inspect}"
           end
@@ -78,40 +78,48 @@ module Pytty
             while c = async_stdout.read(1)
               stdout_appender.write c
               stdout_appender.flush
+
               @stdouts.each do |notification, stdout|
                 begin
                   stdout.write c
-                rescue Errno::EPIPE => ex
+                rescue Errno::EPIPE, Errno::EPROTOTYPE => ex
                   notification.signal
                   @stdouts.delete notification
                 end
               end
             end
+          rescue Async::Stop
+            signal "kill"
+          rescue Exception => ex
+            p ["async_stdout.read", ex]
           ensure
             task_stdin_writer.stop
             Process.wait(@pid)
-            @status = $?.exitstatus
+            @status = if $?.exitstatus
+              $?.exitstatus
+            else
+              Signal.signame $?.termsig
+            end
+            puts "exited #{@id} with status: #{@status}"
+
             @pid = nil
             stdout_appender.close
 
             @stdouts.each do |notification, stdout|
-              p ["notifying: #{notification}"]
               notification.signal
               @stdouts.delete notification
             end
-            p ["exited", @cmd, "status", @status]
+            Pytty::Daemon.dump
           end
         end.wait
 
-        puts "spawned"
-        p ["@stdouts", @stdouts]
+        puts "spawned #{id}"
         return true
       end
 
       def signal(sig)
-        sig_upcased = sig.upcase
-        p ["signaling", sig_upcased, "to", @pid]
-        Process.kill(sig_upcased, @pid)
+        return unless @pid
+        Process.kill(sig.upcase, @pid)
       end
     end
   end

data/lib/pytty/version.rb

@@ -1,3 +1,3 @@
 module Pytty
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pytty
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matti Paksula
@@ -197,7 +197,6 @@ files:
 - lib/pytty/client/api/yield.rb
 - lib/pytty/client/cli.rb
 - lib/pytty/client/cli/attach_command.rb
-- lib/pytty/client/cli/kill_command.rb
 - lib/pytty/client/cli/ps_command.rb
 - lib/pytty/client/cli/rm_command.rb
 - lib/pytty/client/cli/root_command.rb

data/lib/pytty/client/cli/kill_command.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-require 'async'
-require 'async/http'
-require 'async/http/internet'
-require 'json'
-
-module Pytty
-  module Client
-    module Cli
-      class KillCommand < Clamp::Command
-        parameter "ID ...", "id"
-
-        def execute
-          Async.run do
-            internet = Async::HTTP::Internet.new
-            headers = [['accept', 'application/json']]
-            body = {
-              signal: "KILL"
-            }.to_json
-
-            for id in id_list do
-              response = internet.post("#{Pytty::Client.host_url}/v1/signal/#{id}", headers, [body])
-              puts response.read
-            end
-          ensure
-            internet.close
-          end
-        end
-      end
-    end
-  end
-end
-