singularity-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f917e15b139df05230f76923b7c1296caa65d62
-  data.tar.gz: 230d2d431af444026ae30b1ece3e4fcdd65edca8
+  metadata.gz: ad0f8767080ab7ba91d8a934f7db17ebd2fa23e4
+  data.tar.gz: 41704c0d0db1765d77bd86fa38d7c79cdc2eb132
 SHA512:
-  metadata.gz: f294ca9b8811d3a3092475baa0f302ffdb10c14a40866d556bb2d96e57e8421ed111b7c41ba2b5320693121e09e24783a3afd734294a805dba2d31ddcec86b59
-  data.tar.gz: 79759aa9d74a1692304e4c5e738d69f0d13e26904dbc01b9665a74729d5b584786594182b1ac615e8657b5d455232c18742adb84954865ab12b8cf4f5afb1cea
+  metadata.gz: 90b4cd647f164706d0fb3704cada223c00e63d47ecff5ee944f0cc5dfb82a86f277194ad9d46ee79fcc1b1f999af9db8ad8e61fec6af3d201dd592f15c11d48d
+  data.tar.gz: 9db0a3293d747a622c0980160e2d1334871d49f4621cf07cbe98f661cf16a649dd713ead2d3a14f40f86ed3f4877f2e5ac8c9c727ad4d468c1b0395d337d6698

data/lib/singularity.rb

@@ -178,8 +178,7 @@ module Singularity
         # get active tasks until ours shows up so we can get IP/PORT
         begin
           @thisTask = ''
-          @tasks = RestClient.get "#{@uri}/api/tasks/active", :content_type => :json
-          @tasks = JSON.parse(@tasks)
+          @tasks = JSON.parse(RestClient.get "#{@uri}/api/tasks/active", :content_type => :json)
           @tasks.each do |entry|
             if entry['taskRequest']['request']['id'] == @data['requestId']
               @thisTask = entry
@@ -195,31 +194,65 @@ module Singularity
           # this makes sure that the docker image has completely started and the SSH command succeeds
           where = Dir.pwd.split('/').last
           puts " Opening a shell to #{where}, please wait a moment...".light_blue
-          puts " STDOUT / STDERR will print to console when session is over.".light_blue
           begin end until system "ssh -o LogLevel=quiet -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@#{@ip} -p #{@port}"
         else
           puts " Deployed and running #{@data['command']} #{@data['arguments']}".light_green
-        end
+          print " STDOUT".light_cyan
+          print " and"
+          print " STDERR".light_magenta
+          puts ":"
 
-        # need to wait for "task_finished" or "task_running & ssh" before we can ask for STDOUT/STDERR
-        begin
-          @taskState = RestClient.get "#{@uri}/api/history/task/#{@thisTask['taskId']['id']}"
-          @taskState = JSON.parse(@taskState)
-          @taskState["taskUpdates"].each do |update|
-            @taskState = update['taskState']
-          end
-        end until @taskState == "TASK_FINISHED" || (@taskState == "TASK_RUNNING" and @script == "ssh")
-
-        # output STDOUT / STDERR to shell
-        puts ""
-        stdout = RestClient.get "#{@uri}/api/sandbox/#{@thisTask['taskId']['id']}/read", {params: {path: "stdout", length: 30000, offset: 0}}
-        stdout = JSON.parse(stdout)
-        puts "stdout: ".cyan
-        puts stdout['data'].light_cyan
-        stderr = RestClient.get "#{@uri}/api/sandbox/#{@thisTask['taskId']['id']}/read", {params: {path: "stderr", length: 30000, offset: 0}}
-        stderr = JSON.parse(stderr)
-        puts "stderr: ".red
-        puts stderr['data'].light_magenta
+          # output STDOUT / STDERR to shell
+          @stdoutOffset = 0
+          @stderrOffset = 0
+          @lastOutLine = ''
+          @lastErrLine = ''
+          begin
+            # get most recent task state
+            @taskState = JSON.parse(RestClient.get "#{@uri}/api/history/task/#{@thisTask['taskId']['id']}")
+            @taskState["taskUpdates"].each do |update|
+              @taskState = update['taskState']
+            end
+
+            # need to wait for "task_running" before we can ask for STDOUT/STDERR
+            if @taskState == "TASK_RUNNING"
+              @stdout = JSON.parse(RestClient.get "#{@uri}/api/sandbox/#{@thisTask['taskId']['id']}/read", {params: {path: "stdout", length: 30000, offset: @stdoutOffset}})['data']
+              @stdoutOffset += @stdout.length
+              @stdout = @stdout.split("\n")
+              if @stdout.any?
+                if @lastOutLine.include? @stdout[0]
+                  @stdout.shift
+                end
+                if !@stdout.empty?
+                  if @stdout[0].length > 0
+                    @stdout.each do |i|
+                      puts i.light_cyan
+                    end
+                  end
+                end
+                @lastOutLine = @stdout.last
+              end
+
+              @stderr = JSON.parse(RestClient.get "#{@uri}/api/sandbox/#{@thisTask['taskId']['id']}/read", {params: {path: "stderr", length: 30000, offset: @stderrOffset}})['data']
+              @stderrOffset += @stderr.length
+              @stderr = @stderr.split("\n")
+              if @stderr.any?
+                if @lastErrLine.include? @stderr[0]
+                  @stderr.shift
+                end
+                if !@stderr.empty?
+                  if @stderr[0].length > 0
+                    @stderr.each do |i|
+                      puts i.light_magenta
+                    end
+                  end
+                end
+                @lastErrLine = @stderr.last
+              end
+
+            end
+          end until @taskState == "TASK_FINISHED"
+        end
 
         # finally, delete the request (which also deletes the corresponding task)
         RestClient.delete "#{@uri}/api/requests/request/#{@data['requestId']}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Travis Webb