kontena-plugin-upcloud 0.3.1.rc1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa71abdd5e6d879f8868bfb1e14f669a5879d197
-  data.tar.gz: 35cd56ca6f880a201813cfc4ed2724c01a84cbd8
+  metadata.gz: 42158d7b20762b2f956465d59eb2660cb64ba906
+  data.tar.gz: a930e55d552400cf1f2f948523bcd76ff4de1263
 SHA512:
-  metadata.gz: 5c82aabaaa2c8b6f97d0ad708590e67178aede22b22955d8e1aa7c4320951b7c3b1ea730dafc7a019bb7176aed4f46905439685a4837be72bc8551d2d60fa8a3
-  data.tar.gz: 0791e9666f8b9fad40fb3b6558046b1c4cbd0004cc0fc5e9772f841db61aa33c5b22356a1d6e7e13d6c770a4ab897459ba2834c10d190fe202c93e06feea3082
+  metadata.gz: d22b10f7f99ee78629290b8aadde6aa5b9363fb6367e0d9b50d883368c2a003baae60ac7c386fe5dabad2f019d9f55fbb7cc788c8621ba21bfd5531b10fda2be
+  data.tar.gz: f688a5253d5ff2d17791b57853c965c70cafccee5bda7945cd2c2b41aeefd0a86401337fbab5d20a9e59990e40559f53ba2eaa1de6da7fa346214a6baa772974

data/lib/kontena/plugin/upcloud/master/create_command.rb

@@ -1,4 +1,3 @@
-require 'securerandom'
 require 'kontena/plugin/upcloud/prompts'
 
 module Kontena::Plugin::Upcloud::Master
@@ -15,10 +14,11 @@ module Kontena::Plugin::Upcloud::Master
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
 
     def execute
-      require_relative '../../../machine/upcloud'
-
       abort_unless_api_access
 
+      require 'securerandom'
+      require 'kontena/machine/upcloud'
+
       provisioner.run!(
           name: self.name,
           ssh_key: ssh_key,

data/lib/kontena/plugin/upcloud/master_command.rb

@@ -1,9 +1,3 @@
-require_relative 'master/create_command'
-
 class Kontena::Plugin::Upcloud::MasterCommand < Kontena::Command
-
-  subcommand "create", "Create a new master to Upcloud", Kontena::Plugin::Upcloud::Master::CreateCommand
-
-  def execute
-  end
+  subcommand "create", "Create a new master to Upcloud", load_subcommand('kontena/plugin/upcloud/master/create_command')
 end

data/lib/kontena/plugin/upcloud/node_command.rb

@@ -1,13 +1,5 @@
-require_relative 'nodes/create_command'
-require_relative 'nodes/restart_command'
-require_relative 'nodes/terminate_command'
-
 class Kontena::Plugin::Upcloud::NodeCommand < Kontena::Command
-
-  subcommand "create", "Create a new node to Upcloud", Kontena::Plugin::Upcloud::Nodes::CreateCommand
-  subcommand "restart", "Restart Upcloud node", Kontena::Plugin::Upcloud::Nodes::RestartCommand
-  subcommand "terminate", "Terminate Upcloud node", Kontena::Plugin::Upcloud::Nodes::TerminateCommand
-
-  def execute
-  end
+  subcommand "create", "Create a new node to Upcloud", load_subcommand('kontena/plugin/upcloud/nodes/create_command')
+  subcommand "restart", "Restart Upcloud node", load_subcommand('kontena/plugin/upcloud/nodes/restart_command')
+  subcommand "terminate", "Terminate Upcloud node", load_subcommand('kontena/plugin/upcloud/nodes/terminate_command')
 end

data/lib/kontena/plugin/upcloud/nodes/create_command.rb

@@ -14,10 +14,10 @@ module Kontena::Plugin::Upcloud::Nodes
     requires_current_master_token
 
     def execute
-      require_relative '../../../machine/upcloud'
 
       abort_unless_api_access
 
+      require 'kontena/machine/upcloud'
       grid = fetch_grid
       provisioner = Kontena::Machine::Upcloud::NodeProvisioner.new(client, username, password)
       provisioner.run!(

data/lib/kontena/plugin/upcloud/nodes/terminate_command.rb

@@ -1,4 +1,5 @@
 require 'kontena/plugin/upcloud/prompts'
+
 module Kontena::Plugin::Upcloud::Nodes
   class TerminateCommand < Kontena::Command
     include Kontena::Cli::Common
@@ -13,7 +14,8 @@ module Kontena::Plugin::Upcloud::Nodes
 
     def execute
       abort_unless_api_access
-      require_relative '../../../machine/upcloud'
+
+      require 'kontena/machine/upcloud'
       confirm_command(name) unless forced?
       grid = client.get("grids/#{current_grid}")
       destroyer = Kontena::Machine::Upcloud::NodeDestroyer.new(client, username, password)

data/lib/kontena/plugin/upcloud.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Upcloud
-      VERSION = "0.3.1.rc1"
+      VERSION = "0.3.1"
     end
   end
 end

data/lib/kontena/plugin/upcloud_command.rb

@@ -1,11 +1,4 @@
-require_relative 'upcloud/master_command'
-require_relative 'upcloud/node_command'
-
 class Kontena::Plugin::UpcloudCommand < Kontena::Command
-
-  subcommand 'master', 'Upcloud master related commands', Kontena::Plugin::Upcloud::MasterCommand
-  subcommand 'node', 'Upcloud node related commands', Kontena::Plugin::Upcloud::NodeCommand
-
-  def execute
-  end
+  subcommand 'master', 'Upcloud master related commands', load_subcommand('kontena/plugin/upcloud/master_command')
+  subcommand 'node', 'Upcloud node related commands', load_subcommand('kontena/plugin/upcloud/node_command')
 end

data/lib/kontena_cli_plugin.rb

@@ -1,5 +1,5 @@
 require 'kontena_cli'
-require_relative 'kontena/plugin/upcloud'
-require_relative 'kontena/plugin/upcloud_command'
+require 'kontena/plugin/upcloud'
+require 'kontena/cli/subcommand_loader'
 
-Kontena::MainCommand.register("upcloud", "Upcloud specific commands", Kontena::Plugin::UpcloudCommand)
+Kontena::MainCommand.register("upcloud", "Upcloud specific commands", Kontena::Cli::SubcommandLoader.new('kontena/plugin/upcloud_command'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-upcloud
 version: !ruby/object:Gem::Version
-  version: 0.3.1.rc1
+  version: 0.3.1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -99,9 +99,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5