qtc-sdk 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df30db23cfd3384178524f6005f02033801dd00d
-  data.tar.gz: f8ef66175ea3afc26af7d9d3d914659d9de7942c
+  metadata.gz: 7e04ff804e0c81442a6ba99cc7179825b7cd24fe
+  data.tar.gz: d3b0706e21e291fb8cbb5656d685098bef4961c4
 SHA512:
-  metadata.gz: f019c0a37f010d511ddc5107fc7bd655a2017a3dfd9d046cf0c9c5b579ce8852d2eb987c97b2a0cfe4c860b909a1a17fde515a34fd403cd038b6ed4f36ab20b7
-  data.tar.gz: 851b91ada6b47e1e7a1a4ff6d4d2d39ebc1b40c65ec48500940f3ec61f58439389bd38091af6abc53acad25e7a54b5c1b0cf23f2fe064be48f5a7dab2a8c4c69
+  metadata.gz: 2dca7fa4e70ad77280f2ab1b1d25b0a762bcbf2dd42dee0d9aa83183486247d96e72197d0e37ff57d5e89fe1c04e40e0012a30114073307141b905135d5dd94f
+  data.tar.gz: 316383e9626b39b9982338812c72d01cfe7e1ed01c360069ce5e0fedf7d068f7176fb4331abd9fbe6033b99c3144a0164715957df8fdcd38de4751e834d73a55

data/Changelog.md

@@ -0,0 +1,6 @@
+0.2.0
+-----------
+
+- Add support for executing ad-hoc commands inside MAR applications: qtc-cli mar exec
+- Add support for local debugging of MAR applications (using docker): qtc-cli mar local:run
+- Add initial MDB commands: qtc-cli mdb list/logs

data/lib/qtc/cli/commands.rb

@@ -12,3 +12,4 @@ never_trace!
 require_relative 'platform/commands'
 require_relative 'eds/commands'
 require_relative 'mar/commands'
+require_relative 'mdb/commands'

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

@@ -98,6 +98,20 @@ module Qtc
         end
       end
 
+      def exec(command, options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          token = instance_data['authorizations'][0]['access_token']
+          data = {
+              cmd: command,
+              processId: options.process
+          }
+          result = client.post("/apps/#{instance_id}/exec", data, {}, {'Authorization' => "Bearer #{token}"})
+          puts result['stdout']
+        end
+      end
+
       def size_mapping
         {
             '1' => 'mini',

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

@@ -3,6 +3,7 @@ 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'
@@ -165,4 +166,34 @@ command 'mar repo:reset' do |c|
   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

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

@@ -0,0 +1,86 @@
+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

data/lib/qtc/cli/mdb/base.rb

@@ -0,0 +1,43 @@
+require_relative '../../client'
+require_relative '../common'
+
+module Qtc
+  module Cli
+    module Mdb
+      class Base
+        include Cli::Common
+
+        protected
+
+        ##
+        # @param [String] instance_id
+        # @return [String,NilClass]
+        def resolve_datacenter_id(instance_id)
+          match = instance_id.to_s.match(/^(mdb-\w+-\w+)-\w+/)
+          if match[1]
+            match[1]
+          end
+        end
+
+        ##
+        # @return [Qtc::Client]
+        def client
+          if @client.nil?
+            @client = Qtc::Client.new(base_url)
+          end
+
+          @client
+        end
+
+        def base_url
+          datacenters = inifile['datacenters'] || {}
+          if !self.datacenter_id.nil? && datacenters.has_key?(self.datacenter_id)
+            "#{datacenters[self.datacenter_id]}/v1"
+          else
+            raise ArgumentError.new('Unknown datacenter. Please run qtc-cli datacenters to get latest list of your datacenters')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require_relative 'instances'
+
+command 'mdb list' do |c|
+  c.syntax = 'qtc-cli mdb list'
+  c.description = 'List all MDB instances'
+  c.action do |args, options|
+    Qtc::Cli::Mdb::Instances.new.list
+  end
+end
+
+command 'mdb show' do |c|
+  c.syntax = 'qtc-cli mdb show'
+  c.description = 'Show MDB instance info'
+  c.option '--id ID', String, 'MDB instance id'
+  c.action do |args, options|
+    Qtc::Cli::Mdb::Instances.new.show(options)
+  end
+end
+
+command 'mdb logs' do |c|
+  c.syntax = 'qtc-cli mdb logs'
+  c.description = 'Show MDB logs'
+  c.option '--id ID', String, 'MDB instance id'
+  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::Mdb::Instances.new.logs(options)
+  end
+end

data/lib/qtc/cli/mdb/instances.rb

@@ -0,0 +1,60 @@
+require_relative 'base'
+
+module Qtc
+  module Cli
+    class Mdb::Instances < Mdb::Base
+      include Qtc::Cli::Common
+
+      def list
+        accounts = platform_client.get('/user/accounts')
+        accounts['results'].each do |account|
+          print color("== #{account['name']}: #{account['id']}")
+          instances = platform_client.get("/accounts/#{account['id']}/instances", {provider: 'mdb'})
+          instances['results'].each do |instance|
+            say(" ~ <%= color('#{instance['id']}', :green) %> #{instance['name']} <%= color('#{instance['tags'].join(', ')}', :yellow) %>")
+          end
+          puts ''
+        end
+      end
+
+      def show(options)
+        raise ArgumentError.new('--id is required') if options.id.nil?
+
+        self.datacenter_id = self.resolve_datacenter_id(options.id)
+        instance_id = options.id
+        instance_data = instance_info(instance_id)
+        if instance_data
+          token = instance_data['authorizations'][0]['access_token']
+          result = client.get("/services/#{instance_id}", nil,  {'Authorization' => "Bearer #{token}"})
+          puts "Id: #{result['id']}"
+          puts "Name: #{result['name']}"
+          puts "Type: #{result['image']['name']}"
+          puts "Size: #{result['size'].to_i * 256}MB"
+          puts "State: #{result['state']}"
+        end
+      end
+
+      def logs(options)
+        raise ArgumentError.new('--id is required') if options.id.nil?
+
+        self.datacenter_id = self.resolve_datacenter_id(options.id)
+        offset = options.offset || 0
+        limit = options.limit || 100
+        stream = options.stream || nil
+
+        instance_id = options.id
+        instance_data = instance_info(instance_id)
+        if instance_data
+          token = instance_data['authorizations'][0]['access_token']
+          result = client.get("/services/#{instance_id}/logs", {offset: offset, limit: limit},  {'Authorization' => "Bearer #{token}"})
+          result['results'].each do |r|
+            line = ''
+            line << "[#{r['time']}] " if options.timestamp == true
+            line << r['log']
+            puts line
+          end
+        end
+      end
+    end
+  end
+end

data/lib/qtc/version.rb

@@ -1,3 +1,3 @@
 module Qtc
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/qtc-sdk.gemspec

@@ -22,10 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.14.0'
-  spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'vcr'
   spec.add_runtime_dependency 'httpclient', '~> 2.3'
-  spec.add_runtime_dependency 'faye-websocket'
   spec.add_runtime_dependency 'commander'
   spec.add_runtime_dependency 'inifile'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qtc-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jari Kolehmainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,34 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -159,10 +118,14 @@ files:
 - lib/qtc/cli/mar/apps.rb
 - lib/qtc/cli/mar/base.rb
 - lib/qtc/cli/mar/commands.rb
+- lib/qtc/cli/mar/debug.rb
 - lib/qtc/cli/mar/domains.rb
 - lib/qtc/cli/mar/env.rb
 - lib/qtc/cli/mar/repository.rb
 - lib/qtc/cli/mar/ssl_certificates.rb
+- lib/qtc/cli/mdb/base.rb
+- lib/qtc/cli/mdb/commands.rb
+- lib/qtc/cli/mdb/instances.rb
 - lib/qtc/cli/platform/clouds.rb
 - lib/qtc/cli/platform/commands.rb
 - lib/qtc/cli/platform/datacenters.rb
@@ -176,7 +139,6 @@ files:
 - lib/qtc/errors.rb
 - lib/qtc/mws/client.rb
 - lib/qtc/version.rb
-- lib/qtc_cli.rb
 - qtc-sdk.gemspec
 - spec/spec_helper.rb
 - spec/unit/qtc/client_spec.rb

data/lib/qtc_cli.rb

@@ -1,12 +0,0 @@
-require 'thor'
-require 'qtc/client'
-require 'qtc/cli/instances'
-require 'qtc/cli/mar'
-
-class QtcCli < Thor
-  desc 'mar', 'Managed application runtime commands'
-  subcommand 'mar', Qtc::Cli::Mar
-
-  desc 'instances', 'Instances commands'
-  subcommand 'instances', Qtc::Cli::Instances
-end