civo_cli 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f2eab61a5327829f94ecaf9a6f7ebb9ee6ec5e9a1cd72794f2a457c548bd589
-  data.tar.gz: 639b6f698fa9eb70af008a1ef107cb55ab647c8d58773f4156bab231177e202b
+  metadata.gz: 2aabcc396a2225eb28d5f2f79c73478007b634bb6de5d69f43db7c6f40318f84
+  data.tar.gz: 7098b73a6754c32efdd137416bebf318867843875cbb5a2c31ba980d37b20488
 SHA512:
-  metadata.gz: a204b476dac69c523fd47381166ff80ef7a831cd5a001a7b9dabb5e6e48b43ba5f78e75a84a5572d69b7981582696da698d493a89027baec16547a0d0f19559d
-  data.tar.gz: d05142457ecf03e974733346601ea04165e6e6d8228458a971c223a6e3a9a49bdd16feb5b4e47e69082e99a6947e75197be16dff6aab9837a917332a97b4c138
+  metadata.gz: 24d185d2934e3138ae7c0bd4eb50b5c5580f684216bf9c4cb03d7cfc016713e0a3a14314643c97c16b52d9307af4dc4831d0550eb842d9b04ee8a7adca437ded
+  data.tar.gz: 6a1d5caa05c0792fcc768aadef6c36984aea1faeaacf84748d3e1df4498995162dab7aa8a55049d0e0b60a10246f40610baaa835ad9fc586999ebe5d389dceea

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.15] - 2019-08-30
+### Add
+- Added plan support to the Kubernetes marketplace
+
 ## [0.3.14] - 2019-08-28
 ### Fixed
 - Removed debug level logging for Kubernetes marketplace applications commands

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.3.14)
+    civo_cli (0.3.15)
       bundler (~> 1.17)
       civo (>= 1.2.8)
       colorize

data/lib/ask_service.rb

@@ -0,0 +1,22 @@
+class AskService
+  def self.available?
+    STDIN.tty?
+  end
+
+  def self.choose(label, options)
+    result = options.first
+    printf "#{label} (#{options.join(", ")}) [#{options.first}]: "
+    input = STDIN.gets.chomp
+    result = input unless input.empty?
+    unless options.include?(result)
+      puts "That wasn't one of the available options.".colorize(:red) + " Please try again."
+      result = choose(label, options)
+    end
+    result
+  end
+end
+
+trap "SIGINT" do
+  puts "Exiting..."
+  exit 2
+end

data/lib/civo_cli/version.rb

@@ -1,3 +1,3 @@
 module CivoCLI
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 end

data/lib/finder.rb

@@ -20,7 +20,7 @@ class Finder
   def self.detect_app(name)
     result = []
     Civo::Kubernetes.applications.items.each do |app|
-      result << app if app.name.downcase.include?(name)
+      result << app if app.name.downcase.include?(name.downcase)
     end
 
     if result.count.zero?

data/lib/kubernetes.rb

@@ -55,7 +55,12 @@ module CivoCLI
         puts "Installed marketplace applications:"
         rows = []
         cluster.installed_applications.each do |application|
-          rows << [application.application, application.version, application.installed, application.category]
+          name = application.application
+          if application.plan
+            name += " #{application.plan}"
+          end
+          installed = application.installed ? "Yes" : "Not yet"
+          rows << [name, application.version, installed, application.category]
         end
         puts Terminal::Table.new headings: ['Name', 'Version', 'Installed', 'Category'], rows: rows
       end
@@ -94,6 +99,7 @@ module CivoCLI
     option :wait, type: :boolean, banner: 'wait until cluster is running'
     option :save, type: :boolean
     option :switch, type: :boolean
+    option :applications, type: :string
     long_desc <<-LONGDESC
       Create a new Kubernetes cluster with name (randomly assigned if blank), instance size (default: g2.medium),
       \x5\x5Optional parameters are as follows:
@@ -106,7 +112,33 @@ module CivoCLI
     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], applications: options[:applications])
+
+      applications = []
+      options[:applications].split(",").map(&:chomp).each do |name|
+        name, plan = name.split(":")
+        app = Finder.detect_app(name)
+        plans = app.plans&.items
+
+        if app && plans.present? && plan.blank?
+          if AskService.available?
+            plan = AskService.choose("You requested to add #{app.name} but didn't select a plan. Please choose one...", plans.map(&:label))
+            if plan.present?
+              puts "Thank you, next time you could use \"#{app.name}:#{plan}\" to choose automatically"
+            end
+          else
+            puts "You need to specify a plan".colorize(:red) + " from those available (#{plans.join(", ")} using the syntax \"#{app.name}:plan\""
+            exit 1
+          end
+        end
+
+        if plan.present?
+          applications << "#{app.name}:#{plan}"
+        else
+          applications << app.name
+        end
+      end
+
+      @cluster = Civo::Kubernetes.create(name: name, target_nodes_size: options[:size], num_target_nodes: options[:nodes], applications: applications.join(","))
 
       if options[:wait]
         timer = CivoCLI::Timer.new

data/lib/kubernetes_applications.rb

@@ -13,9 +13,16 @@ module CivoCLI
       else
         rows = []
         Civo::Kubernetes.applications.items.each do |app|
-          rows << [app.name, app.version, app.category]
+          plans = app.plans&.items
+          if plans.present?
+            plans = plans.map {|p| p.label}.join(", ")
+          else
+            plans = "Not applicable"
+          end
+
+          rows << [app.name, app.version, app.category, plans]
         end
-        puts Terminal::Table.new headings: ['Name', 'Version', 'Category'], rows: rows
+        puts Terminal::Table.new headings: ['Name', 'Version', 'Category', 'Plans'], rows: rows
       end
     rescue Flexirest::HTTPForbiddenClientException
       reject_user_access
@@ -49,10 +56,28 @@ module CivoCLI
     LONGDESC
     def add(name)
       CivoCLI::Config.set_api_auth
+      name, plan = name.split(":")
       app = Finder.detect_app(name)
       cluster = Finder.detect_cluster(options[:cluster])
+      plans = app.plans&.items
+
+      if app && plans.present? && plan.blank?
+        if AskService.available?
+          plan = AskService.choose("You requested to add #{app.name} but didn't select a plan. Please choose one...", plans.map(&:label))
+          if plan.present?
+            puts "Thank you, next time you could use \"#{app.name}:#{plan}\" to choose automatically"
+          end
+        else
+          puts "You need to specify a plan".colorize(:red) + " from those available (#{plans.join(", ")} using the syntax \"#{app.name}:plan\""
+          exit 1
+        end
+      end
 
-      Civo::Kubernetes.update(id: cluster.id, applications: app.name)
+      if plan.present?
+        Civo::Kubernetes.update(id: cluster.id, applications: "#{app.name}:#{plan}")
+      else
+        Civo::Kubernetes.update(id: cluster.id, applications: app.name)
+      end
       puts "Added #{app.name.colorize(:green)} #{app.version} to Kubernetes cluster #{cluster.name.colorize(:green)}"
     rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Andy Jeffries
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -205,6 +205,7 @@ files:
 - civo_cli.gemspec
 - exe/civo
 - lib/apikey.rb
+- lib/ask_service.rb
 - lib/blueprint.rb
 - lib/civo_cli.rb
 - lib/civo_cli/version.rb