civo_cli 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce4a126792b8b4ac0aab10f94c62a04c2dbf3a161c41e824f5bed5b8df3ce25
-  data.tar.gz: 93f53e2c44d58df69aa5b5bf8f660d79cb3c7f0ffb117cbf50c28017cda92662
+  metadata.gz: 0abd838b80a7091c2c4303aac03c4ce07899d038f0663e14996112976834fb3b
+  data.tar.gz: ad179d84288f5a9848b05abef1fa8be0c57f681eb76128a4353b1dec682f29c8
 SHA512:
-  metadata.gz: 869a5732dc585cf5133c571b1966bfc8842435dbd6cb47980413c6787376022604c22e0e107e2d7180850587d87804ccf8793f5059f0251d8ae78f0ca4993cf2
-  data.tar.gz: '0993d994f2c1d0feb1e956b35fc0eebd001d00bf769ade9dfac886dbfb2fa13ec57734cfd780dc074c6e4bedabb885dcd32d99d677e8b8a04f3dcb8df76ad5e5'
+  metadata.gz: 9db96461a2f75ec8116cc3b3914b0278694fd416d997ca79c9ac649c26edb42d7b4436dfaef65b3ba93329cbb908125c02c92bbacd2e22a973d3c23b52e399df
+  data.tar.gz: ead03aead4578bc8b118e2d6260ba9f74a79536b8888c383964c9a750634f9799cd4afdee0761257286d7feb9a97c6e5c8cd3d441c02b4e4496329dc14638bc1

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.13] - 2019-08-28
+### Fixed
+- Was missing a file for Kubernetes marketplace applications
+
 ## [0.3.12] - 2019-08-28
 ### Added
 - Support for Kubernetes marketplace applications

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.3.12)
+    civo_cli (0.3.13)
       bundler (~> 1.17)
       civo (>= 1.2.8)
       colorize
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.3)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.1)
     flexirest (1.7.9)
       activesupport
       crack
@@ -55,7 +55,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (0.3.8)
+    hashdiff (1.0.0)
     highline (2.0.2)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
@@ -70,14 +70,14 @@ GEM
     multi_json (1.13.1)
     multipart-post (2.1.1)
     nenv (0.3.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parslet (1.8.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
@@ -86,15 +86,15 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     ruby_dep (1.5.0)
     safe_yaml (1.0.5)
     shellany (0.0.1)
@@ -108,10 +108,10 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
-    webmock (3.5.1)
+    webmock (3.7.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
     zeitwerk (2.1.9)
 
 PLATFORMS

data/lib/civo_cli/version.rb

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

data/lib/finder.rb

@@ -0,0 +1,36 @@
+class Finder
+  def self.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 self.detect_app(name)
+    result = []
+    Civo::Kubernetes.applications.items.each do |app|
+      result << app if app.name.downcase.include?(name)
+    end
+
+    if result.count.zero?
+      puts "No Kubernetes marketplace applications found for '#{name}'. Please check your query."
+      exit 1
+    elsif result.count > 1
+      puts "Multiple possible Kubernetes marketplace applications found for '#{name}'. Please try with a more specific query."
+      exit 1
+    else
+      result[0]
+    end
+  end
+end

data/lib/kubernetes.rb

@@ -26,7 +26,6 @@ module CivoCLI
       CivoCLI::Config.set_api_auth
       rows = []
       cluster = Finder.detect_cluster(id)
-      puts cluster.inspect
 
       puts "                ID : #{cluster.id}"
       puts "              Name : #{cluster.name}"

data/lib/kubernetes_applications.rb

@@ -0,0 +1,74 @@
+require 'tempfile'
+
+module CivoCLI
+  class KubernetesApplications < Thor
+    desc "list", "list all available kubernetes applications"
+    option :quiet, type: :boolean, aliases: '-q'
+    def list
+      CivoCLI::Config.set_api_auth
+      if options[:quiet]
+        Civo::Kubernetes.applications.items.each do |app|
+          puts "#{app.name} (#{app.version}, #{app.category})"
+        end
+      else
+        rows = []
+        Civo::Kubernetes.applications.items.each do |app|
+          rows << [app.name, app.version, app.category]
+        end
+        puts Terminal::Table.new headings: ['Name', 'Version', 'Category'], rows: rows
+      end
+    rescue Flexirest::HTTPForbiddenClientException
+      reject_user_access
+    end
+    map "ls" => "list", "all" => "list"
+
+
+    desc "show NAME", "show a Kubernetes application by name"
+    def show(name)
+      CivoCLI::Config.set_api_auth
+      rows = []
+      app = Finder.detect_app(name)
+
+      puts "              Name : #{app.name}"
+      puts "           Version : #{app.version}"
+      puts "          Category : #{app.category}"
+      puts "        Maintainer : #{app.maintainer}"
+      puts "               URL : #{app.url}"
+      puts "       Description : #{app.description}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+    map "get" => "show", "inspect" => "show"
+
+
+    desc "add NAME --cluster=...", "add the marketplace application to a Kubernetes cluster by ID or name"
+    option :cluster
+    long_desc <<-LONGDESC
+      Use --cluster=name to specify part of the ID or name of the cluster to add the application to
+    LONGDESC
+    def add(name)
+      Civo::Kubernetes.verbose!
+      Flexirest::Logger.logfile = STDOUT
+
+      CivoCLI::Config.set_api_auth
+      app = Finder.detect_app(name)
+      cluster = Finder.detect_cluster(options[:cluster])
+
+      Civo::Kubernetes.update(id: cluster.id, applications: app.name)
+      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)
+      exit 1
+    end
+
+    default_task :help
+
+    private
+
+    def reject_user_access
+      puts "Sorry, this functionality is currently in closed beta and not available to the public yet"
+      exit(1)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Andy Jeffries
@@ -211,9 +211,11 @@ files:
 - lib/config.rb
 - lib/domain.rb
 - lib/domain_record.rb
+- lib/finder.rb
 - lib/firewall.rb
 - lib/instance.rb
 - lib/kubernetes.rb
+- lib/kubernetes_applications.rb
 - lib/loadbalancer.rb
 - lib/namegenerator.rb
 - lib/network.rb