civo 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc3b386f26beab6d9fef35b4abfd319a81b719d3
-  data.tar.gz: 5d0c74b1a28e2130a4366bbbc0bf8789cd07b0e2
+  metadata.gz: ed8c49dcdc3351d964ad4efd690048469d25730b
+  data.tar.gz: 24eb760096a174ec86a90b0a94a5e0fb879da391
 SHA512:
-  metadata.gz: a6a67a73e69fda2aafbaf6b39e791fdd260bb65535b242a4791b1a1c5414fbf427e8951b8d16e58b773e59010d18391b1be00a0a697bb268032c867e850c6e89
-  data.tar.gz: 32236f8304ff8bdc87a85657a6d7e73fa44745b6b63c75f9d8f0849a21b9e04cdfa535df7a6d29942695c367b207307569b44aa7f9aef6c0688e13eccd30b2dd
+  metadata.gz: 8f733e989736d52767e1dac30288ee3cdc65cc7cc62dc2209657d02533660e69ce812e18cb31935b246832044aa8e46df66543843e721ee0d72baaa57f81fbda
+  data.tar.gz: f95b3224fb2dd1959396f11cfa7423270ee77850ead33bb8302675a347ab674574014e9c89d8832738dda6e3658b8f14253902524e574edf703832dd8bf992c9

data/lib/civo/version.rb

@@ -1,3 +1,3 @@
 module Civo
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: civo
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flexirest
@@ -55,8 +55,7 @@ dependencies:
 description: A command-line client and API access classes for civo.com
 email:
 - andy@absolutedevops.io
-executables:
-- civo
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -71,20 +70,8 @@ files:
 - app/models/civo/size.rb
 - app/models/civo/ssh_key.rb
 - app/models/civo/template.rb
-- bin/civo
 - config/routes.rb
 - lib/civo.rb
-- lib/civo/cli/client.rb
-- lib/civo/cli/commands/accounts.rb
-- lib/civo/cli/commands/instances.rb
-- lib/civo/cli/commands/quota.rb
-- lib/civo/cli/commands/regions.rb
-- lib/civo/cli/commands/sizes.rb
-- lib/civo/cli/commands/sshkeys.rb
-- lib/civo/cli/commands/templates.rb
-- lib/civo/cli/commands/tokens.rb
-- lib/civo/cli/config.rb
-- lib/civo/cli/token.rb
 - lib/civo/engine.rb
 - lib/civo/version.rb
 - lib/tasks/civo_tasks.rake

data/bin/civo

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/civo/engine', __FILE__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-require 'commander/import'
-require 'toml'
-require 'flexirest'
-require_relative "#{ENGINE_ROOT}/lib/civo.rb"
-require_relative "#{ENGINE_ROOT}/lib/civo/version.rb"
-
-program :version, Civo::VERSION
-program :description, 'Civo CLI and API client library'
-
-require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/accounts.rb"
-require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/sshkeys.rb"
-require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/quota.rb"
-require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/sizes.rb"
-require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/regions.rb"
-require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/templates.rb"
-require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/instances.rb"
-require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/tokens.rb"

data/lib/civo/cli/client.rb

@@ -1,56 +0,0 @@
-module Civo
-  class Client
-    def self.tabulate(hash, titles, options = {})
-      longest_key_length = hash.keys.max_by(&:length).try(:length) || 5
-
-      default = hash.delete("**DEFAULT**")
-      title = "%-#{longest_key_length}s | %s" % [titles[0], titles[1]]
-      puts title
-      puts "%s-|-%s" % [("-" * longest_key_length), ("-" * (69-longest_key_length))]
-      keys = hash.keys
-      keys.sort! if options[:sort] == true
-      keys.each do |key|
-        value = hash[key]
-        print "%-#{longest_key_length}s | %s" % [key, value]
-        if key == default
-          print " (DEFAULT)"
-        end
-        puts
-      end
-    end
-
-    def self.tabulate_flexirest(data, mappings)
-      columns = mappings.dup
-      columns.each do |k, nice|
-        columns[k] = {max_width: (nice.length > 5 ? nice.length : 5), label: nice }
-      end
-
-      data.each do |record|
-        columns.each do |k, v|
-          if block_given?
-            yield record
-          end
-          length = record.send(k).to_s.length
-          if record.send(k).to_s.length > v[:max_width]
-            v[:max_width] = length
-          end
-        end
-      end
-
-      puts columns.keys.map {|k| "%-#{columns[k][:max_width]}s" % columns[k][:label] }.to_a.join(" | ")
-      puts columns.keys.map {|k| "-" * columns[k][:max_width] }.to_a.join("-+-")
-
-      data.each do |record|
-        row = []
-        columns.each do |k, v|
-          value = record.send(k)
-          if value.is_a? Array
-            value = value.join(", ")
-          end
-          row << "%-#{columns[k][:max_width]}s" % value
-        end
-        puts (row.join(" | "))
-      end
-    end
-  end
-end

data/lib/civo/cli/commands/accounts.rb

@@ -1,64 +0,0 @@
-command "accounts" do |c|
-  c.description = "List known accounts (CIVO-INTERNAL-USE ONLY)"
-  c.action do |args, options|
-    begin
-      accounts = Civo::Account.all
-      Civo::Client.tabulate_flexirest accounts, {username: "Account", api_key: "API Key"}
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "account", "accounts"
-
-command "accounts:create" do |c|
-  c.description = "Create an account (CIVO-INTERNAL-USE ONLY)"
-  c.example "Creates an account called 'testuser'", 'civo accounts:create testuser'
-  c.action do |args, options|
-    begin
-      account = Civo::Account.create(name: args.first)
-      puts "Account '#{args.first}' created.  The API key is '#{account.api_key}'"
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "account:create", "accounts:create"
-
-command "accounts:reset" do |c|
-  c.description = "Reset the API Key for an account (CIVO-INTERNAL-USE ONLY)"
-  c.example "Resets the account called 'testuser' with a new API key", 'civo accounts:reset testuser'
-  c.action do |args, options|
-    begin
-      account = Civo::Account.reset(name: args.first)
-      puts "Account '#{args.first}' reset, the new API key is '#{account.api_key}'"
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "account:reset", "accounts:reset"
-
-command "accounts:remove" do |c|
-  c.description = "Remove an account (and all instances, networks, etc) (CIVO-INTERNAL-USE ONLY)"
-  c.example "Removes an account called 'testuser'", 'civo accounts:remove testuser'
-  c.action do |args, options|
-    begin
-      account = Civo::Account.remove(name: args.first)
-      if account.result == "ok"
-        puts "Account '#{args.first}' has been removed."
-      else
-        puts "Failed to delete that account: #{account.inspect}"
-      end
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    rescue Flexirest::HTTPNotFoundClientException => e
-      puts "Couldn't find that account to remove, maybe it's already been removed?"
-    rescue Flexirest::HTTPServerException => e
-      puts "Unable to remove #{e.result.reason}"
-    end
-  end
-end
-alias_command "account:remove", "accounts:remove"
-alias_command "accounts:delete", "accounts:remove"
-alias_command "account:delete", "accounts:remove"

data/lib/civo/cli/commands/instances.rb

@@ -1,140 +0,0 @@
-command "instances" do |c|
-  c.description = "List known instances"
-  c.action do |args, options|
-    begin
-      instances = Civo::Instance.all
-      Civo::Client.tabulate_flexirest instances, {id: "ID", hostname: "Hostname", size: "Size", nice_ip_addresses: "IP Addresses", status: "Status", initial_user: "User", initial_password: "Password"}
-    rescue Flexirest::HTTPServerException => e
-      puts "An error occurred: #{e.result.reason}"
-      exit 3
-    rescue Flexirest::ResponseParseException => e
-      puts "An error occurred: #{e.inspect}"
-      exit 4
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "instance", "instances"
-
-command "instances:create" do |c|
-  c.description = "Create an instance"
-  c.option "--size STRING", String, "The size from 'civo sizes'"
-  c.option "--region STRING", String, "The region from 'civo regions'"
-  c.option "--ssh-key STRING", String, "The SSH key name from 'civo sshkeys'"
-  c.option "--[no-]public-ip", "Should a public IP address be allocated"
-  c.option "--template STRING", String, "The template from 'civo templates'"
-  c.option "--initial-user STRING", String, "The default user to create (defaults to 'civo')"
-  c.example "Creates an instance called 'test1.example.com'", 'civo instances:create test1.example.com --size g1.small --region svg1 --ssh-key default'
-  c.action do |args, options|
-    begin
-      params = {}
-      params[:size] = options.size if options.size
-      params[:region] = options.region if options.region
-      params[:ssh_key] = options.ssh_key if options.ssh_key
-      params[:public_ip] = options.public_ip if options.public_ip
-      params[:template] = options.template if options.template
-      params[:initial_user] = options.initial_user if options.initial_user
-      params[:hostname] = args.first
-      instance = Civo::Instance.create(params)
-      puts "Instance '#{args.first}' created.  The ID is '#{instance.id}' and its status is #{instance.status}"
-    rescue Flexirest::HTTPServerException => e
-      puts "An error occurred: #{e.result.reason}"
-      exit 3
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "instance:create", "instances:create"
-
-command "instances:remove" do |c|
-  c.description = "Remove an instance by hostname or id"
-  c.example "Removes an instance called 'test.example.com'", 'civo instances:remove test.example.com'
-  c.action do |args, options|
-    begin
-      if args.first[/(\w{8}(-\w{4}){3}-\w{12}?)/]
-        id = args.first
-      else
-        instance = Civo::Instance.all.detect {|i| i.hostname == args.first}
-        id = instance.id
-      end
-      instance = Civo::Instance.remove(id: id)
-      if instance.result == "ok"
-        puts "Instance '#{args.first}' has been removed."
-      else
-        puts "Failed to delete that instance: #{instance.inspect}"
-      end
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    rescue Flexirest::HTTPNotFoundClientException => e
-      puts "Couldn't find that account to remove, maybe it's already been removed?"
-    rescue Flexirest::HTTPServerException => e
-      puts "Unable to remove #{e.result.reason}"
-    end
-  end
-end
-alias_command "instance:remove", "instances:remove"
-alias_command "instances:delete", "instances:remove"
-alias_command "instance:delete", "instances:remove"
-
-command "instances:upgrade" do |c|
-  c.description = "Upgrade an instance by hostname or id"
-  c.option "--size STRING", String, "The size from 'civo sizes', must be larger than the current size"
-  c.example "Upgrades an instance called 'test.example.com' to `g1.large` size", 'civo instances:upgrade test.example.com --size g1.large'
-  c.action do |args, options|
-    begin
-      if args.first[/(\w{8}(-\w{4}){3}-\w{12}?)/]
-        id = args.first
-      else
-        instance = Civo::Instance.all.detect {|i| i.hostname == args.first}
-        id = instance.id
-      end
-      instance = Civo::Instance.upgrade(id: id, size: options.size)
-      if instance.result == "ok"
-        puts "Instance '#{args.first}' is being upgraded to #{options.size}."
-      else
-        puts "Failed to upgrade that instance: #{instance.inspect}"
-      end
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    rescue Flexirest::HTTPNotFoundClientException => e
-      puts "Couldn't find that account to remove, maybe it's already been removed?"
-    rescue Flexirest::HTTPServerException => e
-      puts "Unable to remove #{e.result.reason}"
-    end
-  end
-end
-alias_command "instance:upgrade", "instances:upgrade"
-alias_command "instances:resize", "instances:upgrade"
-alias_command "instance:resize", "instances:upgrade"
-
-command "instances:reboot" do |c|
-  c.description = "Reboot an instance by hostname or id"
-  c.example "Reboot an instance called 'test.example.com'", 'civo instances:reboot test.example.com'
-  c.action do |args, options|
-    begin
-      if args.first[/(\w{8}(-\w{4}){3}-\w{12}?)/]
-        id = args.first
-      else
-        instance = Civo::Instance.all.detect {|i| i.hostname == args.first}
-        id = instance.id
-      end
-      instance = Civo::Instance.reboot(id: id)
-      if instance.result == "ok"
-        puts "Instance '#{args.first}' is being rebooted."
-      else
-        puts "Failed to reboot that instance: #{instance.inspect}"
-      end
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    rescue Flexirest::HTTPNotFoundClientException => e
-      puts "Couldn't find that account to remove, maybe it's already been removed?"
-    rescue Flexirest::HTTPServerException => e
-      puts "Unable to remove #{e.result.reason}"
-    end
-  end
-end
-alias_command "instance:reboot", "instances:reboot"
-alias_command "instances:restart", "instances:reboot"
-alias_command "instance:restart", "instances:reboot"

data/lib/civo/cli/commands/quota.rb

@@ -1,82 +0,0 @@
-command "quota" do |c|
-  c.option "--account STRING", String, "The account to get the quota for"
-
-  c.description = "List the quota for the current account"
-  c.action do |args, options|
-    begin
-      if options.account
-        quota = Civo::Quota.current(username: options.account)
-      else
-        quota = Civo::Quota.current
-      end
-      data = {
-        "Number of instances" => "#{quota.instance_count_limit} (used #{quota.instance_count_usage})",
-        "Total CPU cores" => "#{quota.cpu_core_limit} (used #{quota.cpu_core_usage})",
-        "Total RAM" => "#{quota.ram_mb_limit}MB (used #{quota.ram_mb_usage}MB)",
-        "Total disk space" => "#{quota.disk_gb_limit}GB (used #{quota.disk_gb_usage}GB)",
-        "Disk volumes" => "#{quota.disk_volume_count_limit} (used #{quota.disk_volume_count_usage})",
-        "Disk snapshots" => "#{quota.disk_snapshot_count_limit} (used #{quota.disk_snapshot_count_usage})",
-        "Public IP addresses" => "#{quota.public_ip_address_limit} (used #{quota.public_ip_address_usage})",
-        "Private subnets" => "#{quota.subnet_count_limit} (used #{quota.subnet_count_usage})",
-        "Private networks" => "#{quota.network_count_limit} (used #{quota.network_count_usage})",
-        "Security groups" => "#{quota.security_group_limit} (used #{quota.security_group_usage})",
-        "Security group rules" => "#{quota.security_group_rule_limit} (used #{quota.security_group_rule_usage})",
-        "Number of ports (network connections)" => "#{quota.port_count_limit} (used #{quota.port_count_usage})"
-      }
-
-      Civo::Client.tabulate data, ["Title", "Limit"]
-
-      if Civo::Config.admin?
-        puts
-        puts "To set these quota values use:"
-        puts "civo quota:set --instance-count #{quota.instance_count_limit} --cpu-core #{quota.cpu_core_limit} --ram-mb #{quota.ram_mb_limit} --disk-gb #{quota.disk_gb_limit} \\"
-        puts "  --disk-volume-count #{quota.disk_volume_count_limit} --disk-snapshot-count #{quota.disk_snapshot_count_limit} --public-ip-address #{quota.public_ip_address_limit} \\"
-        puts "  --subnet-count #{quota.subnet_count_limit} --network-count #{quota.network_count_limit} --security-group #{quota.security_group_limit} --security-group-rule #{quota.security_group_rule_limit} \\"
-        puts "  --port-count #{quota.port_count_limit} #{"--account #{options.account}" if options.account}"
-      end
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-
-command "quota:set" do |c|
-  c.description = "Update the quotas for the current account (CIVO-INTERNAL-USE ONLY)"
-  c.option "--account STRING", String, "The account to update the quota for"
-  c.option "--instance-count INTEGER", Integer, "The limit to the number of instances available"
-  c.option "--cpu-core INTEGER", Integer, "The limit to the number of CPU cores available"
-  c.option "--ram-mb INTEGER", Integer, "The limit to the amount of RAM (in MB) available"
-  c.option "--disk-gb INTEGER", Integer, "The limit to the of disk space (in GB) available"
-  c.option "--disk-volume-count INTEGER", Integer, "The limit to the number of disk volumes available"
-  c.option "--disk-snapshot-count INTEGER", Integer, "The limit to the number of disk snapshots available"
-  c.option "--public-ip-address INTEGER", Integer, "The limit to the number of public IP addresses available"
-  c.option "--subnet-count INTEGER", Integer, "The limit to the number of subnets available"
-  c.option "--network-count INTEGER", Integer, "The limit to the number of networks available"
-  c.option "--security-group INTEGER", Integer, "The limit to the number of security groups available"
-  c.option "--security-group-rule INTEGER", Integer, "The limit to the number of security group rules available"
-  c.option "--port-count INTEGER", Integer, "The limit to the number of ports (network connections) available"
-
-  c.action do |args, options|
-    begin
-      params = {}
-      params[:name] = options.account if options.account
-      params[:instance_count_limit] = options.instance_count if options.instance_count
-      params[:cpu_core_limit] = options.cpu_core if options.cpu_core
-      params[:ram_mb_limit] = options.ram_mb if options.ram_mb
-      params[:disk_gb_limit] = options.disk_gb if options.disk_gb
-      params[:disk_volume_count_limit] = options.disk_volume_count if options.disk_volume_count
-      params[:disk_snapshot_count_limit] = options.disk_snapshot_count if options.disk_snapshot_count
-      params[:public_ip_address_limit] = options.public_ip_address if options.public_ip_address
-      params[:subnet_count_limit] = options.subnet_count if options.subnet_count
-      params[:network_count_limit] = options.network_count if options.network_count
-      params[:security_group_limit] = options.security_group if options.security_group
-      params[:security_group_rule_limit] = options.security_group_rule if options.security_group_rule
-      params[:port_count_limit] = options.port_count if options.port_count
-      puts params.inspect
-      Civo::Quota.update(params)
-      puts "Quota updated"
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end

data/lib/civo/cli/commands/regions.rb

@@ -1,16 +0,0 @@
-command "regions" do |c|
-  c.description = "List available regions"
-  c.action do |args, options|
-    begin
-      regions = Civo::Region.all
-      puts "Region name"
-      puts "-" * 72
-      regions.each do |region|
-        puts region.name
-      end
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "region", "regions"

data/lib/civo/cli/commands/sizes.rb

@@ -1,26 +0,0 @@
-command "sizes" do |c|
-  c.description = "List available instance sizes"
-  c.action do |args, options|
-    begin
-      sizes = Civo::Size.all
-      Civo::Client.tabulate_flexirest sizes, {name: "Size", description: "Description"}
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-# alias_command "sizes", "size"
-
-command "sizes:reset" do |c|
-  c.description = "Reset available instance sizes"
-  c.action do |args, options|
-    begin
-      Civo::Size.reset
-      puts "Standard sizes reset in Openstack"
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-
-alias_command "size:reset", "sizes:reset"

data/lib/civo/cli/commands/sshkeys.rb

@@ -1,53 +0,0 @@
-command "sshkeys" do |c|
-  c.description = "List the SSH public keys you've uploaded"
-  c.action do |args, options|
-    begin
-      sshkeys = Civo::SshKey.all
-      Civo::Client.tabulate_flexirest sshkeys, {name: "Name", label: "SSH Key Label"}
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "sshkey", "sshkeys"
-
-command "sshkeys:upload" do |c|
-  c.description = "Upload an SSH public key for installing in to new instances"
-  c.example "Uploads an SSH public key, calling it 'default' from file '~/.ssh/id_rsa.pub'", 'civo sshkeys:upload default ~/.ssh/id_rsa.pub'
-  c.action do |args, options|
-    pub_key = File.read(File.expand_path(args[1]))
-    begin
-      Civo::SshKey.create(name: args.first, public_key: pub_key)
-      puts "SSH key '#{args.first}' uploaded."
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "sshkeys:create", "sshkeys:upload"
-alias_command "sshkey:upload", "sshkeys:upload"
-alias_command "sshkey:create", "sshkeys:upload"
-
-command "sshkeys:remove" do |c|
-  c.description = "Remove an SSH public key from the list you've uploaded"
-  c.example "Removes an SSH public key called 'testuser'", 'civo sshkeys:remove testuser'
-  c.action do |args, options|
-    begin
-      key = Civo::SshKey.remove(name: args.first)
-      if key.result == "ok"
-        puts "SSH public key '#{args.first}' has been removed."
-      else
-        puts "Failed to delete that SSH key: #{key.inspect}"
-      end
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    rescue Flexirest::HTTPNotFoundClientException => e
-      puts "Couldn't find that account to remove, maybe it's already been removed?"
-    rescue Flexirest::HTTPServerException => e
-      puts "Unable to remove #{e.result.reason}"
-    end
-  end
-end
-alias_command "sshkey:remove", "sshkeys:remove"
-alias_command "sshkey:delete", "sshkeys:remove"
-alias_command "sshkeys:delete", "sshkeys:remove"

data/lib/civo/cli/commands/templates.rb

@@ -1,78 +0,0 @@
-command "templates" do |c|
-  c.description = "List available instance templates"
-  c.action do |args, options|
-    begin
-      templates = Civo::Template.all
-      Civo::Client.tabulate_flexirest templates, {id: "Template", short_description: "Description"}
-    rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-      puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-    end
-  end
-end
-alias_command "template", "templates"
-
-if Civo::Config.admin?
-  command "templates:create" do |c|
-    c.description = "Create a template (the ID should be all lower-case, hyphens and full stops)"
-    c.option "--name STRING", String, "The name of the template"
-    c.option "--image-id STRING", String, "The Openstack Image ID"
-    c.option "--short-description STRING", String, "A short (one-line) description of this template"
-    c.option "--description STRING", String, "A longer (Markdown format) description of this template"
-    c.option "--cloud-init-file STRING", String, "The filename of a cloud init file"
-    c.example "Creates a template with the ID 'ubuntu-apache' with a cloud init file called 'my-cloud-config'", 'civo template:create ubuntu-apache --image-id 12345-67890-12345 --cloud-init-file=my-cloud-config'
-    c.action do |args, options|
-      params = {
-        id: args[0]
-      }
-      params[:name] = options.name if options.name
-      params[:image_id] = options.image_id if options.image_id
-      params[:short_description] = options.short_description if options.short_description
-      params[:description] = options.description if options.description
-      if options.cloud_init_file
-        cloud_init_file = File.expand_path(options.cloud_init_file)
-        params[:cloud_config] = File.read(cloud_init_file) if File.exist?(cloud_init_file)
-      end
-      begin
-        Civo::Template.create(params)
-        puts "Template '#{args.first}' updated."
-      rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-        puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-      end
-    end
-  end
-  alias_command "template:create", "templates:create"
-  alias_command "template:new", "templates:create"
-  alias_command "templates:new", "templates:create"
-
-  command "templates:update" do |c|
-    c.description = "Update a template"
-    c.option "--name STRING", String, "The name of the template"
-    c.option "--image-id STRING", String, "The Openstack Image ID"
-    c.option "--short-description STRING", String, "A short (one-line) description of this template"
-    c.option "--description STRING", String, "A longer (Markdown format) description of this template"
-    c.option "--cloud-init-file STRING", String, "The filename of a cloud init file"
-    c.example "Updates a template with the ID 'ubuntu-apache' with a cloud init file called 'my-cloud-config'", 'civo template:update ubuntu-apache --cloud-init-file=my-cloud-config'
-    c.action do |args, options|
-      params = {
-        id: args[0]
-      }
-      params[:name] = options.name if options.name
-      params[:image_id] = options.image_id if options.image_id
-      params[:short_description] = options.short_description if options.short_description
-      params[:description] = options.description if options.description
-      if options.cloud_init_file
-        cloud_init_file = File.expand_path(options.cloud_init_file)
-        params[:cloud_config] = File.read(cloud_init_file) if File.exist?(cloud_init_file)
-      end
-      begin
-        Civo::Template.save(params)
-        puts "Template '#{args.first}' updated."
-      rescue Flexirest::HTTPUnauthorisedClientException, Flexirest::HTTPForbiddenClientException
-        puts "Access denied to your default token, ensure it's set correctly with 'civo tokens'"
-      end
-    end
-  end
-  alias_command "template:update", "templates:update"
-  alias_command "template:save", "templates:update"
-  alias_command "templates:save", "templates:update"
-end

data/lib/civo/cli/commands/tokens.rb

@@ -1,41 +0,0 @@
-command "tokens" do |c|
-  c.description = "List the tokens you have saved"
-  c.action do |args, options|
-    tokens = Civo::Token.read_all
-    if tokens.keys.size > 0
-      Civo::Client.tabulate tokens, ["Name", "API Key"]
-    else
-      puts "No tokens found, please set one using tokens:save"
-    end
-  end
-end
-alias_command "token", "tokens"
-
-command "tokens:save" do |c|
-  c.description = "Save an API token supplied by Civo.com"
-  c.example "Saves a token called 'master' with API key 'key_goes_here'", 'civo tokens:save master key_goes_here'
-  c.action do |args, options|
-    Civo::Token.save(args[0], args[1])
-  end
-end
-alias_command "token:save", "tokens:save"
-
-command "tokens:default" do |c|
-  c.description = "Set the default token from the list you have saved"
-  c.example "Sets the default token to 'master'", 'civo tokens:default master'
-  c.action do |args, options|
-    Civo::Token.set_default(args[0])
-  end
-end
-alias_command "tokens:use", "tokens:default"
-alias_command "token:use", "tokens:default"
-alias_command "token:default", "tokens:default"
-
-command "tokens:remove" do |c|
-  c.description = "Remove a token from the list you have saved"
-  c.example "Removes the token 'master'", 'civo tokens:remove master'
-  c.action do |args, options|
-    Civo::Token.remove(args[0])
-  end
-end
-alias_command "token:remove", "tokens:remove"

data/lib/civo/cli/config.rb

@@ -1,53 +0,0 @@
-module Civo
-  class Config
-    FILENAME = "#{ENV["HOME"]}/.civorc"
-
-    def self.header_line
-      "# This file is managed by 'civo'\n"
-    end
-
-    def self.ensure_file_exists!
-      unless File.exists?(FILENAME)
-        update({meta: {version: "1", url: "https://api.civo.com"}}).save
-        FileUtils.chmod(0600, FILENAME)
-      end
-
-      unless File.exists?(FILENAME)
-        puts "#{FILENAME} doesn't exist and couldn't be created"
-        exit 1
-      end
-
-      unless ("%o" % File.stat(FILENAME).mode).to_s[/600$/]
-        puts "The permissions on #{FILENAME} aren't 0600 (#{ ("%o" % File.stat(FILENAME).mode).to_s}), they must be for security reasons"
-        exit 2
-      end
-    end
-
-    def self.parse
-      ensure_file_exists!
-
-      @config = ::TOML.load_file(FILENAME)
-    end
-
-    def self.api_url
-      parse["meta"]["url"]
-    end
-
-    def self.admin?
-      parse["meta"]["admin"] == "true"
-    end
-
-    def self.update(config)
-      @config = config
-      self
-    end
-
-    def self.save
-      File.open(FILENAME, "w") do |f|
-        f << header_line
-        f << TOML::Generator.new(@config).body
-      end
-    end
-
-  end
-end

data/lib/civo/cli/token.rb

@@ -1,53 +0,0 @@
-module Civo
-  class Token
-
-    def self.read_all
-      config = Civo::Config.parse
-      config["tokens"] || {}
-    end
-
-    def self.write_all(tokens)
-      config = Civo::Config.parse
-      config["tokens"] = tokens
-      Civo::Config.update(config).save
-    end
-
-    def self.save(name, key)
-      tokens = read_all
-      tokens[name] = key
-      if tokens["**DEFAULT**"] == nil
-        tokens["**DEFAULT**"] = name
-      end
-      write_all(tokens)
-    end
-
-    def self.set_default(name)
-      puts "Setting default token to be #{name}"
-      tokens = read_all
-      tokens["**DEFAULT**"] = name
-      write_all(tokens)
-    end
-
-    def self.remove(name)
-      tokens = read_all
-      tokens.delete(name)
-      if tokens["**DEFAULT**"] == name
-        tokens["**DEFAULT**"] = tokens.keys.first
-        if tokens["**DEFAULT**"] == "**DEFAULT**"
-          tokens.delete("**DEFAULT**")
-        end
-      end
-      write_all(tokens)
-    end
-
-    def self.default
-      tokens = read_all
-      token = tokens[tokens["**DEFAULT**"]]
-      if token.nil?
-        puts "No default token has been set.  Use 'civo tokens:save --name NAME --token TOKEN' to set one"
-        exit 2
-      end
-      token
-    end
-  end
-end