qtc-sdk 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e04ff804e0c81442a6ba99cc7179825b7cd24fe
-  data.tar.gz: d3b0706e21e291fb8cbb5656d685098bef4961c4
+  metadata.gz: a9bfa0619d71840645a97bcdcd7e127f0e3a99c7
+  data.tar.gz: ca672d82bb261648df83eac626cff20497a326cc
 SHA512:
-  metadata.gz: 2dca7fa4e70ad77280f2ab1b1d25b0a762bcbf2dd42dee0d9aa83183486247d96e72197d0e37ff57d5e89fe1c04e40e0012a30114073307141b905135d5dd94f
-  data.tar.gz: 316383e9626b39b9982338812c72d01cfe7e1ed01c360069ce5e0fedf7d068f7176fb4331abd9fbe6033b99c3144a0164715957df8fdcd38de4751e834d73a55
+  metadata.gz: d8ae8f845101afa83f6fbade7093bd9687d08a3889fa9b7ac65ff502f541ca8aceb695cb9d4c09b1c0866ffbeca669b6fdc8aa3c8998412ff3e4da655aaa145f
+  data.tar.gz: b64b18daa1fda05d426481f9be1daedb8591016038986859f6bb1f4c304eea084e855ee31e83da6fa4586b0fd0fce103b0c94e77f6554c2ce03cf636a68f64e6

data/.gitignore

@@ -1,18 +1,18 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-.idea
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+.idea
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Changelog.md

@@ -1,6 +1,14 @@
-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
+0.3.0
+-----------
+
+- Add support for cloud vpn
+- Add support for stack change
+- Refactor cli to use cloud tokens
+- Remove MWS support
+
+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/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in qtc-sdk.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in qtc-sdk.gemspec
+gemspec

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2014 Jari Kolehmainen
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2014 Jari Kolehmainen
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,44 +1,44 @@
-# Qt Cloud Services SDK for Ruby
-
-This is Qt Cloud Services SDK for Ruby. What is Qt Cloud Services? See below:
-
-* The Qt Cloud Services home page is at https://www.qtc.io
-* The Developer Documentation page is at https://developer.qtc.io
-
-## Getting Started
-
-You can find a getting started guide for Qt Cloud Services at:
-
-http://developer.qtc.io/qtc/getting-started?snippets=ruby
-
-If you are looking for service specific guides, please see:
-
-* [Enginio Data Storage](http://developer.qtc.io/eds/getting-started?snippets=ruby)
-* [Managed Application Runtime](http://developer.qtc.io/mar/getting-started?snippets=ruby)
-
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'qtc-sdk'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install qtc-sdk
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it ( http://github.com/jakolehm/qtc-sdk-ruby/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+# Qt Cloud Services SDK for Ruby
+
+This is Qt Cloud Services SDK for Ruby. What is Qt Cloud Services? See below:
+
+* The Qt Cloud Services home page is at https://www.qtc.io
+* The Developer Documentation page is at https://developer.qtc.io
+
+## Getting Started
+
+You can find a getting started guide for Qt Cloud Services at:
+
+http://developer.qtc.io/qtc/getting-started?snippets=ruby
+
+If you are looking for service specific guides, please see:
+
+* [Enginio Data Storage](http://developer.qtc.io/eds/getting-started?snippets=ruby)
+* [Managed Application Runtime](http://developer.qtc.io/mar/getting-started?snippets=ruby)
+
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'qtc-sdk'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install qtc-sdk
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( http://github.com/qtcloudservices/qtc-sdk-ruby/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"

data/bin/qtc-cli

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-# resolve bin path, ignoring symlinks
-require 'pathname'
-bin_file = Pathname.new(__FILE__).realpath
-
-# add self to libpath
-$:.unshift File.expand_path('../../lib', bin_file)
-
-STDOUT.sync = true
-
-require 'commander/import'
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# resolve bin path, ignoring symlinks
+require 'pathname'
+bin_file = Pathname.new(__FILE__).realpath
+
+# add self to libpath
+$:.unshift File.expand_path('../../lib', bin_file)
+
+STDOUT.sync = true
+
+require 'commander/import'
 require 'qtc/cli/commands'

data/lib/qtc/cli/commands.rb

@@ -1,15 +1,15 @@
-require 'qtc/version'
-
-module Qtc::Cli; end;
-
-program :name, 'qtc-cli'
-program :version, Qtc::VERSION
-program :description, 'Command line interface for Qt Cloud Services'
-
-default_command :help
-never_trace!
-
-require_relative 'platform/commands'
-require_relative 'eds/commands'
-require_relative 'mar/commands'
-require_relative 'mdb/commands'
+require 'qtc/version'
+
+module Qtc::Cli; end;
+
+program :name, 'qtc-cli'
+program :version, Qtc::VERSION
+program :description, 'Command line interface for Qt Cloud Services'
+
+default_command :help
+never_trace!
+
+require_relative 'platform/commands'
+require_relative 'eds/commands'
+require_relative 'mar/commands'
+require_relative 'mdb/commands'

data/lib/qtc/cli/common.rb

@@ -1,91 +1,146 @@
-require 'inifile'
-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
-          response = platform_client.get("/instances/#{instance_id}/authorizations")
-          if response['results']
-            instance_data['authorizations'] = response['results']
-          end
-        else
-          abort("Error: instance not found")
-        end
-
-        instance_data
-      end
-
-      def platform_client(token = nil)
-        inifile['platform']['token'] = token unless token.nil?
-        unless inifile['platform']['token']
-          raise ArgumentError.new("Please login first using: qtc-cli login")
-        end
-
-        if @platform_client.nil?
-          @platform_client = Qtc::Client.new(platform_base_url, {'Authorization' => "Bearer #{inifile['platform']['token']}"})
-        end
-
-        @platform_client
-      end
-
-      def ini_filename
-        File.join(Dir.home, '/.qtc_client')
-      end
-
-      def inifile
-        if @inifile.nil?
-          if File.exists?(ini_filename)
-            @inifile = IniFile.load(ini_filename)
-          else
-            @inifile = IniFile.new
-          end
-        end
-
-        unless @inifile['platform']
-          @inifile['platform'] = {}
-        end
-
-        @inifile
-      end
-
-      ##
-      # @param [String,NilClass]
-      # @return [String]
-      def extract_app_in_dir(remote = nil)
-        if File.exists?(File.expand_path('./.git/config'))
-          remotes = []
-          git_remotes = `git remote -v`
-          git_remotes.lines.each do |line|
-            if match = line.match(/#{remote}\s+git@git-mar-(.*)\:(.*) \(push\)/)
-              remotes << match[2]
-            end
-          end
-          apps = remotes.uniq
-          if apps.size == 1
-            return apps[0]
-          elsif apps.size > 1
-            raise ArgumentError.new("Multiple app git remotes\nSpecify app with --remote REMOTE or --app APP")
-          end
-        end
-      end
-
-      ##
-      # @return [Qtc::Client]
-      def client
-        if @client.nil?
-          @client = Qtc::Client.new(base_url)
-        end
-
-        @client
-      end
-
-      def platform_base_url
-        ENV['QTC_PLATFORM_URL'] || 'https://api.qtc.io/v1'
-      end
-    end
-  end
-end
+require 'inifile'
+module Qtc
+  module Cli
+    module Common
+
+      attr_accessor :datacenter_id
+
+      ##
+      # @param [String] instance_id
+      def instance_info(instance_id)
+        instance_data = platform_client.get("/instances/#{instance_id}")
+        unless instance_data
+          abort("Error: instance not found")
+        end
+
+        instance_data
+      end
+
+      ##
+      # @return [String]
+      def current_cloud_id
+        unless @current_cloud_id
+          unless inifile['platform']['current_cloud']
+            raise ArgumentError.new("Please specify used cloud first: qtc-cli clouds:use <id>")
+          end
+          @current_cloud_id = inifile['platform']['current_cloud']
+          self.datacenter_id = inifile['platform']['current_dc']
+        end
+        @current_cloud_id
+      end
+
+      ##
+      # @return [String]
+      def current_cloud_dc
+        unless @current_cloud_dc
+          unless inifile['platform']['current_cloud']
+            raise ArgumentError.new("Please specify used cloud first: qtc-cli clouds:use <id>")
+          end
+          @current_cloud_dc = inifile['platform']['current_dc']
+        end
+        @current_cloud_dc
+      end
+
+      ##
+      # @return [String]
+      def current_cloud_token
+        token = nil
+        begin
+          authorizations = platform_client.get("/accounts/#{current_cloud_id}/authorizations")
+          unless authorizations['results'][0]
+            platform_client.post("/accounts/#{current_cloud_id}/authorizations", {})
+            raise StandardError.new "retry"
+          end
+          token = authorizations['results'][0]['access_token']
+        rescue ArgumentError => e
+          raise e
+        rescue Qtc::Errors::StandardError => e
+          if e.status == 404
+            raise ArgumentError.new("Cloud not found. Please specify used cloud first: qtc-cli clouds:use <id>")
+          end
+        rescue => e
+          retry
+        end
+
+        token
+      end
+
+      ##
+      # @param [String] token
+      # @return [Qtc::Client]
+      def platform_client(token = nil)
+        inifile['platform']['token'] = token unless token.nil?
+        unless inifile['platform']['token']
+          raise ArgumentError.new("Please login first using: qtc-cli login")
+        end
+
+        if @platform_client.nil?
+          @platform_client = Qtc::Client.new(platform_base_url, {'Authorization' => "Bearer #{inifile['platform']['token']}"})
+        end
+
+        @platform_client
+      end
+
+      ##
+      # @return [String]
+      def ini_filename
+        File.join(Dir.home, '/.qtc_client')
+      end
+
+      ##
+      # @return [Hash]
+      def inifile
+        if @inifile.nil?
+          if File.exists?(ini_filename)
+            @inifile = IniFile.load(ini_filename)
+          else
+            @inifile = IniFile.new
+          end
+        end
+
+        unless @inifile['platform']
+          @inifile['platform'] = {}
+        end
+
+        @inifile
+      end
+
+      ##
+      # @param [String,NilClass]
+      # @return [String]
+      def extract_app_in_dir(remote = nil)
+        if File.exists?(File.expand_path('./.git/config'))
+          remotes = []
+          git_remotes = `git remote -v`
+          git_remotes.lines.each do |line|
+            if match = line.match(/#{remote}\s+git@git-mar-(.*)\:(.*) \(push\)/)
+              remotes << match[2]
+            end
+          end
+          apps = remotes.uniq
+          if apps.size == 1
+            return apps[0]
+          elsif apps.size > 1
+            raise ArgumentError.new("Multiple app git remotes\nSpecify app with --remote REMOTE or --app APP")
+          end
+        end
+      end
+
+      ##
+      # @return [Qtc::Client]
+      def client
+        if @client.nil?
+          @client = Qtc::Client.new(base_url)
+        end
+
+        @client
+      end
+
+      ##
+      # @return [String]
+      def platform_base_url
+        ENV['QTC_PLATFORM_URL'] || 'https://api.qtc.io/v1'
+      end
+    end
+  end
+end

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

@@ -1,28 +1,28 @@
-require 'qtc/client'
-require_relative '../common'
-
-module Qtc
-  module Cli
-    module Eds
-      class Base
-        include Cli::Common
-
-        protected
-
-        ##
-        # @return [Qtc::Client]
-        def client
-          if @client.nil?
-            @client = Qtc::Client.new(base_url)
-          end
-
-          @client
-        end
-
-        def base_url
-          ENV['QTC_EDS_URL'] || 'https://api.engin.io/v1'
-        end
-      end
-    end
-  end
+require 'qtc/client'
+require_relative '../common'
+
+module Qtc
+  module Cli
+    module Eds
+      class Base
+        include Cli::Common
+
+        protected
+
+        ##
+        # @return [Qtc::Client]
+        def client
+          if @client.nil?
+            @client = Qtc::Client.new(base_url)
+          end
+
+          @client
+        end
+
+        def base_url
+          ENV['QTC_EDS_URL'] || 'https://api.engin.io/v1'
+        end
+      end
+    end
+  end
 end

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

@@ -1,20 +1,20 @@
-require_relative 'instances'
-
-command 'eds list' do |c|
-  c.syntax = 'qtc-cli eds list'
-  c.description = 'List all EDS instances'
-  c.action do |args, options|
-    Qtc::Cli::Eds::Instances.new.list
-  end
-end
-
-command 'eds create' do |c|
-  c.syntax = 'qtc-cli eds create <CLOUD_ID> <NAME>'
-  c.description = 'Create a new EDS instance'
-  c.example 'Create new EDS instance "My Backend" to cloud "46738209-a745-4841-8eeb-1ca0672aa6v8"', 'qtc-cli eds create 46738209-a745-4841-8eeb-1ca0672aa6v8 "My Backend"'
-  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::Eds::Instances.new.create(args[0], args[1])
-  end
-end
+require_relative 'instances'
+
+command 'eds list' do |c|
+  c.syntax = 'qtc-cli eds list'
+  c.description = 'List all EDS instances'
+  c.action do |args, options|
+    Qtc::Cli::Eds::Instances.new.list
+  end
+end
+
+command 'eds create' do |c|
+  c.syntax = 'qtc-cli eds create <CLOUD_ID> <NAME>'
+  c.description = 'Create a new EDS instance'
+  c.example 'Create new EDS instance "My Backend" to cloud "46738209-a745-4841-8eeb-1ca0672aa6v8"', 'qtc-cli eds create 46738209-a745-4841-8eeb-1ca0672aa6v8 "My Backend"'
+  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::Eds::Instances.new.create(args[0], args[1])
+  end
+end