qtc-sdk 0.2.0 → 0.3.0

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

@@ -1,30 +1,30 @@
-require_relative 'base'
-
-module Qtc
-  module Cli
-    class Eds::Instances < Eds::Base
-
-      def list
-        accounts = platform_client.get('/user/accounts')
-        accounts['results'].each do |account|
-          print color("== #{account['name']}: #{account['id']}", :cyan)
-          instances = platform_client.get("/accounts/#{account['id']}/instances", {provider: 'eds'})
-          instances['results'].each do |instance|
-            say(" ~ <%= color('#{instance['id']}', :green) %> #{instance['name']} <%= color('#{instance['tags'].join(', ')}', :yellow) %>")
-          end
-          puts ''
-        end
-      end
-
-      def create(cloud_id, name)
-        data = {
-            name: name,
-            serviceProviderId: 'eds',
-            datacenterId: options.datacenter || 'eu-1'
-        }
-        response = platform_client.post("/accounts/#{cloud_id}/instances", data)
-        puts response['id']
-      end
-    end
-  end
-end
+require_relative 'base'
+
+module Qtc
+  module Cli
+    class Eds::Instances < Eds::Base
+
+      def list
+        accounts = platform_client.get('/user/accounts')
+        accounts['results'].each do |account|
+          print color("== #{account['name']}: #{account['id']}", :cyan)
+          instances = platform_client.get("/accounts/#{account['id']}/instances", {provider: 'eds'})
+          instances['results'].each do |instance|
+            say(" ~ <%= color('#{instance['id']}', :green) %> #{instance['name']} <%= color('#{instance['tags'].join(', ')}', :yellow) %>")
+          end
+          puts ''
+        end
+      end
+
+      def create(cloud_id, name)
+        data = {
+            name: name,
+            serviceProviderId: 'eds',
+            datacenterId: options.datacenter || 'eu-1'
+        }
+        response = platform_client.post("/accounts/#{cloud_id}/instances", data)
+        puts response['id']
+      end
+    end
+  end
+end

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

@@ -1,125 +1,116 @@
-require_relative 'base'
-
-module Qtc
-  module Cli
-    class Mar::Apps < Mar::Base
-
-      def list
-        accounts = platform_client.get('/user/accounts')
-        accounts['results'].each do |account|
-          instances = platform_client.get("/accounts/#{account['id']}/instances", {provider: 'mar'})
-          if instances['results'].size > 0
-            print color("== #{account['name']} (#{account['datacenter']['id']}): #{account['id']}")
-            instances['results'].each do |instance|
-              say(" ~ <%= color('#{instance['id']}', :green) %> #{instance['name']} <%= color('#{instance['tags'].join(', ')}', :yellow) %>")
-            end
-            puts ''
-          end
-        end
-      end
-
-      def show(options)
-        instance_id = resolve_instance_id(options)
-
-        instance_data = instance_info(instance_id)
-        if instance_data
-          token = instance_data['authorizations'][0]['access_token']
-          result = client.get("/apps/#{instance_id}", nil,  {'Authorization' => "Bearer #{token}"})
-          puts "Id: #{result['id']}"
-          puts "Name: #{result['name']}"
-          puts "Size: #{size_mapping[result['size'].to_s] || result['size']}"
-          puts "State: #{result['state']}"
-          puts "Structure: #{JSON.pretty_generate(result['structure'])}"
-          status = client.get("/apps/#{instance_id}/status", nil,  {'Authorization' => "Bearer #{token}"})
-          puts "Processes: #{JSON.pretty_generate(status['processes'])}"
-        end
-      end
-
-      def create(cloud_id, name, options)
-        sizes = {mini: 1, small: 2, medium: 4}
-        size = sizes[options.size.to_s.to_sym] || 1
-        data = {
-            name: name,
-            serviceProviderId: 'mar',
-            config: {
-                runtimeSize: size,
-                runtimeType: 'app'
-            }
-        }
-        response = platform_client.post("/accounts/#{cloud_id}/instances", data)
-        puts response['id']
-      end
-
-      def restart(options)
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          token = instance_data['authorizations'][0]['access_token']
-          client.post("/apps/#{instance_id}/restart", {}, nil, {'Authorization' => "Bearer #{token}"})
-        end
-
-      end
-
-      def logs(options)
-        offset = options.offset || 0
-        limit = options.limit || 100
-        stream = options.stream || nil
-
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          token = instance_data['authorizations'][0]['access_token']
-          result = client.get("/apps/#{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
-
-      def scale(args, options)
-        instance_id = resolve_instance_id(options)
-        instance_data = instance_info(instance_id)
-        if instance_data
-          token = instance_data['authorizations'][0]['access_token']
-          app = client.get("/apps/#{instance_id}", nil,  {'Authorization' => "Bearer #{token}"})
-          structure = app['structure']
-          scale = {}
-          args.each do |type|
-            arr = type.strip.split("=")
-            if arr[0] && arr[1]
-              raise ArgumentError.new("#{arr[0]} is not defined in Procfile") unless structure.has_key?(arr[0])
-              scale[arr[0]] = arr[1]
-            end
-          end
-          client.post("/apps/#{instance_id}/scale", scale, {}, {'Authorization' => "Bearer #{token}"})
-        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',
-            '2' => 'small',
-            '4' => 'medium',
-            '8' => 'large'
-        }
-      end
-    end
-  end
-end
+require_relative 'base'
+
+module Qtc
+  module Cli
+    class Mar::Apps < Mar::Base
+
+      def list
+        instances = platform_client(current_cloud_token).get("/accounts/#{current_cloud_id}/instances", {provider: 'mar'})
+        if instances['results'].size > 0
+          template = "%-20.20s %-30.30s %-20.20s"
+          puts template % ["ID", "NAME", "TAGS"]
+          instances['results'].each do |instance|
+            puts template % [instance['id'], instance['name'], instance['tags'].join(',')]
+          end
+        end
+      end
+
+      def show(options)
+        instance_id = resolve_instance_id(options)
+        result = client.get("/apps/#{instance_id}", nil,  {'Authorization' => "Bearer #{current_cloud_token}"})
+        puts "Id: #{result['id']}"
+        puts "Name: #{result['name']}"
+        puts "Size: #{size_mapping[result['size'].to_s] || result['size']}"
+        puts "State: #{result['state']}"
+        puts "Custom SSL: #{result['sslCertificate'].nil? ? 'no': 'yes'}"
+        env_vars = client.get("/apps/#{instance_id}/env_vars", {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+        puts "Stack: #{env_vars['STACK']}"
+        puts "Structure: #{JSON.pretty_generate(result['structure'])}"
+        status = client.get("/apps/#{instance_id}/status", nil,  {'Authorization' => "Bearer #{current_cloud_token}"})
+        puts "Processes: #{JSON.pretty_generate(status['processes'])}"
+      end
+
+      def create(name, options)
+        sizes = {mini: 1, small: 2, medium: 4}
+        size = sizes[options.size.to_s.to_sym] || 1
+        data = {
+            name: name,
+            serviceProviderId: 'mar',
+            config: {
+                runtimeSize: size,
+                runtimeType: 'app'
+            }
+        }
+        response = platform_client.post("/accounts/#{current_cloud_id}/instances", data)
+        puts response['id']
+      end
+
+      def restart(options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          client.post("/apps/#{instance_id}/restart", {}, nil, {'Authorization' => "Bearer #{current_cloud_token}"})
+        end
+      end
+
+      def logs(options)
+        offset = options.offset || 0
+        limit = options.limit || 100
+        stream = options.stream || nil
+
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          result = client.get("/apps/#{instance_id}/logs", {offset: offset, limit: limit}, {'Authorization' => "Bearer #{current_cloud_token}"})
+          result['results'].each do |r|
+            line = ''
+            line << "[#{r['time']}] " if options.timestamp == true
+            line << r['log']
+            puts line
+          end
+        end
+      end
+
+      def scale(args, options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          app = client.get("/apps/#{instance_id}", nil,  {'Authorization' => "Bearer #{current_cloud_token}"})
+          structure = app['structure']
+          scale = {}
+          args.each do |type|
+            arr = type.strip.split("=")
+            if arr[0] && arr[1]
+              raise ArgumentError.new("#{arr[0]} is not defined in Procfile") unless structure.has_key?(arr[0])
+              scale[arr[0]] = arr[1]
+            end
+          end
+          client.post("/apps/#{instance_id}/scale", scale, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+        end
+      end
+
+      def exec(command, options)
+        instance_id = resolve_instance_id(options)
+        instance_data = instance_info(instance_id)
+        if instance_data
+          data = {
+              cmd: command,
+              processId: options.process
+          }
+          result = client.post("/apps/#{instance_id}/exec", data, {}, {'Authorization' => "Bearer #{current_cloud_token}"})
+          puts result['stderr']
+          puts result['stdout']
+        end
+      end
+
+      def size_mapping
+        {
+            '1' => 'mini',
+            '2' => 'small',
+            '4' => 'medium',
+            '8' => 'large'
+        }
+      end
+    end
+  end
+end

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

@@ -1,60 +1,60 @@
-require 'qtc/client'
-require_relative '../common'
-
-module Qtc
-  module Cli
-    module Mar
-      class Base
-        include Cli::Common
-
-        protected
-
-        def resolve_instance_id(options)
-          if options.app.nil?
-            instance_id = extract_app_in_dir(options.remote)
-          else
-            instance_id = options.app
-          end
-          if instance_id.nil?
-            raise ArgumentError.new('Cannot resolve current app, please use --app APP')
-          end
-
-          self.datacenter_id = resolve_datacenter_id(instance_id)
-
-          instance_id
-        end
-
-        ##
-        # @param [String] instance_id
-        # @return [String,NilClass]
-        def resolve_datacenter_id(instance_id)
-          match = instance_id.to_s.match(/^(mar-\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
-
-        private
-
-        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
+require 'qtc/client'
+require_relative '../common'
+
+module Qtc
+  module Cli
+    module Mar
+      class Base
+        include Cli::Common
+
+        protected
+
+        def resolve_instance_id(options)
+          if options.app.nil?
+            instance_id = extract_app_in_dir(options.remote)
+          else
+            instance_id = options.app
+          end
+          if instance_id.nil?
+            raise ArgumentError.new('Cannot resolve current app, please use --app APP')
+          end
+
+          self.datacenter_id = resolve_datacenter_id(instance_id)
+
+          instance_id
+        end
+
+        ##
+        # @param [String] instance_id
+        # @return [String,NilClass]
+        def resolve_datacenter_id(instance_id)
+          match = instance_id.to_s.match(/^(mar-\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
+
+        private
+
+        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