civo_cli 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3363116c1b2b7de8c58c5c01924973acf7afc59ac458a64f0544ec5260d063cd
-  data.tar.gz: 07e510a81a639f95ca12b7f73efb3132157a1fefb8ed2e88f566518798c37c61
+  metadata.gz: 5ce4a126792b8b4ac0aab10f94c62a04c2dbf3a161c41e824f5bed5b8df3ce25
+  data.tar.gz: 93f53e2c44d58df69aa5b5bf8f660d79cb3c7f0ffb117cbf50c28017cda92662
 SHA512:
-  metadata.gz: 4b4a417bc9fd45c00965cd53bc06bf683c3b56e6ad8e7489bcc659b0569ea38ae42aa4bdd98bbd9d0f69ffe84dc3d5980772ffe938cc3198d684aaee75d89616
-  data.tar.gz: 5a7c083587dfabca7e0625070c226b491bb16622aa092f6271c94fd7ac31f8e4e37a9395ca042be10da8e26a16f12c85fd3f49ca7edb608e90dba93c82b49e82
+  metadata.gz: 869a5732dc585cf5133c571b1966bfc8842435dbd6cb47980413c6787376022604c22e0e107e2d7180850587d87804ccf8793f5059f0251d8ae78f0ca4993cf2
+  data.tar.gz: '0993d994f2c1d0feb1e956b35fc0eebd001d00bf769ade9dfac886dbfb2fa13ec57734cfd780dc074c6e4bedabb885dcd32d99d677e8b8a04f3dcb8df76ad5e5'

data/CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to the Civo CLI will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.12] - 2019-08-28
+### Added
+- Support for Kubernetes marketplace applications
+
 ## [0.3.11] - 2019-08-19
 ### Changed
 - Updated `civo` gem dependency for correct Kubernetes endpoints.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.3.11)
+    civo_cli (0.3.12)
       bundler (~> 1.17)
-      civo (>= 1.2.7)
+      civo (>= 1.2.8)
       colorize
       json
       terminal-table
@@ -12,14 +12,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    civo (1.2.7)
+    civo (1.2.8)
       commander
       flexirest (>= 1.4.6)
       toml
@@ -111,6 +112,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    zeitwerk (2.1.9)
 
 PLATFORMS
   ruby

data/civo_cli.gemspec

@@ -49,6 +49,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency "bundler", "~> 1.17"
-  spec.add_runtime_dependency 'civo', ">= 1.2.7"
+  spec.add_runtime_dependency 'civo', ">= 1.2.8"
   spec.add_runtime_dependency 'json'
 end

data/lib/civo_cli/version.rb

@@ -1,3 +1,3 @@
 module CivoCLI
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/lib/civo_cli.rb

@@ -36,10 +36,17 @@ module CivoCLI
     subcommand "instance", CivoCLI::Instance
     map "instances" => "instance"
 
-    desc "kubernetes", "manage kubernetess"
+    desc "kubernetes", "manage Kubernetes"
     subcommand "kubernetes", CivoCLI::Kubernetes
     map "k8s" => "kubernetes", "k3s" => "kubernetes"
 
+    desc "applications", "list and add marketplace applications to Kubernetes clusters"
+    subcommand "applications", CivoCLI::KubernetesApplications
+    map "apps" => "applications", "app" => "applications", "application" => "applications",
+      "addon" => "applications", "addons" => "applications", "marketplace" => "applications",
+      "k8s-apps" => "applications", "k8s-app" => "applications",
+      "k3s-apps" => "applications", "k3s-app" => "applications"
+
     desc "loadbalancer", "manage load balancers"
     subcommand "loadbalancer", CivoCLI::LoadBalancer
     map "loadbalancers" => "loadbalancer"
@@ -48,7 +55,7 @@ module CivoCLI
     subcommand "network", CivoCLI::Network
     map "networks" => "network"
 
-    desc "quota", "view the quota"
+    desc "quota", "view the quota for the active account"
     subcommand "quota", CivoCLI::Quota
     map "quotas" => "quota"
 

data/lib/kubernetes.rb

@@ -1,5 +1,4 @@
 require 'tempfile'
-
 module CivoCLI
   class Kubernetes < Thor
     desc "list", "list all kubernetes clusters"
@@ -22,12 +21,12 @@ module CivoCLI
     end
     map "ls" => "list", "all" => "list"
 
-
     desc "show ID/NAME", "show a Kubernetes cluster by ID or name"
     def show(id)
       CivoCLI::Config.set_api_auth
       rows = []
-      cluster = detect_cluster(id)
+      cluster = Finder.detect_cluster(id)
+      puts cluster.inspect
 
       puts "                ID : #{cluster.id}"
       puts "              Name : #{cluster.name}"
@@ -45,11 +44,22 @@ module CivoCLI
       puts "      API Endpoint : #{cluster.api_endpoint}"
 
       puts ""
+      puts "Nodes:"
       rows = []
       cluster.instances.each do |instance|
         rows << [instance.hostname, instance.public_ip, instance.status]
       end
       puts Terminal::Table.new headings: ['Name', 'IP', 'Status'], rows: rows
+
+      if cluster.installed_applications.any?
+        puts ""
+        puts "Installed marketplace applications:"
+        rows = []
+        cluster.installed_applications.each do |application|
+          rows << [application.application, application.version, application.installed, application.category]
+        end
+        puts Terminal::Table.new headings: ['Name', 'Version', 'Installed', 'Category'], rows: rows
+      end
     rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)
       exit 1
@@ -67,7 +77,7 @@ module CivoCLI
     LONGDESC
     def config(id)
       CivoCLI::Config.set_api_auth
-      cluster = detect_cluster(id)
+      cluster = Finder.detect_cluster(id)
 
       if options[:save]
         save_config(cluster)
@@ -90,13 +100,14 @@ module CivoCLI
       \x5\x5Optional parameters are as follows:
       \x5 --size=<instance_size> - 'g2.medium' if blank. List of sizes and codes to use can be found through `civo sizes`
       \x5 --nodes=<count> - '3' if blank
+      \x5 --applications=name1,name2 - optional, use names from civo applications
       \x5 --wait - wait for build to complete and show status. Off by default.
       \x5 --save - save resulting configuration to ~/.kube/config (requires kubectl and the --wait option)
       \x5 --switch - switch context to newly-created cluster (requires kubectl and the --wait and --save options, as well as existing kubeconfig file)
     LONGDESC
     def create(name = CivoCLI::NameGenerator.create, *args)
       CivoCLI::Config.set_api_auth
-      @cluster = Civo::Kubernetes.create(name: name, target_nodes_size: options[:size], num_target_nodes: options[:nodes])
+      @cluster = Civo::Kubernetes.create(name: name, target_nodes_size: options[:size], num_target_nodes: options[:nodes], applications: options[:applications])
 
       if options[:wait]
         timer = CivoCLI::Timer.new
@@ -135,7 +146,7 @@ module CivoCLI
     LONGDESC
     def rename(id)
       CivoCLI::Config.set_api_auth
-      cluster = detect_cluster(id)
+      cluster = Finder.detect_cluster(id)
 
       if options[:name]
         Civo::Kubernetes.update(id: cluster.id, name: options[:name])
@@ -153,7 +164,7 @@ module CivoCLI
     LONGDESC
     def scale(id)
       CivoCLI::Config.set_api_auth
-      cluster = detect_cluster(id)
+      cluster = Finder.detect_cluster(id)
 
       if options[:nodes]
         Civo::Kubernetes.update(id: cluster.id, num_target_nodes: options[:nodes])
@@ -168,7 +179,7 @@ module CivoCLI
     desc "remove ID/NAME", "removes an entire Kubernetes cluster with ID/name entered (use with caution!)"
     def remove(id)
       CivoCLI::Config.set_api_auth
-      cluster = detect_cluster(id)
+      cluster = Finder.detect_cluster(id)
 
       puts "Removing Kubernetes cluster #{cluster.name.colorize(:red)}"
       cluster.remove
@@ -182,24 +193,6 @@ module CivoCLI
 
     private
 
-    def detect_cluster(id)
-      result = []
-      Civo::Kubernetes.all.items.each do |cluster|
-        result << cluster
-      end
-      result.select! { |cluster| cluster.name.include?(id) || cluster.id.include?(id) }
-
-      if result.count.zero?
-        puts "No Kubernetes clusters found for '#{id}'. Please check your query."
-        exit 1
-      elsif result.count > 1
-        puts "Multiple possible Kubernetes clusters found for '#{id}'. Please try with a more specific query."
-        exit 1
-      else
-        result[0]
-      end
-    end
-
     def save_config(cluster)
       config_file_exists = File.exist?("#{ENV["HOME"]}/.kube/config")
       tempfile = Tempfile.new('import_kubeconfig')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Andy Jeffries
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement