kontena-cli 0.0.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5937cedf8e64f8aee2913e0e13f84426fea8940b
-  data.tar.gz: a422d2aeed00f845cbe6bd5e85452bf6dfbcd94d
+  metadata.gz: 32f7df3c75d9dd5cde332f7cf19267508230be21
+  data.tar.gz: ed374c9d0f1a69e216ff547d7927b67c9b09ae1b
 SHA512:
-  metadata.gz: b469c902f707f9d7257e2205ff8b3fb33ef4416c9e28c202965574e0934124948caccc3433c272c15cec096351b92c43e01967c2dcdf07078807bf6c1653387e
-  data.tar.gz: bd899425cfbb1b073c111ee8782cee22183180f4b9cb49f8831ad90ede1bd9732c9475590ba40b44df3982024fb4478342ea102252ada92d14eacf18d2351a5b
+  metadata.gz: 59b51892ecc57e51c305823aa39450a9f07970ac5aa91d23a9a7bec7682f5ec141918f70d87590071c46864e1b46a5b182f055e30bfaebce9e29be88fc548a67
+  data.tar.gz: 438d344f304461f7d518020125d67882e92067f2dec89a0bd0c4763ad345ff84882abf202a59e5a25a0bd1a2efe61900a8f2968b57894b929230294a612658af

data/kontena-cli.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency 'httpclient', '~> 2.3'
   spec.add_runtime_dependency 'commander'
-  spec.add_runtime_dependency 'inifile'
   spec.add_runtime_dependency 'colorize'
 end

data/lib/kontena/cli/common.rb

@@ -1,4 +1,3 @@
-require 'inifile'
 require 'colorize'
 
 module Kontena
@@ -9,7 +8,7 @@ module Kontena
       end
 
       def require_token
-        token = inifile['server']['token']
+        token = settings['server']['token']
         unless token
           raise ArgumentError.new("Please login first using: kontena login")
         end
@@ -29,28 +28,23 @@ module Kontena
         @client
       end
 
-      def ini_filename
-        File.join(Dir.home, '/.kontena_client')
+      def settings_filename
+        File.join(Dir.home, '/.kontena_client.json')
       end
 
-      def inifile
-        if @inifile.nil?
-          if File.exists?(ini_filename)
-            @inifile = IniFile.load(ini_filename)
+      def settings
+        if @settings.nil?
+          if File.exists?(settings_filename)
+            @settings = JSON.parse(File.read(settings_filename))
           else
-            @inifile = IniFile.new
+            @settings = {'server' => {}}
           end
         end
-
-        unless @inifile['kontena']
-          @inifile['kontena'] = {}
-        end
-
-        @inifile
+        @settings
       end
 
       def api_url
-        url = inifile['server']['url']
+        url = settings['server']['url']
         unless url
           raise ArgumentError.new("Please init service first using: kontena connect")
         end
@@ -58,8 +52,8 @@ module Kontena
       end
 
       def current_grid=(grid)
-        inifile['server']['grid'] = grid['id']
-        inifile.save(filename: ini_filename)
+        settings['server']['grid'] = grid['id']
+        save_settings
       end
 
       def require_current_grid
@@ -69,14 +63,17 @@ module Kontena
       end
 
       def clear_current_grid
-        inifile['server'].delete('grid')
-        inifile.save(filename: ini_filename)
+        settings['server'].delete('grid')
+        save_settings
       end
 
       def current_grid
-        inifile['server']['grid']
+        settings['server']['grid']
       end
 
+      def save_settings
+        File.write(settings_filename, JSON.pretty_generate(settings))
+      end
     end
   end
 end

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

@@ -11,14 +11,14 @@ module Kontena::Cli::Nodes
       token = require_token
 
       grids = client(token).get("grids/#{current_grid}/nodes")
-      puts "%-20s %-20s %-10s %-20s %-10s" % ['Name', 'OS', 'Driver', 'Labels', 'Status']
+      puts "%-30s %-20s %-15s %-30s %-10s" % ['Name', 'OS', 'Driver', 'Labels', 'Status']
       grids['nodes'].each do |node|
         if node['connected']
           status = 'online'
         else
           status = 'offline'
         end
-        puts "%-20.20s %-20.20s %-10s %-20.20s %-10s" % [
+        puts "%-30.30s %-20.20s %-15s %-30.30s %-10s" % [
           node['name'],
           node['os'],
           node['driver'],

data/lib/kontena/cli/server/server.rb

@@ -9,8 +9,8 @@ module Kontena::Cli::Server
       until !api_url.nil? && !api_url.empty?
         api_url = ask('Kontena server url: ')
       end
-      inifile['server']['url'] = api_url
-      inifile.save(filename: ini_filename)
+      settings['server']['url'] = api_url
+      save_settings
 
       sleep 0.1
       if client.get('ping') # test server connection
@@ -22,8 +22,8 @@ module Kontena::Cli::Server
     end
 
     def disconnect
-      inifile['server'].delete('url')
-      inifile.save(filename: ini_filename)
+      settings['server'].delete('url')
+      save_settings
     end
 
     private

data/lib/kontena/cli/server/user.rb

@@ -19,8 +19,8 @@ module Kontena::Cli::Server
       response = client.post('auth', params)
 
       if response
-        inifile['server']['token'] = response['access_token']
-        inifile.save(filename: ini_filename)
+        settings['server']['token'] = response['access_token']
+        save_settings
         print color('Login Successful', :green)
         true
       else
@@ -30,13 +30,13 @@ module Kontena::Cli::Server
     end
 
     def logout
-      inifile['server'].delete('token')
-      inifile.save(filename: ini_filename)
+      settings['server'].delete('token')
+      save_settings
     end
 
     def whoami
       require_api_url
-      puts "Server: #{inifile['server']['url']}"
+      puts "Server: #{settings['server']['url']}"
       token = require_token
       response = client(token).get('user')
       puts "User: #{response['email']}"

data/lib/kontena/cli/services/commands.rb

@@ -24,8 +24,10 @@ end
 command 'service deploy' do |c|
   c.syntax = 'kontena service deploy <service_id>'
   c.description = 'Deploy service to nodes'
+  c.option '--strategy String', String, 'Define deploy strategy (ha / random)'
+  c.option '--wait-for-port String', String, 'Wait for given container port before deploying next container'
   c.action do |args, options|
-    Kontena::Cli::Services::Services.new.deploy(args[0])
+    Kontena::Cli::Services::Services.new.deploy(args[0], options)
   end
 end
 
@@ -69,6 +71,8 @@ command 'service create' do |c|
   c.option '--instances INTEGER', Integer, 'How many instances should be deployed'
   c.option '-u', '--user String', String, 'Username who executes first process inside container'
   c.option '--stateful', 'Set service as stateful'
+  c.option '--cap-add Array', Array, 'Add capabilities'
+  c.option '--cap-drop Array', Array, 'Drop capabilities'
 
   c.action do |args, options|
     Kontena::Cli::Services::Services.new.create(args[0], args[1], options)
@@ -83,6 +87,8 @@ command 'service update' do |c|
   c.option '--image STRING', String, 'Service image'
   c.option '--instances INTEGER', Integer, 'How many instances should be deployed'
   c.option '--cmd STRING', String, 'Command to execute'
+  c.option '--cap-add Array', Array, 'Add capabilities'
+  c.option '--cap-drop Array', Array, 'Drop capabilities'
   c.action do |args, options|
     Kontena::Cli::Services::Services.new.update(args[0], options)
   end
@@ -91,8 +97,9 @@ end
 command 'service scale' do |c|
   c.syntax = 'kontena service scale <service_id> <instances>'
   c.description = 'Scale service horizontally'
+  c.option '--strategy String', String, 'Define deploy strategy (ha / random)'
   c.action do |args, options|
-    Kontena::Cli::Services::Services.new.scale(args[0], args[1])
+    Kontena::Cli::Services::Services.new.scale(args[0], args[1], options)
   end
 end
 

data/lib/kontena/cli/services/services.rb

@@ -10,10 +10,10 @@ module Kontena::Cli::Services
       token = require_token
 
       grids = client(token).get("grids/#{current_grid}/services")
-      puts "%-30.30s %-40.40s %-15s %-8s" % ['NAME', 'IMAGE', 'INSTANCES', 'STATE?']
+      puts "%-30.30s %-40.40s %-10s %-8s" % ['NAME', 'IMAGE', 'INSTANCES', 'STATEFUL']
       grids['services'].each do |service|
         state = service['stateful'] ? 'yes' : 'no'
-        puts "%-30.30s %-40.40s %-15.15s %-8s" % [service['id'], service['image'], service['container_count'], state]
+        puts "%-30.30s %-40.40s %-10.10s %-8s" % [service['id'], service['image'], service['container_count'], state]
       end
     end
 
@@ -63,16 +63,19 @@ module Kontena::Cli::Services
       end
     end
 
-    def scale(service_id, count)
+    def scale(service_id, count, options)
       client(require_token).put("services/#{service_id}", {container_count: count})
-      self.deploy(service_id)
+      self.deploy(service_id, options)
     end
 
-    def deploy(service_id)
+    def deploy(service_id, options)
       require_api_url
       token = require_token
 
-      result = client(token).post("services/#{service_id}/deploy", {})
+      data = {}
+      data[:strategy] = options.strategy if options.strategy
+      data[:wait_for_port] = options.wait_for_port if options.wait_for_port
+      result = client(token).post("services/#{service_id}/deploy", data)
 
       print 'deploying '
       until client(token).get("services/#{service_id}")['state'] != 'deploying' do
@@ -132,6 +135,8 @@ module Kontena::Cli::Services
       data[:cmd] = options.cmd.split(" ") if options.cmd
       data[:user] = options.user if options.user
       data[:cpu] = options.cpu if options.cpu
+      data[:cap_add] = options.cap_add if options.cap_add
+      data[:cap_drop] = options.cap_drop if options.cap_drop
       if options.memory
         memory = human_size_to_number(options.memory)
         raise ArgumentError.new('Invalid --memory')
@@ -151,6 +156,8 @@ module Kontena::Cli::Services
       data[:cmd] = options.cmd.split(" ") if options.cmd
       data[:ports] = parse_ports(options.ports) if options.ports
       data[:image] = options.image if options.image
+      data[:cap_add] = options.cap_add if options.cap_add
+      data[:cap_drop] = options.cap_drop if options.cap_drop
 
       client(require_token).put("services/#{service_id}", data)
     end
@@ -163,19 +170,17 @@ module Kontena::Cli::Services
     end
 
     private
-    def current_grid
-      inifile['server']['grid']
-    end
 
     def parse_ports(port_options)
       port_options.map{|p|
-        node_port, container_port = p.split(':')
+        node_port, container_port, protocol = p.split(':')
         if node_port.nil? || container_port.nil?
           raise ArgumentError.new("Invalid port value #{p}")
         end
         {
           container_port: container_port,
-          node_port: node_port
+          node_port: node_port,
+          protocol: protocol || 'tcp'
         }
       }
     end

data/lib/kontena/cli/version.rb

@@ -1,5 +1,5 @@
 module Kontena
   module Cli
-    VERSION = "0.0.2"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,97 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: inifile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Kontena command line tool
@@ -102,7 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -140,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Kontena command line tool