kontena-cli 1.1.6 → 1.2.0.dev1

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

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

data/spec/kontena/cli/stacks/yaml/validator_v3_spec.rb

@@ -1,4 +1,3 @@
-require_relative '../../../../spec_helper'
 require 'kontena/cli/stacks/yaml/validator_v3'
 
 describe Kontena::Cli::Stacks::YAML::ValidatorV3 do

data/spec/kontena/cli/vault/export_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/vault/export_command'
 
 describe Kontena::Cli::Vault::ExportCommand do

data/spec/kontena/cli/vault/import_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/vault/import_command'
 
 
@@ -18,15 +17,15 @@ describe Kontena::Cli::Vault::ImportCommand do
   expect_to_require_current_master
 
   it 'asks for confirmation' do
-    expect(subject).to receive(:confirm).and_raise(RuntimeError, 'confirm')
+    expect(subject).to receive(:confirm).and_return(false)
     expect(File).to receive(:read).with('foo.yml').and_return("foo: bar\n")
-    expect{subject.run(['foo.yml'])}.to raise_error(RuntimeError, 'confirm')
+    subject.run(['foo.yml'])
   end
 
   it 'dies if the yml contains something odd' do
     expect(File).to receive(:read).with('foo.yml').and_return({foo: 'bar', bar: { foo: ["bar"] }}.to_yaml)
-    expect(subject).to receive(:exit_with_error).with(/Invalid value/).and_raise(RuntimeError, 'invalid')
-    expect{subject.run(['foo.yml'])}.to raise_error(RuntimeError, 'invalid')
+    expect(subject).to receive(:exit_with_error).with(/Invalid value/).and_call_original
+    expect{subject.run(['--force', 'foo.yml'])}.to exit_with_error
   end
 
   it 'runs vault write for kv-pairs in yaml' do

data/spec/kontena/cli/version_command_spec.rb

@@ -1,17 +1,19 @@
-require_relative "../../spec_helper"
 require "kontena/cli/version_command"
 
 describe Kontena::Cli::VersionCommand do
 
   include ClientHelpers
+  
+  let :http_client do
+    double(:http_client)
+  end
 
   describe '#execute' do
-    before(:each) do
-      allow(subject).to receive(:client).and_return(client)
-    end
-
     it 'runs without errors' do
-      expect { subject.run([]) }.not_to raise_error
+      expect(client).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:get).with(path: '/').and_return(double(body: '{"version": "0.1"}'))
+
+      expect { subject.run([]) }.to output("cli: #{Kontena::Cli::VERSION}\nmaster: 0.1 (someurl)\n").to_stdout
     end
   end
 end

data/spec/kontena/cli/vpn/create_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/vpn/create_command"
 
 describe Kontena::Cli::Vpn::CreateCommand do
@@ -13,7 +12,7 @@ describe Kontena::Cli::Vpn::CreateCommand do
 
       expect {
         subject.execute
-      }.to raise_error SystemExit
+      }.to exit_with_error
     end
   end
 
@@ -29,7 +28,7 @@ describe Kontena::Cli::Vpn::CreateCommand do
 
       expect {
         subject.find_node(token, nil)
-      }.to raise_error SystemExit
+      }.to exit_with_error
     end
 
     it 'should return first online node with public ip' do
@@ -69,7 +68,7 @@ describe Kontena::Cli::Vpn::CreateCommand do
 
       expect {
         subject.find_node(token, 'foobar')
-      }.to raise_error SystemExit
+      }.to exit_with_error
     end
 
   end

data/spec/kontena/client_spec.rb

@@ -1,4 +1,3 @@
-require_relative '../spec_helper'
 require 'kontena_cli'
 require 'ostruct'
 

data/spec/kontena/config_spec.rb

@@ -1,4 +1,3 @@
-require_relative '../spec_helper'
 
 # Lots of coverage already in Common spec
 describe Kontena::Cli::Config do

data/spec/kontena/kontena_cli_spec.rb

@@ -1,6 +1,6 @@
-require_relative '../spec_helper'
 require 'kontena_cli'
 require 'kontena/light_prompt'
+require 'kontena/cli/whoami_command'
 
 describe Kontena do
   context 'prompt' do

data/spec/kontena/main_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative '../spec_helper'
 require 'kontena/main_command'
 
 describe Kontena::MainCommand do

data/spec/kontena/plugin_manager_spec.rb

@@ -1,4 +1,3 @@
-require_relative '../spec_helper'
 require 'kontena_cli'
 
 describe Kontena::PluginManager do

data/spec/spec_helper.rb

@@ -62,3 +62,4 @@ require_relative 'support/client_helpers'
 require_relative 'support/requirements_helper'
 require_relative 'support/fixtures_helpers'
 require_relative 'support/output_helpers'
+require_relative 'support/exit_with_error_helper'

data/spec/support/client_helpers.rb

@@ -6,7 +6,7 @@ module ClientHelpers
     end
 
     base.let(:client) do
-      spy(:client)
+      instance_double(Kontena::Client, :client)
     end
 
     base.let(:token) do

data/spec/support/exit_with_error_helper.rb

@@ -0,0 +1,36 @@
+RSpec::Matchers.define :exit_with_error do
+
+  def supports_block_expectations?
+    true
+  end
+
+  match do |block|
+    begin
+      block.call
+    rescue SystemExit => e
+      @exit_status = e.status
+    end
+    !@exit_status.nil? && @exit_status == expected_status
+  end
+
+  chain :status do |status|
+    @expected_status = status
+  end
+
+  failure_message do |block|
+    "expected block to exit with status #{expected_status} but exit " +
+      (@exit_status.nil? ? "was not called" : "status was #{@exit_status}")
+  end
+
+  failure_message_when_negated do |block|
+    "expected block not to raise SystemExit, got exit with status #{@exit_status}"
+  end
+
+  description do
+    "expect block to exit #{expected_status.zero? ? "without error" : "with error (status #{expected_status})"}"
+  end
+
+  def expected_status
+    @expected_status ||= 1
+  end
+end

data/spec/support/fixtures_helpers.rb

@@ -1,7 +1,10 @@
 module FixturesHelpers
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/'
 
+  def fixture_path(file)
+    File.expand_path(FIXTURES_PATH + file)
+  end
   def fixture(file)
-    IO.read(FIXTURES_PATH+file)
+    IO.read(fixture_path(file))
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0.dev1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
-description: Kontena command line tool
+description: Command-line client for the Kontena container and microservices platform
 email:
 - info@kontena.io
 executables:
@@ -202,6 +202,7 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".gitignore"
+- ".rspec"
 - Dockerfile
 - Gemfile
 - LICENSE.txt
@@ -444,6 +445,7 @@ files:
 - lib/kontena/cli/stacks/yaml/service_extender.rb
 - lib/kontena/cli/stacks/yaml/validations.rb
 - lib/kontena/cli/stacks/yaml/validator_v3.rb
+- lib/kontena/cli/subcommand_loader.rb
 - lib/kontena/cli/vault/export_command.rb
 - lib/kontena/cli/vault/import_command.rb
 - lib/kontena/cli/vault/list_command.rb
@@ -474,7 +476,10 @@ files:
 - lib/kontena/presets/github_auth_provider.yml
 - lib/kontena/presets/kontena_auth_provider.yml
 - lib/kontena/scripts/completer
+- lib/kontena/scripts/completer.rb
 - lib/kontena/scripts/init
+- lib/kontena/scripts/kontena.bash
+- lib/kontena/scripts/kontena.zsh
 - lib/kontena/stacks_cache.rb
 - lib/kontena/stacks_client.rb
 - lib/kontena/util.rb
@@ -522,6 +527,8 @@ files:
 - spec/fixtures/stack-with-env-file.yml
 - spec/fixtures/stack-with-ifs.yml
 - spec/fixtures/stack-with-invalid-liquid.yml
+- spec/fixtures/stack-with-liquid-optional.yml
+- spec/fixtures/stack-with-liquid-undefined.yml
 - spec/fixtures/stack-with-liquid.yml
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
@@ -601,6 +608,7 @@ files:
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
+- spec/support/exit_with_error_helper.rb
 - spec/support/fixtures_helpers.rb
 - spec/support/output_helpers.rb
 - spec/support/requirements_helper.rb
@@ -621,9 +629,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8
@@ -655,6 +663,8 @@ test_files:
 - spec/fixtures/stack-with-env-file.yml
 - spec/fixtures/stack-with-ifs.yml
 - spec/fixtures/stack-with-invalid-liquid.yml
+- spec/fixtures/stack-with-liquid-optional.yml
+- spec/fixtures/stack-with-liquid-undefined.yml
 - spec/fixtures/stack-with-liquid.yml
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
@@ -734,6 +744,7 @@ test_files:
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
+- spec/support/exit_with_error_helper.rb
 - spec/support/fixtures_helpers.rb
 - spec/support/output_helpers.rb
 - spec/support/requirements_helper.rb