superbot-cloud 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db593e16a528d6b2d3962fc3cbf698c371c33ab782f7a4c466863655e06779eb
-  data.tar.gz: 4852ae8c8b4edb93faecdc2fc90e58eeaab958ce66e42f04df7f45496f426789
+  metadata.gz: 974b01bdf05f6ef310b1d8350a3828b5fc2195e91cd46d88ca7e4298416fd800
+  data.tar.gz: 6795a9122f33dfeeebc40804eb528a700351d760abc872275a1abe2446a8a2ab
 SHA512:
-  metadata.gz: 83306afd7af5b132ff46d96be8b3e4fe5c1fc3f52c5836b7fa8a6a41e2a130dfe1ff08cb6d5a337da96e978861a02227f4ac06bcf8cf5bce7ffe7f367e75cfb6
-  data.tar.gz: 9ab8d305a398c82d6cf8e24c774466940fb6f036a301d7d72ef74b37f506a7186415eac68dd8cdf483a76c2b8ba1208067b0138e81584e6378f65733ffded570
+  metadata.gz: a7a3ac1f4bf6b972cdffd1e4414f60e74bae3f6ef02c3c25f13df17eac4d9cea5d9c911c9623c621be428c4f2ac0bb38b54970923e6623e97b1858a060b71815
+  data.tar.gz: 65595db9d9a843c7b90209171ee557be310e71a064c62dcbc0a02795c1a5683c01c3f91800f3583c757dc2a9ecfdb745dbe92559178fe547aa29c602a8146985

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    superbot-cloud (0.3.0)
+    superbot-cloud (0.3.1)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
@@ -33,7 +33,7 @@ GEM
     mini_portile2 (2.4.0)
     multipart-post (2.0.0)
     mustermann (1.0.3)
-    nokogiri (1.10.0)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     parallel (1.12.1)
     parser (2.5.1.2)
@@ -41,7 +41,7 @@ GEM
     powerpack (0.1.2)
     public_suffix (3.0.3)
     rack (2.0.6)
-    rack-protection (2.0.4)
+    rack-protection (2.0.5)
       rack
     rainbow (3.0.0)
     rake (10.5.0)
@@ -71,34 +71,34 @@ GEM
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
-    sinatra (2.0.4)
+    sinatra (2.0.5)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.4)
+      rack-protection (= 2.0.5)
       tilt (~> 2.0)
     sinatra-silent (0.0.1)
-    superbot (0.3.0)
+    superbot (0.4.0)
       clamp (= 1.2.1)
       kommando (= 0.1.2)
       launchy (= 2.4.3)
-      sinatra (= 2.0.4)
+      sinatra (= 2.0.5)
       sinatra-silent (= 0.0.1)
-      superbot-cloud (= 0.2.1)
+      superbot-cloud (= 0.3.0)
       superbot-record (= 0.1.0)
-      superbot-runner (= 0.1.2)
+      superbot-runner (= 0.1.3)
       superbot-selenium-webdriver (= 1.0.5)
-      superbot-teleport (= 0.2.5)
+      superbot-teleport (= 0.3.0)
       zaru (= 0.2.0)
     superbot-record (0.1.0)
       superbot-record-chrome
     superbot-record-chrome (0.1.0)
-    superbot-runner (0.1.2)
+    superbot-runner (0.1.3)
       superbot-runner-side
     superbot-runner-side (0.1.0)
     superbot-selenium-webdriver (1.0.5)
       chromedriver-helper (= 2.1.0)
       selenium-webdriver (= 3.141.0)
-    superbot-teleport (0.2.5)
+    superbot-teleport (0.3.0)
       excon
     tilt (2.0.9)
     unicode-display_width (1.4.0)
@@ -112,7 +112,7 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.53)
-  superbot (~> 0.3.0)
+  superbot (~> 0.4.0)
   superbot-cloud!
 
 BUNDLED WITH

data/lib/superbot/cloud.rb

@@ -26,7 +26,6 @@ module Superbot
       all_credentials[Superbot::DOMAIN.to_sym] = data.transform_keys!(&:to_sym)
       FileUtils.mkdir_p CREDENTIALS_PATH
       File.write CREDENTIALS_FILE_PATH, all_credentials.to_json
-      puts "Logged in as %<username>s (%<email>s)" % credentials.slice(:username, :email)
     end
 
     def self.remove_credentials

data/lib/superbot/cloud/api.rb

@@ -9,6 +9,7 @@ module Superbot
       ENDPOINT_MAP = {
         token:                      { method: :post, endpoint: 'token' },
         organization_list:          { method: :get, endpoint: 'organizations' },
+        get_organization:           { method: :get, endpoint: 'organizations', required_param: :name},
         test_list:                  { method: :get, endpoint: 'tests' },
         test_upload:                { method: :post_multipart, endpoint: 'tests' },
         test_download:              { method: :get, endpoint: 'tests', required_param: :name },
@@ -34,7 +35,7 @@ module Superbot
 
       def self.request(type, params: {})
         method, endpoint, required_param = ENDPOINT_MAP[type].values
-        uri = URI.parse([BASE_URI, endpoint, params[required_param]].compact.join('/'))
+        uri = URI.parse([BASE_URI, endpoint, params[required_param] && CGI.escape(params[required_param])].compact.join('/'))
 
         request_class = Net::HTTP.const_get(method.to_s.split('_').map(&:capitalize).join('::'))
 

data/lib/superbot/cloud/cli/organization/base_command.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Organization
+        class BaseCommand < LoginRequiredCommand
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/organization/default_command.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Organization
+        class DefaultCommand < BaseCommand
+          parameter "NAME", "Organization name", required: true
+
+          def execute
+            organization = Superbot::Cloud::Api.request(:get_organization, params: { name: name })
+            new_credentials = Superbot::Cloud.credentials.merge(organization: organization[:name])
+            Superbot::Cloud.save_credentials(new_credentials)
+
+            puts "Default organization: #{Superbot::Cloud.credentials[:organization]}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/organization/list_command.rb

@@ -4,14 +4,17 @@ module Superbot
   module Cloud
     module CLI
       module Organization
-        class ListCommand < Clamp::Command
+        class ListCommand < BaseCommand
           def execute
             list_organizations
           end
 
           def list_organizations
+            default_org = Superbot::Cloud.credentials[:organization]
             api_response = Superbot::Cloud::Api.request(:organization_list)
-            puts(api_response.map { |org| org[:name] })
+
+            puts "Your organizations:"
+            puts(api_response.map { |org| org[:name] == default_org ? "#{org[:name]} (default)" : org[:name] })
           end
         end
       end

data/lib/superbot/cloud/cli/organization_based_command.rb

@@ -4,7 +4,7 @@ module Superbot
   module Cloud
     module CLI
       class OrganizationBasedCommand < LoginRequiredCommand
-        option ["--org"], "ORGANIZATION", "Name of organization to take action on", environment_variable: "SUPERBOT_ORG", required: ENV['SUPERBOT_TOKEN'].to_s.empty?, attribute_name: :organization
+        option ["--org"], "ORGANIZATION", "Name of organization to take action on", environment_variable: "SUPERBOT_ORG", attribute_name: :organization, default: Superbot::Cloud.credentials&.fetch(:organization, nil)
       end
     end
   end

data/lib/superbot/cloud/cli/organization_command.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require_relative 'organization/base_command'
 require_relative 'organization/list_command'
+require_relative 'organization/default_command'
 
 module Superbot
   module Cloud
     module CLI
       class OrganizationCommand < LoginRequiredCommand
         subcommand ['list'], "List user organizations from the cloud", Organization::ListCommand
+        subcommand ['default'], "Set default organization for CLI", Organization::DefaultCommand
       end
     end
   end

data/lib/superbot/cloud/cli/run/create_command.rb

@@ -4,7 +4,7 @@ module Superbot
   module Cloud
     module CLI
       module Run
-        class CreateCommand < OrganizationBasedCommand
+        class CreateCommand < BaseCommand
           parameter "NAME", "the name of the test to delete", required: true
           option ['--region'], 'REGION', 'Region for remote webdriver'
 

data/lib/superbot/cloud/version.rb

@@ -2,6 +2,6 @@
 
 module Superbot
   module Cloud
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/superbot/cloud/web.rb

@@ -5,7 +5,7 @@ module Superbot
     module Web
       def self.registered(sinatra)
         sinatra.get "/login" do
-          credentials = request.params.slice('username', 'email', 'token')
+          credentials = request.params.slice(*%w[username email token organization])
           Superbot::Cloud.save_credentials(credentials)
           redirect "#{Superbot::Cloud::LOGIN_URI}/success"
         end

data/superbot-cloud.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "multipart-post", "2.0.0"
   spec.add_runtime_dependency "marcel", "0.3.3"
 
-  spec.add_development_dependency "superbot", "~> 0.3.0"
+  spec.add_development_dependency "superbot", "~> 0.4.0"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-cloud
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,8 @@ files:
 - lib/superbot/cloud/cli/member/list_command.rb
 - lib/superbot/cloud/cli/member/remove_command.rb
 - lib/superbot/cloud/cli/member_command.rb
+- lib/superbot/cloud/cli/organization/base_command.rb
+- lib/superbot/cloud/cli/organization/default_command.rb
 - lib/superbot/cloud/cli/organization/list_command.rb
 - lib/superbot/cloud/cli/organization_based_command.rb
 - lib/superbot/cloud/cli/organization_command.rb