kontena-cli 1.0.0.pre1 → 1.0.0.pre2

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

@@ -29,7 +29,6 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       'services' => {
         'wordpress' => {
           'image' => 'wordpress:4.1',
-          'extends' => {"file"=>"docker-compose_v2.yml", "service"=>"wordpress"},
           'ports' => ['80:80'],
           'depends_on' => ['mysql'],
           'stateful' => true,
@@ -40,7 +39,6 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         },
         'mysql' => {
           'image' => 'mysql:5.6',
-          'extends' => {"file"=>"docker-compose_v2.yml", "service"=>"mysql"},
           'stateful' => true,
           'environment' => ['MYSQL_ROOT_PASSWORD=test_secret'],
           'secrets' => []
@@ -71,7 +69,7 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         allow(ENV).to receive(:key?).and_return(true)
         allow(ENV).to receive(:[]).with('TAG').and_return('4.1')
         allow(ENV).to receive(:[]).with('STACK').and_return('test')
-        allow(ENV).to receive(:[]).with('grid').and_return('test-grid')
+        allow(ENV).to receive(:[]).with('GRID').and_return('test-grid')
         allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('mariadb:latest')
       end
 
@@ -95,23 +93,23 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         allow(File).to receive(:read)
           .with(absolute_yaml_path)
           .and_return(fixture('stack-with-variables.yml'))
-        allow(ENV).to receive(:key?)
+        allow(ENV).to receive(:[])
           .with('MYSQL_IMAGE')
-          .and_return(false)
+          .and_return(nil)
 
         expect {
           subject
-        }.to output('The MYSQL_IMAGE is not set. Substituting an empty string.
-').to_stdout
+        }.to output("Value for MYSQL_IMAGE is not set. Substituting with an empty string.\n").to_stdout
       end
     end
 
     it 'replaces $$VAR variables to $VAR format' do
       allow(ENV).to receive(:key?).and_return(true)
+      allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
       allow(ENV).to receive(:[]).with('TAG').and_return('4.1')
       allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('mariadb:latest')
       allow(ENV).to receive(:[]).with('STACK').and_return('test')
-      allow(ENV).to receive(:[]).with('grid').and_return('test-grid')
+      allow(ENV).to receive(:[]).with('GRID').and_return('test-grid')
       allow(File).to receive(:read)
         .with(absolute_yaml_path)
         .and_return(fixture('stack-with-variables.yml'))
@@ -148,7 +146,7 @@ describe Kontena::Cli::Stacks::YAML::Reader do
   describe '#execute' do
     before(:each) do
       allow(ENV).to receive(:[]).with('STACK').and_return('test')
-      allow(ENV).to receive(:[]).with('grid').and_return('test-grid')
+      allow(ENV).to receive(:[]).with('GRID').and_return('test-grid')
     end
 
     context 'when extending services' do
@@ -272,7 +270,7 @@ describe Kontena::Cli::Stacks::YAML::Reader do
     it 'returns validation errors' do
       allow(File).to receive(:read)
         .with(absolute_yaml_path('kontena_v3.yml'))
-        .and_return(fixture('kontena-invalid.yml'))
+        .and_return(fixture('stack-invalid.yml'))
       outcome = subject.execute
       expect(outcome[:errors].size).to eq(1)
     end

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

@@ -15,7 +15,7 @@ describe Kontena::Cli::Stacks::YAML::ServiceExtender do
     }
   end
 
-  describe '#extend' do
+  describe '#extend_from' do
     it 'merges options' do
       result = described_class.new(options).extend_from(parent_options)
       expected_result = {
@@ -47,7 +47,9 @@ describe Kontena::Cli::Stacks::YAML::ServiceExtender do
         from = { 'environment' => ['FOO=bar'] }
         to = { 'environment' => ['BAR=baz'] }
         result = described_class.new(to).extend_from(from)
-        expect(result['environment']).to eq(['BAR=baz', 'FOO=bar'])
+        expect(result['environment'].include?('BAR=baz')).to be_truthy
+        expect(result['environment'].include?('FOO=bar')).to be_truthy
+        expect(result['environment'].size).to eq 2
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: opto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Kontena command line tool
 email:
 - info@kontena.io
@@ -356,7 +370,10 @@ files:
 - lib/kontena/cli/stacks/list_command.rb
 - lib/kontena/cli/stacks/logs_command.rb
 - lib/kontena/cli/stacks/monitor_command.rb
+- lib/kontena/cli/stacks/pull_command.rb
+- lib/kontena/cli/stacks/push_command.rb
 - lib/kontena/cli/stacks/remove_command.rb
+- lib/kontena/cli/stacks/search_command.rb
 - lib/kontena/cli/stacks/service_generator.rb
 - lib/kontena/cli/stacks/service_generator_v2.rb
 - lib/kontena/cli/stacks/show_command.rb
@@ -366,6 +383,9 @@ files:
 - lib/kontena/cli/stacks/yaml/custom_validators/extends_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/hooks_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/secrets_validator.rb
+- lib/kontena/cli/stacks/yaml/opto/prompt_resolver.rb
+- lib/kontena/cli/stacks/yaml/opto/vault_resolver.rb
+- lib/kontena/cli/stacks/yaml/opto/vault_setter.rb
 - lib/kontena/cli/stacks/yaml/reader.rb
 - lib/kontena/cli/stacks/yaml/service_extender.rb
 - lib/kontena/cli/stacks/yaml/validations.rb
@@ -397,6 +417,8 @@ files:
 - lib/kontena/presets/kontena_auth_provider.yml
 - lib/kontena/scripts/completer
 - lib/kontena/scripts/init
+- lib/kontena/stacks_cache.rb
+- lib/kontena/stacks_client.rb
 - lib/kontena/util.rb
 - lib/kontena_cli.rb
 - spec/fixtures/app.json
@@ -418,7 +440,9 @@ files:
 - spec/fixtures/kontena_v3.yml
 - spec/fixtures/mysql.yml
 - spec/fixtures/stack-internal-extend.yml
+- spec/fixtures/stack-invalid.yml
 - spec/fixtures/stack-with-env-file.yml
+- spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/wordpress-scaled.yml
 - spec/fixtures/wordpress.yml
@@ -530,7 +554,9 @@ test_files:
 - spec/fixtures/kontena_v3.yml
 - spec/fixtures/mysql.yml
 - spec/fixtures/stack-internal-extend.yml
+- spec/fixtures/stack-invalid.yml
 - spec/fixtures/stack-with-env-file.yml
+- spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/wordpress-scaled.yml
 - spec/fixtures/wordpress.yml