kontena-cli 1.4.3 → 1.5.0.pre1

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

@@ -47,7 +47,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
         'volumes' => [ ],
         'dependencies' => nil,
         'source' => a_string_matching(/.+/),
-        'parent_name' => nil,
+        'parent' => nil,
         'variables' => {
           'grid_name' => '{{ GRID }} stackname',
           'copies' => 2,

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

@@ -73,7 +73,7 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         dependencies
         source
         variables
-        parent_name
+        parent
       ).each do |k|
         expect(result.key?(k)).to be_truthy
       end
@@ -171,6 +171,38 @@ describe Kontena::Cli::Stacks::YAML::Reader do
           )
         end
       end
+
+      context 'from a registry stack' do
+        let(:subject) do
+          described_class.new(fixture_path('kontena_v3_with_registry_extends.yml'))
+        end
+
+        it 'extends services from a registry stack' do
+          expect(Kontena::StacksCache).to receive(:pull).at_least(:once).with('registrystack/compose:1.0.0').and_return(File.read(fixture_path('docker-compose_v2.yml')))
+          expect(subject.execute['services']).to match array_including(
+            hash_including(
+              "instances"=>2,
+              "image"=>"wordpress:4.1",
+              "env"=>["WORDPRESS_DB_PASSWORD=test_secret"],
+              "links"=>[{"name"=>"mysql", "alias"=>"mysql"}],
+              "ports"=>[{"ip"=>"0.0.0.0", "container_port"=>80, "node_port"=>80, "protocol"=>"tcp"}],
+              "stateful"=>true,
+              "strategy"=>"ha",
+              "name"=>"wordpress"
+            ),
+            hash_including(
+              "instances"=>nil,
+              "image"=>"mysql:5.6",
+              "env"=>["MYSQL_ROOT_PASSWORD=test_secret"],
+              "links"=>[],
+              "ports"=>[],
+              "stateful"=>true,
+              "name"=>"mysql",
+              "entrypoint" => "test"
+            )
+          )
+        end
+      end
     end
 
     context 'variable interpolation' do

data/spec/kontena/client_spec.rb

@@ -233,13 +233,50 @@ describe Kontena::Client do
       end
     end
 
+    context "with empty response JSON" do
+      before :each do
+        allow(subject).to receive(:http_client).and_call_original
+
+        WebMock.stub_request(:delete, 'http://localhost/v1/test').to_return(
+          status: 200,
+          headers: {
+            'Content-Type' => 'application/json',
+          },
+          body: '',
+        )
+      end
+
+      it "returns nil" do
+        expect(subject.delete('test')).to be_nil
+      end
+    end
+
+    context "with invalid response JSON" do
+      before :each do
+        allow(subject).to receive(:http_client).and_call_original
+
+        WebMock.stub_request(:any, 'http://localhost/v1/test').to_return(
+          status: 200,
+          headers: {
+            'Content-Type' => 'application/json',
+          },
+          body: 'this is not valid JSON',
+        )
+      end
+
+      it "raises Kontena::Errors::StandardError with 520" do
+        # XXX: for some reason the response.path is empty?
+        expect{subject.get('test')}.to raise_error(Kontena::Errors::StandardError, /Invalid response JSON from server for : JSON::ParserError/)
+      end
+    end
+
     context "with an empty error response" do
       before :each do
         # workaround https://github.com/bblimke/webmock/issues/653
         expect(http_client).to receive(:request).with(
           hash_including(path: '/v1/coffee', method: :brew)
         ) {
-          raise Excon::Errors::HTTPStatusError.new("I'm a teapot",
+          raise Excon::Error::HTTPStatus.new("I'm a teapot",
             {
               method: 'brew',
               path: '/v1/coffee',

data/spec/kontena/stacks/change_resolver_spec.rb

@@ -0,0 +1,44 @@
+require 'kontena/stacks/change_resolver'
+
+describe Kontena::Stacks::ChangeResolver do
+
+  let(:loader) { double(:loader) }
+  let(:old_data) do
+    {
+      'stack-a' => {
+        stack_data: {
+          'services' => []
+        }
+      }
+    }
+  end
+  let(:new_data) do
+    {
+      'stack-a' => {
+        stack_data: {
+          'services' => []
+        },
+        loader: loader
+      }
+    }
+  end
+
+  let(:subject) { described_class.new(old_data, new_data) }
+
+  describe '#safe?' , :output do
+    it 'returns true if no changes' do
+      expect(subject.safe?).to be_truthy
+    end
+
+    it 'returns true if only additions' do
+      new_data['stack-b'] = new_data['stack-a'].dup
+      expect(subject.safe?).to be_truthy
+    end
+
+    it 'returns false if destructive changes' do
+      a = new_data.delete('stack-a')
+      new_data['stack-b'] = a
+      expect(subject.safe?).to be_falsey
+    end
+  end
+end

data/spec/kontena/stacks/stack_data_set_spec.rb

@@ -0,0 +1,59 @@
+require 'kontena/stacks/stack_data_set'
+
+describe Kontena::Stacks::StackDataSet do
+
+  let(:loader) { double(:loader) }
+  let(:data) do
+    {
+      'stack-a' => {
+        stack_data: {
+        },
+        loader: loader
+      },
+      'stack-b' => {
+        stack_data: {
+
+        },
+        loader: loader
+      }
+    }
+  end
+  let(:subject) { described_class.new(data) }
+
+  describe '#stack' do
+    it 'returns nil if stack not found' do
+      expect(subject.stack('foo')).to be_nil
+    end
+
+    it 'returns StackData' do
+      expect(subject.stack('stack-a')).to be_instance_of(Kontena::Stacks::StackData)
+    end
+  end
+
+  describe '#stacks' do
+    it 'returns array of StackData objects' do
+      stacks = subject.stacks
+      expect(stacks.size).to eq(2)
+      expect(stacks[0]).to be_instance_of((Kontena::Stacks::StackData))
+    end
+  end
+
+  describe '#size' do
+    it 'returns size of dataset' do
+      expect(subject.size).to eq(2)
+    end
+  end
+
+  describe '#stack_names' do
+    it 'returns array of stack names' do
+      expect(subject.stack_names).to eq(%w(stack-a stack-b))
+    end
+  end
+
+  describe '#delete' do
+    it 'deletes item from dataset and returns StackData' do
+      expect(subject.delete('stack-a')).to be_instance_of(Kontena::Stacks::StackData)
+      expect(subject.size).to eq(1)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,44 +42,44 @@ dependencies:
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.60.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: ruby_dig
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: hash_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +238,7 @@ files:
 - lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/70_invite_self_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/90_proptip_after_deploy.rb
+- lib/kontena/cli/browser_launcher.rb
 - lib/kontena/cli/bytes_helper.rb
 - lib/kontena/cli/certificate/authorize_command.rb
 - lib/kontena/cli/certificate/common.rb
@@ -355,7 +342,6 @@ files:
 - lib/kontena/cli/master/user/role/remove_command.rb
 - lib/kontena/cli/master/user/role_command.rb
 - lib/kontena/cli/master/user_command.rb
-- lib/kontena/cli/master/users_command.rb
 - lib/kontena/cli/master_command.rb
 - lib/kontena/cli/node_command.rb
 - lib/kontena/cli/nodes/create_command.rb
@@ -378,6 +364,7 @@ files:
 - lib/kontena/cli/plugins/search_command.rb
 - lib/kontena/cli/plugins/show_command.rb
 - lib/kontena/cli/plugins/uninstall_command.rb
+- lib/kontena/cli/plugins/upgrade_command.rb
 - lib/kontena/cli/registry/create_command.rb
 - lib/kontena/cli/registry/remove_command.rb
 - lib/kontena/cli/registry_command.rb
@@ -412,10 +399,10 @@ files:
 - lib/kontena/cli/spinner.rb
 - lib/kontena/cli/stack_command.rb
 - lib/kontena/cli/stacks/build_command.rb
-- lib/kontena/cli/stacks/change_resolver.rb
 - lib/kontena/cli/stacks/common.rb
 - lib/kontena/cli/stacks/deploy_command.rb
 - lib/kontena/cli/stacks/events_command.rb
+- lib/kontena/cli/stacks/inspect_command.rb
 - lib/kontena/cli/stacks/install_command.rb
 - lib/kontena/cli/stacks/list_command.rb
 - lib/kontena/cli/stacks/logs_command.rb
@@ -505,6 +492,9 @@ files:
 - lib/kontena/scripts/init
 - lib/kontena/scripts/kontena.bash
 - lib/kontena/scripts/kontena.zsh
+- lib/kontena/stacks/change_resolver.rb
+- lib/kontena/stacks/stack_data.rb
+- lib/kontena/stacks/stack_data_set.rb
 - lib/kontena/stacks_cache.rb
 - lib/kontena/stacks_client.rb
 - lib/kontena/util.rb
@@ -545,6 +535,7 @@ files:
 - spec/fixtures/kontena_build_v3.yml
 - spec/fixtures/kontena_v3.yml
 - spec/fixtures/kontena_v3_with_compose_variables.yml
+- spec/fixtures/kontena_v3_with_registry_extends.yml
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.yml
 - spec/fixtures/stack-with-anchors.yml
@@ -564,6 +555,7 @@ files:
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/stack-with-volumes.yml
+- spec/kontena/cli/certificates/authorize_command_spec.rb
 - spec/kontena/cli/certificates/export_command_spec.rb
 - spec/kontena/cli/certificates/import_command_spec.rb
 - spec/kontena/cli/certificates/show_command_spec.rb
@@ -590,7 +582,9 @@ files:
 - spec/kontena/cli/master/join_command_spec.rb
 - spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
+- spec/kontena/cli/master/token/create_command_spec.rb
 - spec/kontena/cli/master/token/current_spec.rb
+- spec/kontena/cli/master/token/show_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/master/user/invite_command_spec.rb
 - spec/kontena/cli/master/user/remove_command_spec.rb
@@ -671,6 +665,8 @@ files:
 - spec/kontena/plugin_manager/rubygems_client_spec.rb
 - spec/kontena/plugin_manager/uninstaller_spec.rb
 - spec/kontena/plugin_manager_spec.rb
+- spec/kontena/stacks/change_resolver_spec.rb
+- spec/kontena/stacks/stack_data_set_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
 - spec/support/exit_with_error_helper.rb
@@ -691,15 +687,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.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.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Kontena command line tool
@@ -721,6 +717,7 @@ test_files:
 - spec/fixtures/kontena_build_v3.yml
 - spec/fixtures/kontena_v3.yml
 - spec/fixtures/kontena_v3_with_compose_variables.yml
+- spec/fixtures/kontena_v3_with_registry_extends.yml
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.yml
 - spec/fixtures/stack-with-anchors.yml
@@ -740,6 +737,7 @@ test_files:
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/stack-with-volumes.yml
+- spec/kontena/cli/certificates/authorize_command_spec.rb
 - spec/kontena/cli/certificates/export_command_spec.rb
 - spec/kontena/cli/certificates/import_command_spec.rb
 - spec/kontena/cli/certificates/show_command_spec.rb
@@ -766,7 +764,9 @@ test_files:
 - spec/kontena/cli/master/join_command_spec.rb
 - spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
+- spec/kontena/cli/master/token/create_command_spec.rb
 - spec/kontena/cli/master/token/current_spec.rb
+- spec/kontena/cli/master/token/show_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/master/user/invite_command_spec.rb
 - spec/kontena/cli/master/user/remove_command_spec.rb
@@ -847,6 +847,8 @@ test_files:
 - spec/kontena/plugin_manager/rubygems_client_spec.rb
 - spec/kontena/plugin_manager/uninstaller_spec.rb
 - spec/kontena/plugin_manager_spec.rb
+- spec/kontena/stacks/change_resolver_spec.rb
+- spec/kontena/stacks/stack_data_set_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
 - spec/support/exit_with_error_helper.rb