kontena-cli 0.7.3 → 0.8.0

data/spec/kontena/cli/deploy_command_spec.rb

@@ -0,0 +1,213 @@
+require_relative "../../spec_helper"
+require "kontena/cli/deploy_command"
+
+describe Kontena::Cli::DeployCommand do
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:settings) do
+    {'server' => {'url' => 'http://kontena.test', 'token' => token}}
+  end
+
+  let(:token) do
+    '1234567'
+  end
+
+  let(:yml) do
+    yml_content = <<yml
+wordpress:
+  image: wordpress:4.1
+  stateful: true
+  ports:
+    - 80:80
+  links:
+    - mysql:mysql
+  environment:
+    - WORDPRESS_DB_PASSWORD=%{prefix}_secret
+  instances: 2
+  deploy:
+    strategy: ha
+mysql:
+  image: mysql:5.6
+  stateful: true
+  environment:
+    - MYSQL_ROOT_PASSWORD=%{prefix}_secret
+yml
+    yml_content
+  end
+
+  let(:services) do
+    {
+        'wordpress' => {
+            'image' => 'wordpress:latest',
+            'links' => ['mysql:db'],
+            'ports' => ['80:80'],
+            'instances' => 2,
+            'deploy' => {
+                'strategy' => 'ha'
+            }
+        },
+        'mysql' => {
+            'image' => 'mysql:5.6',
+            'stateful' => true
+        }
+    }
+  end
+
+  let(:client) do
+    double
+  end
+
+  let(:options) do
+    double({prefix: false, file: false, service: nil})
+  end
+
+  let(:env_vars) do
+    ["#comment line", "TEST_ENV_VAR=test", "MYSQL_ADMIN_PASSWORD=abcdef"]
+  end
+
+  let(:dot_env) do
+    ["TEST_ENV_VAR=test2","", "TEST_ENV_VAR2=test3"]
+  end
+
+  describe '#deploy' do
+    context 'when api_url is nil' do
+      it 'raises error' do
+        allow(subject).to receive(:settings).and_return({'server' => {}})
+        expect{subject.run([])}.to raise_error(ArgumentError)
+      end
+    end
+
+    context 'when token is nil' do
+      it 'raises error' do
+        allow(subject).to receive(:settings).and_return({'server' => {'url' => 'http://kontena.test'}})
+        expect{subject.run([])}.to raise_error(ArgumentError)
+      end
+    end
+
+    context 'when api url and token are valid' do
+      before(:each) do
+        allow(subject).to receive(:settings).and_return(settings)
+        allow(File).to receive(:exists?).and_return(true)
+        allow(File).to receive(:read).and_return(yml)
+        allow(subject).to receive(:get_service).and_raise(Kontena::Errors::StandardError.new(404, 'Not Found'))
+        allow(subject).to receive(:create_service).and_return({'id' => 'kontena-test-mysql'},{'id' => 'kontena-test-wordpress'})
+        allow(subject).to receive(:current_grid).and_return('1')
+        allow(subject).to receive(:deploy_service).and_return(nil)
+      end
+
+      it 'reads ./kontena.yml file by default' do
+        allow(subject).to receive(:settings).and_return(settings)
+        expect(File).to receive(:read).with('./kontena.yml').and_return(yml)
+        subject.run([])
+      end
+
+      it 'reads given yml file' do
+        expect(subject).to receive(:file).once.and_return('custom.yml')
+        expect(File).to receive(:read).with('custom.yml').and_return(yml)
+        subject.run([])
+      end
+
+      it 'uses current directory as service name prefix by default' do
+        current_dir = '/kontena/tests/stacks'
+        allow(Dir).to receive(:getwd).and_return(current_dir)
+        expect(File).to receive(:basename).with(current_dir).and_return('stacks')
+        subject.run([])
+      end
+
+      context 'when yml file has multiple env files' do
+        it 'merges environment variables correctly' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+          allow(YAML).to receive(:load).and_return(services)
+          services['wordpress']['environment'] = ['MYSQL_ADMIN_PASSWORD=password']
+          services['wordpress']['env_file'] = %w(/path/to/env_file .env)
+
+          expect(File).to receive(:readlines).with('/path/to/env_file').and_return(env_vars)
+          expect(File).to receive(:readlines).with('.env').and_return(dot_env)
+
+          data = {
+              :name =>"kontena-test-wordpress",
+              :image=>"wordpress:latest",
+              :env=>["MYSQL_ADMIN_PASSWORD=password", "TEST_ENV_VAR=test", "TEST_ENV_VAR2=test3"],
+              :container_count=>2,
+              :stateful=>false,
+              :links=>[{:name=>"kontena-test-mysql", :alias=>"db"}],
+              :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+          }
+
+          expect(subject).to receive(:create_service).with('1234567', '1', data)
+          subject.run([])
+        end
+      end
+
+      context 'when yml file has one env file' do
+        it 'merges environment variables correctly' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+          allow(YAML).to receive(:load).and_return(services)
+          services['wordpress']['environment'] = ['MYSQL_ADMIN_PASSWORD=password']
+          services['wordpress']['env_file'] = '/path/to/env_file'
+
+          expect(File).to receive(:readlines).with('/path/to/env_file').and_return(env_vars)
+
+          data = {
+              :name =>"kontena-test-wordpress",
+              :image=>"wordpress:latest",
+              :env=>["MYSQL_ADMIN_PASSWORD=password", "TEST_ENV_VAR=test"],
+              :container_count=>2,
+              :stateful=>false,
+              :links=>[{:name=>"kontena-test-mysql", :alias=>"db"}],
+              :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+          }
+
+          expect(subject).to receive(:create_service).with('1234567', '1', data)
+          subject.run([])
+        end
+      end
+
+      it 'creates mysql service before wordpress' do
+        allow(subject).to receive(:current_dir).and_return("kontena-test")
+        data = {:name =>"kontena-test-mysql", :image=>'mysql:5.6', :env=>["MYSQL_ROOT_PASSWORD=kontena-test_secret"], :container_count=>nil, :stateful=>true}
+        expect(subject).to receive(:create_service).with('1234567', '1', data)
+
+        subject.run([])
+      end
+
+      it 'creates wordpress service' do
+        allow(subject).to receive(:current_dir).and_return("kontena-test")
+
+        data = {
+            :name =>"kontena-test-wordpress",
+            :image=>"wordpress:4.1",
+            :env=>["WORDPRESS_DB_PASSWORD=kontena-test_secret"],
+            :container_count=>2,
+            :stateful=>true,
+            :links=>[{:name=>"kontena-test-mysql", :alias=>"mysql"}],
+            :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+        }
+        expect(subject).to receive(:create_service).with('1234567', '1', data)
+
+        subject.run([])
+      end
+
+      it 'deploys services' do
+        allow(subject).to receive(:current_dir).and_return("kontena-test")
+        expect(subject).to receive(:deploy_service).with('1234567', 'kontena-test-mysql', {})
+        expect(subject).to receive(:deploy_service).with('1234567', 'kontena-test-wordpress', {:strategy => 'ha'})
+        subject.run([])
+      end
+
+      context 'when giving service option' do
+        it 'deploys only given services' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+          allow(subject).to receive(:deploy_services).and_return({})
+          expect(subject).to receive(:create).once.with('wordpress', anything).and_return({})
+          expect(subject).not_to receive(:create).with('mysql', services['mysql'])
+
+          subject.run(['--service', 'wordpress'])
+        end
+      end
+    end
+  end
+end

data/spec/kontena/cli/login_command_spec.rb

@@ -0,0 +1,22 @@
+require_relative "../../spec_helper"
+require "kontena/cli/login_command"
+
+describe Kontena::Cli::LoginCommand do
+  describe '#register' do
+
+    let(:auth_client) do
+      double(Kontena::Client)
+    end
+
+    let(:subject) { described_class.new(File.basename($0)) }
+
+    it 'asks email and password' do
+      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

data/spec/kontena/cli/register_command_spec.rb

@@ -0,0 +1,57 @@
+require_relative "../../spec_helper"
+require "kontena/cli/register_command"
+
+describe Kontena::Cli::RegisterCommand do
+  describe '#register' do
+
+    let(:auth_client) do
+      double(Kontena::Client)
+    end
+
+    let(:subject) { described_class.new(File.basename($0)) }
+
+    it 'asks password twice' do
+      allow(subject).to receive(:ask).once.with('Email: ').and_return('john.doe@acme.io')
+      expect(subject).to receive(:password).once.with('Password: ').and_return('secret')
+      expect(subject).to receive(:password).once.with('Password again: ').and_return('secret')
+      allow(Kontena::Client).to receive(:new).and_return(auth_client)
+      allow(auth_client).to receive(:post)
+      subject.run([])
+    end
+
+    it 'validates given passwords' do
+      allow(subject).to receive(:ask).once.with('Email: ').and_return('john.doe@acme.io')
+      expect(subject).to receive(:password).once.with('Password: ').and_return('secret')
+      expect(subject).to receive(:password).once.with('Password again: ').and_return('secret2')
+      expect{subject.run([])}.to raise_error(SystemExit)
+    end
+
+    it 'uses https://auth.kontena.io as default auth provider' do
+      allow(subject).to receive(:ask).and_return('john.doe@acme.io')
+      allow(subject).to receive(:ask).once.with('Email: ').and_return('john.doe@acme.io')
+      expect(subject).to receive(:password).once.with('Password: ').and_return('secret')
+      expect(subject).to receive(:password).once.with('Password again: ').and_return('secret')
+      expect(Kontena::Client).to receive(:new).with('https://auth.kontena.io').and_return(auth_client)
+      allow(auth_client).to receive(:post)
+      subject.run([])
+    end
+
+    it 'uses given auth provider' do
+      allow(subject).to receive(:ask).and_return('john.doe@acme.io')
+      expect(subject).to receive(:password).once.with('Password: ').and_return('secret')
+      expect(subject).to receive(:password).once.with('Password again: ').and_return('secret')
+      expect(Kontena::Client).to receive(:new).with('http://custom.auth-provider.io').and_return(auth_client)
+      allow(auth_client).to receive(:post)
+      subject.run(['--auth-provider-url', 'http://custom.auth-provider.io'])
+    end
+
+    it 'sends register request to auth provider' do
+      allow(subject).to receive(:ask).and_return('john.doe@acme.io')
+      expect(subject).to receive(:password).once.with('Password: ').and_return('secret')
+      expect(subject).to receive(:password).once.with('Password again: ').and_return('secret')
+      allow(Kontena::Client).to receive(:new).with('https://auth.kontena.io').and_return(auth_client)
+      expect(auth_client).to receive(:post).with('users', {email: 'john.doe@acme.io', password: 'secret'})
+      subject.run([])
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,10 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
+require 'clamp'
+require 'kontena/cli/common'
+require 'kontena/client'
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
@@ -15,4 +19,4 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shell-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,38 +126,104 @@ files:
 - bin/kontena
 - kontena-cli.gemspec
 - kontena-docker.sh
-- lib/kontena/cli/commands.rb
+- lib/kontena/cli/app_command.rb
+- lib/kontena/cli/apps/common.rb
+- lib/kontena/cli/apps/deploy_command.rb
+- lib/kontena/cli/apps/init_command.rb
+- lib/kontena/cli/apps/list_command.rb
+- lib/kontena/cli/apps/logs_command.rb
+- lib/kontena/cli/apps/remove_command.rb
+- lib/kontena/cli/apps/start_command.rb
+- lib/kontena/cli/apps/stop_command.rb
 - lib/kontena/cli/common.rb
-- lib/kontena/cli/containers/commands.rb
-- lib/kontena/cli/containers/containers.rb
-- lib/kontena/cli/grids/audit_log.rb
-- lib/kontena/cli/grids/commands.rb
-- lib/kontena/cli/grids/external_registries.rb
-- lib/kontena/cli/grids/grids.rb
-- lib/kontena/cli/grids/registry.rb
-- lib/kontena/cli/grids/users.rb
-- lib/kontena/cli/grids/vpn.rb
-- lib/kontena/cli/nodes/commands.rb
-- lib/kontena/cli/nodes/nodes.rb
-- lib/kontena/cli/server/commands.rb
-- lib/kontena/cli/server/server.rb
-- lib/kontena/cli/server/user.rb
-- lib/kontena/cli/services/commands.rb
-- lib/kontena/cli/services/containers.rb
-- lib/kontena/cli/services/logs.rb
-- lib/kontena/cli/services/services.rb
+- lib/kontena/cli/container_command.rb
+- lib/kontena/cli/containers/exec_command.rb
+- lib/kontena/cli/deploy_command.rb
+- lib/kontena/cli/external_registries/add_command.rb
+- lib/kontena/cli/external_registries/delete_command.rb
+- lib/kontena/cli/external_registries/list_command.rb
+- lib/kontena/cli/external_registry_command.rb
+- lib/kontena/cli/forgot_password_command.rb
+- lib/kontena/cli/grid_command.rb
+- lib/kontena/cli/grids/add_user_command.rb
+- lib/kontena/cli/grids/audit_log_command.rb
+- lib/kontena/cli/grids/common.rb
+- lib/kontena/cli/grids/create_command.rb
+- lib/kontena/cli/grids/current_command.rb
+- lib/kontena/cli/grids/list_command.rb
+- lib/kontena/cli/grids/list_users_command.rb
+- lib/kontena/cli/grids/remove_command.rb
+- lib/kontena/cli/grids/remove_user_command.rb
+- lib/kontena/cli/grids/show_command.rb
+- lib/kontena/cli/grids/use_command.rb
+- lib/kontena/cli/invite_command.rb
+- lib/kontena/cli/login_command.rb
+- lib/kontena/cli/logout_command.rb
+- lib/kontena/cli/node_command.rb
+- lib/kontena/cli/nodes/digital_ocean/create_command.rb
+- lib/kontena/cli/nodes/digital_ocean/restart_command.rb
+- lib/kontena/cli/nodes/digital_ocean/terminate_command.rb
+- lib/kontena/cli/nodes/digital_ocean_command.rb
+- lib/kontena/cli/nodes/list_command.rb
+- lib/kontena/cli/nodes/remove_command.rb
+- lib/kontena/cli/nodes/show_command.rb
+- lib/kontena/cli/nodes/update_command.rb
+- lib/kontena/cli/nodes/vagrant/create_command.rb
+- lib/kontena/cli/nodes/vagrant/restart_command.rb
+- lib/kontena/cli/nodes/vagrant/ssh_command.rb
+- lib/kontena/cli/nodes/vagrant/start_command.rb
+- lib/kontena/cli/nodes/vagrant/stop_command.rb
+- lib/kontena/cli/nodes/vagrant/terminate_command.rb
+- lib/kontena/cli/nodes/vagrant_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_command.rb
+- lib/kontena/cli/reset_password_command.rb
+- lib/kontena/cli/service_command.rb
+- lib/kontena/cli/services/container_command.rb
+- lib/kontena/cli/services/containers_command.rb
+- lib/kontena/cli/services/create_command.rb
+- lib/kontena/cli/services/delete_command.rb
+- lib/kontena/cli/services/deploy_command.rb
+- lib/kontena/cli/services/list_command.rb
+- lib/kontena/cli/services/logs_command.rb
+- lib/kontena/cli/services/restart_command.rb
+- lib/kontena/cli/services/scale_command.rb
 - lib/kontena/cli/services/services_helper.rb
-- lib/kontena/cli/services/stats.rb
-- lib/kontena/cli/stacks/commands.rb
-- lib/kontena/cli/stacks/stacks.rb
+- lib/kontena/cli/services/show_command.rb
+- lib/kontena/cli/services/start_command.rb
+- lib/kontena/cli/services/stats_command.rb
+- lib/kontena/cli/services/stop_command.rb
+- lib/kontena/cli/services/update_command.rb
+- lib/kontena/cli/verify_account_command.rb
 - lib/kontena/cli/version.rb
+- lib/kontena/cli/version_command.rb
+- lib/kontena/cli/vpn/config_command.rb
+- lib/kontena/cli/vpn/create_command.rb
+- lib/kontena/cli/vpn/delete_command.rb
+- lib/kontena/cli/vpn_command.rb
+- lib/kontena/cli/whoami_command.rb
 - lib/kontena/client.rb
 - lib/kontena/errors.rb
+- lib/kontena/machine/common.rb
+- lib/kontena/machine/digital_ocean.rb
+- lib/kontena/machine/digital_ocean/cloudinit.yml
+- lib/kontena/machine/digital_ocean/node_destroyer.rb
+- lib/kontena/machine/digital_ocean/node_provisioner.rb
+- lib/kontena/machine/random_name.rb
+- lib/kontena/machine/vagrant.rb
+- lib/kontena/machine/vagrant/Vagrantfile.coreos.rb.erb
+- lib/kontena/machine/vagrant/cloudinit.yml
+- lib/kontena/machine/vagrant/node_destroyer.rb
+- lib/kontena/machine/vagrant/node_provisioner.rb
 - lib/kontena/scripts/completer
 - lib/kontena/scripts/init
-- spec/kontena/cli/server/user_spec.rb
+- spec/kontena/cli/app/deploy_command_spec.rb
+- spec/kontena/cli/deploy_command_spec.rb
+- spec/kontena/cli/login_command_spec.rb
+- spec/kontena/cli/register_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
-- spec/kontena/cli/stacks/stacks_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: http://www.kontena.io
@@ -152,12 +246,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Kontena command line tool
 test_files:
-- spec/kontena/cli/server/user_spec.rb
+- spec/kontena/cli/app/deploy_command_spec.rb
+- spec/kontena/cli/deploy_command_spec.rb
+- spec/kontena/cli/login_command_spec.rb
+- spec/kontena/cli/register_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
-- spec/kontena/cli/stacks/stacks_spec.rb
 - spec/spec_helper.rb