qtc-sdk 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7670fe44cccc0a8a866ddffcb6d50d261d41e562
-  data.tar.gz: 18b7cbd99727bdd467ba2980f808b877870361bc
+  metadata.gz: df30db23cfd3384178524f6005f02033801dd00d
+  data.tar.gz: f8ef66175ea3afc26af7d9d3d914659d9de7942c
 SHA512:
-  metadata.gz: 80522e72595546c33febb7433a1745108293ac9751ee5df9f031fad5fc3791fa688c3cf7154710ed46859bd12d2d2fe6d39912f471e0b1466d7abb01e29b6fec
-  data.tar.gz: 6ec3a2c658e9db8436ff1f73ff52a04c9325602e0dbe3a3137ce5b2a5a02a2bedef630945864d9e461aff00d7e3a7a291b1835885c0d34485b8bb2b137cd306e
+  metadata.gz: f019c0a37f010d511ddc5107fc7bd655a2017a3dfd9d046cf0c9c5b579ce8852d2eb987c97b2a0cfe4c860b909a1a17fde515a34fd403cd038b6ed4f36ab20b7
+  data.tar.gz: 851b91ada6b47e1e7a1a4ff6d4d2d39ebc1b40c65ec48500940f3ec61f58439389bd38091af6abc53acad25e7a54b5c1b0cf23f2fe064be48f5a7dab2a8c4c69

data/lib/qtc/cli/common.rb

@@ -3,6 +3,8 @@ module Qtc
   module Cli
     module Common
 
+      attr_accessor :datacenter_id
+
       def instance_info(instance_id)
         instance_data = platform_client.get("/instances/#{instance_id}")
         if instance_data
@@ -81,10 +83,6 @@ module Qtc
         @client
       end
 
-      def base_url
-        ENV['QTC_MAR_URL'] || 'https://mar-eu-1.qtc.io/v1'
-      end
-
       def platform_base_url
         ENV['QTC_PLATFORM_URL'] || 'https://api.qtc.io/v1'
       end

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

@@ -7,14 +7,14 @@ module Qtc
       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: 'mar'})
-          instances['results'].each do |instance|
-            if instance['config']['MAR_GIT_ADDRESS']
+          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
-          puts ''
         end
       end
 
@@ -25,9 +25,9 @@ module Qtc
         if instance_data
           token = instance_data['authorizations'][0]['access_token']
           result = client.get("/apps/#{instance_id}", nil,  {'Authorization' => "Bearer #{token}"})
-          say "Id: #{result['id']}"
+          puts "Id: #{result['id']}"
           puts "Name: #{result['name']}"
-          puts "Size: #{result['size']}"
+          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}"})
@@ -41,7 +41,6 @@ module Qtc
         data = {
             name: name,
             serviceProviderId: 'mar',
-            datacenterId: options.datacenter || 'eu-1',
             config: {
                 runtimeSize: size,
                 runtimeType: 'app'
@@ -98,6 +97,15 @@ module Qtc
           client.post("/apps/#{instance_id}/scale", scale, {}, {'Authorization' => "Bearer #{token}"})
         end
       end
+
+      def size_mapping
+        {
+            '1' => 'mini',
+            '2' => 'small',
+            '4' => 'medium',
+            '8' => 'large'
+        }
+      end
     end
   end
 end

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

@@ -19,9 +19,21 @@ module Qtc
             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
@@ -32,8 +44,15 @@ module Qtc
           @client
         end
 
+        private
+
         def base_url
-          ENV['QTC_MAR_URL'] || 'https://mar-eu-1.qtc.io/v1'
+          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

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

@@ -37,7 +37,6 @@ 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.option '--datacenter DATACENTER', String, 'Datacenter id'
   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?

data/lib/qtc/cli/platform/clouds.rb

@@ -11,22 +11,5 @@ module Qtc::Cli::Platform
         print color("~ #{account['name']} (#{account['id']})", :bold)
       end
     end
-
-    def login
-      pass = password("Personal Access Token (copy from https://console.qtcloudservices.com/#/user/profile):")
-      inifile['platform']['token'] = pass
-
-      response = platform_client(pass).get('/user/accounts', {}) rescue nil
-      if response
-        inifile.save(filename: ini_filename)
-      else
-        print color('Invalid Personal Access Token', :red)
-      end
-    end
-
-    def logout
-      inifile['platform'].delete('token')
-      inifile.save(filename: ini_filename)
-    end
   end
 end

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

@@ -1,9 +1,18 @@
 module Qtc::Cli::Platform; end;
 
+require_relative 'datacenters'
 require_relative 'clouds'
 require_relative 'user'
 require_relative 'ssh_keys'
 
+command 'datacenters' do |c|
+  c.syntax = 'qtc-cli datacenters'
+  c.description = 'List all datacenters'
+  c.action do |args, options|
+    Qtc::Cli::Platform::Datacenters.new.list
+  end
+end
+
 command 'clouds' do |c|
   c.syntax = 'qtc-cli clouds'
   c.description = 'List all clouds'

data/lib/qtc/cli/platform/datacenters.rb

@@ -0,0 +1,21 @@
+require 'qtc/client'
+require_relative '../common'
+
+module Qtc::Cli::Platform
+  class Datacenters
+    include Qtc::Cli::Common
+
+    def list
+      datacenters = platform_client.get('/datacenters')
+      inifile['datacenters'] = {}
+
+      datacenters['results'].each do |datacenter|
+        datacenter['services'].each do |service|
+          inifile['datacenters']["#{service['id']}-#{datacenter['id']}"] = service['url']
+        end
+        print color("~ #{datacenter['id']} (#{datacenter['description']})", :bold)
+      end
+      inifile.save(filename: ini_filename)
+    end
+  end
+end

data/lib/qtc/mws/client.rb

@@ -16,9 +16,10 @@ module Qtc
       # @param [String] gateway_id
       # @param [Hash] options
       def initialize(gateway_id, options = {})
-        self.gateway_id = opts[:gateway_id]
+        self.gateway_id = gateway_id
         self.options = DEFAULT_OPTIONS.merge(options)
         self.http_client = Qtc::Client.new(http_client_url)
+        self.access_token = options[:access_token]
       end
 
       ##
@@ -33,13 +34,45 @@ module Qtc
         self.http_client.post('/messages', data)
       end
 
+      ##
+      # Create a new websocket object
+      #
+      # @param [Array<String>] tags
+      # @return [Hash]
+      def create_socket(tags = [])
+        data = {tags: tags}
+        self.http_client.post('/sockets', data)
+      end
+
+      ##
+      # Get websocket uri
+      #
+      # @return [Hash]
+      def websocket_uri
+        self.http_client.get('/websocket_uri')
+      end
+
       ##
       # Get websocket client
       #
+      # @param [String] uri
       # @return [Faye::WebSocket::Client]
-      def websocket_client
-        uri = self.http_client.get('/websocket_uri')
-        Faye::WebSocket::Client.new(uri["uri"])
+      def websocket_client(uri = nil)
+        uri = websocket_uri["uri"] if uri.nil?
+
+        Faye::WebSocket::Client.new(uri)
+      end
+
+      ##
+      # Set access token
+      #
+      # @param [String] access_token
+      def access_token=(access_token)
+        if !access_token.nil?
+          self.http_client.default_headers['Authorization'] = "Bearer #{access_token}"
+        else
+          self.http_client.default_headers.delete('Authorization')
+        end
       end
 
       private
@@ -53,4 +86,4 @@ module Qtc
       end
     end
   end
-end
+end

data/lib/qtc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qtc-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Jari Kolehmainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,6 +165,7 @@ files:
 - lib/qtc/cli/mar/ssl_certificates.rb
 - lib/qtc/cli/platform/clouds.rb
 - lib/qtc/cli/platform/commands.rb
+- lib/qtc/cli/platform/datacenters.rb
 - lib/qtc/cli/platform/ssh_keys.rb
 - lib/qtc/cli/platform/user.rb
 - lib/qtc/client.rb