kontena-plugin-packet 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54e3412de2db2c3589d8a07dda64e4b71b6938ee
-  data.tar.gz: 8bbb27b48ae051c404705bd23dd56296e3812e03
+  metadata.gz: 5ad1fb71e03dea023766c8cfdab6b25c99f89050
+  data.tar.gz: de48c4136195379e8a5bc094ea82a8a12a9af892
 SHA512:
-  metadata.gz: 6684f9e2fa5f0fb63667939caccebd091dd7723e27f559345535bdc8776ad8c94511b74641f74f906d78af5235768448c1c5ec5aabd5975dc67747fe1a97fa40
-  data.tar.gz: c0e7bb1bbed2af8e3c28321ce0bb61ca84b4b4f37b3e09e5087efea4f5c6731969be0cfe408d1f06e953ec421d1efddcbab6db4c144cc1f159a9914b5c6fb4f2
+  metadata.gz: 8e3d7a57a42d6c0b66a95c52c66e47a7afc4b1d838f90c244ee6d75259e022a11cb4ecca9e6c20d005d09b58a0de469d94a6f5455d29756d3571a259cc63b4fe
+  data.tar.gz: 61112a7899b4a70ce9210a36f227fb39a1e5bc3a3befcf6bc3db04c79129f35830c68a110d338701829ae5931998d6daf21af614ca7abae6bb9add3359fd4a39

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0-p648
-  - 2.1.8
-  - 2.2.3
-  - 2.3.1
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.1
 env:
   - secure: "cUyvZs8EwaLZrE1xQFNTKq4Ft6evckt2qeU3lB0PuNONYUfRli2RqOUjD8So7yiPYucNKlqJ2u641WRV4AYY8TUnu2jKFGlEEmZuYkWj0jv6HAy02vWt+d4fjgq6R4+TCW+7wKQcrN8zYH9KJImPcN9S01XqaTm4oHsaZZk4dRWL7PnKHAnnxPnpSpytF2jgtETmfOQWAfECOtR5+ypFmmmoCz+6/RPO6Ys+mIL0MbbJQxqq+FEothgoZD92cR/kzZI4YIwoijw54JlIIpRlK9Y1szfC13LxaCujYfic2ny7HnfV8tfl7lt/OVE/NQCYJfK4Bao73zMemQ2th80O68WzF9px5p5gRrPhumjT8Oxf9MTEcH46PDQprznZW0UnZF51oPGDQWDIFwLgiokalKgzR/tPHM8sm/kJs6BPlTUHxkRDWWfiSR+rIz8t94HSBK2N9mCdesIM9oNUx8tUbEvQXmVOGmpRivHr2Fa5rtv0/dbXW0Y78XyF7WNPBIeuFwDQLTTwtzbYxuhC6V0q9yV9Tos2fRqzIn1Ddc01xOjRVfnz8J8cw1su7a0SarXZgnjzWuxU6N/xMyh4QNKvJPbUAMKi243tN+QyG0Kq8nT4SL525khZBoHx1wr9sRDSjd9vgHi51/cV3YGh+9FXsFJ8kkRCE825k/gnZxo3JvA="
 cache: bundler
@@ -14,3 +14,4 @@ deploy:
   gem: kontena-plugin-packet
   on:
     tags: true
+    rvm: 2.4.1

data/README.md

@@ -1,7 +1,6 @@
 # Kontena Packet Plugin
 
-This plugin provides support for Packet provisioning to Kontena CLI.
-
+This plugin provides support for (Packet)[https://www.packet.net/] provisioning to Kontena CLI.
 
 ## Contributing
 

data/kontena-plugin-packet.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["info@kontena.io"]
 
   spec.summary       = "Kontena Packet plugin"
-  spec.description   = "Packet provision plugin for Kontena"
+  spec.description   = "Kontena Packet plugin"
   spec.homepage      = "https://github.com/kontena/kontena-plugin-packet"
   spec.license       = "Apache-2.0"
 

data/lib/kontena/machine/packet/master_provisioner.rb

@@ -66,7 +66,9 @@ module Kontena
             end
           end
 
-          public_ip = device_public_ip(device)
+          public_ip = spinner "Looking for device public IP" do
+            device_public_ip(device)
+          end
           master_url = "https://#{public_ip['address']}"
 
           Excon.defaults[:ssl_verify_peer] = false

data/lib/kontena/machine/packet/node_destroyer.rb

@@ -29,11 +29,7 @@ module Kontena
           end
 
           node = api_client.get("grids/#{grid['id']}/nodes")['nodes'].find{|n| n['name'] == name}
-          if node
-            spinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
-              api_client.delete("grids/#{grid['id']}/nodes/#{name}")
-            end
-          end
+          Kontena.run(['node', 'rm', '--force', '--grid', grid['name'], name]) if node
         end
       end
     end

data/lib/kontena/machine/packet/packet_common.rb

@@ -51,11 +51,24 @@ module Kontena
         end
 
         def device_public_ip(device)
+          start_time = Time.now.to_i
           api_retry "Packet API did not find a public ip address for the device" do
-            device.ip_addresses.find{|ip| ip['public'] && ip['address_family'] == 4}
+            loop do
+              ip = refresh(device).ip_addresses.find{|ip| ip['public'] && ip['address_family'] == 4}
+              return ip if ip
+              sleep 0.5
+              raise 'Timeout while looking for device public ip' if (Time.now.to_i - start_time) > 300
+            end
           end
         end
 
+        # Reloads the device data from Packet API
+        # @param device [Packet::Device]
+        # @return refreshed_device [Packet::Device]
+        def refresh(device)
+          client.get_device(device.id)
+        end
+
         # Retry API requests to recover from random tls errors
         # @param [String] message Message to output when giving up
         # @param [Fixnum] times Default: 5

data/lib/kontena/plugin/packet.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Packet
-      VERSION = "0.2.5"
+      VERSION = "0.2.6"
     end
   end
 end

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

@@ -1,8 +1,7 @@
-require 'securerandom'
-require_relative '../token_option'
-require_relative '../project_option'
-require_relative '../type_option'
-require_relative '../facility_option'
+require 'kontena/plugin/packet/token_option'
+require 'kontena/plugin/packet/project_option'
+require 'kontena/plugin/packet/type_option'
+require 'kontena/plugin/packet/facility_option'
 
 module Kontena::Plugin::Packet::Master
   class CreateCommand < Kontena::Command
@@ -22,7 +21,8 @@ module Kontena::Plugin::Packet::Master
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     def execute
-      require_relative '../../../machine/packet'
+      require 'securerandom'
+      require 'kontena/machine/packet'
 
       provisioner = provisioner(token)
       provisioner.run!(

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

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

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

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

@@ -1,7 +1,7 @@
-require_relative '../token_option'
-require_relative '../project_option'
-require_relative '../type_option'
-require_relative '../facility_option'
+require 'kontena/plugin/packet/token_option'
+require 'kontena/plugin/packet/project_option'
+require 'kontena/plugin/packet/type_option'
+require 'kontena/plugin/packet/facility_option'
 
 module Kontena::Plugin::Packet::Nodes
   class CreateCommand < Kontena::Command
@@ -21,8 +21,7 @@ module Kontena::Plugin::Packet::Nodes
     def execute
       require_api_url
       require_current_grid
-
-      require_relative '../../../machine/packet'
+      require 'kontena/machine/packet'
       grid = fetch_grid
       provisioner = provisioner(client, token)
       provisioner.run!(

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

@@ -8,8 +8,7 @@ module Kontena::Plugin::Packet::Nodes
     option "--project", "PROJECT ID", "Packet project id", required: true
 
     def execute
-      require_relative '../../../machine/packet'
-
+      require 'kontena/machine/packet'
       restarter = Kontena::Machine::Packet::NodeRestarter.new(token)
       restarter.run!(project, name)
     end

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

@@ -1,17 +1,23 @@
+require 'kontena/plugin/packet/token_option'
+require 'kontena/plugin/packet/project_option'
+
 module Kontena::Plugin::Packet::Nodes
   class TerminateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
     parameter "NAME", "Node name"
-    option "--token", "TOKEN", "Packet API token", required: true
-    option "--project", "PROJECT ID", "Packet project id", required: true
+
+    include Kontena::Plugin::Packet::TokenOption
+    include Kontena::Plugin::Packet::ProjectOption
+
+    option '--force', :flag, 'Force terminate'
 
     def execute
+      confirm_command(name) unless force?
       require_api_url
       require_current_grid
-
-      require_relative '../../../machine/packet'
+      require 'kontena/machine/packet'
       grid = client(require_token).get("grids/#{current_grid}")
       destroyer = destroyer(client(require_token), token)
       destroyer.run!(grid, project, name)

data/lib/kontena/plugin/packet/token_option.rb

@@ -4,7 +4,7 @@ module Kontena::Plugin::Packet
       base.option "--token", "TOKEN", "Packet API token", environment_variable: 'PACKET_TOKEN'
       base.class_eval do
         def default_token
-          Kontena.prompt.ask("Packet API token:")
+          Kontena.prompt.ask("Packet API token:", echo: false)
         end
       end
     end

data/lib/kontena/plugin/packet_command.rb

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

data/lib/kontena_cli_plugin.rb

@@ -1,5 +1,5 @@
 require 'kontena_cli'
-require_relative 'kontena/plugin/packet'
-require_relative 'kontena/plugin/packet_command'
+require 'kontena/plugin/packet'
+require 'kontena/cli/subcommand_loader'
 
-Kontena::MainCommand.register("packet", "Packet specific commands", Kontena::Plugin::PacketCommand)
+Kontena::MainCommand.register("packet", "Packet specific commands", Kontena::Cli::SubcommandLoader.new('kontena/plugin/packet_command'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-packet
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Packet provision plugin for Kontena
+description: Kontena Packet plugin
 email:
 - info@kontena.io
 executables: []
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Kontena Packet plugin