kontena-cli 1.0.1 → 1.0.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08dbe21db191ffa55abcfd05ba71a938324e64fc
-  data.tar.gz: 86de5ca2a7921f23e5289daa547123ca675232ce
+  metadata.gz: 10d95d577cd62d1ef303de2391e5cc943a258492
+  data.tar.gz: e38f1964bae2e547b28b281f38a49cb661106e5d
 SHA512:
-  metadata.gz: 64dd1d95be76e2ed7198f46648a84b68a10aeac29b5dc5b6d8a618eff1c360a966f71be38cc48d8eb6dc7cffcc4e5b8aad49de9e0d3e5847044b8ebd8cda725d
-  data.tar.gz: 972083ee70376698af16655bf0d31adbad026f73c8ddb9c05f6f29f0e64e11a3bca200c7bfbf70a7a714d6f09c74d92c760f8cfaad7d7f3588b78916603e819b
+  metadata.gz: 79ee080091fef65600adb307d308599bd7399c151b48f5322cfd39baf0f5d61101234d146bf64cfe6a72636ecdda68820ac5deb08bdbb4c82c96272e373b2fcd
+  data.tar.gz: 39a0fe44eadac6a14c92ee7b9437b2d9965232d2439d2030163383c6130a2f0b987307d5b79b7eae93b7ed47472f3c010d79839d85d17433efefc119e9900ad0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2.pre1

data/lib/kontena/cli/registry/create_command.rb

@@ -1,8 +1,10 @@
+require_relative '../stacks/stacks_helper'
+
 module Kontena::Cli::Registry
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include Kontena::Cli::Services::ServicesHelper
+    include Kontena::Cli::Stacks::StacksHelper
 
     REGISTRY_VERSION = '2.2'
 
@@ -109,9 +111,7 @@ module Kontena::Cli::Registry
       client(token).post("grids/#{current_grid}/stacks", data)
       deployment = client(token).post("stacks/#{current_grid}/registry/deploy", {})
       spinner "Deploying #{data[:name].colorize(:cyan)} stack " do
-        deployment['service_deploys'].each do |service_deploy|
-          wait_for_deploy_to_finish(token, service_deploy)
-        end
+        wait_for_deploy_to_finish(deployment)
       end
       puts "\n"
       puts "Docker Registry #{REGISTRY_VERSION} is now running at registry.#{current_grid}.kontena.local."

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

@@ -1,10 +1,10 @@
-require_relative 'common'
+require_relative 'stacks_helper'
 
 module Kontena::Cli::Stacks
   class DeployCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include Common
+    include StacksHelper
 
     banner "Deploys all services of a stack that has been installed in a grid on Kontena Master"
 
@@ -24,33 +24,5 @@ module Kontena::Cli::Stacks
     def deploy_stack(name)
       client.post("stacks/#{current_grid}/#{name}/deploy", {})
     end
-
-    # @param [Hash] deployment
-    # @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("stacks/#{deployment['stack_id']}/deploys/#{deployment['id']}")
-          deployed = true if states.include?(deployment['state'])
-          sleep 1
-        end
-        if deployment['state'] == 'error'
-          deployment['service_deploys'].each do |service_deploy|
-            if service_deploy['state'] == 'error'
-              puts "        #{service_deploy['reason']}"
-            end
-          end
-
-          raise 'deploy failed'
-        end
-      end
-
-      deployed
-    rescue Timeout::Error
-      raise 'deploy timed out'
-    end
   end
 end

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

@@ -0,0 +1,32 @@
+
+module Kontena::Cli::Stacks
+  module StacksHelper
+
+    # @param [Hash] deployment
+    # @return [Boolean]
+    def wait_for_deploy_to_finish(deployment, timeout = 600)
+      deployed = false
+      states = %w(success error)
+      Timeout::timeout(timeout) do
+        until deployed
+          deployment = client.get("stacks/#{deployment['stack_id']}/deploys/#{deployment['id']}")
+          deployed = true if states.include?(deployment['state'])
+          sleep 1
+        end
+        if deployment['state'] == 'error'
+          deployment['service_deploys'].each do |service_deploy|
+            if service_deploy['state'] == 'error'
+              puts "        #{service_deploy['reason']}"
+            end
+          end
+
+          raise 'deploy failed'
+        end
+      end
+
+      deployed
+    rescue Timeout::Error
+      raise 'deploy timed out'
+    end
+  end
+end

data/lib/kontena/cli/vpn/create_command.rb

@@ -1,8 +1,10 @@
+require_relative '../stacks/stacks_helper'
+
 module Kontena::Cli::Vpn
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include Kontena::Cli::Services::ServicesHelper
+    include Kontena::Cli::Stacks::StacksHelper
 
     option '--node', 'NODE', 'Node name where VPN is deployed'
     option '--ip', 'IP', 'Node ip-address to use in VPN service configuration'
@@ -46,9 +48,7 @@ module Kontena::Cli::Vpn
       client(token).post("grids/#{current_grid}/stacks", data)
       deployment = client(token).post("stacks/#{current_grid}/#{name}/deploy", {})
       spinner "Deploying #{pastel.cyan(name)} service " do
-        deployment['service_deploys'].each do |service_deploy|
-          wait_for_deploy_to_finish(token, service_deploy)
-        end
+        wait_for_deploy_to_finish(deployment)
       end
       spinner "Generating #{pastel.cyan(name)} keys (this will take a while) " do
         wait_for_configuration_to_finish(token)

data/lib/kontena/scripts/completer

@@ -32,11 +32,27 @@ class Helper
     []
   end
 
+  def stacks
+    stacks = client.get("grids/#{current_grid}/stacks")['stacks']
+    results = []
+    results.push stacks.map{|s| s['name']}
+    results.delete('null')
+    results
+  rescue
+    []
+  end
+
   def services
     services = client.get("grids/#{current_grid}/services")['services']
     results = []
-    results.push services.map{|s| s['name']}
-
+    results.push services.map{ |s|
+      stack = s['stack']['id'].split('/').last
+      if stack != 'null'
+        "#{stack}/#{s['name']}"
+      else
+        s['name']
+      end
+    }
     results
   rescue
     []
@@ -57,17 +73,19 @@ class Helper
   def yml_services
     if File.exist?('kontena.yml')
       yaml = YAML.load(File.read('kontena.yml'))
-      if yaml['version'] == '2'
-        services = yaml['services']
-      else
-        services = yaml
-      end
+      services = yaml['services']
       services.keys
     end
   rescue
     []
   end
 
+  def yml_files
+    Dir["./*.yml"].map{|file| file.sub('./', '')}
+  rescue
+    []
+  end
+
   def master_names
     config_file = File.expand_path('~/.kontena_client.json')
     if(File.exist?(config_file))
@@ -86,7 +104,7 @@ words = ARGV
 words.delete_at(0)
 
 completion = []
-completion.push %w(cloud logout grid app service vault certificate node master vpn registry container etcd external-registry whoami plugin version) if words.size < 2
+completion.push %w(cloud logout grid app service stack vault certificate node master vpn registry container etcd external-registry whoami plugin version) if words.size < 2
 if words.size > 0
   case words[0]
     when 'plugin'
@@ -197,6 +215,25 @@ if words.size > 0
       else
         completion.push sub_commands
       end
+    when 'stack'
+      completion.clear
+      sub_commands = %w(build install upgrade deploy start stop remove rm ls list
+                        logs monitor show registry)
+      if words[1]
+        if words[1] == 'registry'
+          registry_sub_commands = %(push pull search show rm)
+          completion.push registry_sub_commands
+        elsif %w(install).include?(words[1])
+            completion.push helper.yml_files
+        elsif words[1] == 'upgrade' && words[3]
+          completion.push helper.yml_files
+        else
+          completion.push(sub_commands) unless sub_commands.include?(words[1])
+          completion.push helper.stacks
+        end
+      else
+        completion.push sub_commands
+      end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -394,6 +394,7 @@ files:
 - lib/kontena/cli/stacks/service_generator.rb
 - lib/kontena/cli/stacks/service_generator_v2.rb
 - lib/kontena/cli/stacks/show_command.rb
+- lib/kontena/cli/stacks/stacks_helper.rb
 - lib/kontena/cli/stacks/upgrade_command.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/affinities_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/build_validator.rb
@@ -543,9 +544,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