singularity-cli 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad0f8767080ab7ba91d8a934f7db17ebd2fa23e4
-  data.tar.gz: 41704c0d0db1765d77bd86fa38d7c79cdc2eb132
+  metadata.gz: b11bac3f0e26dcf4d6259d2da6fc587fc901c9e0
+  data.tar.gz: 8880e2d2a6c9d95f36ccbc0a3ac5241462ae6063
 SHA512:
-  metadata.gz: 90b4cd647f164706d0fb3704cada223c00e63d47ecff5ee944f0cc5dfb82a86f277194ad9d46ee79fcc1b1f999af9db8ad8e61fec6af3d201dd592f15c11d48d
-  data.tar.gz: 9db0a3293d747a622c0980160e2d1334871d49f4621cf07cbe98f661cf16a649dd713ead2d3a14f40f86ed3f4877f2e5ac8c9c727ad4d468c1b0395d337d6698
+  metadata.gz: 729a5968fc1b06c7479d56fb99ec64057f301f8c0ac1c8daeb262a6db103b5b96d49f7929aa7a4aff935cbbbd165d780ffdb080bd11e06e3ab8c634e048a5e1f
+  data.tar.gz: 5b212f74c1e911bfa46133c7db4819d30bef1d6d3ca841bec3e519b0a3bb93c96a425f0217d5708f6d6c6d9c299257383dd9452e797f57f0a5c49193f7d66906

data/bin/singularity

@@ -5,10 +5,27 @@ require 'singularity'
 ARGV << '--help' if ARGV.empty?
 
 def print_usage
-  puts "Usage:\n\tsingularity delete <uri> <file.json>\n\tsingularity deploy <uri> <file.json> <release>\n\tsingularity run <uri> <file.json> <release> <script>"
+  puts
   exit
 end
 
+  def print_usage
+    puts <<END
+# Usage:
+#    singularity deploy <uri> <file.json> <release>
+#       - deploy singularity job
+#    singularity delete <uri> <file.json>
+#       - delete singularity deploy
+#    singularity run <commands>
+#       - start new box in singularity and run <commands>
+#         (do this from the base project folder of the box you wish to start)
+#    singularity runx <commands>
+#       - same as "singularity run" without use of /sbin/my_init
+#    singularity ssh
+#       - start new box in singularity and SSH into it
+END
+  end
+
 action = ARGV[0]
 uri = ARGV[1]
 file = ARGV[2]

data/lib/singularity.rb

@@ -79,10 +79,10 @@ module Singularity
 
   class Runner
     def initialize(script)
-      #########################################################
-      # TODO
-      # check to see that .mescal.json and mesos-deploy.yml exist
-      #########################################################
+      if !File.file?("mesos-deploy.yml") or !File.file?(".mescal.json")
+        puts "Please do this command from a project directory (where mesos-deploy.yml and .mescal.json exist)"
+      end
+
       @script = script
       # read .mescal.json for ssh command, image, release number, cpus, mem
       @configData = JSON.parse(ERB.new(open(File.join(Dir.pwd, ".mescal.json")).read).result(Request.new.get_binding))
@@ -205,51 +205,28 @@ module Singularity
           # output STDOUT / STDERR to shell
           @stdoutOffset = 0
           @stderrOffset = 0
-          @lastOutLine = ''
-          @lastErrLine = ''
           begin
             # get most recent task state
+            # need to wait for "task_running" before we can ask for STDOUT/STDERR
             @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"
+              # print stdout
               @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
+              outLength = @stdout.bytes.to_a.size
+              if @stdout.length > 0
+                print @stdout.light_cyan
+                @stdoutOffset += outLength
               end
-
+              # print stderr
               @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
+              errLength = @stderr.bytes.to_a.size
+              if @stderr.length > 0
+                print @stderr.light_magenta
+                @stderrOffset += errLength
               end
-
             end
           end until @taskState == "TASK_FINISHED"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Travis Webb
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client