kontena-cli 1.1.6 → 1.2.0.dev1

data/spec/kontena/cli/app/service_generator_v2_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/apps/service_generator_v2"
 require 'ruby_dig'
 

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

@@ -1,4 +1,3 @@
-require_relative '../../../../spec_helper'
 require 'kontena/cli/apps/yaml/reader'
 
 describe Kontena::Cli::Apps::YAML::Reader do

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

@@ -1,4 +1,3 @@
-require_relative '../../../../spec_helper'
 require 'kontena/cli/apps/yaml/service_extender'
 
 describe Kontena::Cli::Apps::YAML::ServiceExtender do

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

@@ -1,4 +1,3 @@
-require_relative '../../../../spec_helper'
 require 'kontena/cli/apps/yaml/validator'
 
 describe Kontena::Cli::Apps::YAML::Validator do

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

@@ -1,4 +1,3 @@
-require_relative '../../../../spec_helper'
 require 'kontena/cli/apps/yaml/validator_v2'
 
 describe Kontena::Cli::Apps::YAML::ValidatorV2 do

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

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/cloud/login_command'
 require 'kontena/cli/localhost_web_server'
 require 'launchy'

data/spec/kontena/cli/cloud/logout_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/cloud/logout_command'
 
 describe Kontena::Cli::Cloud::LogoutCommand do

data/spec/kontena/cli/cloud/master/add_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../../spec_helper"
 require 'kontena/cli/cloud/master/add_command'
 
 describe Kontena::Cli::Cloud::Master::AddCommand do

data/spec/kontena/cli/common_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../spec_helper"
 require "kontena/cli/common"
 
 describe Kontena::Cli::Common do

data/spec/kontena/cli/containers/list_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/grid_options'
 require "kontena/cli/containers/list_command"
 

data/spec/kontena/cli/containers/logs_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/grid_options'
 require "kontena/cli/containers/logs_command"
 

data/spec/kontena/cli/etcd/health_command_spec.rb

@@ -1,3 +1,5 @@
+require 'kontena/cli/etcd/health_command'
+
 describe Kontena::Cli::Etcd::HealthCommand do
   include ClientHelpers
   include OutputHelpers

data/spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../../spec_helper"
 require "kontena/cli/grids/trusted_subnet_command"
 require "kontena/cli/grids/trusted_subnets/add_command"
 
@@ -7,16 +6,6 @@ describe Kontena::Cli::Grids::TrustedSubnets::AddCommand do
   include ClientHelpers
 
   describe '#execute' do
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['grid', 'subnet'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run(['grid', 'subnet'])
-    end
-
     it 'requires grid as param' do
       expect {
         subject.run([])

data/spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../../spec_helper"
 require "kontena/cli/grids/trusted_subnet_command"
 require "kontena/cli/grids/trusted_subnets/list_command"
 
@@ -7,16 +6,6 @@ describe Kontena::Cli::Grids::TrustedSubnets::ListCommand do
   include ClientHelpers
 
   describe '#execute' do
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['grid'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run(['grid'])
-    end
-
     it 'requires grid as param' do
       expect {
         subject.run([])
@@ -24,8 +13,10 @@ describe Kontena::Cli::Grids::TrustedSubnets::ListCommand do
     end
 
     it 'requests grid details from master' do
-      expect(client).to receive(:get).with("grids/test-grid")
-      subject.run(['test-grid'])
+      expect(client).to receive(:get).with("grids/test-grid").and_return('trusted_subnets' => [
+          '192.168.0.1/24',
+      ])
+      expect{subject.run(['test-grid'])}.to output("192.168.0.1/24\n").to_stdout
     end
   end
 end

data/spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../../spec_helper"
 require "kontena/cli/grids/trusted_subnet_command"
 require "kontena/cli/grids/trusted_subnets/remove_command"
 
@@ -7,16 +6,6 @@ describe Kontena::Cli::Grids::TrustedSubnets::RemoveCommand do
   include ClientHelpers
 
   describe '#execute' do
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['--force', 'grid', 'subnet'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run(['--force', 'grid', 'subnet'])
-    end
-
     it 'requires grid as param' do
       expect {
         subject.run([])

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

@@ -1,5 +1,4 @@
 
-require_relative "../../../spec_helper"
 require 'kontena/cli/grids/use_command'
 
 describe Kontena::Cli::Grids::UseCommand do

data/spec/kontena/cli/helpers/log_helper_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/helpers/log_helper"
 
 describe Kontena::Cli::Helpers::LogHelper do

data/spec/kontena/cli/main_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../spec_helper"
 require "kontena/main_command"
 
 describe Kontena::MainCommand do
@@ -7,8 +6,8 @@ describe Kontena::MainCommand do
   describe '#subcommand_missing' do
     it 'suggests plugin install for known plugin commands' do
       expect(subject).to receive(:known_plugin_subcommand?).with('testplugin').and_return(true)
-      expect(subject).to receive(:exit_with_error).with(/plugin has not been installed/).and_raise(StandardError)
-      expect{subject.run(['testplugin', 'master', 'create'])}.to raise_error(StandardError)
+      expect(subject).to receive(:exit_with_error).with(/plugin has not been installed/).and_call_original
+      expect{subject.run(['testplugin', 'master', 'create'])}.to exit_with_error
     end
 
     it 'runs normal error handling for unknown sub commands' do

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

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

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

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/master/init_cloud_command"
 
 describe Kontena::Cli::Master::InitCloudCommand do

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

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/master/login_command'
 require 'kontena/cli/localhost_web_server'
 require 'launchy'

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

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/master/logout_command'
 
 describe Kontena::Cli::Master::LogoutCommand do

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

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/master/use_command'
 
 describe Kontena::Cli::Master::UseCommand do

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

@@ -1,4 +1,3 @@
-require_relative "../../../../spec_helper"
 require 'kontena/cli/master/users_command'
 require 'kontena/cli/master/users/invite_command'
 
@@ -6,13 +5,10 @@ describe Kontena::Cli::Master::Users::InviteCommand do
 
   include ClientHelpers
 
-  let(:subject) do
-    described_class.new(File.basename($0))
-  end
-
   describe "#invite" do
     it 'makes invitation request for all given users' do
       expect(client).to receive(:post).with("/oauth2/authorize", {email: 'john@example.org', external_id: nil, response_type: "invite"}).once
+      expect(client).to receive(:post).with("/oauth2/authorize", {email: 'jane@example.org', external_id: nil, response_type: "invite"}).once
 
       subject.run(['john@example.org', 'jane@example.org'])
     end

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

@@ -1,4 +1,3 @@
-require_relative "../../../../spec_helper"
 require 'kontena/cli/master/users_command'
 require "kontena/cli/master/users/remove_command"
 
@@ -12,25 +11,14 @@ describe Kontena::Cli::Master::Users::RemoveCommand do
       allow(subject).to receive(:confirm).and_return(true)
     end
 
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['john@domain.com'])
-    end
-
     it 'it requires confirmation' do
       expect(subject).to receive(:confirm).once
-      subject.run(['john@domain.com'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
+      expect(client).to receive(:delete).with('users/john@domain.com')
       subject.run(['john@domain.com'])
     end
 
     it 'sends email to master' do
-      expect(client).to receive(:delete).with(
-        'users/john@domain.com'
-      )
+      expect(client).to receive(:delete).with('users/john@domain.com')
       subject.run(['john@domain.com'])
     end
   end

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

@@ -1,4 +1,3 @@
-require_relative "../../../../../spec_helper"
 require 'kontena/cli/master/users_command'
 require 'kontena/cli/master/users/roles/add_command'
 

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

@@ -1,4 +1,3 @@
-require_relative "../../../../../spec_helper"
 require 'kontena/cli/master/users_command'
 require 'kontena/cli/master/users/roles/remove_command'
 

data/spec/kontena/cli/nodes/list_command_spec.rb

@@ -1,3 +1,5 @@
+require 'kontena/cli/nodes/list_command'
+
 describe Kontena::Cli::Nodes::ListCommand do
   include ClientHelpers
   include OutputHelpers

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

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/services/containers_command"
 
 describe Kontena::Cli::Services::ContainersCommand do
@@ -6,23 +5,6 @@ describe Kontena::Cli::Services::ContainersCommand do
   include ClientHelpers
 
   describe '#execute' do
-
-    before(:each) do
-      allow(client).to receive(:get).and_return({
-        'containers' => []
-      })
-    end
-
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['service-a'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run(['service-a'])
-    end
-
     it 'to not throw on missing "overlay_cidr" property' do
       allow(client).to receive(:get).and_return({
         'containers' => [

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

@@ -1,3 +1,5 @@
+require 'kontena/cli/services/exec_command'
+
 describe Kontena::Cli::Services::ExecCommand do
   include ClientHelpers
   include OutputHelpers
@@ -98,7 +100,7 @@ describe Kontena::Cli::Services::ExecCommand do
     it "Errors on a nonexistant container if given" do
       expect(client).to receive(:get).with('services/test-grid/null/test-service/containers').and_return(service_containers)
 
-      expect{subject.run(['--instance=4', 'test-service', 'test'])}.to output(/Service test-service does not have container instance 4/).to_stderr.and raise_error(SystemExit)
+      expect{subject.run(['--instance=4', 'test-service', 'test'])}.to exit_with_error.and output(/Service test-service does not have container instance 4/).to_stderr
     end
 
     it "Executes on each running container" do
@@ -114,7 +116,7 @@ describe Kontena::Cli::Services::ExecCommand do
       expect(client).to receive(:get).with('services/test-grid/null/test-service/containers').and_return(service_containers)
       expect(client).to receive(:post).with('containers/test-grid/host/test-service.container-1/exec', { cmd: ['test'] }).and_return(exec_fail)
 
-      expect{subject.run(['--silent', '--all', 'test-service', 'test'])}.to output("error\n").to_stderr.and raise_error(SystemExit)
+      expect{subject.run(['--silent', '--all', 'test-service', 'test'])}.to exit_with_error.and output("error\n").to_stderr
     end
 
     it "Stops if the second container fails" do
@@ -122,7 +124,7 @@ describe Kontena::Cli::Services::ExecCommand do
       expect(client).to receive(:post).with('containers/test-grid/host/test-service.container-1/exec', { cmd: ['test'] }).and_return(exec_ok)
       expect(client).to receive(:post).with('containers/test-grid/host/test-service.container-2/exec', { cmd: ['test'] }).and_return(exec_fail)
 
-      expect{subject.run(['--silent', '--all', 'test-service', 'test'])}.to output("ok\n").to_stdout.and output("error\n").to_stderr.and raise_error(SystemExit)
+      expect{subject.run(['--silent', '--all', 'test-service', 'test'])}.to exit_with_error.and output("ok\n").to_stdout.and output("error\n").to_stderr
     end
 
     it "Keeps going if the second container fails when using --skip" do
@@ -131,7 +133,7 @@ describe Kontena::Cli::Services::ExecCommand do
       expect(client).to receive(:post).with('containers/test-grid/host/test-service.container-2/exec', { cmd: ['test'] }).and_return(exec_fail)
       expect(client).to receive(:post).with('containers/test-grid/host/test-service.container-3/exec', { cmd: ['test'] }).and_return(exec_ok)
 
-      expect{subject.run(['--silent', '--all', '--skip', 'test-service', 'test'])}.to output("ok\nok\n").to_stdout.and output("error\n").to_stderr.and raise_error(SystemExit)
+      expect{subject.run(['--silent', '--all', '--skip', 'test-service', 'test'])}.to exit_with_error.and output("ok\nok\n").to_stdout.and output("error\n").to_stderr
     end
   end
 end

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

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/services/link_command"
 
 describe Kontena::Cli::Services::LinkCommand do
@@ -6,34 +5,21 @@ describe Kontena::Cli::Services::LinkCommand do
   include ClientHelpers
 
   describe '#execute' do
-    before(:each) do
-      allow(client).to receive(:get).and_return({
-        'links' => []
-      })
-    end
-
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['service-a', 'service-b'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run(['service-a', 'service-b'])
-    end
-
     it 'aborts if service is already linked' do
-      allow(client).to receive(:get).and_return({
+      expect(client).to receive(:get).with('services/test-grid/null/service-a').and_return({
         'links' => [
           {'alias' => 'service-b', 'id' => "grid/null/service-b"}
         ]
       })
       expect {
         subject.run(['service-a', 'service-b'])
-      }.to raise_error(SystemExit)
+      }.to exit_with_error
     end
 
     it 'sends link to master' do
+      expect(client).to receive(:get).with('services/test-grid/null/service-a').and_return({
+        'links' => []
+      })
       expect(client).to receive(:put).with(
         'services/test-grid/null/service-a', {links: [{name: 'null/service-b', alias: 'service-b'}]}
       )

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

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/services/restart_command"
 
 describe Kontena::Cli::Services::RestartCommand do
@@ -6,21 +5,6 @@ describe Kontena::Cli::Services::RestartCommand do
   include ClientHelpers
 
   describe '#execute' do
-
-    before(:each) do
-      allow(subject).to receive(:restart_service).and_return({})
-    end
-
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['service'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).once
-      subject.run(['service'])
-    end
-
     it 'triggers restart command' do
       expect(subject).to receive(:restart_service)
       subject.run(['service'])