kontena-cli 0.17.0.pre4 → 0.17.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cd10a782d72e14c697891b6de5aa825f6d25ee3
-  data.tar.gz: 4a00e35a86fed8fa9f41dd194a81577e921a26d1
+  metadata.gz: 3835d40a477a0fb0ab94945857b84a1ab33d006f
+  data.tar.gz: 5f177bfca7d455d0861ddad86d3f83c79512697a
 SHA512:
-  metadata.gz: 73c71530dac6cd22b3781754cd6302cca76e4b3421edf58ea7e929d2dff00e077a507b80e81bd759e8abdc9625faf5247c724852ad9bf17074afc7634678a1c0
-  data.tar.gz: 68493feaf35cbb9e0c0a2611d1ca52b7f7ed4aafde767565d73e799e873c05f9ff83a5b99c50279696b6f3ba604a76899d6485effb595b3e9221332816447c3c
+  metadata.gz: 291def87302aa7427d81ee28ff0040f4bc4b8d235f775bf42530e243fdf461c1e5022e853bd88a3807b887470e893cc469f0eb6c40315041c80bdd2f2611ebbf
+  data.tar.gz: 15705cab01e27db243cbe6d9be9c7b18a748027755ab7674b1f34ac5482b9c036d9d005e2cfb8cb12eab7a316532a0b0330976b648fdb42768b59f665771ba9d

data/VERSION

@@ -1 +1 @@
-0.17.0.pre4
+0.17.0.pre5

data/lib/kontena/cli/master/login_command.rb

@@ -255,7 +255,7 @@ module Kontena::Cli::Master
     def update_server_to_config(server)
       server.name ||= next_default_name
       config.servers << server unless config.servers.include?(server)
-      config.current_server = server.name
+      config.current_master = server.name
       config.write
       config.reset_instance
     end
@@ -289,7 +289,7 @@ module Kontena::Cli::Master
 
         name_match = config.find_server(name)
 
-        if name_match 
+        if name_match
           #found a server with the provided name, set the provided url to it and return
           name_match.url = url
           return name_match

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

@@ -311,6 +311,50 @@ describe Kontena::Cli::Master::LoginCommand do
     end
   end
 
+  context 'with servers in config' do
+    let(:webserver) { double(:webserver) }
+    before(:each) do
+      allow(File).to receive(:read).and_return('
+        {
+          "current_server": null,
+          "current_account": "kontena",
+          "servers": [
+            {
+              "name": "fooserver",
+              "url": "http://foo.example.com:80",
+              "username": "admin",
+              "grid": "test",
+              "token": "abcd",
+              "token_expires_at": 0,
+              "refresh_token": null
+            }
+          ]
+        }
+      ')
+
+      allow(File).to receive(:write).and_return(true)
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:readable?).and_return(true)
+      allow(Kontena::Client).to receive(:new).and_return(client)
+      allow(Kontena::LocalhostWebServer).to receive(:new).and_return(webserver)
+      allow(webserver).to receive(:port).and_return(12345)
+      allow(webserver).to receive(:serve_one).and_return(
+        { 'code' => 'abcd1234' }
+      )
+    end
+
+    it 'changes current master to created master' do
+      allow(client).to receive(:last_response).at_least(:once).and_return(OpenStruct.new(status: 302, headers: { 'Location' => 'http://authprovider.example.com/authplz' }))
+      allow(client).to receive(:request).and_return({})
+      allow(Launchy).to receive(:open).with('http://authprovider.example.com/authplz').and_return(true)
+      allow(client).to receive(:exchange_code).with('abcd1234').and_return('access_token' => 'defg456', 'server' => { 'name' => 'foobar' }, 'user' => { 'name' => 'testuser' })
+      subject.config.current_master = 'fooserver'
+      subject.config.current_master
+      subject.run(%w(--skip-grid-auto-select http://foobar.example.com))
+      expect(subject.config.current_master.name).to eq 'foobar'
+    end
+  end
+
   describe '#authentication_url_from_master' do
     it 'should exit with error if master returns a json with error' do
       allow(Kontena::Client).to receive(:new).and_return(client)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.17.0.pre4
+  version: 0.17.0.pre5
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler