kontena-cli 1.0.0.pre3 → 1.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba22a3516366cf0d4cb3d9b44e4460984a0cabf
-  data.tar.gz: 9e220dd6c8231906600723523ca8e59badc537ab
+  metadata.gz: 736ce5191f521cac27f9880c5ae7c7be58dfcc0a
+  data.tar.gz: e0c8fe58d93e4cf7eb3c23afbe8ee93867ddda0d
 SHA512:
-  metadata.gz: 4088c0e1841b305ff61091f29adcae757045ecdf629840dd0988c83efc91e4b63d22e993c6766c3c36642c5e0fcdca3a48ef4a3e8c4ce405d73c0f1d6a9e9d9a
-  data.tar.gz: c15c7cee466cd4510f09616651d1ade116ba0b62e2c7dc8c6d415b630d88efbd88a665058dc2e474176dfbc1d846c454411cca16a80d0827c486d66bb10aa86d
+  metadata.gz: 62ad31693e22387f9dd233523f185a2ceb8df60c579c498a6c791cc7bcc95fcda65b51ebdc4386de95dbc5caec080b820861716d818fa3757bbd1cdc8d6aade4
+  data.tar.gz: 76f2ee0a455f03f0966f5222572bda1686f4aa292e88ed96f0b651d550461ba38683ce267f5524d780454a641975d8257e4bd0555bb20922b3bedfcd2e333b9f

data/VERSION

@@ -1 +1 @@
-1.0.0.pre3
+1.0.0.pre4

data/kontena-cli.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "hash_validator", "~> 0.7.0"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
   spec.add_runtime_dependency "opto", "~> 1.5"
+  spec.add_runtime_dependency "semantic", "~> 1.5"
 end

data/lib/kontena/cli/nodes/labels/add_command.rb

@@ -10,9 +10,9 @@ module Kontena::Cli::Nodes::Labels
     requires_current_grid
 
     def execute
-      node = client.get("grids/#{current_grid}/nodes/#{node_id}")
+      node = client.get("nodes/#{current_grid}/#{node_id}")
       data = { labels: (Array(node['labels']) + label_list).uniq }
-      client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
+      client.put("nodes/#{current_grid}/#{node_id}", data)
     end
   end
 end

data/lib/kontena/cli/nodes/labels/list_command.rb

@@ -9,9 +9,8 @@ module Kontena::Cli::Nodes::Labels
     requires_current_grid
 
     def execute
-      node = client.get("grids/#{current_grid}/nodes/#{node_id}")
+      node = client.get("nodes/#{current_grid}/#{node_id}")
       puts Array(node['labels']).join("\n")
     end
   end
 end
-

data/lib/kontena/cli/nodes/labels/remove_command.rb

@@ -10,9 +10,9 @@ module Kontena::Cli::Nodes::Labels
     requires_current_grid
 
     def execute
-      node = client.get("grids/#{current_grid}/nodes/#{node_id}")
+      node = client.get("nodes/#{current_grid}/#{node_id}")
       data = { labels: Array(node['labels']).reject {|label| label_list.include?(label) } }
-      client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
+      client.put("nodes/#{current_grid}/#{node['id']}", data)
     end
   end
 end

data/lib/kontena/cli/nodes/remove_command.rb

@@ -13,7 +13,7 @@ module Kontena::Cli::Nodes
       confirm_command(node_id) unless forced?
 
       spinner "Removing #{node_id.colorize(:cyan)} node from #{current_grid.colorize(:cyan)} grid " do
-        client(token).delete("grids/#{current_grid}/nodes/#{node_id}")
+        client(token).delete("nodes/#{current_grid}/#{node_id}")
       end
     end
   end

data/lib/kontena/cli/nodes/show_command.rb

@@ -11,7 +11,7 @@ module Kontena::Cli::Nodes
       require_current_grid
       token = require_token
 
-      node = client(token).get("grids/#{current_grid}/nodes/#{node_id}")
+      node = client(token).get("nodes/#{current_grid}/#{node_id}")
       puts "#{node['name']}:"
       puts "  id: #{node['id']}"
       puts "  agent version: #{node['agent_version']}"

data/lib/kontena/cli/nodes/update_command.rb

@@ -11,11 +11,10 @@ module Kontena::Cli::Nodes
       require_current_grid
       token = require_token
 
-      node = client(token).get("grids/#{current_grid}/nodes/#{node_id}")
       data = {}
       data[:labels] = label_list if label_list
       spinner "Updating #{node_id.colorize(:cyan)} node " do
-        client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
+        client.put("nodes/#{current_grid}/#{node_id}", data)
       end
     end
   end

data/lib/kontena/cli/stack_command.rb

@@ -20,7 +20,7 @@ class Kontena::Cli::StackCommand < Kontena::Command
   subcommand "logs", "Show logs from services in a stack", Kontena::Cli::Stacks::LogsCommand
   subcommand "monitor", "Monitor services in a stack", Kontena::Cli::Stacks::MonitorCommand
   subcommand "build", "Build images listed in a stack file and push them to an image registry", Kontena::Cli::Stacks::BuildCommand
-  subcommand "registry", "Stack registry related commands", Kontena::Cli::Stacks::RegistryCommand
+  subcommand ["reg", "registry"], "Stack registry related commands", Kontena::Cli::Stacks::RegistryCommand
 
   def execute
   end

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

@@ -15,7 +15,11 @@ module Kontena::Cli::Stacks
 
     def execute
       require_config_file(filename)
-      services = services_from_yaml(filename, service_list, service_prefix)
+      services = Kontena::Cli::Stacks::YAML::Reader.new(filename).execute[:services]
+      unless service_list.empty?
+        services.select! { |name, _| service_list.include?(name) }
+      end
+
       if services.none?{ |name, service| service['build'] }
         abort 'Not found any service with a build option'.colorize(:red)
       end

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

@@ -24,12 +24,12 @@ module Kontena::Cli::Stacks
       @stack_name ||= self.name || stack_name_from_yaml(filename)
     end
 
-    def stack_from_yaml(filename)
-      reader = Kontena::Cli::Stacks::YAML::Reader.new(filename)
+    def stack_from_yaml(filename, from_registry: false)
+      reader = Kontena::Cli::Stacks::YAML::Reader.new(filename, from_registry: from_registry)
       if reader.stack_name.nil?
         exit_with_error "Stack MUST have stack name in YAML top level field 'stack'! Aborting."
       end
-      set_env_variables(self.name || reader.stack_name, current_grid)
+      set_env_variables(reader.stack_name, current_grid)
       #reader.reload
       outcome = reader.execute
 

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

@@ -8,7 +8,7 @@ module Kontena::Cli::Stacks
 
     banner "Installs a stack to a grid on Kontena Master"
 
-    parameter "[FILE]", "Kontena stack file", default: "kontena.yml", attribute_name: :filename
+    parameter "[FILE]", "Kontena stack file or a registry stack name (user/stack or user/stack:version)", default: "kontena.yml", attribute_name: :filename
 
     option ['-n', '--name'], 'NAME', 'Define stack name (by default comes from stack file)'
     option '--deploy', :flag, 'Deploy after installation'
@@ -17,8 +17,15 @@ module Kontena::Cli::Stacks
     requires_current_master_token
 
     def execute
-      require_config_file(filename)
-      stack = stack_from_yaml(filename)
+
+      if !File.exist?(filename) && filename =~ /\A[a-zA-Z0-9\_\.\-]+\/[a-zA-Z0-9\_\.\-]+(?::.*)?\z/
+        from_registry = true
+      else
+        from_registry = false
+        require_config_file(filename)
+      end
+
+      stack = stack_from_yaml(filename, from_registry: from_registry)
       stack['name'] = name if name
       spinner "Creating stack #{pastel.cyan(stack['name'])} " do
         create_stack(stack)

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

@@ -13,15 +13,19 @@ module Kontena::Cli::Stacks::Registry
     requires_current_account_token
 
     def execute
-      stack = ::YAML.load(stacks_client.show(stack_name))
-      puts "#{stack['stack']}:"
-      puts "  latest_version: #{stack['version']}"
-      puts "  expose: #{stack['expose'] || '-'}"
-      puts "  description: #{stack['description'] || '-'}"
+      require 'semantic'
+      unless versions?
+        stack = ::YAML.load(stacks_client.show(stack_name, stack_version))
+        puts "#{stack['stack']}:"
+        puts "  #{"latest_" unless stack_version}version: #{stack['version']}"
+        puts "  expose: #{stack['expose'] || '-'}"
+        puts "  description: #{stack['description'] || '-'}"
 
-      puts "  available_versions:"
-      stacks_client.versions(stack_name).map { |s| s['version']}.sort.reverse_each do |version|
-        puts "    - #{version}"
+        puts "  available_versions:"
+      end
+
+      stacks_client.versions(stack_name).reject {|s| s['version'].nil? || s['version'].empty?}.map { |s| Semantic::Version.new(s['version'])}.sort.reverse_each do |version|
+        puts versions? ? version : "    - #{version}"
       end
     end
   end

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

@@ -34,7 +34,8 @@ module Kontena::Cli::Stacks
 
     # @param [String] service_id
     def show_service(service_id)
-      service = get_service(service_id)
+      token = require_token
+      service = get_service(token, service_id)
       pad = '    '.freeze
       puts "#{pad}#{service['name']}:"
       puts "#{pad}  image: #{service['image']}"

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

@@ -23,7 +23,7 @@ module Kontena::Cli::Stacks
         if from_registry?
           require 'shellwords'
           @raw_content = Kontena::StacksCache.pull(file)
-          @registry    = Kontena::StacksCache::RegistryClientFactory.new.stacks_client.api_url
+          @registry    = Kontena::StacksCache.registry_url
         else
           @raw_content = File.read(File.expand_path(file))
         end

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

@@ -7,7 +7,8 @@ module Kontena::Cli::Vpn
       require 'rbconfig'
       require_api_url
       payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
-      stdout, stderr = client(require_token).post("services/#{current_grid}/vpn/server/containers/1/exec", payload)
+      service = client(require_token).get("services/#{current_grid}/vpn/server/containers")['containers'][0]
+      stdout, stderr = client(require_token).post("containers/#{service['id']}/exec", payload)
       if linux?
         stdout << "\n"
         stdout << "script-security 2 system\n"

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

@@ -60,9 +60,10 @@ module Kontena::Cli::Vpn
     def wait_for_configuration_to_finish(token)
       finished = false
       payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
+      service = client(require_token).get("services/#{current_grid}/vpn/server/containers", payload)['containers'][0]
       until finished
         sleep 3
-        stdout, stderr = client(require_token).post("services/#{current_grid}/vpn/server/containers/1/exec", payload)
+        stdout, stderr = client(require_token).post("containers/#{service['id']}/exec", payload)
         finished = true if stdout.join('').include?('BEGIN PRIVATE KEY'.freeze)
       end
 

data/lib/kontena/stacks_cache.rb

@@ -94,6 +94,10 @@ module Kontena
         stack
       end
 
+      def registry_url
+        client.api_url
+      end
+
       def client
         @client ||= RegistryClientFactory.new.stacks_client
       end

data/lib/kontena/stacks_client.rb

@@ -15,8 +15,8 @@ module Kontena
       post('/stack/', data, {}, CT_YAML)
     end
 
-    def show(stack_name)
-      get("#{path_to(stack_name, nil)}", {}, ACCEPT_JSON)
+    def show(stack_name, stack_version = nil)
+      get("#{path_to(stack_name, stack_version)}", {}, ACCEPT_JSON)
     end
 
     def versions(stack_name)

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

@@ -9,6 +9,8 @@ describe Kontena::Cli::Stacks::InstallCommand do
     let(:stack) do
       {
         name: 'stack-a',
+        stack: 'user/stack-a',
+        version: '1.0.0',
         registry: 'file://kontena.yml',
         source: "YAML content",
         services: []
@@ -20,20 +22,23 @@ describe Kontena::Cli::Stacks::InstallCommand do
     end
 
     it 'requires api url' do
-      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml', hash_including(from_registry: false)).and_return(stack)
       expect(described_class.requires_current_master?).to be_truthy
       subject.run([])
     end
 
     it 'requires token' do
-      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml', hash_including(from_registry: false)).and_return(stack)
       expect(described_class.requires_current_master_token?).to be_truthy
       subject.run([])
     end
 
     it 'sends stack to master' do
+      allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
       allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml', hash_including(from_registry: false)).and_return(stack)
       expect(client).to receive(:post).with(
         'grids/test-grid/stacks', stack
       )
@@ -41,8 +46,9 @@ describe Kontena::Cli::Stacks::InstallCommand do
     end
 
     it 'allows to override stack name' do
+      allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
       allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml', hash_including(from_registry: false)).and_return(stack)
       stack_b = stack
       stack_b[:name] = 'stack-b'
       expect(client).to receive(:post).with(
@@ -50,5 +56,14 @@ describe Kontena::Cli::Stacks::InstallCommand do
       )
       subject.run(['--name', 'stack-b'])
     end
+
+    it 'accepts a stack name as filename' do
+      expect(File).to receive(:exist?).with('user/stack:1.0.0').and_return(false)
+      expect(subject).to receive(:stack_from_yaml).with('user/stack:1.0.0', from_registry: true).and_return(stack)
+      expect(client).to receive(:post).with(
+        'grids/test-grid/stacks', stack
+      )
+      subject.run(['user/stack:1.0.0'])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.pre4
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: semantic
+  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