kontena-cli 1.1.2.rc1 → 1.1.2.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c08178a70fa7abd31742032c4a32bfcd3c448c6e
-  data.tar.gz: d425757f104f91eef926f0cc73a212ad60fb7df1
+  metadata.gz: 8d73f838d7604f63336bf79e2ab6c044767e3501
+  data.tar.gz: f92c2116744c5dd0745292865aa95211263a2604
 SHA512:
-  metadata.gz: b2d8888c0b79d53b134dd3b9399afbcfac958fc6e2d8ed31ea2846eaeee2f8da905ed9e70afdba11ced3bb961e50c55e586980acfca81d0796e96e0f190d1fe2
-  data.tar.gz: 13356fee387db7005b1588a7c0a277e9f98172fbcc252d38610638a7f493cc291ad8ab3e34bcbea3c834edbf3747da5b0e27439ca4205be49230dcaed3024b41
+  metadata.gz: 936f1d240681d63ffe2ad4e9f10575d4f7d118dfe69e447745c16f04c56a5d2642d88298767067073e1020d370250bffb55f504c6ab54f8a45e649cba9a82546
+  data.tar.gz: 340f1fdb9898f45d5cd813971dadb46611afe46d624db9ad9faf8e779a269e60aeda9ecc8a10489a1de06c6e2b420b77201386b244cee4772f3ba81ddf22fd3f

data/VERSION

@@ -1 +1 @@
-1.1.2.rc1
+1.1.2.rc2

data/lib/kontena/cli/stacks/yaml/opto/service_link_resolver.rb

@@ -32,10 +32,13 @@ module Kontena::Cli::Stacks::YAML::Opto::Resolvers
     # @return [Integer]
     def default_index(services)
       index = services.index {|s| service_link(s) == option.default }
-      if index
-        index.to_i + 1
+
+      if index && !option.required?
+        index + 2 # extra offset for the initial <none> option
+      elsif index
+        index + 1 # menu index starts from 1
       else
-        0
+        0 # XXX: this just explodes?
       end
     end
 

data/spec/kontena/cli/stacks/yaml/opto/service_link_resolver_spec.rb

@@ -24,31 +24,54 @@ describe Kontena::Cli::Stacks::YAML::Opto::Resolvers::ServiceLink do
     end
   end
 
-  describe '#default_index' do
+  context "For a required option with a default value" do
     let(:option) do
-      ::Opto::Option.new(default: 'foo/bar')
+      ::Opto::Option.new(type: 'string', name: 'link', default: 'foo/bar')
     end
     let(:subject) do
       described_class.new({'prompt' => 'foo'}, option)
     end
 
-    it 'returns matching index' do
-      services = [
-        {'id' => 'test/foo/foo'},
-        {'id' => 'test/foo/bar'},
-        {'id' => 'test/asd/asd'}
-      ]
-      index = subject.default_index(services)
-      expect(index).to eq(2)
+    describe '#default_index' do
+      it 'returns matching index' do
+        services = [
+          {'id' => 'test/foo/foo'},
+          {'id' => 'test/foo/bar'},
+          {'id' => 'test/asd/asd'}
+        ]
+        index = subject.default_index(services)
+        expect(index).to eq(2)
+      end
+
+      it 'returns 0 if no matches' do
+        services = [
+          {'id' => 'test/foo/foo'},
+          {'id' => 'test/asd/asd'}
+        ]
+        index = subject.default_index(services)
+        expect(index).to eq(0)
+      end
+    end
+  end
+
+  context "For an optional option with a default value" do
+    let(:option) do
+      ::Opto::Option.new(type: 'string', name: 'link', default: 'foo/bar', required: false)
+    end
+    let(:subject) do
+      described_class.new({'prompt' => 'foo'}, option)
     end
 
-    it 'returns 0 if no matches' do
-      services = [
-        {'id' => 'test/foo/foo'},
-        {'id' => 'test/asd/asd'}
-      ]
-      index = subject.default_index(services)
-      expect(index).to eq(0)
+    describe '#default_index' do
+      it 'returns matching index' do
+        services = [
+          {'id' => 'test/foo/foo'},
+          {'id' => 'test/foo/bar'},
+          {'id' => 'test/asd/asd'}
+        ]
+        index = subject.default_index(services)
+        expect(index).to eq(3)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.2.rc1
+  version: 1.1.2.rc2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler