kontena-cli 0.15.5 → 0.16.0.pre1

data/spec/support/requirements_helper.rb

@@ -0,0 +1,32 @@
+module RequirementsHelper
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    def expect_to_require_current_master
+      describe "prerequisites" do
+        it "should require current master" do
+          expect(described_class.requires_current_master?).to be_truthy
+        end
+      end
+    end
+
+    def expect_to_require_current_grid
+      describe "prerequisites" do
+        it "should require current grid" do
+          expect(described_class.requires_current_current_grid?).to be_truthy
+        end
+      end
+    end
+
+    def expect_to_require_current_master_token
+      describe "prerequisites" do
+        it "should require current master token" do
+          expect(described_class.requires_current_current_master_token?).to be_truthy
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.16.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.49.0
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.8
-- !ruby/object:Gem::Dependency
-  name: shell-spinner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: ruby_dig
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +164,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.3
 description: Kontena command line tool
 email:
 - info@kontena.io
@@ -204,6 +190,7 @@ files:
 - Dockerfile
 - Gemfile
 - LICENSE.txt
+- LOGO
 - README.md
 - Rakefile
 - VERSION
@@ -220,6 +207,16 @@ files:
 - examples/kontena-plugin-hello/lib/kontena_cli_plugin.rb
 - kontena-cli.gemspec
 - kontena-docker.sh
+- lib/kontena/callback.rb
+- lib/kontena/callbacks/.gitkeep
+- lib/kontena/callbacks/auth/01_list_and_select_grid_after_master_auth.rb
+- lib/kontena/callbacks/master/01_clear_current_master_after_terminate.rb
+- lib/kontena/callbacks/master/deploy/01_show_logo_before_deploy.rb
+- lib/kontena/callbacks/master/deploy/05_before_deploy_configuration_wizard.rb
+- lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb
+- lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb
+- lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb
+- lib/kontena/callbacks/master/deploy/90_suggest_inviting_yourself_after_deploy.rb
 - lib/kontena/cli/app_command.rb
 - lib/kontena/cli/apps/build_command.rb
 - lib/kontena/cli/apps/common.rb
@@ -251,7 +248,16 @@ files:
 - lib/kontena/cli/certificate/get_command.rb
 - lib/kontena/cli/certificate/register_command.rb
 - lib/kontena/cli/certificate_command.rb
+- lib/kontena/cli/cloud/login_command.rb
+- lib/kontena/cli/cloud/master/add_command.rb
+- lib/kontena/cli/cloud/master/delete_command.rb
+- lib/kontena/cli/cloud/master/list_command.rb
+- lib/kontena/cli/cloud/master/show_command.rb
+- lib/kontena/cli/cloud/master/update_command.rb
+- lib/kontena/cli/cloud/master_command.rb
+- lib/kontena/cli/cloud_command.rb
 - lib/kontena/cli/common.rb
+- lib/kontena/cli/config.rb
 - lib/kontena/cli/container_command.rb
 - lib/kontena/cli/containers/containers_helper.rb
 - lib/kontena/cli/containers/exec_command.rb
@@ -291,10 +297,21 @@ files:
 - lib/kontena/cli/grids/users/list_command.rb
 - lib/kontena/cli/grids/users/remove_command.rb
 - lib/kontena/cli/helpers/log_helper.rb
+- lib/kontena/cli/localhost_web_server.rb
 - lib/kontena/cli/login_command.rb
 - lib/kontena/cli/logout_command.rb
+- lib/kontena/cli/master/audit_log_command.rb
+- lib/kontena/cli/master/config/export_command.rb
+- lib/kontena/cli/master/config/get_command.rb
+- lib/kontena/cli/master/config/import_command.rb
+- lib/kontena/cli/master/config/set_command.rb
+- lib/kontena/cli/master/config/unset_command.rb
+- lib/kontena/cli/master/config_command.rb
+- lib/kontena/cli/master/create_command.rb
 - lib/kontena/cli/master/current_command.rb
+- lib/kontena/cli/master/join_command.rb
 - lib/kontena/cli/master/list_command.rb
+- lib/kontena/cli/master/login_command.rb
 - lib/kontena/cli/master/use_command.rb
 - lib/kontena/cli/master/users/invite_command.rb
 - lib/kontena/cli/master/users/list_command.rb
@@ -318,7 +335,6 @@ files:
 - lib/kontena/cli/plugins/list_command.rb
 - lib/kontena/cli/plugins/search_command.rb
 - lib/kontena/cli/plugins/uninstall_command.rb
-- lib/kontena/cli/register_command.rb
 - lib/kontena/cli/registry/create_command.rb
 - lib/kontena/cli/registry/delete_command.rb
 - lib/kontena/cli/registry/remove_command.rb
@@ -350,6 +366,7 @@ files:
 - lib/kontena/cli/services/stop_command.rb
 - lib/kontena/cli/services/unlink_command.rb
 - lib/kontena/cli/services/update_command.rb
+- lib/kontena/cli/spinner.rb
 - lib/kontena/cli/stack_command.rb
 - lib/kontena/cli/stacks/common.rb
 - lib/kontena/cli/stacks/create_command.rb
@@ -358,10 +375,6 @@ files:
 - lib/kontena/cli/stacks/remove_command.rb
 - lib/kontena/cli/stacks/show_command.rb
 - lib/kontena/cli/stacks/update_command.rb
-- lib/kontena/cli/user/forgot_password_command.rb
-- lib/kontena/cli/user/reset_password_command.rb
-- lib/kontena/cli/user/verify_command.rb
-- lib/kontena/cli/user_command.rb
 - lib/kontena/cli/vault/list_command.rb
 - lib/kontena/cli/vault/read_command.rb
 - lib/kontena/cli/vault/remove_command.rb
@@ -386,6 +399,8 @@ files:
 - lib/kontena/machine/random_name.rb
 - lib/kontena/main_command.rb
 - lib/kontena/plugin_manager.rb
+- lib/kontena/presets/github_auth_provider.yml
+- lib/kontena/presets/kontena_auth_provider.yml
 - lib/kontena/scripts/completer
 - lib/kontena/scripts/init
 - lib/kontena/util.rb
@@ -397,8 +412,6 @@ files:
 - spec/fixtures/kontena-build.yml
 - spec/fixtures/kontena-internal-extend.yml
 - spec/fixtures/kontena-invalid.yml
-- spec/fixtures/kontena-malformed-yaml.yml
-- spec/fixtures/kontena-not-hash-service-config.yml
 - spec/fixtures/kontena-with-env-file.yml
 - spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
@@ -427,15 +440,14 @@ files:
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
+- spec/kontena/cli/grids/use_command_spec.rb
 - spec/kontena/cli/helpers/log_helper_spec.rb
-- spec/kontena/cli/login_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/master/users/invite_command_spec.rb
 - spec/kontena/cli/master/users/remove_command_spec.rb
 - spec/kontena/cli/master/users/roles/add_command_spec.rb
 - spec/kontena/cli/master/users/roles/remove_command_spec.rb
-- spec/kontena/cli/register_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
@@ -447,10 +459,12 @@ files:
 - spec/kontena/cli/version_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
+- spec/kontena/config_spec.rb
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
 - spec/support/fixtures_helpers.rb
+- spec/support/requirements_helper.rb
 - tasks/release.rake
 - tasks/rspec.rake
 homepage: https://www.kontena.io
@@ -468,9 +482,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -485,8 +499,6 @@ test_files:
 - spec/fixtures/kontena-build.yml
 - spec/fixtures/kontena-internal-extend.yml
 - spec/fixtures/kontena-invalid.yml
-- spec/fixtures/kontena-malformed-yaml.yml
-- spec/fixtures/kontena-not-hash-service-config.yml
 - spec/fixtures/kontena-with-env-file.yml
 - spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
@@ -515,15 +527,14 @@ test_files:
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
+- spec/kontena/cli/grids/use_command_spec.rb
 - spec/kontena/cli/helpers/log_helper_spec.rb
-- spec/kontena/cli/login_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/master/users/invite_command_spec.rb
 - spec/kontena/cli/master/users/remove_command_spec.rb
 - spec/kontena/cli/master/users/roles/add_command_spec.rb
 - spec/kontena/cli/master/users/roles/remove_command_spec.rb
-- spec/kontena/cli/register_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
@@ -535,7 +546,9 @@ test_files:
 - spec/kontena/cli/version_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
+- spec/kontena/config_spec.rb
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
 - spec/support/fixtures_helpers.rb
+- spec/support/requirements_helper.rb

data/lib/kontena/cli/register_command.rb

@@ -1,23 +0,0 @@
-class Kontena::Cli::RegisterCommand < Clamp::Command
-  include Kontena::Cli::Common
-
-  option "--auth-provider-url", "AUTH_PROVIDER_URL", "Auth provider URL"
-
-  def execute
-    require 'highline/import'
-
-    auth_api_url = auth_provider_url || 'https://auth.kontena.io'
-    if !auth_api_url.start_with?('http://') && !auth_api_url.start_with?('https://')
-      auth_api_url = "https://#{auth_api_url}"
-    end
-    email = ask("Email: ")
-    password = ask("Password: ") { |q| q.echo = "*" }
-    password2 = ask("Password again: ") { |q| q.echo = "*" }
-    if password != password2
-      abort("Passwords don't match".colorize(:red))
-    end
-    params = {email: email, password: password}
-    auth_client = Kontena::Client.new(auth_api_url)
-    auth_client.post('users', params)
-  end
-end

data/lib/kontena/cli/user/forgot_password_command.rb

@@ -1,16 +0,0 @@
-module Kontena::Cli::User
-  class ForgotPasswordCommand < Clamp::Command
-    include Kontena::Cli::Common
-
-    parameter "EMAIL", "Email address"
-
-    option "--auth-provider-url", "URL", "Auth provider URL", default: "https://auth.kontena.io/"
-
-    def execute
-      params = {email: email}
-      auth_client = Kontena::Client.new(auth_provider_url)
-      auth_client.post('user/password_reset', params)
-      puts 'Email with password reset instructions is sent to your email address. Please follow the instructions to change your password.'
-    end
-  end
-end

data/lib/kontena/cli/user/reset_password_command.rb

@@ -1,23 +0,0 @@
-module Kontena::Cli::User
-  class ResetPasswordCommand < Clamp::Command
-    include Kontena::Cli::Common
-
-    parameter "TOKEN", "Password reset token"
-
-    option "--auth-provider-url", "URL", "Auth provider URL", default: "https://auth.kontena.io/"
-
-    def execute
-      require 'highline/import'
-
-      password = ask("Password: ") { |q| q.echo = "*" }
-      password2 = ask("Password again: ") { |q| q.echo = "*" }
-      if password != password2
-        abort("Passwords don't match")
-      end
-      params = {token: token, password: password}
-      auth_client = Kontena::Client.new(auth_provider_url)
-      auth_client.put('user/password_reset', params)
-      puts 'Password is now changed. To login with the new password, please run: kontena login'
-    end
-  end
-end

data/lib/kontena/cli/user/verify_command.rb

@@ -1,20 +0,0 @@
-module Kontena::Cli::User
-  class VerifyCommand < Clamp::Command
-    include Kontena::Cli::Common
-
-    parameter "TOKEN", "Kontena verify token"
-
-    option "--auth-provider-url", "URL", "Auth provider URL", default: "https://auth.kontena.io/"
-
-    def execute
-      params = { token: token }
-      begin
-        auth_client = Kontena::Client.new(auth_provider_url)
-        auth_client.post('user/email_confirm', params)
-        puts 'Account verified'.colorize(:green)
-      rescue Kontena::Errors::StandardError
-        abort 'Invalid verify token'.colorize(:red)
-      end
-    end
-  end
-end

data/lib/kontena/cli/user_command.rb

@@ -1,13 +0,0 @@
-require_relative 'user/verify_command'
-require_relative 'user/forgot_password_command'
-require_relative 'user/reset_password_command'
-
-class Kontena::Cli::UserCommand < Clamp::Command
-
-  subcommand "verify", "Verify user account", Kontena::Cli::User::VerifyCommand
-  subcommand "forgot-password", "Request password reset for Kontena account", Kontena::Cli::User::ForgotPasswordCommand
-  subcommand "reset-password", "Reset Kontena account password", Kontena::Cli::User::ResetPasswordCommand
-
-  def execute
-  end
-end

data/spec/fixtures/kontena-malformed-yaml.yml

@@ -1,6 +0,0 @@
-version: '2'
-services:
-  wordpress:
-    build: .
-      context: .
-      dockerfile: Dockerfile.alternative

data/spec/fixtures/kontena-not-hash-service-config.yml

@@ -1,3 +0,0 @@
-version: '2'
-services:
-  wordpress: 'service config cannot be string'    

data/spec/kontena/cli/login_command_spec.rb

@@ -1,32 +0,0 @@
-require_relative "../../spec_helper"
-require "kontena/cli/login_command"
-
-describe Kontena::Cli::LoginCommand do
-  describe '#register' do
-
-    let(:settings) do
-      {'current_server' => 'alias',
-       'servers' => [
-           {'name' => 'some_master', 'url' => 'some_master'},
-           {'name' => 'alias', 'url' => 'someurl', 'token' => '123456'}
-       ]
-      }
-    end
-
-    let(:auth_client) do
-      double(Kontena::Client)
-    end
-
-    let(:subject) { described_class.new(File.basename($0)) }
-
-    it 'asks email and password' do
-      allow(subject).to receive(:settings).and_return(settings)
-      expect(subject).to receive(:ask).once.with('Email: ').and_return('john.doe@acme.io')
-      allow(subject).to receive(:ask).once.with('Password: ').and_return('secret')
-      allow(Kontena::Client).to receive(:new).and_return(auth_client)
-      allow(auth_client).to receive(:post)
-      allow(subject).to receive(:request_server_info).and_return(true)
-      subject.run(['http://localhost:8443'])
-    end
-  end
-end