civo_cli 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2036f8ca9f8bf23a3a130c98784aca3fc974f0798d8550334a87ef51b66a9d5
-  data.tar.gz: 748c9360b9333a653e987886754cc287bb2ab11664d2d70eaa686966909f87be
+  metadata.gz: b5787d9ab0c66dee190959129ab97d5358b5e93c439db620085c81122810abaa
+  data.tar.gz: 5c229c96e001eca1027b4ed66de391d50555d2457673a3d019fedf90276fa772
 SHA512:
-  metadata.gz: 44339de9ba2c6d0f4f7b604554340efd01adc614c50bf8f5f64e439b1622f78de3b1f37540dc9e0e4694794eb619f2d68208e7670e2e490b3dfb15fb727970fd
-  data.tar.gz: e5162bb097e7ad7e1ff60da14192d17235d575ff43f15ff148e9f69320bda502cd64a33be518983a3eabbce038c8737b0f3a25b2f47f654dde3f41394ed6462c
+  metadata.gz: aa88841fdc522e311818d1e678dc057e2e8ae5931d803628bd700db0be1479528578d375c21b8602a1ad4cad0597a63a096e0a4a85bd489996be3dcc7e133139
+  data.tar.gz: 54805d074e258962b9f6b1cc70d3b3c0b744343d5a9ab0ac808f27ac470f954f3dc87d2794b81289b16358ffad47d097575e12b56402f59e81a50179815a9788

data/CHANGELOG.md

@@ -3,6 +3,17 @@ 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.4.2] - 2019-09-26
+### Changed
+- Add ability to specify a version when creating a cluster (default to our current version).
+
+## [0.4.1] - 2019-09-21
+### Changed
+- `civo kubernetes config` will show an error (and exit with a non-zero status) if the config isn't available from the server
+
+### Added
+- Add `civo update` command to automatically update your `civo_cli` Ruby gem to the latest version.
+
 ## [0.4.0] - 2019-09-17
 ### Changed
 - Now the capability exists for pre-installed applications in a cluster, ensure they aren't manually installed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.4.0)
+    civo_cli (0.4.2)
       bundler (~> 1.17)
       civo (>= 1.2.8)
       colorize
@@ -35,10 +35,11 @@ GEM
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
-    flexirest (1.8.0)
+    flexirest (1.8.5)
       activesupport
       crack
       faraday
+      mime-types
       multi_json
     formatador (0.2.5)
     guard (2.15.0)
@@ -66,7 +67,10 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
-    minitest (5.11.3)
+    mime-types (3.3)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0904)
+    minitest (5.12.0)
     multi_json (1.13.1)
     multipart-post (2.1.1)
     nenv (0.3.0)

data/lib/civo_cli/version.rb

@@ -1,3 +1,3 @@
 module CivoCLI
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/lib/civo_cli.rb

@@ -12,6 +12,8 @@ module CivoCLI
   class Error < StandardError; end
 
   class Main < Thor
+    check_unknown_options!
+
     desc "apikey", "manage API keys stored in the client"
     subcommand "apikey", CivoCLI::APIKey
     map "apikeys" => "apikey"
@@ -79,6 +81,16 @@ module CivoCLI
     subcommand "template", CivoCLI::Template
     map "templates" => "template"
 
+    desc "update", "update to the latest Civo CLI"
+    def update
+      output = `gem update civo_cli 2>&1`
+      if output["You don't have write permissions"]
+        puts "Updating Civo CLI with sudo permissions (unable to do it without)"
+        `sudo gem update civo_cli 2>&1`
+      end
+      version
+    end
+
     desc "version", "show the version of Civo CLI used"
     def version
       gem_details = Civo::Base._request("https://rubygems.org/api/v1/gems/civo_cli.json")

data/lib/finder.rb

@@ -5,6 +5,15 @@ class Finder
       result << cluster
     end
 
+    if id.blank?
+      if result.count == 1
+        return result[0]
+      elsif result.count > 1
+        puts 'Multiple possible Kubernetes clusters found. Please try again and specify the cluster with --cluster=NAME.'
+        exit 1
+      end
+    end
+      
     matched = result.detect { |cluster| cluster.name == id || cluster.id == id }
     return matched if matched
 

data/lib/kubernetes.rb

@@ -83,10 +83,18 @@ module CivoCLI
       CivoCLI::Config.set_api_auth
       cluster = Finder.detect_cluster(id)
 
-      if options[:save]
-        save_config(cluster)
+      if !cluster.ready
+        puts "The cluster isn't ready yet, so the KUBECONFIG isn't available.".colorize(:red)
+        exit 1
+      elsif cluster.kubeconfig.blank?
+        puts "The cluster is being installed, but the KUBECONFIG isn't available yet.".colorize(:red)
+        exit 1
       else
-        puts cluster.kubeconfig
+        if options[:save]
+          save_config(cluster)
+        else
+          puts cluster.kubeconfig
+        end
       end
     rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)
@@ -106,6 +114,7 @@ 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 --version=<version> - our latest k3s version if blank
       \x5 --applications=name1,name2 - optional, use names shown by running `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)
@@ -143,7 +152,7 @@ module CivoCLI
         end
       end
 
-      @cluster = Civo::Kubernetes.create(name: name, target_nodes_size: options[:size], num_target_nodes: options[:nodes], applications: applications.join(","))
+      @cluster = Civo::Kubernetes.create(name: name, target_nodes_size: options[:size], num_target_nodes: options[:nodes], applications: applications.join(","), version: options[:version])
 
       if options[:wait]
         timer = CivoCLI::Timer.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Andy Jeffries
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake