kontena-cli 1.0.0 → 1.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c2e185f884687f6fe09fde71a6afc3a9217bae
-  data.tar.gz: 9b91bec0786e2d8e0267ce3a606397dd872e2170
+  metadata.gz: c16073e087d4cdae97421bd4eb5e8dee42b65462
+  data.tar.gz: c6f92090afa63cd4f6a416f27823746138d63244
 SHA512:
-  metadata.gz: d303382c55ea443921586f667a0c92defee60927d0a9e8894b2079be94864c39b6bc390161bfb6f9a0a54171fba346d00027127f96a60c48f76d7deaa25df073
-  data.tar.gz: 5152e458b7fba018f77b975353992771ee25a2af3987514c8f395b60c92a0c6bd538b80c1a33df462ec8d25daf9e2e797656a22388a159c278d8f97691b8e955
+  metadata.gz: 743dd0816028f2ec8a2a4a2c9d96d3196af3354c00d804c8dd5e996878379c9e9d6329f38a74023c4e40aea9525b7acce8184917a04bf59c174eb5abd670e4b5
+  data.tar.gz: c801bd06d17d3f201222acc9a05494b692124fbd428a2cacc994faac08f0f3c2ceaebc5cd8ca125e7acf55ab9acacf3d5d9f04e3d7682fc2e9f16bab1401d35a

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1.rc1

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

@@ -29,8 +29,7 @@ module Kontena::Cli::Stacks
       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)
-      #reader.reload
+      set_env_variables(reader.stack_name, current_grid)      
       outcome = reader.execute
 
       hint_on_validation_notifications(outcome[:notifications]) if outcome[:notifications].size > 0

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

@@ -17,9 +17,7 @@ module Kontena::Cli::Stacks
       deployment = nil
       spinner "Deploying stack #{pastel.cyan(name)}" do
         deployment = deploy_stack(name)
-        deployment['service_deploys'].each do |service_deploy|
-          wait_for_deploy_to_finish(service_deploy)
-        end
+        wait_for_deploy_to_finish(deployment)
       end
     end
 
@@ -31,14 +29,22 @@ module Kontena::Cli::Stacks
     # @return [Boolean]
     def wait_for_deploy_to_finish(deployment, timeout = 600)
       deployed = false
+      progress = []
+      states = %w(success error)
       Timeout::timeout(timeout) do
         until deployed
-          deployment = client.get("services/#{deployment['service_id']}/deploys/#{deployment['id']}")
-          deployed = true if deployment['finished_at']
+          deployment = client.get("stacks/#{deployment['stack_id']}/deploys/#{deployment['id']}")
+          deployed = true if states.include?(deployment['state'])
           sleep 1
         end
         if deployment['state'] == 'error'
-          raise deployment['reason']
+          deployment['service_deploys'].each do |service_deploy|
+            if service_deploy['state'] == 'error'
+              puts "        #{service_deploy['reason']}"
+            end
+          end
+
+          raise 'deploy failed'
         end
       end
 

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

@@ -7,19 +7,12 @@ module Kontena::Cli::Stacks
     banner "Shows logs from services in a stack"
 
     parameter "NAME", "Stack name"
-    option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
-    option ["-l", "--lines"], "LINES", "How many lines to show", default: '100'
-    option "--since", "SINCE", "Show logs since given timestamp"
 
     requires_current_master
     requires_current_master_token
 
     def execute
-      query_params = {}
-      query_params[:limit] = lines if lines
-      query_params[:since] = since if since
-
-      show_logs("stacks/#{current_grid}/#{name}/container_logs", query_params) do |log|
+      show_logs("stacks/#{current_grid}/#{name}/container_logs") do |log|
         show_log(log)
       end
     end

data/lib/kontena/cli/stacks/registry/push_command.rb

@@ -13,6 +13,7 @@ module Kontena::Cli::Stacks::Registry
 
     def execute
       file = Kontena::Cli::Stacks::YAML::Reader.new(filename, skip_variables: true, replace_missing: "filler")
+      file.execute
       name = "#{file.yaml['stack']}:#{file.yaml['version']}"
       spinner("Pushing #{pastel.cyan(name)} to stacks registry") do
         stacks_client.push(file.yaml['stack'], file.yaml['version'], file.raw_content)

data/lib/kontena/cli/stacks/yaml/reader.rb

@@ -33,8 +33,6 @@ module Kontena::Cli::Stacks
         @skip_validation  = skip_validation
         @skip_variables   = skip_variables
         @replace_missing  = replace_missing
-        parse_variables unless skip_variables
-        parse_yaml
       end
 
       def from_registry?
@@ -44,9 +42,10 @@ module Kontena::Cli::Stacks
       # @return [Opto::Group]
       def variables
         return @variables if @variables
-        yaml = ::YAML.load(interpolate(raw_content, 'filler'))
         if yaml && yaml.has_key?('variables')
-          @variables = Opto::Group.new(yaml['variables'], defaults: { from: :env, to: :env })
+          variables_yaml = yaml['variables'].to_yaml
+          variables_hash = ::YAML.load(replace_dollar_dollars(interpolate(variables_yaml)))
+          @variables = Opto::Group.new(variables_hash, defaults: { from: :env, to: :env })
         else
           @variables = Opto::Group.new(defaults: { from: :env, to: :env })
         end
@@ -62,6 +61,11 @@ module Kontena::Cli::Stacks
       # @param [String] service_name
       # @return [Hash]
       def execute(service_name = nil)
+        load_yaml(false)
+        parse_variables unless skip_variables?
+        load_yaml
+        validate unless skip_validation?
+
         result = {}
         Dir.chdir(from_registry? ? Dir.pwd : File.dirname(File.expand_path(file))) do
           result[:stack]         = yaml['stack']
@@ -77,15 +81,8 @@ module Kontena::Cli::Stacks
         result
       end
 
-      def reload
-        @errors = []
-        @notifications = []
-        @variables = nil
-        parse_variables unless skip_variables?
-        parse_yaml
-      end
-
       def stack_name
+        yaml = ::YAML.load(raw_content)
         yaml['stack'].split('/').last.split(':').first if yaml['stack']
       end
 
@@ -102,13 +99,12 @@ module Kontena::Cli::Stacks
         @content_variables ||= raw_content.scan(/((?<!\$)\$(?!\$)\{?(\w+)\}?)/m)
       end
 
-      def parse_yaml
-        load_yaml
-        validate unless skip_validation?
-      end
-
-      def load_yaml
-        @yaml = ::YAML.load(replace_dollar_dollars(interpolate(raw_content)))
+      def load_yaml(interpolate = true)
+        if interpolate
+          @yaml = ::YAML.load(replace_dollar_dollars(interpolate(raw_content)))
+        else
+          @yaml = ::YAML.load(raw_content)
+        end
       rescue Psych::SyntaxError => e
         raise "Error while parsing #{file}".colorize(:red)+ " "+e.message
       end
@@ -224,21 +220,17 @@ module Kontena::Cli::Stacks
 
       ##
       # @param [String] text - content of YAML file
-      def interpolate(text, filler = nil)
+      def interpolate(text)
         text.gsub(/(?<!\$)\$(?!\$)\{?\w+\}?/) do |v| # searches $VAR and ${VAR} and not $$VAR
-          if filler
-            filler
+          var = v.tr('${}', '')
+          val = ENV[var]
+          if val
+            val
           elsif @replace_missing
             @replace_missing
           else
-            var = v.tr('${}', '')
-            val = ENV[var]
-            if val
-              val
-            else
-              puts "Value for #{var} is not set. Substituting with an empty string." unless skip_validation?
-              ''
-            end
+            puts "Value for #{var} is not set. Substituting with an empty string." unless skip_validation?
+            ''
           end
         end
       end

data/lib/kontena/cli/stacks/yaml/service_extender.rb

@@ -34,12 +34,15 @@ module Kontena::Cli::Stacks
       # @param [Array] to
       # @return [Array]
       def extend_env_vars(from, to)
-        to   ||= []
-        from ||= []
-        to_hash   = Hash[*to.flat_map {|t| t.split('=') }]
-        from_hash = Hash[*from.flat_map {|f| f.split('=') }]
-
-        from_hash.merge(to_hash).map {|k,v| "#{k}=#{v}"}
+        env_vars = to || []
+        if from
+          from.each do |env|
+            env_vars << env unless to && to.find do |key|
+              key.split('=').first == env.split('=').first
+            end
+          end
+        end
+        env_vars
       end
 
       # Takes two arrays of hashes containing { 'secret' => 'str', 'type' => 'str', 'name' => 'str' }

data/lib/kontena/command.rb

@@ -151,7 +151,7 @@ class Kontena::Command < Clamp::Command
     Kontena::Cli::Config.instance.require_current_master_token
   rescue Kontena::Cli::Config::TokenExpiredError
     success = Kontena::Client.new(
-      Kontena::Cli::Config.instance.current_master,
+      Kontena::Cli::Config.instance.current_master.url,
       Kontena::Cli::Config.instance.current_master.token
     ).refresh_token
     if success && !retried

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

@@ -6,6 +6,10 @@ describe Kontena::Cli::Stacks::DeployCommand do
   include ClientHelpers
 
   describe '#execute' do
+    before(:each) do
+      allow(subject).to receive(:wait_for_deploy_to_finish).and_return(spy)
+    end
+
     it 'requires api url' do
       expect(described_class.requires_current_master?).to be_truthy
       subject.run(['test-stack'])

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

@@ -63,62 +63,6 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         .and_return(fixture('kontena_v3.yml'))
       subject
     end
-
-    context 'variable interpolation' do
-      before(:each) 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('MYSQL_IMAGE').and_return('mariadb:latest')
-      end
-
-      it 'interpolates $VAR variables' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('stack-with-variables.yml'))
-        services = subject.yaml['services']
-        expect(services['wordpress']['image']).to eq('wordpress:4.1')
-      end
-
-      it 'interpolates ${VAR} variables' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('stack-with-variables.yml'))
-        services = subject.yaml['services']
-        expect(services['mysql']['image']).to eq('mariadb:latest')
-      end
-
-      it 'warns about empty variables' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('stack-with-variables.yml'))
-        allow(ENV).to receive(:[])
-          .with('MYSQL_IMAGE')
-          .and_return(nil)
-
-        expect {
-          subject
-        }.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(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('stack-with-variables.yml'))
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path('docker-compose_v2.yml'))
-        .and_return(fixture('docker-compose_v2.yml'))
-      services = subject.execute[:services]
-      expect(services['mysql']['environment'].first).to eq('INTERNAL_VAR=$INTERNAL_VAR')
-    end
   end
 
   context 'when yaml file is malformed' do
@@ -199,6 +143,65 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       end
     end
 
+    context 'variable interpolation' do
+      before(:each) 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('MYSQL_IMAGE').and_return('mariadb:latest')
+        allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+      end
+
+      it 'interpolates $VAR variables' do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path)
+          .and_return(fixture('stack-with-variables.yml'))
+        subject.execute
+        services = subject.yaml['services']
+        expect(services['wordpress']['image']).to eq('wordpress:4.1')
+      end
+
+      it 'interpolates ${VAR} variables' do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path)
+          .and_return(fixture('stack-with-variables.yml'))
+        subject.execute
+        services = subject.yaml['services']
+        expect(services['mysql']['image']).to eq('mariadb:latest')
+      end
+
+      it 'warns about empty variables' do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path)
+          .and_return(fixture('stack-with-variables.yml'))
+        allow(ENV).to receive(:[])
+          .with('MYSQL_IMAGE')
+          .and_return(nil)
+
+        expect {
+          subject.execute
+        }.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(File).to receive(:read)
+        .with(absolute_yaml_path)
+        .and_return(fixture('stack-with-variables.yml'))
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path('docker-compose_v2.yml'))
+        .and_return(fixture('docker-compose_v2.yml'))
+      services = subject.execute[:services]
+      expect(services['mysql']['environment'].first).to eq('INTERNAL_VAR=$INTERNAL_VAR')
+    end
+
     context 'environment variables' do
       it 'converts env hash to array' do
         result = subject.execute[:services]
@@ -282,7 +285,6 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         .with(absolute_yaml_path)
         .and_return(fixture('kontena_build_v3.yml'))
       outcome = subject.execute
-      puts outcome
       expect(outcome[:services]['webapp']['build']['context']).to eq(File.expand_path('.'))
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -543,9 +543,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.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.5.1