singularity-cli 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1b969a0fecc12a57a4d7526bd79b88f074755c
-  data.tar.gz: dd4d88b3fd58799b2baaa6f34f5b85b8d3f32e63
+  metadata.gz: 4f917e15b139df05230f76923b7c1296caa65d62
+  data.tar.gz: 230d2d431af444026ae30b1ece3e4fcdd65edca8
 SHA512:
-  metadata.gz: e3ae653b12db18fc8334de1cbfe83ccc543e122269681ec777a9e4681380da7710de35649efe9774a7381bcba0159e0eeb2e7347dc86e3fc0d699a942b4c65ac
-  data.tar.gz: 7334989a24708803cf21db7d5e1a8b4d63419a93a02a327bf7c2c0171ddadfa5ab4c47d7ef6ded6e1de5c920dfcd4bfcb443e15f7f8bd161d5f70164342af4d7
+  metadata.gz: f294ca9b8811d3a3092475baa0f302ffdb10c14a40866d556bb2d96e57e8421ed111b7c41ba2b5320693121e09e24783a3afd734294a805dba2d31ddcec86b59
+  data.tar.gz: 79759aa9d74a1692304e4c5e738d69f0d13e26904dbc01b9665a74729d5b584786594182b1ac615e8657b5d455232c18742adb84954865ab12b8cf4f5afb1cea

data/README.md

@@ -5,3 +5,4 @@ Authors:
 # Usage:
     singularity delete <uri> <file>
     singularity deploy <uri> <file> <release>
+    singularity run <uri> <file/script> <release>

data/bin/singularity

@@ -5,7 +5,7 @@ require 'singularity'
 ARGV << '--help' if ARGV.empty?
 
 def print_usage
-  puts "Usage:\n\tsingularity delete <uri> <file>\n\tsingularity deploy <uri> <file> <release>"
+  puts "Usage:\n\tsingularity delete <uri> <file.json>\n\tsingularity deploy <uri> <file.json> <release>\n\tsingularity run <uri> <file.json> <release> <script>"
   exit
 end
 
@@ -14,7 +14,6 @@ uri = ARGV[1]
 file = ARGV[2]
 
 case action
-
   when "delete"
     print_usage unless ARGV.size == 3
     Singularity::Deleter.new(uri,file).delete
@@ -24,6 +23,19 @@ case action
     release = ARGV[3]
     Singularity::Deployer.new(uri,file,release).deploy
 
+  when "run"
+    # remove the word "run" from ARGV, pass the remainder to Runner
+    ARGV.shift
+    Singularity::Runner.new(ARGV).runner
+
+  when "runx"
+    # this option is to skip the use of /sbin/my_init
+    # (some commands won't run correctly when both are used)
+    Singularity::Runner.new(ARGV).runner
+
+  when "ssh"
+    Singularity::Runner.new("ssh").runner
+
   else
       print_usage
 end

data/lib/singularity.rb

@@ -2,18 +2,17 @@ require 'erb'
 require 'json'
 require 'rest-client'
 require 'colorize'
+require 'yaml'
 
 module Singularity
   class Request
     attr_accessor :release, :cpus, :mem, :envs, :schedule, :cmd, :arguments, :request_id, :repo, :release_string, :release_id_string
-
     def get_binding
       binding()
     end
   end
 
   class Deployer
-
     def initialize(uri, file, release)
       @uri = uri
       @file = file
@@ -25,7 +24,6 @@ module Singularity
       print @data['id']
     end
 
-
     def is_paused
       begin
         resp = RestClient.get "#{@uri}/api/requests/request/#{@data['id']}"
@@ -45,7 +43,6 @@ module Singularity
           # create or update the request
           resp = RestClient.post "#{@uri}/api/requests", @data.to_json, :content_type => :json
         end
-        
         # deploy the request
         @data['requestId'] = @data['id']
         @data['id'] = "#{@release}.#{Time.now.to_i}"
@@ -54,9 +51,7 @@ module Singularity
          'user' => `whoami`.chomp,
          'unpauseOnSuccessfulDeploy' => false
         }
-
         resp = RestClient.post "#{@uri}/api/deploys", deploy.to_json, :content_type => :json
-
         puts " DEPLOYED".green
       rescue Exception => e
         puts " #{e.response}".red
@@ -65,12 +60,10 @@ module Singularity
   end
 
   class Deleter
-
     def initialize(uri, file)
       @uri = uri
       @file = file
     end
-
     # Deleter.delete -- arguments are <uri>, <file>
     def delete
       begin
@@ -82,6 +75,158 @@ module Singularity
         puts "#{task_id} #{$!.response}"
       end
     end
-  end 
+  end
+
+  class Runner
+    def initialize(script)
+      #########################################################
+      # TODO
+      # check to see that .mescal.json and mesos-deploy.yml exist
+      #########################################################
+      @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))
+      @sshCmd = @configData['sshCmd']
+      @image = @configData['image'].split(':')[0]
+      @release = @configData['image'].split(':')[1]
+
+      # read mesos-deploy.yml for singularity url
+      @mesosDeployConfig = YAML.load_file(File.join(Dir.pwd, "mesos-deploy.yml"))
+      @uri = @mesosDeployConfig['singularity_url']
+
+      # create request/deploy json data
+      @data = {
+        'command' => "/sbin/my_init",
+        'resources' => {
+          'memoryMb' => @configData['mem'],
+          'cpus' => @configData['cpus'],
+          'numPorts' => 1
+        },
+        'env' => {
+          'APPLICATION_ENV' => "production"
+        },
+        'requestType' => "RUN_ONCE",
+        'containerInfo' => {
+          'type' => "DOCKER",
+          'docker' => {
+            'image' => @configData['image'],
+            'network' => "BRIDGE",
+            'portMappings' => [{
+              'containerPortType': "LITERAL",
+              'containerPort': 22,
+              'hostPortType': "FROM_OFFER",
+              'hostPort': 0
+            }]
+          }
+        }
+      }
+      # either we typed 'singularity ssh'
+      if @script == "ssh"
+        @data['id'] = Dir.pwd.split('/').last + "_SSH"
+        @data['command'] = "#{@sshCmd}"
+      # or we passed a script/commands to 'singularity run'
+      else
+        # if we passed "runx", then skip use of /sbin/my_init
+        if @script[0] == "runx"
+          @data['arguments'] = [] # don't use "--" as first argument
+          @data['command'] = @script[1] #remove "runx" from commands
+          @script.shift
+          @data['id'] = @script.join("-").tr('@/\*?% []#$', '_')
+          @data['id'][0] = ''
+          @script.shift
+        # else join /sbin/my_init with your commands
+        else
+          @data['arguments'] = ["--"]
+          @data['id'] = @script.join("-").tr('@/\*?% []#$', '_')
+          @data['id'][0] = ''
+        end
+        @script.each { |i| @data['arguments'].push i }
+      end
+    end
+
+    def is_paused
+      begin
+        resp = RestClient.get "#{@uri}/api/requests/request/#{@data['id']}"
+        JSON.parse(resp)['state'] == 'PAUSED'
+      rescue
+        print " Deploying request...".light_green
+        false
+      end
+    end
+
+    def runner
+      begin
+        if is_paused()
+          puts " PAUSED, SKIPPING.".yellow
+          return
+        else
+          # create or update the request
+          RestClient.post "#{@uri}/api/requests", @data.to_json, :content_type => :json
+        end
+
+        # deploy the request
+        @data['requestId'] = @data['id']
+        @data['id'] = "#{@release}.#{Time.now.to_i}"
+        @deploy = {
+         'deploy' => @data,
+         'user' => `whoami`.chomp,
+         'unpauseOnSuccessfulDeploy' => false
+        }
+        RestClient.post "#{@uri}/api/deploys", @deploy.to_json, :content_type => :json
+        puts " Deploy succeeded.".green
+
+        # 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.each do |entry|
+            if entry['taskRequest']['request']['id'] == @data['requestId']
+              @thisTask = entry
+            end
+          end
+        end until @thisTask != ''
+        @ip = @thisTask['offer']['url']['address']['ip']
+        @port = @thisTask['mesosTask']['container']['docker']['portMappings'][0]['hostPort']
+
+        # SSH into the machine
+        if @script == "ssh"
+          # uses "begin end until" because "system" will keep returning "false" unless the command exits with success
+          # 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
+
+        # 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
 
+        # finally, delete the request (which also deletes the corresponding task)
+        RestClient.delete "#{@uri}/api/requests/request/#{@data['requestId']}"
+
+      rescue Exception => e
+        puts " #{e.response}".red
+      end
+    end
+  end
 end

metadata

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