qtc-sdk 0.4.0 → 0.4.1

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

@@ -1,88 +1,94 @@
-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)
-      stack = options.stack || 'cedar-14'
-      app_home = File.realpath('.')
-      puts "-----> Starting to build MAR app locally"
-      build_slug(app_home, stack)
-    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
+require_relative 'base'
+require 'open3'
+
+module Qtc
+  module Cli
+    class Mar::Debug < Mar::Base
+
+      def local_debug(commands, options)
+        app_home = File.realpath('.')
+        stack = options.stack || 'cedar-14'
+        branch = options.branch || 'master'
+        puts "-----> Starting to build MAR app locally"
+        puts "       Using stack: #{stack}"
+        puts "       Using git branch: #{branch}"
+
+        if options.clean == true && File.exists?("#{app_home}/slug.tgz")
+          File.delete("#{app_home}/slug.tgz")
+        end
+
+        unless File.exists?("#{app_home}/slug.tgz")
+          build_slug(app_home, stack, branch)
+        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)
+      stack = options.stack || 'cedar-14'
+      branch = options.branch || 'master'
+      app_home = File.realpath('.')
+      puts "-----> Starting to build MAR app locally"
+      puts "       Using stack: #{stack}"
+      puts "       Using git branch: #{branch}"
+      build_slug(app_home, stack, branch)
+    end
+
+    def build_slug(app_home, stack, branch)
+      docker_id = nil
+      run_opts = '-i -a stdin'
+      if File.exists?("#{app_home}/.env")
+        run_opts << "--env-file=#{app_home}/.env"
+      end
+      Open3.popen3("git archive #{branch} | docker run #{run_opts} qtcs/slugbuilder:#{stack}") {|stdin, stdout, stderr, wait_thr|
+        stdin.close
+        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

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

@@ -1,35 +1,35 @@
-require_relative 'base'
-
-module Qtc
-  module Cli
-    class Mar::Domains < Mar::Base
-
-      def list(options)
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          result = client.get("/apps/#{instance_id}/domains", nil, {'Authorization' => "Bearer #{current_cloud_token}"})
-          result['results'].each do |r|
-            print color("* #{r['name']}", :bold)
-          end
-        end
-      end
-
-      def create(name, options)
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          client.post("/apps/#{instance_id}/domains", {name: name}, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
-        end
-      end
-
-      def destroy(name, options)
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          client.delete("/apps/#{instance_id}/domains/#{name}", nil, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
-        end
-      end
-    end
-  end
-end
+require_relative 'base'
+
+module Qtc
+  module Cli
+    class Mar::Domains < Mar::Base
+
+      def list(options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          result = client.get("/apps/#{instance_id}/domains", nil, {'Authorization' => "Bearer #{current_cloud_token}"})
+          result['results'].each do |r|
+            print color("* #{r['name']}", :bold)
+          end
+        end
+      end
+
+      def create(name, options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          client.post("/apps/#{instance_id}/domains", {name: name}, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+        end
+      end
+
+      def destroy(name, options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          client.delete("/apps/#{instance_id}/domains/#{name}", nil, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+        end
+      end
+    end
+  end
+end

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

@@ -1,38 +1,38 @@
-require_relative 'base'
-
-module Qtc
-  module Cli
-    class Mar::Env < Mar::Base
-
-      def set(vars, options)
-        instance_id = resolve_instance_id(options)
-        env_vars = {}
-        vars.each do |type|
-          arr = type.strip.split('=', 2)
-          if arr[0]
-            if arr[1].nil? || arr[1] == ''
-              env_vars[arr[0]] = nil
-            else
-              env_vars[arr[0]] = arr[1]
-            end
-          end
-        end
-        instance_data = instance_info(instance_id)
-        if instance_data
-          client.put("/apps/#{instance_id}/env_vars", env_vars, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
-        end
-      end
-
-      def show(options)
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          env_vars = client.get("/apps/#{instance_id}/env_vars", {}, {'Authorization' => "Bearer #{current_cloud_token}"})
-          env_vars.each do |key, value|
-            puts "#{key}=#{value}"
-          end
-        end
-      end
-    end
-  end
-end
+require_relative 'base'
+
+module Qtc
+  module Cli
+    class Mar::Env < Mar::Base
+
+      def set(vars, options)
+        instance_id = resolve_instance_id(options)
+        env_vars = {}
+        vars.each do |type|
+          arr = type.strip.split('=', 2)
+          if arr[0]
+            if arr[1].nil? || arr[1] == ''
+              env_vars[arr[0]] = nil
+            else
+              env_vars[arr[0]] = arr[1]
+            end
+          end
+        end
+        instance_data = instance_info(instance_id)
+        if instance_data
+          client.put("/apps/#{instance_id}/env_vars", env_vars, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+        end
+      end
+
+      def show(options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          env_vars = client.get("/apps/#{instance_id}/env_vars", {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+          env_vars.each do |key, value|
+            puts "#{key}=#{value}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,24 +1,24 @@
-require_relative 'base'
-
-module Qtc
-  module Cli
-    class Mar::Repository < Mar::Base
-
-      def purge_cache(options)
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          client.delete("/apps/#{instance_id}/build_cache", nil, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
-        end
-      end
-
-      def reset(options)
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          client.delete("/apps/#{instance_id}/repository", nil, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
-        end
-      end
-    end
-  end
-end
+require_relative 'base'
+
+module Qtc
+  module Cli
+    class Mar::Repository < Mar::Base
+
+      def purge_cache(options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          client.delete("/apps/#{instance_id}/build_cache", nil, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+        end
+      end
+
+      def reset(options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          client.delete("/apps/#{instance_id}/repository", nil, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+        end
+      end
+    end
+  end
+end

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

@@ -1,80 +1,80 @@
-require_relative 'base'
-
-require 'yaml'
-require 'fileutils'
-require 'httpclient'
-require 'net/http'
-
-module Qtc
-  module Cli
-    class Mar::Slugs < Mar::Base
-
-      def list(options)
-        instance_id = resolve_instance_id(options)
-        slugs = client.get("/apps/#{instance_id}/slugs/", {}, {'Authorization' => "Bearer #{current_cloud_token}"})
-        if slugs && slugs['results'].size > 0
-          template = "%-20.20s %-30.30s %-30.30s"
-          puts template % ["TAG", "CREATED", "DEPLOYED"]
-          slugs['results'].each do |slug|
-            puts template % [slug['tag'], slug['createdAt'], slug['deployedAt']]
-          end
-        end
-      end
-
-      def remove(slug_id, options)
-        instance_id = resolve_instance_id(options)
-        client.delete("/apps/#{instance_id}/slugs/#{slug_id}", {}, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
-      end
-
-      def upload(options)
-        instance_id = resolve_instance_id(options)
-
-        slug = create_slug(instance_id, options)
-        upload_uri = URI(slug['blob']['url'])
-        puts "Starting slug upload, if your slug is large this may take a while"
-        # todo Would be nice to have some sort of progress indication...
-        begin
-          open(File.new(options.slug), 'rb') do |io|
-            aws_client = Net::HTTP.new(upload_uri.host)
-            req = Net::HTTP::Put.new(upload_uri.request_uri)
-            req.content_length = io.size
-            req.body_stream = io
-            req['Content-Type'] = 'application/octet-stream'
-
-            aws_client.request(req)
-          end
-        rescue => exc
-          puts "Slug upload failed:#{exc.to_s}"
-          raise StandardError "Slug upload failed!"
-        end
-        puts "Slug uploaded successfully, you may now deploy it using commit tag: #{slug['tag']}"
-      end
-
-      def deploy(slug_id, options)
-        instance_id = resolve_instance_id(options)
-        client.post("/apps/#{instance_id}/slugs/#{slug_id}/deploy", {}, {},  {'Authorization' => "Bearer #{current_cloud_token}"})
-      end
-
-      def create_slug(instance_id, options)
-        process_types = resolve_proc_types(options)
-        data = {
-            tag: options.tag,
-            process_types: process_types
-        }
-        client.post("/apps/#{instance_id}/slugs", data, {},  {'Authorization' => "Bearer #{current_cloud_token}"})
-      end
-
-      def resolve_proc_types(options)
-        if options.procfile
-          procfile_hash = {}
-          procfile = YAML.load(File.read(options.procfile), :encoding => 'utf-8')
-          procfile_hash.merge!(procfile) if procfile
-          procfile_hash
-        else
-          raise StandardError 'Procfile must be given'
-        end
-      end
-    end
-  end
-end
-
+require_relative 'base'
+
+require 'yaml'
+require 'fileutils'
+require 'httpclient'
+require 'net/http'
+
+module Qtc
+  module Cli
+    class Mar::Slugs < Mar::Base
+
+      def list(options)
+        instance_id = resolve_instance_id(options)
+        slugs = client.get("/apps/#{instance_id}/slugs/", {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+        if slugs && slugs['results'].size > 0
+          template = "%-20.20s %-30.30s %-30.30s"
+          puts template % ["TAG", "CREATED", "DEPLOYED"]
+          slugs['results'].each do |slug|
+            puts template % [slug['tag'], slug['createdAt'], slug['deployedAt']]
+          end
+        end
+      end
+
+      def remove(slug_id, options)
+        instance_id = resolve_instance_id(options)
+        client.delete("/apps/#{instance_id}/slugs/#{slug_id}", {}, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+      end
+
+      def upload(options)
+        instance_id = resolve_instance_id(options)
+
+        slug = create_slug(instance_id, options)
+        upload_uri = URI(slug['blob']['url'])
+        puts "Starting slug upload, if your slug is large this may take a while"
+        # todo Would be nice to have some sort of progress indication...
+        begin
+          open(File.new(options.slug), 'rb') do |io|
+            aws_client = Net::HTTP.new(upload_uri.host)
+            req = Net::HTTP::Put.new(upload_uri.request_uri)
+            req.content_length = io.size
+            req.body_stream = io
+            req['Content-Type'] = 'application/octet-stream'
+
+            aws_client.request(req)
+          end
+        rescue => exc
+          puts "Slug upload failed:#{exc.to_s}"
+          raise StandardError "Slug upload failed!"
+        end
+        puts "Slug uploaded successfully, you may now deploy it using commit tag: #{slug['tag']}"
+      end
+
+      def deploy(slug_id, options)
+        instance_id = resolve_instance_id(options)
+        client.post("/apps/#{instance_id}/slugs/#{slug_id}/deploy", {}, {},  {'Authorization' => "Bearer #{current_cloud_token}"})
+      end
+
+      def create_slug(instance_id, options)
+        process_types = resolve_proc_types(options)
+        data = {
+            tag: options.tag,
+            process_types: process_types
+        }
+        client.post("/apps/#{instance_id}/slugs", data, {},  {'Authorization' => "Bearer #{current_cloud_token}"})
+      end
+
+      def resolve_proc_types(options)
+        if options.procfile
+          procfile_hash = {}
+          procfile = YAML.load(File.read(options.procfile), :encoding => 'utf-8')
+          procfile_hash.merge!(procfile) if procfile
+          procfile_hash
+        else
+          raise StandardError 'Procfile must be given'
+        end
+      end
+    end
+  end
+end
+