kontena-cli 0.6.1 → 0.7.0

data/lib/kontena/scripts/init

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+_kontena_complete() {
+  COMPREPLY=()
+  DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+  local word="${COMP_WORDS[COMP_CWORD]}"
+  local completions="$(${DIR}/completer ${COMP_WORDS[*]})"
+  COMPREPLY=( $(compgen -W "$completions" -- "$word") )
+}
+
+complete -F _kontena_complete kontena

data/spec/kontena/cli/server/user_spec.rb

@@ -0,0 +1,59 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/server/user"
+
+module Kontena::Cli::Server
+  describe User do
+    describe '#register' do
+
+      let(:auth_client) do
+        double(Kontena::Client)
+      end
+
+      it 'asks email' do
+        expect(subject).to receive(:ask).once.and_return('john.doe@acme.io')
+        allow(subject).to receive(:password).and_return('secret')
+        allow(Kontena::Client).to receive(:new).and_return(auth_client)
+        allow(auth_client).to receive(:post)
+        subject.register(nil, {})
+      end
+
+      it 'asks password twice' do
+        allow(subject).to receive(:ask).once.and_return('john.doe@acme.io')
+        expect(subject).to receive(:password).twice.and_return('secret')
+        allow(Kontena::Client).to receive(:new).and_return(auth_client)
+        allow(auth_client).to receive(:post)
+        subject.register(nil, {})
+      end
+
+      it 'validates given passwords' do
+        allow(subject).to receive(:ask).once.and_return('john.doe@acme.io')
+        expect(subject).to receive(:password).twice.and_return('secret', 'secret2')
+        expect{subject.register(nil, {})}.to raise_error(ArgumentError)
+      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(:password).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.register(nil, {})
+      end
+
+      it 'uses given auth provider' do
+        allow(subject).to receive(:ask).and_return('john.doe@acme.io')
+        allow(subject).to receive(:password).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.register('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')
+        allow(subject).to receive(:password).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.register(nil, {})
+      end
+    end
+  end
+end

data/spec/kontena/cli/services/services_helper_spec.rb

@@ -17,39 +17,40 @@ module Kontena::Cli::Services
 
     before(:each) do
       allow(subject).to receive(:client).with(token).and_return(client)
+      allow(subject).to receive(:current_grid).and_return('test-grid')
     end
 
     describe '#create_service' do
-      it 'creates POST grids/:id/services request to Kontena Server' do
-        expect(client).to receive(:post).with('grids/1/services', {'name' => 'test-service'})
-        subject.create_service(token, '1', {'name' => 'test-service'})
+      it 'creates POST grids/:grid/:name/services request to Kontena Server' do
+        expect(client).to receive(:post).with('grids/test-grid/services', {'name' => 'test-service'})
+        subject.create_service(token, 'test-grid', {'name' => 'test-service'})
       end
     end
 
     describe '#update_service' do
       it 'creates PUT services/:id request to Kontena Server' do
-        expect(client).to receive(:put).with('services/1', {'name' => 'test-service'})
+        expect(client).to receive(:put).with('services/test-grid/1', {'name' => 'test-service'})
         subject.update_service(token, '1', {'name' => 'test-service'})
       end
     end
 
     describe '#get_service' do
       it 'creates GET services/:id request to Kontena Server' do
-        expect(client).to receive(:get).with('services/test-service')
+        expect(client).to receive(:get).with('services/test-grid/test-service')
         subject.get_service(token, 'test-service')
       end
     end
 
     describe '#deploy_service' do
       it 'creates POST services/:id/deploy request to Kontena Server' do
-        allow(client).to receive(:get).with('services/1').and_return({'state' => 'running'})
-        expect(client).to receive(:post).with('services/1/deploy', {'strategy' => 'ha'})
+        allow(client).to receive(:get).with('services/test-grid/1').and_return({'state' => 'running'})
+        expect(client).to receive(:post).with('services/test-grid/1/deploy', {'strategy' => 'ha'})
         subject.deploy_service(token, '1', {'strategy' => 'ha'})
       end
 
       it 'polls Kontena Server until service is running' do
-        allow(client).to receive(:post).with('services/1/deploy', anything)
-        expect(client).to receive(:get).with('services/1').twice.and_return({'state' => 'deploying'}, {'state' => 'running'})
+        allow(client).to receive(:post).with('services/test-grid/1/deploy', anything)
+        expect(client).to receive(:get).with('services/test-grid/1').twice.and_return({'state' => 'deploying'}, {'state' => 'running'})
 
         subject.deploy_service(token, '1', {'strategy' => 'ha'})
       end
@@ -100,4 +101,4 @@ module Kontena::Cli::Services
       end
     end
   end
-end
+end

data/spec/kontena/cli/stacks/stacks_spec.rb

@@ -11,6 +11,28 @@ module Kontena::Cli::Stacks
       '1234567'
     end
 
+    let(:yml) do
+      content = <<content
+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
+content
+      content
+    end
 
     let(:services) do
       {
@@ -35,7 +57,7 @@ module Kontena::Cli::Stacks
     end
 
     let(:options) do
-      options = double({prefix: false, file: false})
+      options = double({prefix: false, file: false, service: nil})
     end
 
     let(:env_vars) do
@@ -64,8 +86,7 @@ module Kontena::Cli::Stacks
       context 'when api url and token are valid' do
         before(:each) do
           allow(subject).to receive(:settings).and_return(settings)
-          allow(YAML).to receive(:load).and_return(services)
-          allow(File).to receive(:read)
+          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')
@@ -74,28 +95,28 @@ module Kontena::Cli::Stacks
 
         it 'reads ./kontena.yml file by default' do
           allow(subject).to receive(:settings).and_return(settings)
-
-          expect(File).to receive(:read).with('./kontena.yml')
+          expect(File).to receive(:read).with('./kontena.yml').and_return(yml)
           expect(options).to receive(:file).once.and_return(false)
           subject.deploy(options)
         end
 
         it 'reads given yml file' do
           expect(options).to receive(:file).once.and_return('custom.yml')
-          expect(File).to receive(:read).with('custom.yml')
+          expect(File).to receive(:read).with('custom.yml').and_return(yml)
           subject.deploy(options)
         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)
+          expect(File).to receive(:basename).with(current_dir).and_return('stacks')
           subject.deploy(options)
         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)
 
@@ -120,6 +141,7 @@ module Kontena::Cli::Stacks
         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'
 
@@ -142,7 +164,7 @@ module Kontena::Cli::Stacks
 
         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=>nil, :container_count=>nil, :stateful=>true}
+          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.deploy(options)
@@ -153,11 +175,11 @@ module Kontena::Cli::Stacks
 
           data = {
               :name =>"kontena-test-wordpress",
-              :image=>"wordpress:latest",
-              :env=>nil,
+              :image=>"wordpress:4.1",
+              :env=>["WORDPRESS_DB_PASSWORD=kontena-test_secret"],
               :container_count=>2,
-              :stateful=>false,
-              :links=>[{:name=>"kontena-test-mysql", :alias=>"db"}],
+              :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)
@@ -172,8 +194,18 @@ module Kontena::Cli::Stacks
           subject.deploy(options)
         end
 
+        context 'when giving service option' do
+          it 'deploys only given services' do
+            allow(subject).to receive(:current_dir).and_return("kontena-test")
+            allow(options).to receive(:service).and_return(['wordpress'])
+            expect(subject).to receive(:create).once.with('wordpress', anything).and_return({})
+            expect(subject).not_to receive(:create).with('mysql', services['mysql'])
 
+            subject.deploy(options)
+          end
+        end
       end
+
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,9 @@ files:
 - 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
@@ -122,6 +124,9 @@ files:
 - lib/kontena/cli/version.rb
 - lib/kontena/client.rb
 - lib/kontena/errors.rb
+- lib/kontena/scripts/completer
+- lib/kontena/scripts/init
+- spec/kontena/cli/server/user_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
 - spec/kontena/cli/stacks/stacks_spec.rb
 - spec/spec_helper.rb
@@ -151,6 +156,7 @@ signing_key:
 specification_version: 4
 summary: Kontena command line tool
 test_files:
+- spec/kontena/cli/server/user_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
 - spec/kontena/cli/stacks/stacks_spec.rb
 - spec/spec_helper.rb