civo_cli 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7490809da82e850e68b3f4bb27241b8f87048ab372a5a5d5a59f8f7000e7d672
-  data.tar.gz: 5e5f15459e0bbdcb994274bb5d8b69bbb91d03d754d681131c20029fccd183b1
+  metadata.gz: acd3180b6eaaf19c77c92333d99c03ca4c6718f64a9418f09efc7f3fd35733da
+  data.tar.gz: 9e5d92ca791a4c30aab31084592add09506abd00a7574aca2c881e9ea821b210
 SHA512:
-  metadata.gz: e612c8f5dd8db26e1a7a6032bc49caddb908432871427d7f21c87376b7cd35b01f4655c9f3bdb1f9dc9a21aece3e9dc233f2b2a211f743b88884064585f98c58
-  data.tar.gz: 1846b570f31e6fc4e66195eb6ee45a7852e7b00311c481653882567aebcf3ef368bce4d9a28937e981f6419d172e5e41580e346167b740b17a4ced8d21864df9
+  metadata.gz: 5d18746327d2def6e43d25585eac8a9712185f6d609fa0ebdc4e5a6b7e2b38e0ee27f601757ce05a89fdffb94ac86a0b8f4d66aa2f12395bda655d3bf88c1aaa
+  data.tar.gz: 902519bfa7cdafd3e9f246616ce4695391c70b8b3a39625728662164bd1a3ae92eb61e48db49a73077daeaedeeee59a7fb60d243816b339b81877952705a7081

data/CHANGELOG.md

@@ -3,6 +3,13 @@ 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.2.5] - 2019-06-28
+### Added
+- Added support for using part of an ID instead of a whole ID
+
+### Fixed
+- Trapping of error message when a non-administrator tries to update blueprints
+
 ## [0.2.4] - 2019-06-28
 ### Added
 - Added Kubernetes endpoints for when the service launches

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.2.4)
+    civo_cli (0.2.5)
       civo (>= 1.2.1)
       colorize
       json

data/lib/blueprint.rb

@@ -8,6 +8,9 @@ module CivoCLI
         rows << [blueprint.id, blueprint.name, blueprint.template_id, blueprint.version, blueprint.last_build_ended_at]
       end
       puts Terminal::Table.new headings: ['ID', 'Name', 'Template ID', 'Version', "Last built"], rows: rows
+    rescue Flexirest::HTTPForbiddenClientException => e
+      puts "Sorry, you don't have access to this feature".colorize(:red)
+      exit 1
     rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)
       exit 1
@@ -16,7 +19,7 @@ module CivoCLI
     desc "show ID", "show the details for a single blueprint"
     def show(id)
       CivoCLI::Config.set_api_auth
-      blueprint = Civo::Blueprint.all.detect {|b| b.id == id }
+      blueprint = detect_blueprint_id(id)
       puts "                ID : #{blueprint.id}"
       puts "              Name : #{blueprint.name}"
       puts "       Template ID : #{blueprint.template_id}"
@@ -27,6 +30,9 @@ module CivoCLI
       puts "-" * 29 + " CONTENT " + "-" * 29
       puts ""
       puts blueprint.dsl_content
+    rescue Flexirest::HTTPForbiddenClientException => e
+      puts "Sorry, you don't have access to this feature".colorize(:red)
+      exit 1
     rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)
       exit 1
@@ -35,16 +41,21 @@ module CivoCLI
     option "content-file", type: :string, desc: "The filename of a file to be used as the Blueprintfile content", aliases: ["-c"], banner: "CONTENT_FILE"
     option "template-id", type: :string, desc: "The ID of the template to update", aliases: ["-t"], banner: "TEMPLATE_ID"
     option :name, type: :string, desc: "A nice name to be used for the blueprint", aliases: ["-n"], banner: "NICE_NAME"
+    option :force, type: :boolean, desc: "Force a rebuild on the next run", aliases: ["-f"]
     desc "update ID", "update the blueprint with ID"
     def update(id)
       CivoCLI::Config.set_api_auth
-      params = {id: id}
+      params = {id: detect_blueprint_id(id)}
       params[:dsl_content] = File.read(options["content-file"]) unless options["content-file"].nil?
       params[:template_id] = options["template-id"] unless options["template-id"].nil?
       params[:name] = options["name"] unless options["name"].nil?
+      params[:force] = options["force"] unless options["force"].nil?
       Civo::Blueprint.update(params)
       blueprint = Civo::Blueprint.all.detect {|b| b.id == id }
       puts "Updated blueprint #{blueprint.name.colorize(:green)}"
+    rescue Flexirest::HTTPForbiddenClientException => e
+      puts "Sorry, you don't have access to this feature".colorize(:red)
+      exit 1
     rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)
       exit 1
@@ -63,6 +74,9 @@ module CivoCLI
       result = Civo::Blueprint.create(params)
       blueprint = Civo::Blueprint.all.detect {|b| b.id == result.id }
       puts "Created blueprint #{blueprint.name.colorize(:green)} with ID #{blueprint.id.colorize(:green)}"
+    rescue Flexirest::HTTPForbiddenClientException => e
+      puts "Sorry, you don't have access to this feature".colorize(:red)
+      exit 1
     rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)
       exit 1
@@ -72,7 +86,10 @@ module CivoCLI
     desc "remove ID", "remove the blueprint with ID"
     def remove(id)
       CivoCLI::Config.set_api_auth
-      Civo::Blueprint.remove(id)
+      Civo::Blueprint.remove(detect_blueprint_id(id))
+    rescue Flexirest::HTTPForbiddenClientException => e
+      puts "Sorry, you don't have access to this feature".colorize(:red)
+      exit 1
     rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)
       exit 1
@@ -80,5 +97,25 @@ module CivoCLI
     map "delete" => "remove", "rm" => "remove"
 
     default_task :list
+
+    private
+
+    def detect_blueprint_id(id)
+      result = []
+      Civo::Blueprint.all.items.each do |blueprint|
+        result << blueprint
+      end
+      result.select! { |blueprint| blueprint.name.include?(id) || blueprint.id.include?(id) }
+
+      if result.count.zero?
+        puts "No blueprints found for '#{id}'. Please check your query."
+        exit 1
+      elsif result.count > 1
+        puts "Multiple possible blueprints found for '#{id}'. Please try with a more specific query."
+        exit 1
+      else
+        result[0]
+      end
+    end
   end
 end

data/lib/civo_cli/version.rb

@@ -1,3 +1,3 @@
 module CivoCLI
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/instance.rb

@@ -312,7 +312,7 @@ module CivoCLI
       Civo::Instance.all.items.each do |instance|
         result << instance
       end
-      result.select! { |instance| instance.hostname.include?(id) }
+      result.select! { |instance| instance.hostname.include?(id) || instance.id.include?(id) }
 
       if result.count.zero?
         puts "No instances found for '#{id}'. Please check your query."

data/lib/kubernetes.rb

@@ -31,8 +31,7 @@ module CivoCLI
         puts "            Status : #{cluster.status.colorize(:red)}"
       end
       puts "           Version : #{cluster.kubernetes_version}"
-      puts "      API Endpoint : #{cluster.kubeconfig[/https:\/\/(\d+.)*:6443/]}"
-      #<Civo::Kubernetes id: "9f1cf43c-a924-468f-baa7-38dbe0e98ff0", name: "chris-edward", version: "1", status: "ACTIVE", num_target_nodes: 3, target_nodes_size: "g2.medium", built_at: "2019-06-27 16:56:25", kubeconfig: "apiVersion: v1\nclusters:\n- cluster:\n    certificate...", kubernetes_version: "0.6.1", created_at: "2019-06-27 16:52:10", instances: #<Flexirest::ResultIterator:0x00007fc43847d958 @_status=nil, @_headers=nil, @items=[#<Civo::Kubernetes hostname: "k8s-node-acf8", size: "g2.medium", region: "lon1", created_at: "2019-06-27 16:52:11", status: "ACTIVE", firewall_id: "fdf99ced-e257-4ddf-9c81-da81a1dea4ff", public_ip: "185.136.234.35">, #<Civo::Kubernetes hostname: "k8s-node-3615", size: "g2.medium", region: "lon1", created_at: "2019-06-27 16:52:11", status: "ACTIVE", firewall_id: "fdf99ced-e257-4ddf-9c81-da81a1dea4ff", public_ip: "185.136.232.85">, #<Civo::Kubernetes hostname: "k8s-master-4f46", size: "g2.medium", region: "lon1", created_at: "2019-06-27 16:52:11", status: "ACTIVE", firewall_id: "fdf99ced-e257-4ddf-9c81-da81a1dea4ff", public_ip: "185.136.232.240">]>>
+      puts "      API Endpoint : #{cluster.api_endpoint}"
 
       puts ""
       rows = []
@@ -151,7 +150,7 @@ module CivoCLI
       Civo::Kubernetes.all.items.each do |cluster|
         result << cluster
       end
-      result.select! { |cluster| cluster.name.include?(id) }
+      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."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Andy Jeffries
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler