civo_cli 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d11ea9765c6587f9b9fe117fb9c3ff15b50cae5fddd6110191f71c819e235b9e
-  data.tar.gz: cb754f79de7af4b2072c0ecbe51285887d7688f0c569d9057fb466112a3da331
+  metadata.gz: 8819a307c3a3c33baaaf05fac0530e93965a4cf78575cfa3adaa0713a26586f6
+  data.tar.gz: 2d5be57eb29a3d1fedfc1450485f09d7dd20dfc61a7358bb4c46830d6becaee9
 SHA512:
-  metadata.gz: efcabbc75b6bf60c6750a1b7b0dcc8359211ef6ad69139691f925bcd99fe340150cf05206cb695416a187515855fe94e59b6f904d556aea9e8461524bfab47bf
-  data.tar.gz: cabfc6bfdcf8dd8cbfd7606f42c23cb4881c3960ff7cee8198102e23484acabb7d40d7103940a4fa8a5cbde01c19fbec0008e80ca9e44e4e799cb219daeffe82
+  metadata.gz: 4ac35f3f40d3a524a581ee1439b1c2b8265a4c2a0f3fedec9eb01a2bf626a3488dfe50667b4c97b436f2e859f19f1dfe30a9a44f12fc018e4f43795e60656a74
+  data.tar.gz: 1513d0d52f85712125aaa292759f2462f3eb24b38f57eb81a9d7a3a86da86f0a6c0431dbff153da7adf4ce073c8a9da9c85e0dfc8f05026f4d698ac4742f3d4c

data/CHANGELOG.md

@@ -7,4 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Rewrote
 - Written new version in Ruby for ease of maintenance that replaces the old [Go-based CLI](https://github.com/absolutedevops/civo)
 
+## [0.2.0] - 2019-06-19
+### API endpoints implemented
+- Implemented APIkey, Blueprint, Domain, Domainrecord, Firewall, Instance, Network, Quota, Region, Size, Snapshot, SSHKey, Template and Volume endpoints
+
 [1.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.0...v1.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.1.1)
+    civo_cli (0.2.0)
       civo (>= 1.1.14)
       colorize
       json
@@ -18,7 +18,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    civo (1.1.14)
+    civo (1.1.17)
       commander
       flexirest (>= 1.4.6)
       toml
@@ -33,7 +33,7 @@ GEM
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.10.0)
-    flexirest (1.7.6)
+    flexirest (1.7.7)
       activesupport
       crack
       faraday
@@ -54,7 +54,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.8)
-    highline (2.0.1)
+    highline (2.0.2)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     json (2.2.0)
@@ -66,7 +66,7 @@ GEM
     method_source (0.9.2)
     minitest (5.11.3)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)

data/Rakefile

@@ -3,4 +3,13 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
+task :console do
+  require 'irb'
+  require 'irb/completion'
+  require './lib/civo_cli'
+  ARGV.clear
+  IRB.start
+end
+task :c => :console
+
 task :default => :spec

data/lib/apikey.rb

@@ -24,8 +24,16 @@ module CivoCLI
 
     desc "remove NAME", "Remove the API Key with a label of 'NAME'"
     def remove(name)
-      CivoCLI::Config.delete_apikey(name)
-      puts "Removed the API Key #{name.colorize(:green)}"
+       keys = CivoCLI::Config.get_apikeys
+        if keys.keys.include?(name)
+          CivoCLI::Config.delete_apikey(name)
+          puts "Removed the API Key #{name.colorize(:green)}"
+        else 
+          puts "The API Key #{name.colorize(:red)} couldn't be found."
+          exit 1
+        end
+
+
     end
     map "delete" => "remove", "rm" => "remove"
 

data/lib/blueprint.rb

@@ -42,7 +42,7 @@ module CivoCLI
       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?
-      Civo::Blueprint.save(params)
+      Civo::Blueprint.update(params)
       blueprint = Civo::Blueprint.all.detect {|b| b.id == id }
       puts "Updated blueprint #{blueprint.name.colorize(:green)}"
     rescue Flexirest::HTTPException => e
@@ -60,7 +60,8 @@ module CivoCLI
       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?
-      blueprint = Civo::Blueprint.create(params)
+      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::HTTPException => e
       puts e.result.reason.colorize(:red)

data/lib/civo_cli/version.rb

@@ -1,3 +1,3 @@
 module CivoCLI
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/civo_cli.rb

@@ -23,6 +23,10 @@ module CivoCLI
     subcommand "domain", CivoCLI::Domain
     map "domains" => "domain"
 
+    desc "domainrecord", "manage domain name DNS records for a domain"
+    subcommand "domainrecord", CivoCLI::DomainRecord
+    map "domainrecords" => "domainrecord"
+
     desc "firewall", "manage firewalls"
     subcommand "firewall", CivoCLI::Firewall
     map "firewalls" => "firewall"

data/lib/config.rb

@@ -38,6 +38,8 @@ module CivoCLI
 
     def self.get_meta(key)
       current["meta"].transform_keys{ |key| key.to_sym rescue key }[key]
+    rescue
+      nil
     end
 
     def self.set_meta(key, value)
@@ -47,6 +49,8 @@ module CivoCLI
 
     def self.current
       @config ||= JSON.parse(File.read(filename))
+    rescue
+      @config = {}
     end
 
     def self.reset

data/lib/domain.rb

@@ -1,5 +1,39 @@
 module CivoCLI
   class Domain < Thor
+    desc "list", "list all domain records for a domain"
+    def list
+      CivoCLI::Config.set_api_auth
+      rows = []
+      Civo::DnsDomain.all.items.each do |domain|
+        rows << [domain.id, domain.name]
+      end
+      puts Terminal::Table.new headings: ['ID', 'Name'], rows: rows
+    end
+
+    desc "create DOMAIN", "create a new domain name called DOMAIN"
+    def create(name)
+      CivoCLI::Config.set_api_auth
+      domain = Civo::DnsDomain.create(name: name)
+      puts "Created a domain called #{name.colorize(:green)} with ID #{domain.id.colorize(:green)}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+    map "new" => "create"
+
+    desc "remove ID", "remove the domain with ID (or name)"
+    def remove(id)
+      CivoCLI::Config.set_api_auth
+      domain = Civo::DnsDomain.all.items.detect {|key| key.id == id || key.name == id}
+      Civo::DnsDomain.remove(id: domain.id)
+      puts "Removed the domain #{domain.name.colorize(:green)} with ID #{domain.id.colorize(:green)}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+    map "delete" => "remove", "rm" => "remove"
+
+    default_task :list
 
   end
 end

data/lib/domain_record.rb

@@ -0,0 +1,116 @@
+module CivoCLI
+  class DomainRecord < Thor
+
+    desc "list DOMAIN_ID", "list all entries for DOMAIN_ID (or name)"
+    def list(domain_id)
+      CivoCLI::Config.set_api_auth
+      domain = Civo::DnsDomain.all.items.detect {|key| key.id == domain_id || key.name == domain_id}
+
+      rows = []
+      Civo::DnsRecord.all(domain_id: domain.id).items.each do |record|
+        value = (record.value.length > 20 ? record.value[0, 17] + "..." : record.value)
+        rows << [record.id, record.type.upcase, "#{record.name}.#{domain.name.colorize(:light_black)}", value, record.ttl, record.priority]
+      end
+      puts Terminal::Table.new headings: ['ID', 'Type', 'Name', 'Value', 'TTL', 'Priority'], rows: rows
+    end
+
+    desc "show RECORD_ID", "show full information for record RECORD_ID (or full DNS name)"
+    def show(record_id)
+      CivoCLI::Config.set_api_auth
+      Civo::DnsDomain.all.items.each do |domain|
+        @domain = domain
+        @record = Civo::DnsRecord.all(domain_id: domain.id).detect {|key| key.id == record_id || (key.domain_id == domain.id && key.name == record_id.gsub(/\.#{domain.name}$/, '')) }
+        break if @record
+      end
+      puts "               ID: #{@record.id}"
+      puts "             Type: #{@record.type.upcase}"
+      puts "             Name: #{@record.name}.#{@domain.name.colorize(:light_black)}"
+      puts "              TTL: #{@record.ttl}"
+      puts "         Priority: #{@record.priority}"
+      puts ""
+      puts "-" * 29 + "VALUE" + "-" * 29
+      puts @record.value
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+
+    option :priority, type: :string, desc: "The priority for MX records", aliases: ["-p"], banner: "PRIORITY"
+    option :ttl, type: :string, desc: "The Time-To-Live for this record", aliases: ["-t"], banner: "TTL"
+    desc "create RECORD TYPE VALUE", "create a new domain record called RECORD TYPE(a/alias, cname/canonical, mx/mail, txt/text) VALUE"
+    def create(name, type, value)
+      CivoCLI::Config.set_api_auth
+      domain, part = find_domain(name)
+      if domain
+        type = case(type.downcase)
+        when "cname", "canonical"
+          "cname"
+        when "mx", "mail"
+          "mx"
+        when "txt", "text"
+          "txt"
+        else
+          "a"
+        end.upcase
+        out = "Created #{type.colorize(:green)} record #{part.colorize(:green)} for #{domain.name.colorize(:green)}"
+        if options[:ttl] && options[:ttl] != ""
+          out += " with a TTL of #{options[:ttl].colorize(:green)} seconds"
+          if options[:priority] && options[:priority] != ""
+            out += " and"
+          end
+        end
+        if options[:priority] && options[:priority] != ""
+          out += " with a priority of #{options[:priority].colorize(:green)}"
+        end
+        options[:ttl] ||= 600
+        options[:priority] ||= 0
+
+        record = Civo::DnsRecord.create(type: type, domain_id: domain.id, name: part, value: value, priority: options[:priority], ttl: options[:ttl])
+        puts record.inspect
+        puts "#{out} with ID #{record.id.colorize(:green)}"
+      else
+        puts "Unable to find the domain name for #{name}".colorize(:red)
+      end
+    rescue Flexirest::HTTPException => e
+      puts e.inspect
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+    map "new" => "create"
+
+    desc "remove ID", "remove the domain record with ID"
+    def remove(id)
+      CivoCLI::Config.set_api_auth
+      Civo::DnsDomain.all.items.each do |d|
+        Civo::DnsRecord.all(domain_id: d.id).items.each do |r|
+          if r.id == id
+            Civo::DnsRecord.remove(domain_id: d.id, id: r.id)
+            puts "Removed the record #{r.name.colorize(:green)} record with ID #{r.id.colorize(:green)}"
+          end
+        end
+      end
+    rescue Flexirest::HTTPException => e
+      puts e.result&.reason&.colorize(:red)
+      exit 1
+    end
+    map "delete" => "remove", "rm" => "remove"
+
+    default_task :list
+
+    private
+
+    def find_domain(record)
+      domain = nil
+      part = nil
+      Civo::DnsDomain.all.items.each do |d|
+        if record.end_with? d.name
+          domain = d
+          part = record.gsub(".#{d.name}", "")
+          break
+        end
+      end
+      [domain, part]
+    end
+
+  end
+end

data/lib/firewall.rb

@@ -1,5 +1,85 @@
 module CivoCLI
   class Firewall < Thor
+    desc "create firewall_name", "Create a new firewall"
+    def create(firewall_name)
+      CivoCLI::Config.set_api_auth
 
+      Civo::Firewall.create(name: firewall_name)
+      puts "Created firewall #{firewall_name.colorize(:green)}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+
+    desc "list", "Lists all firewalls"
+    def list
+      CivoCLI::Config.set_api_auth
+      rows = []
+      Civo::Firewall.all.items.each do |element|
+        rows << [element.id, element.name, element.rules_count, element.instances_count]
+      end
+      puts Terminal::Table.new headings: ['ID', 'Name', 'No. of Rules', 'instances using'], rows: rows
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+
+    desc "remove firewall_ID", "Removes a firewall with Firewall ID provided"
+    def remove(firewall_ID)
+      CivoCLI::Config.set_api_auth
+      Civo::Firewall.remove(id: firewall_ID)
+      puts "Removed firewall #{firewall_ID.colorize(:red)}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+
+    desc "new-rule", "Create new rule on firewall firewall_id called rule_name with required arguments"
+    option :firewall_id, required: true
+    option :protocol, default: 'tcp'
+    option :start_port, required: true
+    option :end_port
+    option :cidr, default: '0.0.0.0/0'
+    option :direction, default: 'inbound'
+    option :label
+    def new_rule
+      CivoCLI::Config.set_api_auth
+
+      if !options[:end_port]
+        Civo::FirewallRule.create(firewall_id: options[:firewall_id], start_port: options[:start_port], end_port: options[:start_port], cidr: options[:cidr], direction: options[:direction], label: options[:label])
+      end
+      if options[:end_port]
+        Civo::FirewallRule.create(firewall_id: options[:firewall_id], start_port: options[:start_port], end_port: options[:end_port], cidr: options[:cidr], direction: options[:direction], label: options[:label])
+      end
+      puts "New rule" + (options[:label].nil? ? "" : " #{options[:label].colorize(:green)}") + " created"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+
+    desc "list-rules firewall_id", "Lists all active rules for firewall ID provided"
+    def list_rules(firewall_id)
+      CivoCLI::Config.set_api_auth
+      rules = Civo::FirewallRule.all(firewall_id: firewall_id)
+      rows = []
+      rules.each do |rule|
+        rows << [rule.id, rule.protocol, rule.start_port, rule.end_port, rule.direction, rule.cidr.items.join(", "), rule.label]
+      end
+      puts Terminal::Table.new title: "Firewall rules for #{firewall_id}", headings: ['ID', 'Protocol', 'Start Port', 'End Port', 'Direction', 'CIDR', 'Label'], rows: rows
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+
+    desc "delete-rule firewall_id rule_id", "Deletes rule with rule_id from firewall with firewall_id"
+    def delete_rule(firewall_id, rule_id)
+      CivoCLI::Config.set_api_auth
+
+      Civo::FirewallRule.remove(firewall_id: firewall_id, id: rule_id)
+      puts "Removed Firewall rule #{rule_id.colorize(:red)}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
   end
 end

data/lib/instance.rb

@@ -13,103 +13,284 @@ module CivoCLI
     end
 
     if CivoCLI::Config.get_meta("admin")
-      desc "", ""
+      desc "high-cpu", "list high CPU using instances"
       def high_cpu
         # {ENV["CIVO_API_VERSION"] || "1"}/instances/high_cpu"
+        CivoCLI::Config.set_api_auth
+        instance = detect_instance_id(id)
+
+        Civo::Instance.high_cpu
       end
     end
 
-    desc "", ""
-    def find
+    desc "show ID/HOSTNAME", "show an instance by ID or hostname"
+    def show(id)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id", requires: [:id]
+      CivoCLI::Config.set_api_auth
+      rows = []
+      instance = detect_instance_id(id)
+
+      sizes = Civo::Size.all(all: true).items
+      ssh_keys = Civo::SshKey.all.items
+      networks = Civo::Network.all.items
+      firewalls = Civo::Firewall.all.items
+
+      size = sizes.detect {|s| s.name == instance.size}
+      if size
+        @size_name = size.description
+      end
+      @network = networks.detect {|n| n.id == instance.network_id}
+      @firewall = firewalls.detect {|fw| fw.id == instance.firewall_id}
+
+      puts "                ID : #{instance.id}"
+      puts "          Hostname : #{instance.hostname}"
+      if instance.reverse_dns
+        puts "       Reverse DNS : #{instance.reverse_dns}"
+      end
+      puts "              Tags : #{instance.tags.join(", ")}"
+      puts "              Size : #{@size_name}"
+      case instance.status
+      when "ACTIVE"
+        puts "            Status : #{instance.status.colorize(:green)}"
+      when /ING$/
+        puts "            Status : #{instance.status.colorize(:orange)}"
+      else
+        puts "            Status : #{instance.status.colorize(:red)}"
+      end
+      puts "        Private IP : #{instance.private_ip}"
+      puts "         Public IP : #{[instance.pseudo_ip, instance.public_ip].join(" => ")}"
+      puts "           Network : #{@network.label} (#{@network.cidr})"
+      puts "          Firewall : #{@firewall&.name} (rules: #{@firewall&.rules_count})"
+      puts "            Region : #{instance.region}"
+      puts "      Initial User : #{instance.initial_user}"
+      puts "  Initial Password : #{instance.initial_password}"
+      if instance.ssh_key.present?
+        key = ssh_keys.detect { |k| k.id == instance.ssh_key }
+        puts "           SSH Key : #{key.name} (#{key.fingerprint})"
+      end
+      puts "      OpenStack ID : #{instance.openstack_server_id}"
+      puts "       Template ID : #{instance.template_id}"
+      puts "       Snapshot ID : #{instance.snapshot_id}"
+      puts ""
+      puts "-" * 29 + " NOTES " + "-" * 29
+      puts ""
+      puts instance.notes
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def create
+    desc "create --hostname=host_name --size=instance_size [--template=template_id ] [--snapshot=snapshot_id]", "create a new instance with specified hostname, instance size, template/snapshot ID. Optional: region, public_ip (true or false), initial user"
+    option :hostname, required: true
+    option :size, required: true
+    option :region, default: 'lon1'
+    option :public_ip, default: 'create'
+    option :initial_user, default: "civo"
+    option :template
+    option :snapshot
+    option :ssh_key_id
+    option :tags
+    def create(*args)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances", requires: [:hostname, :size, :region],
       # defaults: {public_ip: true, initial_user: "civo"}
+      CivoCLI::Config.set_api_auth
+      if options[:template] && options[:snapshot] || !options[:template] && !options[:snapshot]
+        puts "Please provide either template OR snapshot ID".colorize(:red)
+        exit 1
+      end
+      if options[:template]
+        Civo::Instance.create(hostname: options[:hostname], size: options[:size], template: options[:template], initial_user: options[:initial_user], region: options[:region], ssh_key_id: options[:ssh_key_id], tags: options[:tags])
+      end
+
+      if options[:snapshot]
+        Civo::Instance.create(hostname: options[:hostname], size: options[:size], snapshot_id: options[:snapshot], initial_user: options[:initial_user], region: options[:region], ssh_key_id: options[:ssh_key_id], tags: options[:tags])
+      end
+      puts "Created instance #{options[:hostname].colorize(:green)}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def tags
+    desc "tags ID 'tag1 tag2 tag3...'", "retag instance by ID (input no tags to clear all tags)"
+    def tags(id, newtags = nil)
+      CivoCLI::Config.set_api_auth
+      instance = detect_instance_id(id)
 
+      Civo::Instance.tags(id: instance.id, tags: newtags)
+      puts "Updated tags on #{instance.hostname.colorize(:green)}. Use 'civo instance show #{instance.hostname}' to see the current tags.'"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def update
+    desc "update ID/HOSTNAME [--name=new_hostname] [--notes='txt']", "update details of instance. Use --hostname=new_name, --notes='notes' to specify update"
+    option :name
+    option :notes
+    def update(id)
+      CivoCLI::Config.set_api_auth
+      instance = detect_instance_id(id)
 
+      if options[:name]
+        Civo::Instance.update(id: instance.id, hostname: options[:name])
+        puts "Instance #{instance.id} now named #{options[:name].colorize(:green)}"
+      end
+      if options[:notes]
+        Civo::Instance.update(id: instance.id, notes: options[:notes])
+        puts "Instance #{instance.id} notes are now: #{options[:notes].colorize(:green)}"
+      end
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def remove
+    desc "remove ID/HOSTNAME", "removes an instance with ID/hostname entered (use with caution!)"
+    def remove(id)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id", requires: [:id], send_delete_body: true
+      CivoCLI::Config.set_api_auth
+      instance = detect_instance_id(id)
+
+      puts "Removing instance #{instance.hostname.colorize(:red)}"
+      instance.remove
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def reboot
+    desc "reboot ID/HOSTNAME", "reboots instance with ID/hostname entered"
+    def reboot(id)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/reboots", requires: [:id]
-    end
+      CivoCLI::Config.set_api_auth
 
-    desc "", ""
-    def hard_reboot
-      # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/hard_reboots", requires: [:id]
+      instance = detect_instance_id(id)
+      puts "Rebooting #{instance.hostname.colorize(:red)}. Use 'civo instance show #{instance.hostname}' to see the current status."
+      instance.reboot
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
+    map "hard-reboot" => "reboot"
 
-    desc "", ""
-    def soft_reboot
+    desc "soft-reboot ID/HOSTNAME", "soft-reboots instance with ID entered"
+    def soft_reboot(id)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/soft_reboots", requires: [:id]
-    end
+      CivoCLI::Config.set_api_auth
 
-    desc "", ""
-    def console
-      # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/console", requires: [:id]
+      instance = detect_instance_id(id)
+      puts "Soft-rebooting #{instance.hostname.colorize(:red)}. Use 'civo instance show #{instance.hostname}' to see the current status."
+      instance.soft_reboot
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def rebuild
-      # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/rebuild", requires: [:id]
+    desc "console ID/HOSTNAME", "outputs a URL for a web-based console for instance with ID provided"
+    def console(id)
+      # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/console", requires: [:id]
+      CivoCLI::Config.set_api_auth
+      instance = detect_instance_id(id)
+      puts "Access #{instance.hostname.colorize(:green)} at #{instance.console.url}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def stop
+    desc "stop ID/HOSTNAME", "shuts down the instance with ID provided"
+    def stop(id)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/stop", requires: [:id]
+      CivoCLI::Config.set_api_auth
+      instance = detect_instance_id(id)
+      puts "Stopping #{instance.hostname.colorize(:red)}. Use 'civo instance show #{instance.hostname}' to see the current status."
+      Civo::Instance.stop(id: instance.id)
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def start
+    desc "start ID/HOSTNAME", "starts a stopped instance with ID provided"
+    def start(id)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/start", requires: [:id]
+      CivoCLI::Config.set_api_auth
+
+      instance = detect_instance_id(id)
+      puts "Starting #{instance.hostname.colorize(:green)}. Use 'civo instance show #{instance.hostname}' to see the current status."
+      instance.start
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def upgrade
+    desc "upgrade ID new-size", "Upgrade instance with ID to size provided (see civo sizes for size names)"
+    def upgrade(id, new_size)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/resize", requires: [:size, :id]
-    end
+      CivoCLI::Config.set_api_auth
+
+      instance = detect_instance_id(id)
 
-    desc "", ""
-    def restore
-      # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/restore", requires: [:snapshot, :id]
+      Civo::Instance.upgrade(id: instance.id, size: new_size)
+      puts "Resizing #{instance.hostname.colorize(:green)} to #{new_size.colorize(:red)}. Use 'civo instance show #{instance.hostname}' to see the current status."
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def move_ip
+    desc "move-ip targetID IP_Address", "move a public IP_Address to target instance"
+    def move_ip(id, ip_address)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/ip/:ip", requires: [:ip, :id]
-    end
+      CivoCLI::Config.set_api_auth
 
-    desc "", ""
-    def rescue
-      # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/rescue", requires: [:id]
-    end
+      instance = detect_instance_id(id)
 
-    desc "", ""
-    def unrescue
-      # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/unrescue", requires: [:id]
+      Civo::Instance.move_ip(id: instance.id, ip: ip_address)
+      puts "Moved public IP #{ip_address} to instance #{instance.hostname}"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
-    desc "", ""
-    def firewall
+    # desc "", ""
+    # def rescue
+    #   # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/rescue", requires: [:id]
+    # end
+
+    # desc "", ""
+    # def unrescue
+    #   # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/unrescue", requires: [:id]
+    # end
+
+    desc "firewall ID/HOSTNAME firewall_id", "set instance with ID/HOSTNAME to use firewall with firewall_id"
+    def firewall(id, firewall_id)
       # {ENV["CIVO_API_VERSION"] || "1"}/instances/:id/firewall", requires: [:firewall_id, :id]
+      CivoCLI::Config.set_api_auth
+
+      instance = detect_instance_id(id)
+
+      Civo::Instance.firewall(id: instance.id, firewall_id: firewall_id)
+      puts "Set #{instance.hostname.colorize(:green)} to use firewall '#{firewall_id.colorize(:yellow)}'"
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
     end
 
     default_task :list
+
+    private
+
+    def detect_instance_id(id)
+      result = []
+      Civo::Instance.all.items.each do |instance|
+        result << instance
+      end
+      result.select! { |instance| instance.hostname.include?(id) }
+
+      if result.count.zero?
+        puts "No instances found for '#{id}'. Please check your query."
+        exit 1
+      elsif result.count > 1
+        puts "Multiple possible instances found for '#{id}'. Please try with a more specific query."
+        exit 1
+      else
+        result[0]
+      end
+    end
   end
 end

data/lib/sub_command_base.rb

@@ -0,0 +1,9 @@
+class SubCommandBase < Thor
+  def self.banner(command, namespace = nil, subcommand = false)
+    "#{basename} #{subcommand_prefix} #{command.usage}"
+  end
+
+  def self.subcommand_prefix
+    self.name.gsub(%r{.*::}, '').gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| "-#{match[0].downcase}" }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andy Jeffries
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,6 +208,7 @@ files:
 - lib/civo_cli/version.rb
 - lib/config.rb
 - lib/domain.rb
+- lib/domain_record.rb
 - lib/firewall.rb
 - lib/instance.rb
 - lib/network.rb
@@ -216,6 +217,7 @@ files:
 - lib/size.rb
 - lib/snapshot.rb
 - lib/sshkey.rb
+- lib/sub_command_base.rb
 - lib/template.rb
 - lib/volume.rb
 homepage: https://www.civo.com/api