kontena-plugin-digitalocean 0.3.1.rc1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 159d041998037905df8bfaf653d921910f8ba2df
-  data.tar.gz: b49274c2e74cace9384aa6c25fde76e6c19edb41
+  metadata.gz: 0b360ca30054c74ad16332d725ce999af892cf52
+  data.tar.gz: 275a49354f7c585ba5f5e13f8292a1308b4ad907
 SHA512:
-  metadata.gz: 88ebcc12587efa3c1edbd14f249dc6e5a4b6dbe051eb6f5e7d27a6ca2bbcf81f8941e6928cc148e4be37eeaa4e059451bf83a2cc812fbcb8439765e6feb3f097
-  data.tar.gz: 4608d8bc37fb630b12f91316a05a704106fa89717d106a64ae912438978cbf94dddb18777dc2476892270a4adc3ea2ed10a4c4ee67fb5b812015667deb0974e8
+  metadata.gz: 93ae933981067d120c5823fa9b8f18ba942ae6c294c2aaed9dae89b1540b39116c1e8e2f66995ff23c3d62bf76f920cb3064cb6eea7039428bde97a7bf784d44
+  data.tar.gz: 5937a77e6584f1f4259e96aa55cc98c4224872f6877bc08a8f398dafda6f997fc7f537e56a617cf7cb99f508727b602d8caefd282755fb948c5b4c5d513ca21c

data/lib/kontena/plugin/digital_ocean.rb

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

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

@@ -1,5 +1,4 @@
-require 'securerandom'
-require_relative '../prompts'
+require 'kontena/plugin/digital_ocean/prompts'
 
 module Kontena::Plugin::DigitalOcean::Master
   class CreateCommand < Kontena::Command
@@ -17,13 +16,14 @@ module Kontena::Plugin::DigitalOcean::Master
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
-
     def execute
       suppress_warnings # until DO merges resource_kit pr #32
       do_token = ask_do_token
 
-      require_relative '../../../machine/digital_ocean'
+      require 'securerandom'
+      require 'kontena/machine/digital_ocean'
 
+      do_token = ask_do_token
       do_region = ask_droplet_region(do_token)
       do_size = ask_droplet_size(do_token, do_region)
       do_ssh_key_id = ask_ssh_key(do_token)

data/lib/kontena/plugin/digital_ocean/master/terminate_command.rb

@@ -1,3 +1,5 @@
+require 'kontena/plugin/digital_ocean/prompts'
+
 module Kontena::Plugin::DigitalOcean::Master
   class TerminateCommand < Kontena::Command
     include Kontena::Cli::Common
@@ -10,10 +12,9 @@ module Kontena::Plugin::DigitalOcean::Master
 
     def execute
       suppress_warnings # until DO merges resource_kit pr #32
+      require 'kontena/machine/digital_ocean'
       do_token = ask_do_token
       confirm_command(name) unless forced?
-
-      require_relative '../../../machine/digital_ocean'
       destroyer = destroyer(do_token)
       destroyer.run!(name)
     ensure

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

@@ -1,11 +1,4 @@
-require_relative 'master/create_command'
-require_relative 'master/terminate_command'
-
 class Kontena::Plugin::DigitalOcean::MasterCommand < Kontena::Command
-
-  subcommand "create", "Create a new master to DigitalOcean", Kontena::Plugin::DigitalOcean::Master::CreateCommand
-  subcommand "terminate", "Terminate DigitalOcean master", Kontena::Plugin::DigitalOcean::Master::TerminateCommand
-
-  def execute
-  end
+  subcommand "create", "Create a new master to DigitalOcean", load_subcommand('kontena/plugin/digital_ocean/master/create_command')
+  subcommand "terminate", "Terminate DigitalOcean master", load_subcommand('kontena/plugin/digital_ocean/master/terminate_command')
 end

data/lib/kontena/plugin/digital_ocean/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::DigitalOcean::NodeCommand < Kontena::Command
-
-  subcommand "create", "Create a new node to DigitalOcean", Kontena::Plugin::DigitalOcean::Nodes::CreateCommand
-  subcommand "restart", "Restart DigitalOcean node", Kontena::Plugin::DigitalOcean::Nodes::RestartCommand
-  subcommand "terminate", "Terminate DigitalOcean node", Kontena::Plugin::DigitalOcean::Nodes::TerminateCommand
-
-  def execute
-  end
+  subcommand "create", "Create a new node to DigitalOcean", load_subcommand('kontena/plugin/digital_ocean/nodes/create_command')
+  subcommand "restart", "Restart DigitalOcean node", load_subcommand('kontena/plugin/digital_ocean/nodes/restart_command')
+  subcommand "terminate", "Terminate DigitalOcean node", load_subcommand('kontena/plugin/digital_ocean/nodes/terminate_command')
 end

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

@@ -1,4 +1,4 @@
-require_relative '../prompts'
+require 'kontena/plugin/digital_ocean/prompts'
 
 module Kontena::Plugin::DigitalOcean::Nodes
   class CreateCommand < Kontena::Command
@@ -17,13 +17,11 @@ module Kontena::Plugin::DigitalOcean::Nodes
 
     def execute
       suppress_warnings # until DO merges resource_kit pr #32
+      require 'kontena/machine/digital_ocean'
       require_api_url
       require_current_grid
 
       do_token = ask_do_token
-
-      require_relative '../../../machine/digital_ocean'
-
       do_region = ask_droplet_region(do_token)
       coreos_channel = self.channel || ask_channel
       do_size = ask_droplet_size(do_token, do_region)

data/lib/kontena/plugin/digital_ocean/nodes/restart_command.rb

@@ -1,4 +1,4 @@
-require_relative '../prompts'
+require 'kontena/plugin/digital_ocean/prompts'
 
 module Kontena::Plugin::DigitalOcean::Nodes
   class RestartCommand < Kontena::Command
@@ -11,12 +11,11 @@ module Kontena::Plugin::DigitalOcean::Nodes
 
     def execute
       suppress_warnings # until DO merges resource_kit pr #32
+      require 'kontena/machine/digital_ocean'
       require_api_url
       require_current_grid
       do_token = ask_do_token
 
-      require_relative '../../../machine/digital_ocean'
-
       node_name = ask_node(require_token)
       client = DropletKit::Client.new(access_token: do_token)
       droplet = client.droplets.all.find{|d| d.name == node_name}

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

@@ -1,4 +1,4 @@
-require_relative '../prompts'
+require 'kontena/plugin/digital_ocean/prompts'
 
 module Kontena::Plugin::DigitalOcean::Nodes
   class TerminateCommand < Kontena::Command
@@ -12,6 +12,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
 
     def execute
       suppress_warnings # until DO merges resource_kit pr #32
+      require 'kontena/machine/digital_ocean'
       require_api_url
       require_current_grid
       token = require_token
@@ -19,7 +20,6 @@ module Kontena::Plugin::DigitalOcean::Nodes
       do_token = ask_do_token
       confirm_command(node_name) unless forced?
 
-      require_relative '../../../machine/digital_ocean'
       grid = client(require_token).get("grids/#{current_grid}")
       destroyer = destroyer(client(token), do_token)
       destroyer.run!(grid, node_name)

data/lib/kontena/plugin/digital_ocean/prompts.rb

@@ -18,7 +18,7 @@ module Kontena::Plugin::DigitalOcean::Prompts
       public_key = File.read(self.ssh_key).strip
     else
       keys = manager.list
-      key_id = :new
+      key = :new
 
       default_path = File.join(Dir.home, '.ssh', 'id_rsa.pub')
       default = File.exist?(default_path) ? File.read(default_path).strip : nil

data/lib/kontena/plugin/digital_ocean_command.rb

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

data/lib/kontena_cli_plugin.rb

@@ -1,5 +1,5 @@
 require 'kontena_cli'
-require_relative 'kontena/plugin/digital_ocean'
-require_relative 'kontena/plugin/digital_ocean_command'
+require 'kontena/plugin/digital_ocean'
+require 'kontena/cli/subcommand_loader'
 
-Kontena::MainCommand.register("digitalocean", "DigitalOcean specific commands", Kontena::Plugin::DigitalOceanCommand)
+Kontena::MainCommand.register("digitalocean", "DigitalOcean specific commands", Kontena::Cli::SubcommandLoader.new('kontena/plugin/digital_ocean_command'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-digitalocean
 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-03 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -129,9 +129,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.6.11