kontena-cli 1.4.0.pre10 → 1.4.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf9375a2a08c843570d3497ffba6f5c9c08d8b26
-  data.tar.gz: 763a11db98a1dbeca9a8958b740335ed39154081
+  metadata.gz: 6243212ae3157790b6220f240a7b1984fca05f64
+  data.tar.gz: 56f06d70b780d78960cba3984c7261d268d1d3fa
 SHA512:
-  metadata.gz: 7c169207ab0236f40286ae58719ab514820fb29adf76e60c095fbd8c657216e5beb4ffa908d151c0069cc80a9d8dc24cafbc5659bfeec97206f2d1669f209148
-  data.tar.gz: a2f237a79e37feb732263998d04012b8e54c3c35d9ea9266ee76784866de0fbef45703ed57f1ecf80ec2d81f2fc3a21d29fad074b5a9daf8552324e3c6b793d2
+  metadata.gz: 58da1ecc9ff8b5be1caf94b45235e16e0342b858f49c4c2cbb5073aa4412474ffdcb0ace8aa0920a97f4b9a4deedf9c9bcff1282d84ae749c734b33ee2abe8f6
+  data.tar.gz: a699ec0cdc8abe7e95f1ad4d0d56109d1245a428f40b060c265145216583a2f2f578eb2eb544442dd3b64826243c6c59668267702a86ec9107bb94aff00ed423

data/VERSION

@@ -1 +1 @@
-1.4.0.pre10
+1.4.0.pre11

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

@@ -150,8 +150,8 @@ module Kontena::Cli::Stacks
       end
 
       unless changes.added_stacks.empty?
-        puts pastel.red("These new stack dependencies #{will} be installed:")
-        changes.added_stacks.each { |stack| puts pastel.red("- #{stack}") }
+        puts pastel.green("These new stack dependencies #{will} be installed:")
+        changes.added_stacks.each { |stack| puts pastel.green("- #{stack}") }
         puts
       end
 

data/lib/kontena/cli/table_generator.rb

@@ -36,7 +36,8 @@ module Kontena
         end
 
         def print_table(array, fields = nil, &block)
-          puts generate_table(array, fields, &block)
+          output = generate_table(array, fields, &block)
+          puts output unless output.strip.empty?
         end
       end
 
@@ -68,7 +69,7 @@ module Kontena
 
       def render
         if data.empty?
-          fields.map(&method(:format_header_item)).join('  ')
+          fields.size > 1 ? fields.map(&method(:format_header_item)).join('  ') : ''
         else
           table.render(render_mode, render_options).gsub(/\s+$/, '')
         end

data/omnibus/config/software/kontena-cli.rb

@@ -1,5 +1,6 @@
 name "kontena-cli"
-license "Apache 2.0"
+license "Apache-2.0"
+skip_transitive_dependency_licensing true # XXX: assumes bundler is installed within build
 default_version File.read('../VERSION').strip
 source path: "./wrappers"
 dependency "ruby"

data/spec/kontena/cli/table_generator_spec.rb

@@ -51,6 +51,10 @@ describe Kontena::Cli::TableGenerator do
           ]).without_header
         end
 
+        it 'outputs nothing when table with no data and only one field' do
+          expect{subject.print_table({}, ['a'])}.to output(/\A\z/).to_stdout
+        end
+
         it 'tries to read the fields from #fields method when none given' do
           expect(subject).to receive(:fields).and_return(['a', 'b'])
           expect{subject.print_table(data)}.to output_table([

data/tasks/release.rake

@@ -1,16 +1,33 @@
 namespace :release do
   VERSION = Gem::Version.new(File.read('VERSION').strip)
+  DEB_NAME = 'kontena-cli'
   DOCKER_NAME = 'kontena/cli'
   if VERSION.prerelease?
     DOCKER_VERSIONS = ['edge']
+    DEB_COMPONENT = 'edge'
   else
     DOCKER_VERSIONS = ['latest', VERSION.to_s.match(/(\d+\.\d+)/)[1]]
+    DEB_COMPONENT = 'main'
+  end
+
+  desc 'Setup omnibus'
+  task :setup_omnibus do
+    Dir.chdir('omnibus') do
+      sh("bundle install --binstubs")
+    end
   end
 
   desc 'Build all'
   task :build => [:build_docker] do
   end
 
+  desc 'Build omnibus package'
+  task :build_omnibus do
+    Dir.chdir('omnibus') do
+      sh("bin/omnibus build kontena --log-level info")
+    end
+  end
+
   desc 'Build docker images'
   task :build_docker do
     sh("docker rmi #{DOCKER_NAME}:#{VERSION} || true")
@@ -32,4 +49,14 @@ namespace :release do
       sh("docker push #{DOCKER_NAME}:#{v}")
     end
   end
+
+  desc 'Upload ubuntu packages'
+  task :push_omnibus_ubuntu do
+    rev = ENV['REV'] || '1'
+    repo = ENV['REPO'] || 'ubuntu'
+    arch = ENV['ARCH'] || 'amd64'
+    deb = "./omnibus/pkg/#{DEB_NAME}_*_#{arch}.deb"
+
+    sh("curl --netrc -T #{deb} 'https://api.bintray.com/content/kontena/#{repo}/#{DEB_NAME}/#{VERSION}/pool/#{DEB_COMPONENT}/k/#{DEB_NAME}-#{VERSION}-#{rev}~xenial.deb;deb_distribution=xenial;deb_component=#{DEB_COMPONENT};deb_architecture=#{arch};publish=1'")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre10
+  version: 1.4.0.pre11
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler