kontena-cli 0.15.5 → 0.16.0.pre1

data/spec/kontena/cli/app/yaml/reader_spec.rb

@@ -156,28 +156,6 @@ describe Kontena::Cli::Apps::YAML::Reader do
     end
   end
 
-  context 'when yaml file is malformed' do
-    it 'exits the execution' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('kontena-malformed-yaml.yml'))
-      expect {
-        subject.execute
-      }.to raise_error(SystemExit)
-    end
-  end
-
-  context 'when service config is not hash' do
-    it 'returns error' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('kontena-not-hash-service-config.yml'))
-
-      outcome = subject.execute
-      expect(outcome[:errors].size).to eq(1)
-    end
-  end
-
   describe '#v2?' do
     context 'version 1' do
       it 'returns false' do
@@ -429,30 +407,4 @@ describe Kontena::Cli::Apps::YAML::Reader do
       end
     end
   end
-
-  describe '#stack_name' do
-    it 'returns nil for v1' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path('kontena.yml'))
-        .and_return(fixture('kontena.yml'))
-      name = subject.stack_name
-      expect(name).to be_nil
-    end
-
-    it 'returns name for v2 if defined' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path('kontena.yml'))
-        .and_return(fixture('kontena_v2.yml'))
-      name = subject.stack_name
-      expect(name).to eq('test-project')
-    end
-
-    it 'returns nil for v2 if not defined' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path('kontena.yml'))
-        .and_return(fixture('docker-compose.yml'))
-      name = subject.stack_name
-      expect(name).to be_nil
-    end
-  end
 end

data/spec/kontena/cli/common_spec.rb

@@ -9,35 +9,44 @@ describe Kontena::Cli::Common do
   end
 
   before(:each) do
-    allow(subject).to receive(:settings).and_return({'current_server' => 'default',
-                                                     'servers' => [{}]
-                                                    })
-    allow(subject).to receive(:save_settings)
+    RSpec::Mocks.space.proxy_for(File).reset
+    Kontena::Cli::Config.reset_instance
+  end
+
+  def mock_config(cfg_hash)
+    expect(File).to receive(:readable?).and_return(true)
+    expect(File).to receive(:exist?).and_return(true)
+    expect(File).to receive(:read).and_return(cfg_hash.to_json)
   end
 
   describe '#current_grid' do
     it 'returns nil by default' do
-      allow(subject).to receive(:settings).and_return({'current_server' => 'alias',
-                                                       'servers' => [
-                                                           {'name' => 'some_master', 'url' => 'some_master'},
-                                                           {'name' => 'alias', 'url' => 'someurl'}
-                                                       ]
-                                                      })
+      mock_config({
+        'current_server' => 'alias',
+        'servers' => [
+           {'name' => 'some_master', 'url' => 'some_master'},
+           {'name' => 'alias', 'url' => 'someurl'}
+        ]
+      })
+
       expect(subject.current_grid).to eq(nil)
     end
 
     it 'returns grid from env' do
-      expect(ENV).to receive(:[]).with('KONTENA_GRID').and_return('foo')
+      allow(ENV).to receive(:[]).with(anything).and_return(nil)
+      allow(ENV).to receive(:[]).with('DEBUG').and_call_original
+      allow(ENV).to receive(:[]).with('KONTENA_GRID').and_return('foo')
       expect(subject.current_grid).to eq('foo')
     end
 
     it 'returns grid from json' do
-      allow(subject).to receive(:settings).and_return({'current_server' => 'alias',
-                                                       'servers' => [
-                                                           {'name' => 'some_master', 'url' => 'some_master'},
-                                                           {'name' => 'alias', 'url' => 'someurl', 'grid' => 'foo_grid'}
-                                                       ]
-                                                      })
+      mock_config({
+        'current_server' => 'alias',
+        'servers' => [
+          {'name' => 'some_master', 'url' => 'some_master'},
+          {'name' => 'alias', 'url' => 'someurl', 'grid' => 'foo_grid'}
+        ]
+      })
       expect(subject.current_grid).to eq('foo_grid')
     end
 
@@ -55,7 +64,8 @@ describe Kontena::Cli::Common do
     end
 
     it 'return url from env' do
-      expect(ENV).to receive(:[]).with('KONTENA_URL').and_return('https://domain.com')
+      allow(ENV).to receive(:[]).with(anything).and_return(nil)
+      allow(ENV).to receive(:[]).with('KONTENA_URL').and_return('https://domain.com')
       expect(subject.api_url).to eq('https://domain.com')
     end
   end
@@ -66,22 +76,17 @@ describe Kontena::Cli::Common do
         subject.require_token
       }.to raise_error(ArgumentError)
     end
-
-    it 'return token from env' do
-      expect(ENV).to receive(:[]).with('KONTENA_TOKEN').and_return('secret_token')
-      expect(subject.require_token).to eq('secret_token')
-    end
   end
 
   describe '#current_master' do
     it 'return correct master info' do
-      allow(subject).to receive(:settings).and_return({'current_server' => 'alias',
-                                                       'servers' => [
-                                                           {'name' => 'some_master', 'url' => 'some_master'},
-                                                           {'name' => 'alias', 'url' => 'someurl'}
-                                                       ]
-                                                      })
-
+      mock_config({ 
+        'current_server' => 'alias',
+        'servers' => [
+          {'name' => 'some_master', 'url' => 'some_master'},
+          {'name' => 'alias', 'url' => 'someurl'}
+        ]
+      })
       expect(subject.current_master['url']).to eq('someurl')
       expect(subject.current_master['name']).to eq('alias')
     end
@@ -89,51 +94,50 @@ describe Kontena::Cli::Common do
 
   describe '#settings' do
     it 'migrates old settings' do
-      RSpec::Mocks.space.proxy_for(subject).reset
-
-      allow(File).to receive(:exists?).and_return(true)
-      allow(File).to receive(:read).and_return('{
-        "server": {
-          "url": "https://master.domain.com:8443",
-          "grid": "my-grid",
-          "token": "kontena-token"
+      mock_config({
+        "server" => {
+          "url" => "https://master.domain.com:8443",
+          "grid" => "my-grid",
+          "token" => "kontena-token"
         }
-      }')
-      expected_settings = {
-          'current_server' => 'default',
-          'servers' => [
-              {
-                  "url" => "https://master.domain.com:8443",
-                  "grid" => "my-grid",
-                  "token" => "kontena-token",
-                  "name" => "default"
-              }
-          ]
-      }
-      expect(File).to receive(:write).with(subject.settings_filename, JSON.pretty_generate(expected_settings))
-
-      subject.settings
+      })
+      expect(File).to receive(:write) do |filename, content|
+        expect(File.basename(filename)).to eq(".kontena_client.json")
+        config_hash = JSON.parse(content)
+        expect(config_hash['servers']).to be_kind_of(Array)
+        expect(config_hash['servers'].first).to be_kind_of(Hash)
+        expect(config_hash['servers'].first['name']).to eq("default")
+        expect(config_hash['servers'].first['url']).to eq("https://master.domain.com:8443")
+        expect(config_hash['servers'].first['token']).to eq("kontena-token")
+        expect(config_hash['servers'].first['grid']).to eq("my-grid")
+        expect(config_hash['current_server']).to be_kind_of(String)
+        expect(config_hash['current_server']).to eq("default")
+      end
+      subject.config.write
     end
 
   end
 
   describe '#error' do
     it 'prints error message to stderr if given and raise error' do
-      expect($stderr).to receive(:puts).with('error message!')
-      expect{subject.error('error message!')}.to raise_error(SystemExit)
+      begin
+        expect{subject.error('error message!')}.to output('error message').to_stderr
+      rescue SystemExit => ex
+        expect(ex.status).to be 1
+      end
     end
   end
 
   describe '#confirm_command' do
     it 'returns true if input matches' do
-      allow(subject).to receive(:prompt).and_return('name-to-confirm')
+      allow(subject).to receive(:ask).and_return('name-to-confirm')
 
       expect(subject.confirm_command('name-to-confirm')).to be_truthy
       expect{subject.confirm_command('name-to-confirm')}.to_not raise_error
     end
 
     it 'raises error unless input matches' do
-      expect(subject).to receive(:prompt).and_return('wrong-name')
+      expect(subject).to receive(:ask).and_return('wrong-name')
       expect(subject).to receive(:error).with(/did not match/)
 
       subject.confirm_command('name-to-confirm')
@@ -142,14 +146,14 @@ describe Kontena::Cli::Common do
 
   describe '#confirm' do
     it 'returns true if confirmed' do
-      allow(subject).to receive(:prompt).and_return('y')
+      allow(subject.prompt).to receive(:yes?).and_return(true)
 
       expect(subject.confirm).to be_truthy
       expect{subject.confirm}.to_not raise_error
     end
 
     it 'raises error unless confirmed' do
-      expect(subject).to receive(:prompt).and_return('ei')
+      expect(subject.prompt).to receive(:yes?).and_return(false)
       expect(subject).to receive(:error).with(/Aborted/)
 
       subject.confirm

data/spec/kontena/cli/grids/use_command_spec.rb

@@ -0,0 +1,43 @@
+
+require_relative "../../../spec_helper"
+require 'kontena/cli/grids/use_command'
+
+describe Kontena::Cli::Grids::UseCommand do
+
+  include RequirementsHelper
+
+  let(:client) do 
+    Kontena::Client.new('https://foo', {access_token: 'abcd1234'})
+  end
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:server) do
+    Kontena::Cli::Config::Server.new(url: 'https://localhost', token: 'abcd1234')
+  end
+
+  expect_to_require_current_master
+
+  describe "#use" do
+    before(:each) do
+      expect(subject).to receive(:client).and_return(client)
+      expect(Kontena::Cli::Config.instance).to receive(:write).and_return(true)
+      expect(Kontena::Cli::Config.instance).to receive(:require_current_master).and_return(server)
+      expect(Kontena::Cli::Config.instance).to receive(:current_master).and_return(server)
+    end
+
+    it "should set the current grid in config" do
+      expect(server).to receive(:grid=).with('foo')
+      expect(client).to receive(:get).and_return(
+        { 'grids' => [
+            { 'name' => 'foo' }
+          ]
+        }
+      )
+      subject.run(['foo'])
+    end
+  end
+end
+

data/spec/kontena/cli/master/current_command_spec.rb

@@ -2,52 +2,31 @@ require_relative "../../../spec_helper"
 require 'kontena/cli/master/current_command'
 
 describe Kontena::Cli::Master::CurrentCommand do
-  let(:settings) do
-    {'current_server' => 'alias',
-      'servers' => [
-        {'name' => 'some_master', 'url' => 'some_master'},
-        {'name' => 'alias', 'url' => 'someurl', 'token' => '123456'}
-      ]
-    }
-  end
-
+  include ClientHelpers
+  
   let(:subject) { described_class.new(File.basename($0)) }
 
   describe '#execute' do
     it 'puts master name and URL' do
-      allow(subject).to receive(:settings).and_return(settings)
-
       expect {
         subject.run([])
       }.to output(/alias.*someurl/).to_stdout
     end
 
     it 'only outputs name if name-flag is set' do
-      allow(subject).to receive(:settings).and_return(settings)
-
       expect {
         subject.run(['--name'])
       }.to output("alias\n").to_stdout
     end
 
     it 'does not raise error when logged in' do
-      allow(subject).to receive(:settings).and_return(settings)
-
       expect {
         subject.run([])
       }.to_not raise_error
     end
 
     it 'raises error when not logged in' do
-      allow(subject).to receive(:settings).and_return(
-        {
-            'current_server' => nil,
-            'servers' => [
-                {'name' => 'some_master', 'url' => 'some_master'},
-                {'name' => 'alias', 'url' => 'someurl', 'token' => '123456'}
-            ]
-        }
-      )
+      expect(subject.config).to receive(:current_master).and_return(nil)
 
       expect {
         subject.run([])

data/spec/kontena/cli/master/use_command_spec.rb

@@ -3,41 +3,16 @@ require 'kontena/cli/master/use_command'
 
 describe Kontena::Cli::Master::UseCommand do
 
+  include ClientHelpers
+
   let(:subject) do
     described_class.new(File.basename($0))
   end
 
-  let(:client) { spy(:client) }
-
-  let(:valid_settings) do
-    {'current_server' => 'alias',
-     'servers' => [
-         {'name' => 'some_master', 'url' => 'some_master'},
-         {'name' => 'alias', 'url' => 'someurl', 'token' => '123456'}
-     ]
-    }
-  end
-
   describe '#use' do
     it 'should update current master' do
-      allow(subject).to receive(:client).and_return(client)
-      allow(subject).to receive(:settings).and_return(valid_settings)
-      expect(subject).to receive(:current_master=).with('some_master')
-      subject.run(['some_master'])
-    end
-
-    it 'should fetch grid list from master' do
-      allow(subject).to receive(:require_token).and_return('token')
-      allow(subject).to receive(:client).and_return(client)
-      allow(subject).to receive(:settings).and_return(valid_settings)
       expect(subject).to receive(:current_master=).with('some_master')
-      expect(client).to receive(:get).with('grids')
       subject.run(['some_master'])
     end
-
-    it 'should abort with error message if master is not configured' do
-      expect { subject.run(['not_existing']) }.to raise_error(
-        SystemExit, /Could not resolve master with name: not_existing/)
-    end
   end
 end

data/spec/kontena/cli/master/users/invite_command_spec.rb

@@ -4,30 +4,16 @@ require 'kontena/cli/master/users/invite_command'
 
 describe Kontena::Cli::Master::Users::InviteCommand do
 
+  include ClientHelpers
+
   let(:subject) do
     described_class.new(File.basename($0))
   end
 
-  let(:valid_settings) do
-    {'current_server' => 'alias',
-     'servers' => [
-         {'name' => 'some_master', 'url' => 'some_master'},
-         {'name' => 'alias', 'url' => 'someurl', 'token' => '123456'}
-     ]
-    }
-  end
-
-  let(:client) { spy(:client) }
-
   describe "#invite" do
-    before(:each) do
-      allow(subject).to receive(:client).and_return(client)
-      allow(subject).to receive(:settings).and_return(valid_settings)
-    end
-
     it 'makes invitation request for all given users' do
-      expect(client).to receive(:post).with("users", {email: 'john@example.org'}).once
-      expect(client).to receive(:post).with("users", {email: 'jane@example.org'}).once
+      expect(client).to receive(:post).with("/oauth2/authorize", {email: 'john@example.org', response_type: "invite"}).once
+      expect(client).to receive(:post).with("/oauth2/authorize", {email: 'jane@example.org', response_type: "invite"}).once
 
       subject.run(['john@example.org', 'jane@example.org'])
     end

data/spec/kontena/cli/master/users/roles/add_command_spec.rb

@@ -4,27 +4,13 @@ require 'kontena/cli/master/users/roles/add_command'
 
 describe Kontena::Cli::Master::Users::Roles::AddCommand do
 
+  include ClientHelpers
+
   let(:subject) do
     described_class.new(File.basename($0))
   end
 
-  let(:client) { spy(:client) }
-
-  let(:valid_settings) do
-    {'current_server' => 'alias',
-     'servers' => [
-         {'name' => 'some_master', 'url' => 'some_master'},
-         {'name' => 'alias', 'url' => 'someurl', 'token' => '123456'}
-     ]
-    }
-  end
-
   describe "#add-role" do
-    before(:each) do
-      allow(subject).to receive(:client).and_return(client)
-      allow(subject).to receive(:settings).and_return(valid_settings)
-    end
-
     it 'makes add role request for all given users' do
       expect(client).to receive(:post).with("users/john@example.org/roles", {role: 'role'}).once
       expect(client).to receive(:post).with("users/jane@example.org/roles", {role: 'role'}).once