qtc-sdk 0.2.0 → 0.3.0

data/lib/qtc/cli/mar/commands.rb

@@ -1,199 +1,221 @@
-require_relative 'apps'
-require_relative 'domains'
-require_relative 'ssl_certificates'
-require_relative 'env'
-require_relative 'repository'
-require_relative 'debug'
-
-command 'mar list' do |c|
-  c.syntax = 'qtc-cli mar list'
-  c.description = 'List all apps'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Apps.new.list
-  end
-end
-
-command 'mar show' do |c|
-  c.syntax = 'qtc-cli mar show'
-  c.description = 'Show app details'
-  c.example 'Show app details for app with instance id: mar-eu-1-example', 'qtc-cli mar show --app mar-eu-1-example'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Apps.new.show(options)
-  end
-end
-
-command 'mar restart' do |c|
-  c.syntax = 'qtc-cli mar restart'
-  c.description = 'Restart app'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Apps.new.restart(options)
-  end
-end
-
-command 'mar create' do |c|
-  c.syntax = 'qtc-cli mar create CLOUD_ID NAME'
-  c.description = 'Create a new app instance'
-  c.option '--size SIZE', String, 'App runtime size'
-  c.action do |args, options|
-    raise ArgumentError.new('CLOUD_ID is required') if args[0].nil?
-    raise ArgumentError.new('NAME is required') if args[1].nil?
-    Qtc::Cli::Mar::Apps.new.create(args[0], args[1], options)
-  end
-end
-
-
-command 'mar scale' do |c|
-  c.syntax = 'qtc-cli mar scale KEY=VALUE'
-  c.description = 'Scale app processes'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Apps.new.scale(args, options)
-  end
-end
-
-command 'mar logs' do |c|
-  c.syntax = 'qtc-cli mar logs'
-  c.description = 'List app log entries'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.option '--timestamp', String, 'Include timestamp'
-  c.option '--stream', String, 'stdout or stderr'
-  c.option '--limit LIMIT', Integer, 'Limit'
-  c.option '--offset OFFSET', Integer, 'Offset'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Apps.new.logs(options)
-  end
-end
-
-command 'mar domains' do |c|
-  c.syntax = 'qtc-cli mar domains'
-  c.description = 'List app domains'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Domains.new.list(options)
-  end
-end
-
-command 'mar domains:add' do |c|
-  c.syntax = 'qtc-cli mar domains:add DOMAIN'
-  c.description = 'Add custom domain to app'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    raise ArgumentError.new('DOMAIN is required') if args[0].nil?
-    Qtc::Cli::Mar::Domains.new.create(args[0], options)
-  end
-end
-
-command 'mar domains:remove' do |c|
-  c.syntax = 'qtc-cli domains:remove DOMAIN'
-  c.description = 'Remove custom domain from app'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    raise ArgumentError.new('DOMAIN is required') if args[0].nil?
-    Qtc::Cli::Mar::Domains.new.destroy(args[0], options)
-  end
-end
-
-command 'mar envs' do |c|
-  c.syntax = 'qtc-cli mar envs'
-  c.description = 'List app environment variables'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Env.new.show(options)
-  end
-end
-
-command 'mar envs:set' do |c|
-  c.syntax = 'qtc-cli mar envs:set KEY=value'
-  c.description = 'Set app environment variable'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    raise ArgumentError.new("You didn't specify any values") if args[0].nil?
-    Qtc::Cli::Mar::Env.new.set(args, options)
-  end
-end
-
-command 'mar ssl:add' do |c|
-  c.syntax = 'qtc-cli mar ssl:add --key=<path_to_pem> --cert=<path_to_crt>'
-  c.description = 'Add SSL certificate to app'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.option '--key PATH', String, 'Path to private key file'
-  c.option '--cert PATH', String, 'Path to certificate file'
-  c.option '--chain PATH', String, 'Path to certificate chain file'
-  c.action do |args, options|
-    raise ArgumentError.new("--key is required") unless options.key
-    raise ArgumentError.new("--cert is required") unless options.cert
-    Qtc::Cli::Mar::SslCertificates.new.create(options)
-  end
-end
-
-command 'mar ssl:remove' do |c|
-  c.syntax = 'qtc-cli mar remove-ssl-cert'
-  c.description = 'Remove SSL certificate from app'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    Qtc::Cli::Mar::SslCertificates.new.destroy(options)
-  end
-end
-
-command 'mar repo:purge_cache' do |c|
-  c.syntax = 'qtc-cli mar repo:purge_cache'
-  c.description = 'Delete remote repository build cache contents'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Repository.new.purge_cache(options)
-  end
-end
-
-command 'mar repo:reset' do |c|
-  c.syntax = 'qtc-cli mar repo:reset'
-  c.description = 'Reset remote git repository'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Repository.new.reset(options)
-  end
-end
-
-command 'mar local:run' do |c|
-  c.syntax = 'qtc-cli mar local:run'
-  c.option '--clean', String, 'Force clean build'
-  c.description = 'Debug mar app locally (requires docker)'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Debug.new.local_debug(args, options)
-  end
-end
-
-command 'mar local:build_slug' do |c|
-  c.syntax = 'qtc-cli mar local:build_slug'
-  c.description = 'Build mar app slug locally (requires docker)'
-  c.action do |args, options|
-    Qtc::Cli::Mar::Debug.new.local_build(options)
-  end
-end
-
-command 'mar exec' do |c|
-  c.syntax = 'qtc-cli mar exec <cmd>'
-  c.description = 'Execute command inside app process'
-  c.option '--process PROCESS_ID', String, 'App process id'
-  c.option '--app APP', String, 'App instance id'
-  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
-  c.action do |args, options|
-    raise ArgumentError.new("command required") if args.size == 0
-    raise ArgumentError.new("--process is required") unless options.process
-    Qtc::Cli::Mar::Apps.new.exec(args.join(" "), options)
-  end
-end
+require_relative 'apps'
+require_relative 'domains'
+require_relative 'ssl_certificates'
+require_relative 'env'
+require_relative 'repository'
+require_relative 'debug'
+require_relative 'stack'
+
+command 'mar list' do |c|
+  c.syntax = 'qtc-cli mar list'
+  c.description = 'List all apps'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Apps.new.list
+  end
+end
+
+command 'mar show' do |c|
+  c.syntax = 'qtc-cli mar show'
+  c.description = 'Show app details'
+  c.example 'Show app details for app with instance id: mar-eu-1-example', 'qtc-cli mar show --app mar-eu-1-example'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Apps.new.show(options)
+  end
+end
+
+command 'mar restart' do |c|
+  c.syntax = 'qtc-cli mar restart'
+  c.description = 'Restart app'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Apps.new.restart(options)
+  end
+end
+
+command 'mar create' do |c|
+  c.syntax = 'qtc-cli mar create NAME'
+  c.description = 'Create a new app instance'
+  c.option '--size SIZE', String, 'App runtime size'
+  c.action do |args, options|
+    raise ArgumentError.new('NAME is required') if args[0].nil?
+    Qtc::Cli::Mar::Apps.new.create(args[0], options)
+  end
+end
+
+command 'mar stack' do |c|
+  c.syntax = 'qtc-cli mar stack'
+  c.description = 'Get app stack'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Stack.new.show(args[0], options)
+  end
+end
+
+command 'mar stack:set' do |c|
+  c.syntax = 'qtc-cli mar stack:set STACK'
+  c.description = 'Set app stack'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    raise ArgumentError.new('STACK is required') if args[0].nil?
+    Qtc::Cli::Mar::Stack.new.update(args[0], options)
+  end
+end
+
+command 'mar scale' do |c|
+  c.syntax = 'qtc-cli mar scale KEY=VALUE'
+  c.description = 'Scale app processes'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Apps.new.scale(args, options)
+  end
+end
+
+command 'mar logs' do |c|
+  c.syntax = 'qtc-cli mar logs'
+  c.description = 'List app log entries'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.option '--timestamp', String, 'Include timestamp'
+  c.option '--stream', String, 'stdout or stderr'
+  c.option '--limit LIMIT', Integer, 'Limit'
+  c.option '--offset OFFSET', Integer, 'Offset'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Apps.new.logs(options)
+  end
+end
+
+command 'mar domains' do |c|
+  c.syntax = 'qtc-cli mar domains'
+  c.description = 'List app domains'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Domains.new.list(options)
+  end
+end
+
+command 'mar domains:add' do |c|
+  c.syntax = 'qtc-cli mar domains:add DOMAIN'
+  c.description = 'Add custom domain to app'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    raise ArgumentError.new('DOMAIN is required') if args[0].nil?
+    Qtc::Cli::Mar::Domains.new.create(args[0], options)
+  end
+end
+
+command 'mar domains:remove' do |c|
+  c.syntax = 'qtc-cli domains:remove DOMAIN'
+  c.description = 'Remove custom domain from app'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    raise ArgumentError.new('DOMAIN is required') if args[0].nil?
+    Qtc::Cli::Mar::Domains.new.destroy(args[0], options)
+  end
+end
+
+command 'mar envs' do |c|
+  c.syntax = 'qtc-cli mar envs'
+  c.description = 'List app environment variables'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Env.new.show(options)
+  end
+end
+
+command 'mar envs:set' do |c|
+  c.syntax = 'qtc-cli mar envs:set KEY=value'
+  c.description = 'Set app environment variable'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    raise ArgumentError.new("You didn't specify any values") if args[0].nil?
+    Qtc::Cli::Mar::Env.new.set(args, options)
+  end
+end
+
+command 'mar ssl:add' do |c|
+  c.syntax = 'qtc-cli mar ssl:add --key=<path_to_pem> --cert=<path_to_crt>'
+  c.description = 'Add SSL certificate to app'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.option '--key PATH', String, 'Path to private key file'
+  c.option '--cert PATH', String, 'Path to certificate file'
+  c.option '--chain PATH', String, 'Path to certificate chain file'
+  c.action do |args, options|
+    raise ArgumentError.new("--key is required") unless options.key
+    raise ArgumentError.new("--cert is required") unless options.cert
+    Qtc::Cli::Mar::SslCertificates.new.create(options)
+  end
+end
+
+command 'mar ssl:remove' do |c|
+  c.syntax = 'qtc-cli mar remove-ssl-cert'
+  c.description = 'Remove SSL certificate from app'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::SslCertificates.new.destroy(options)
+  end
+end
+
+command 'mar repo:purge_cache' do |c|
+  c.syntax = 'qtc-cli mar repo:purge_cache'
+  c.description = 'Delete remote repository build cache contents'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Repository.new.purge_cache(options)
+  end
+end
+
+command 'mar repo:reset' do |c|
+  c.syntax = 'qtc-cli mar repo:reset'
+  c.description = 'Reset remote git repository'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Repository.new.reset(options)
+  end
+end
+
+command 'mar local:run' do |c|
+  c.syntax = 'qtc-cli mar local:run'
+  c.option '--clean', String, 'Force clean build'
+  c.option '--stack STRING', String, 'Define used stack (default: cedar-14)'
+  c.description = 'Debug mar app locally (requires docker)'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Debug.new.local_debug(args, options)
+  end
+end
+
+command 'mar local:build_slug' do |c|
+  c.syntax = 'qtc-cli mar local:build_slug'
+  c.option '--stack STRING', String, 'Define used stack (default: cedar-14)'
+  c.description = 'Build mar app slug locally (requires docker)'
+  c.action do |args, options|
+    Qtc::Cli::Mar::Debug.new.local_build(options)
+  end
+end
+
+command 'mar exec' do |c|
+  c.syntax = 'qtc-cli mar exec <cmd>'
+  c.description = 'Execute command inside app process'
+  c.option '--process PROCESS_ID', String, 'App process id'
+  c.option '--app APP', String, 'App instance id'
+  c.option '--remote REMOTE', String, 'Git remote to use, eg "staging"'
+  c.action do |args, options|
+    raise ArgumentError.new("command required") if args.size == 0
+    raise ArgumentError.new("--process is required") unless options.process
+    Qtc::Cli::Mar::Apps.new.exec(args.join(" "), options)
+  end
+end

data/lib/qtc/cli/mar/debug.rb

@@ -1,86 +1,87 @@
-require_relative 'base'
-require 'open3'
-
-module Qtc
-  module Cli
-    class Mar::Debug < Mar::Base
-
-      def local_debug(commands, options)
-        app_home = File.realpath('.')
-        docker_id = nil
-        puts "-----> Starting to build MAR app locally"
-
-        if options.clean == true && File.exists?("#{app_home}/slug.tgz")
-          File.delete("#{app_home}/slug.tgz")
-        end
-
-        unless File.exists?("#{app_home}/slug.tgz")
-          docker_id = build_slug(app_home)
-        else
-          puts "       Existing slug.tgz found, build not needed."
-        end
-        puts "-----> Starting app container"
-        run_opts = [
-          '-e PORT=5000',
-          '-e STACK=cedar',
-          '-e SLUG_URL=file:///tmp/fake_slug.tgz',
-          '-p 5000',
-          "-v #{app_home}/slug.tgz:/tmp/fake_slug.tgz"
-        ]
-        if File.exists?("#{app_home}/.env")
-          run_opts << "--env-file=#{app_home}/.env"
-        end
-        if commands.size == 0
-          cmd = 'start web'
-        else
-          cmd = commands.join(" ")
-        end
-
-        exec("docker run -it --rm #{run_opts.join(" ")} qtcs/slugrunner #{cmd}")
-    end
-
-    def local_build_slug(options)
-      app_home = File.realpath('.')
-      puts "-----> Starting to build MAR app locally"
-      build_slug(app_home)
-    end
-
-    def build_slug(app_home)
-      docker_id = nil
-      run_opts = ''
-      if File.exists?("#{app_home}/.env")
-        run_opts << "--env-file=#{app_home}/.env"
-      end
-      Open3.popen3("docker run -d #{run_opts} -v #{app_home}:/tmp/gitrepo:r qtcs/slugbuilder") {|stdin, stdout, stderr, wait_thr|
-        docker_id = stdout.gets
-        if docker_id
-          docker_id.strip!
-        else
-          puts stderr.gets
-        end
-        exit_status = wait_thr.value
-        unless exit_status.success?
-          raise "ERROR: build failed to start"
-        end
-      }
-      Open3.popen3('docker', 'attach', docker_id){|stdin, stdout, stderr, wait_thr|
-        stdin.close
-        while line = stdout.gets
-          puts line
-        end
-        exit_status = wait_thr.value
-        unless exit_status.success?
-          raise "ERROR: build failed to complete"
-        end
-      }
-      puts "-----> Extracting slug from build image to ./slug.tgz"
-      system("docker cp #{docker_id}:/tmp/slug.tgz . > /dev/null")
-
-      docker_id
-    rescue => exc
-      system("docker rm -f #{docker_id}") if docker_id
-      raise exc
-    end
-    end
-  end
-end
+require_relative 'base'
+require 'open3'
+
+module Qtc
+  module Cli
+    class Mar::Debug < Mar::Base
+
+      def local_debug(commands, options)
+        app_home = File.realpath('.')
+        docker_id = nil
+        stack = options.stack || 'cedar-14'
+        puts "-----> Starting to build MAR app locally"
+
+        if options.clean == true && File.exists?("#{app_home}/slug.tgz")
+          File.delete("#{app_home}/slug.tgz")
+        end
+
+        unless File.exists?("#{app_home}/slug.tgz")
+          docker_id = build_slug(app_home, stack)
+        else
+          puts "       Existing slug.tgz found, build not needed."
+        end
+        puts "-----> Starting app container"
+        run_opts = [
+          '-e PORT=5000',
+          "-e STACK=#{stack}",
+          '-e SLUG_URL=file:///tmp/fake_slug.tgz',
+          '-p 5000',
+          "-v #{app_home}/slug.tgz:/tmp/fake_slug.tgz"
+        ]
+        if File.exists?("#{app_home}/.env")
+          run_opts << "--env-file=#{app_home}/.env"
+        end
+        if commands.size == 0
+          cmd = 'start web'
+        else
+          cmd = commands.join(" ")
+        end
+
+        exec("docker run -it #{run_opts.join(" ")} qtcs/slugrunner:#{stack} #{cmd}")
+    end
+
+    def local_build_slug(options)
+      app_home = File.realpath('.')
+      puts "-----> Starting to build MAR app locally"
+      build_slug(app_home)
+    end
+
+    def build_slug(app_home, stack)
+      docker_id = nil
+      run_opts = ''
+      if File.exists?("#{app_home}/.env")
+        run_opts << "--env-file=#{app_home}/.env"
+      end
+      Open3.popen3("docker run -d #{run_opts} -v #{app_home}:/tmp/gitrepo:r qtcs/slugbuilder:#{stack}") {|stdin, stdout, stderr, wait_thr|
+        docker_id = stdout.gets
+        if docker_id
+          docker_id.strip!
+        else
+          puts stderr.gets
+        end
+        exit_status = wait_thr.value
+        unless exit_status.success?
+          raise "ERROR: build failed to start"
+        end
+      }
+      Open3.popen2('docker', 'attach', docker_id){|stdin, stdout, wait_thr|
+        stdin.close
+        while line = stdout.gets
+          puts line
+        end
+        exit_status = wait_thr.value
+        unless exit_status.success?
+          raise "ERROR: build failed to complete"
+        end
+      }
+      puts "-----> Extracting slug from build image to ./slug.tgz"
+      system("docker cp #{docker_id}:/tmp/slug.tgz . > /dev/null")
+
+      docker_id
+    rescue => exc
+      system("docker rm -f #{docker_id}") if docker_id
+      raise exc
+    end
+    end
+  end
+end