kontena-cli 0.12.3 → 0.13.0

data/spec/kontena/cli/master/users/{add_role_command_spec.rb → roles/add_command_spec.rb}

@@ -1,8 +1,8 @@
-require_relative "../../../../spec_helper"
+require_relative "../../../../../spec_helper"
 require 'kontena/cli/master/users_command'
-require 'kontena/cli/master/users/add_role_command'
+require 'kontena/cli/master/users/roles/add_command'
 
-describe Kontena::Cli::Master::Users::AddRoleCommand do
+describe Kontena::Cli::Master::Users::Roles::AddCommand do
 
   let(:subject) do
     described_class.new(File.basename($0))

data/spec/kontena/cli/master/users/{remove_role_command_spec.rb → roles/remove_command_spec.rb}

@@ -1,8 +1,8 @@
-require_relative "../../../../spec_helper"
+require_relative "../../../../../spec_helper"
 require 'kontena/cli/master/users_command'
-require 'kontena/cli/master/users/remove_role_command'
+require 'kontena/cli/master/users/roles/remove_command'
 
-describe Kontena::Cli::Master::Users::RemoveRoleCommand do
+describe Kontena::Cli::Master::Users::Roles::RemoveCommand do
 
   let(:subject) do
     described_class.new(File.basename($0))

data/spec/kontena/cli/services/{add_secret_command_spec.rb → secrets/link_command_spec.rb}

@@ -1,7 +1,8 @@
-require_relative "../../../spec_helper"
-require "kontena/cli/services/add_secret_command"
+require_relative "../../../../spec_helper"
+require "kontena/cli/grid_options"
+require "kontena/cli/services/secrets/link_command"
 
-describe Kontena::Cli::Services::AddSecretCommand do
+describe Kontena::Cli::Services::Secrets::LinkCommand do
 
   include ClientHelpers
 

data/spec/kontena/cli/services/{remove_secret_command_spec.rb → secrets/unlink_command_spec.rb}

@@ -1,7 +1,8 @@
-require_relative "../../../spec_helper"
-require "kontena/cli/services/remove_secret_command"
+require_relative "../../../../spec_helper"
+require "kontena/cli/grid_options"
+require "kontena/cli/services/secrets/unlink_command"
 
-describe Kontena::Cli::Services::RemoveSecretCommand do
+describe Kontena::Cli::Services::Secrets::UnlinkCommand do
 
   include ClientHelpers
 

data/spec/kontena/cli/services/services_helper_spec.rb

@@ -130,5 +130,49 @@ module Kontena::Cli::Services
         expect(subject.parse_image('redis:3.0')).to eq('redis:3.0')
       end
     end
+
+    describe '#parse_memory' do
+      it 'parses kilobytes' do
+        expect(subject.parse_memory("1024k")).to eq(1 * 1024 * 1024)
+        expect(subject.parse_memory("1024K")).to eq(1 * 1024 * 1024)
+      end
+
+      it 'parses megabytes' do
+        expect(subject.parse_memory("32m")).to eq(32 * 1024 * 1024)
+        expect(subject.parse_memory("32M")).to eq(32 * 1024 * 1024)
+      end
+
+      it 'parses gigabytes' do
+        expect(subject.parse_memory("2g")).to eq(2 * 1024 * 1024 * 1024)
+        expect(subject.parse_memory("2G")).to eq(2 * 1024 * 1024 * 1024)
+      end
+
+      it 'parses plain bytes' do
+        expect(subject.parse_memory("#{12 * 1024 * 1024}")).to eq(12 * 1024 * 1024)
+      end
+
+      it 'raises error if invalid format' do
+        expect{subject.parse_memory("1.024g")}.to raise_error(ArgumentError)
+        expect{subject.parse_memory("1MG")}.to raise_error(ArgumentError)
+      end
+    end
+
+    describe '#parse_relative_time' do
+      it 'parses minutes' do
+        expect(subject.parse_relative_time("60min")).to eq(60 * 60)
+      end
+
+      it 'parses hours' do
+        expect(subject.parse_relative_time("8h")).to eq(8 * 60 * 60)
+      end
+
+      it 'parses days' do
+        expect(subject.parse_relative_time("7d")).to eq(7 * 24 * 60 * 60)
+      end
+
+      it 'parses seconds by default' do
+        expect(subject.parse_relative_time("600")).to eq(600)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,7 @@ files:
 - lib/kontena/cli/apps/show_command.rb
 - lib/kontena/cli/apps/start_command.rb
 - lib/kontena/cli/apps/stop_command.rb
+- lib/kontena/cli/bytes_helper.rb
 - lib/kontena/cli/common.rb
 - lib/kontena/cli/container_command.rb
 - lib/kontena/cli/containers/exec_command.rb
@@ -174,10 +175,8 @@ files:
 - lib/kontena/cli/external_registries/list_command.rb
 - lib/kontena/cli/external_registries/remove_command.rb
 - lib/kontena/cli/external_registry_command.rb
-- lib/kontena/cli/forgot_password_command.rb
 - lib/kontena/cli/grid_command.rb
 - lib/kontena/cli/grid_options.rb
-- lib/kontena/cli/grids/add_user_command.rb
 - lib/kontena/cli/grids/audit_log_command.rb
 - lib/kontena/cli/grids/cloud_config_command.rb
 - lib/kontena/cli/grids/common.rb
@@ -185,28 +184,36 @@ files:
 - lib/kontena/cli/grids/current_command.rb
 - lib/kontena/cli/grids/env_command.rb
 - lib/kontena/cli/grids/list_command.rb
-- lib/kontena/cli/grids/list_users_command.rb
 - lib/kontena/cli/grids/logs_command.rb
 - lib/kontena/cli/grids/remove_command.rb
-- lib/kontena/cli/grids/remove_user_command.rb
 - lib/kontena/cli/grids/show_command.rb
+- lib/kontena/cli/grids/trusted_subnet_command.rb
+- lib/kontena/cli/grids/trusted_subnets/add_command.rb
+- lib/kontena/cli/grids/trusted_subnets/list_command.rb
+- lib/kontena/cli/grids/trusted_subnets/remove_command.rb
 - lib/kontena/cli/grids/update_command.rb
 - lib/kontena/cli/grids/use_command.rb
+- lib/kontena/cli/grids/user_command.rb
+- lib/kontena/cli/grids/users/add_command.rb
+- lib/kontena/cli/grids/users/list_command.rb
+- lib/kontena/cli/grids/users/remove_command.rb
 - lib/kontena/cli/login_command.rb
 - lib/kontena/cli/logout_command.rb
 - lib/kontena/cli/master/aws/create_command.rb
 - lib/kontena/cli/master/aws_command.rb
 - lib/kontena/cli/master/azure/create_command.rb
 - lib/kontena/cli/master/azure_command.rb
+- lib/kontena/cli/master/current_command.rb
 - lib/kontena/cli/master/digital_ocean/create_command.rb
 - lib/kontena/cli/master/digital_ocean_command.rb
 - lib/kontena/cli/master/list_command.rb
 - lib/kontena/cli/master/use_command.rb
-- lib/kontena/cli/master/users/add_role_command.rb
 - lib/kontena/cli/master/users/invite_command.rb
 - lib/kontena/cli/master/users/list_command.rb
 - lib/kontena/cli/master/users/remove_command.rb
-- lib/kontena/cli/master/users/remove_role_command.rb
+- lib/kontena/cli/master/users/role_command.rb
+- lib/kontena/cli/master/users/roles/add_command.rb
+- lib/kontena/cli/master/users/roles/remove_command.rb
 - lib/kontena/cli/master/users_command.rb
 - lib/kontena/cli/master/vagrant/create_command.rb
 - lib/kontena/cli/master/vagrant/restart_command.rb
@@ -217,7 +224,6 @@ files:
 - lib/kontena/cli/master/vagrant_command.rb
 - lib/kontena/cli/master_command.rb
 - lib/kontena/cli/node_command.rb
-- lib/kontena/cli/nodes/add_label_command.rb
 - lib/kontena/cli/nodes/aws/create_command.rb
 - lib/kontena/cli/nodes/aws/restart_command.rb
 - lib/kontena/cli/nodes/aws/terminate_command.rb
@@ -230,9 +236,11 @@ files:
 - lib/kontena/cli/nodes/digital_ocean/restart_command.rb
 - lib/kontena/cli/nodes/digital_ocean/terminate_command.rb
 - lib/kontena/cli/nodes/digital_ocean_command.rb
+- lib/kontena/cli/nodes/label_command.rb
+- lib/kontena/cli/nodes/labels/add_command.rb
+- lib/kontena/cli/nodes/labels/remove_command.rb
 - lib/kontena/cli/nodes/list_command.rb
 - lib/kontena/cli/nodes/remove_command.rb
-- lib/kontena/cli/nodes/remove_label_command.rb
 - lib/kontena/cli/nodes/show_command.rb
 - lib/kontena/cli/nodes/ssh_command.rb
 - lib/kontena/cli/nodes/update_command.rb
@@ -248,25 +256,26 @@ files:
 - lib/kontena/cli/registry/delete_command.rb
 - lib/kontena/cli/registry/remove_command.rb
 - lib/kontena/cli/registry_command.rb
-- lib/kontena/cli/reset_password_command.rb
 - lib/kontena/cli/service_command.rb
-- lib/kontena/cli/services/add_env_command.rb
-- lib/kontena/cli/services/add_secret_command.rb
 - lib/kontena/cli/services/container_command.rb
 - lib/kontena/cli/services/containers_command.rb
 - lib/kontena/cli/services/create_command.rb
 - lib/kontena/cli/services/delete_command.rb
 - lib/kontena/cli/services/deploy_command.rb
-- lib/kontena/cli/services/envs_command.rb
+- lib/kontena/cli/services/env_command.rb
+- lib/kontena/cli/services/envs/add_command.rb
+- lib/kontena/cli/services/envs/list_command.rb
+- lib/kontena/cli/services/envs/remove_command.rb
 - lib/kontena/cli/services/link_command.rb
 - lib/kontena/cli/services/list_command.rb
 - lib/kontena/cli/services/logs_command.rb
 - lib/kontena/cli/services/monitor_command.rb
 - lib/kontena/cli/services/remove_command.rb
-- lib/kontena/cli/services/remove_env_command.rb
-- lib/kontena/cli/services/remove_secret_command.rb
 - lib/kontena/cli/services/restart_command.rb
 - lib/kontena/cli/services/scale_command.rb
+- lib/kontena/cli/services/secret_command.rb
+- lib/kontena/cli/services/secrets/link_command.rb
+- lib/kontena/cli/services/secrets/unlink_command.rb
 - lib/kontena/cli/services/services_helper.rb
 - lib/kontena/cli/services/show_command.rb
 - lib/kontena/cli/services/start_command.rb
@@ -274,14 +283,16 @@ files:
 - lib/kontena/cli/services/stop_command.rb
 - lib/kontena/cli/services/unlink_command.rb
 - lib/kontena/cli/services/update_command.rb
-- lib/kontena/cli/users_command.rb
+- lib/kontena/cli/user/forgot_password_command.rb
+- lib/kontena/cli/user/reset_password_command.rb
+- lib/kontena/cli/user/verify_command.rb
+- lib/kontena/cli/user_command.rb
 - lib/kontena/cli/vault/list_command.rb
 - lib/kontena/cli/vault/read_command.rb
 - lib/kontena/cli/vault/remove_command.rb
 - lib/kontena/cli/vault/update_command.rb
 - lib/kontena/cli/vault/write_command.rb
 - lib/kontena/cli/vault_command.rb
-- lib/kontena/cli/verify_account_command.rb
 - lib/kontena/cli/version.rb
 - lib/kontena/cli/version_command.rb
 - lib/kontena/cli/vpn/config_command.rb
@@ -337,18 +348,22 @@ files:
 - spec/kontena/cli/app/docker_helper_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/common_spec.rb
+- spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
+- spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
+- spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
 - spec/kontena/cli/login_command_spec.rb
+- spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
-- spec/kontena/cli/master/users/add_role_command_spec.rb
 - spec/kontena/cli/master/users/invite_command_spec.rb
 - spec/kontena/cli/master/users/remove_command_spec.rb
-- spec/kontena/cli/master/users/remove_role_command_spec.rb
+- spec/kontena/cli/master/users/roles/add_command_spec.rb
+- spec/kontena/cli/master/users/roles/remove_command_spec.rb
 - spec/kontena/cli/register_command_spec.rb
-- spec/kontena/cli/services/add_secret_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
-- spec/kontena/cli/services/remove_secret_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
+- spec/kontena/cli/services/secrets/link_command_spec.rb
+- spec/kontena/cli/services/secrets/unlink_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb
@@ -391,18 +406,22 @@ test_files:
 - spec/kontena/cli/app/docker_helper_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/common_spec.rb
+- spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
+- spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
+- spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
 - spec/kontena/cli/login_command_spec.rb
+- spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
-- spec/kontena/cli/master/users/add_role_command_spec.rb
 - spec/kontena/cli/master/users/invite_command_spec.rb
 - spec/kontena/cli/master/users/remove_command_spec.rb
-- spec/kontena/cli/master/users/remove_role_command_spec.rb
+- spec/kontena/cli/master/users/roles/add_command_spec.rb
+- spec/kontena/cli/master/users/roles/remove_command_spec.rb
 - spec/kontena/cli/register_command_spec.rb
-- spec/kontena/cli/services/add_secret_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
-- spec/kontena/cli/services/remove_secret_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
+- spec/kontena/cli/services/secrets/link_command_spec.rb
+- spec/kontena/cli/services/secrets/unlink_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb

data/lib/kontena/cli/forgot_password_command.rb

@@ -1,13 +0,0 @@
-class Kontena::Cli::ForgotPasswordCommand < Clamp::Command
-  include Kontena::Cli::Common
-
-  parameter "EMAIL", "Email address"
-
-  def execute
-    require_api_url
-
-    params = {email: email}
-    client.post('user/password_reset', params)
-    puts 'Email with password reset instructions is sent to your email address. Please follow the instructions to change your password.'
-  end
-end

data/lib/kontena/cli/reset_password_command.rb

@@ -1,19 +0,0 @@
-class Kontena::Cli::ResetPasswordCommand < Clamp::Command
-  include Kontena::Cli::Common
-
-  parameter "TOKEN", "Password reset token"
-
-  def execute
-    require 'highline/import'
-    
-    require_api_url
-    password = ask("Password: ") { |q| q.echo = "*" }
-    password2 = ask("Password again: ") { |q| q.echo = "*" }
-    if password != password2
-      abort("Passwords don't match")
-    end
-    params = {token: token, password: password}
-    client.put('user/password_reset', params)
-    puts 'Password is now changed. To login with the new password, please run: kontena login'
-  end
-end

data/lib/kontena/cli/users_command.rb

@@ -1,15 +0,0 @@
-require_relative 'users/invite_command'
-require_relative 'users/list_command'
-require_relative 'users/add_role_command'
-require_relative 'users/remove_role_command'
-
-class Kontena::Cli::UsersCommand < Clamp::Command
-
-  subcommand "invite", "Invite user to Kontena Master", Kontena::Cli::Users::InviteCommand
-  subcommand ["list", "ls"], "List users", Kontena::Cli::Users::ListCommand
-  subcommand "add-role", "Add role to user", Kontena::Cli::Users::AddRoleCommand
-  subcommand "remove-role", "Remove role from user", Kontena::Cli::Users::RemoveRoleCommand
-
-  def execute
-  end
-end

data/lib/kontena/cli/verify_account_command.rb

@@ -1,13 +0,0 @@
-class Kontena::Cli::VerifyAccountCommand < Clamp::Command
-  include Kontena::Cli::Common
-
-  parameter "TOKEN", "Kontena verify token"
-
-  def execute
-    require_api_url
-
-    params = {token: token}
-    client.post('user/email_confirm', params)
-    puts 'Account verified'.colorize(:green)
-  end
-end