kontena-cli 1.0.1.rc1 → 1.0.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c16073e087d4cdae97421bd4eb5e8dee42b65462
-  data.tar.gz: c6f92090afa63cd4f6a416f27823746138d63244
+  metadata.gz: fdcf34433ba7835fede5369afbbc9559c6492924
+  data.tar.gz: 7d3a2b29b763a1341d72a8ada76584d909073e2c
 SHA512:
-  metadata.gz: 743dd0816028f2ec8a2a4a2c9d96d3196af3354c00d804c8dd5e996878379c9e9d6329f38a74023c4e40aea9525b7acce8184917a04bf59c174eb5abd670e4b5
-  data.tar.gz: c801bd06d17d3f201222acc9a05494b692124fbd428a2cacc994faac08f0f3c2ceaebc5cd8ca125e7acf55ab9acacf3d5d9f04e3d7682fc2e9f16bab1401d35a
+  metadata.gz: 60ab49c26084f991a866e0c2ef3082f9e22295544c65d2cda645e6cb87cd4a1ec42db4d03a7de2e05516fee07aa507fbbc07d418c069931f519a4b0e4eadbe4a
+  data.tar.gz: f03d5fed14586662fca3db267152e052db4d92ce7a607c2a08ca80377a0be9b98a1d4cf769adfa876628aee95ff7c012ceae5fb298d3b260dab46e3ae365f0b5

data/VERSION

@@ -1 +1 @@
-1.0.1.rc1
+1.0.1.rc2

data/lib/kontena/cli/stacks/common.rb

@@ -24,12 +24,12 @@ module Kontena::Cli::Stacks
       @stack_name ||= self.name || stack_name_from_yaml(filename)
     end
 
-    def stack_from_yaml(filename, from_registry: false)
+    def stack_from_yaml(filename, from_registry: false, name: nil)
       reader = Kontena::Cli::Stacks::YAML::Reader.new(filename, from_registry: from_registry)
       if reader.stack_name.nil?
         exit_with_error "Stack MUST have stack name in YAML top level field 'stack'! Aborting."
       end
-      set_env_variables(reader.stack_name, current_grid)      
+      set_env_variables(name || reader.stack_name, current_grid)
       outcome = reader.execute
 
       hint_on_validation_notifications(outcome[:notifications]) if outcome[:notifications].size > 0

data/lib/kontena/cli/stacks/install_command.rb

@@ -25,7 +25,7 @@ module Kontena::Cli::Stacks
         require_config_file(filename)
       end
 
-      stack = stack_from_yaml(filename, from_registry: from_registry)
+      stack = stack_from_yaml(filename, from_registry: from_registry, name: name)
       stack['name'] = name if name
       spinner "Creating stack #{pastel.cyan(stack['name'])} " do
         create_stack(stack)

data/lib/kontena/cli/stacks/upgrade_command.rb

@@ -17,7 +17,7 @@ module Kontena::Cli::Stacks
 
     def execute
       require_config_file(file)
-      stack = stack_from_yaml(file)
+      stack = stack_from_yaml(file, name: name)
       spinner "Upgrading stack #{pastel.cyan(name)} " do
         update_stack(stack)
       end

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

@@ -59,7 +59,7 @@ describe Kontena::Cli::Stacks::InstallCommand do
 
     it 'accepts a stack name as filename' do
       expect(File).to receive(:exist?).with('user/stack:1.0.0').and_return(false)
-      expect(subject).to receive(:stack_from_yaml).with('user/stack:1.0.0', from_registry: true).and_return(stack)
+      expect(subject).to receive(:stack_from_yaml).with('user/stack:1.0.0', from_registry: true, name: nil).and_return(stack)
       expect(client).to receive(:post).with(
         'grids/test-grid/stacks', stack
       )

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

@@ -16,33 +16,33 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
 
     it 'requires api url' do
       allow(subject).to receive(:require_config_file).and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-name').and_return(stack)
       expect(described_class.requires_current_master?).to be_truthy
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
     it 'requires token' do
       allow(subject).to receive(:require_config_file).and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-name').and_return(stack)
       expect(described_class.requires_current_master_token?).to be_truthy
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
     it 'requires stack file' do
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-name').and_return(stack)
       expect(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
     it 'uses kontena.yml as default stack file' do
       expect(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-      expect(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      expect(subject).to receive(:stack_from_yaml).with('kontena.yml', name: 'stack-name').and_return(stack)
       subject.run(['stack-name'])
     end
 
     it 'sends stack to master' do
       allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a').and_return(stack)
       expect(client).to receive(:put).with(
         'stacks/test-grid/stack-a', anything
       )
@@ -51,7 +51,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
 
     it 'allows to override stack name' do
       allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-b').and_return(stack)
       stack_b = stack
       stack_b[:name] = 'stack-b'
       expect(client).to receive(:put).with(
@@ -64,7 +64,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       context 'when given' do
         it 'triggers deploy' do
           allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
-          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a').and_return(stack)
           allow(client).to receive(:put).with(
             'stacks/test-grid/stack-a', anything
           ).and_return({})
@@ -75,7 +75,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       context 'when not given' do
         it 'does not trigger deploy' do
           allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
-          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a').and_return(stack)
           allow(client).to receive(:put).with(
             'stacks/test-grid/stack-a', anything
           ).and_return({})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1.rc1
+  version: 1.0.1.rc2
 platform: ruby
 authors:
 - Kontena, Inc