civo 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6136e69d7c660fee04c7f6f56bc3df6220fbe341
-  data.tar.gz: 99a3d93d69866e6c85a49b510e23b308d7fa345a
+  metadata.gz: 88fb842b620664375d47a297a498bffc90d906ba
+  data.tar.gz: 75269b25b36f9bb7c4aafe806ec3f79598853e18
 SHA512:
-  metadata.gz: 1d023bc82c4f5b8485877abb5e032173db43cd7c9640c90febc290a5bd7cb7d9da4c49319d3f50738b1382e70d16d5d21d770d2aafb9ac6a9b50b0984a5d4678
-  data.tar.gz: 401508d5b26d16bda1aa1c0f2cdd67964fbfd2da731506a234a58bb9b9f6aa1a97bdee96e3630d1c2f1a8836e2677b6865497d81ce92d9a62e0e3691ece5bd0e
+  metadata.gz: 3b7927c1ed8cbdf0ec0c605310bd3f240a63b0c89463840ae994461fe9b8b13b1a3f1178a96f9beb7d698a04266ed5f66fcc672221dbedd11b9a12a4c2010740
+  data.tar.gz: 650c51ba8cb87e2e9d20de8e4681898122c8df560df08d1b3756ebd340457ba4ee36bb141644541359827a765fefb4fb04af3926cfb3141b30bf6f0e08274741

data/Rakefile

@@ -15,3 +15,20 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 Bundler::GemHelper.install_tasks
+
+task :console do
+  require 'irb'
+  require 'irb/completion'
+  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"
+  ARGV.clear
+  IRB.start
+end

data/bin/civo

@@ -11,7 +11,7 @@ require 'toml'
 require 'flexirest'
 require_relative "#{ENGINE_ROOT}/lib/civo.rb"
 
-program :version, '0.0.1'
+program :version, Civo::VERSION
 program :description, 'Civo CLI and API client library'
 
 require_relative "#{ENGINE_ROOT}/lib/civo/cli/commands/tokens.rb"

data/lib/civo.rb

@@ -12,7 +12,7 @@ module Civo
     autoload :Base, "#{ENGINE_ROOT}/app/models/civo/base"
     autoload :SshKey, "#{ENGINE_ROOT}/app/models/civo/ssh_key"
     autoload :Quota, "#{ENGINE_ROOT}/app/models/civo/quota"
-    autoload :Size, "#{ENGINE_ROOT}/app/models/civo/size"
+    autoload :Size, "#{ENGINE_ROOT}/app/models/civo/size.rb"
     autoload :Region, "#{ENGINE_ROOT}/app/models/civo/region"
     autoload :Template, "#{ENGINE_ROOT}/app/models/civo/template"
     autoload :Instance, "#{ENGINE_ROOT}/app/models/civo/instance"

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

@@ -9,6 +9,7 @@ command "accounts" do |c|
     end
   end
 end
+alias_command "account", "accounts"
 
 command "accounts:create" do |c|
   c.description = "Create an account (CIVO-INTERNAL-USE ONLY)"
@@ -22,6 +23,7 @@ command "accounts:create" do |c|
     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)"
@@ -35,6 +37,7 @@ command "accounts:reset" do |c|
     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)"
@@ -56,3 +59,6 @@ command "accounts:remove" do |c|
     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

@@ -15,6 +15,7 @@ command "instances" do |c|
     end
   end
 end
+alias_command "instance", "instances"
 
 command "instances:create" do |c|
   c.description = "Create an instance"
@@ -45,23 +46,11 @@ command "instances:create" do |c|
     end
   end
 end
-
-command "instances:reset" do |c|
-  c.description = "Reset the API Key for an account"
-  c.example "Resets the account called 'testuser' with a new API key", 'civo instances:reset testuser'
-  c.action do |args, options|
-    begin
-      account = Civo::Instance.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 "instance:create", "instances:create"
 
 command "instances:remove" do |c|
-  c.description = "Remove an account (and all instances, networks, etc)"
-  c.example "Removes an account called 'testuser'", 'civo instances:remove testuser'
+  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}?)/]
@@ -85,3 +74,6 @@ command "instances:remove" do |c|
     end
   end
 end
+alias_command "instance:remove", "instances:remove"
+alias_command "instances:delete", "instances:remove"
+alias_command "instance:delete", "instances:remove"

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

@@ -13,3 +13,4 @@ command "regions" do |c|
     end
   end
 end
+alias_command "region", "regions"

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

@@ -9,6 +9,7 @@ command "sizes" do |c|
     end
   end
 end
+# alias_command "sizes", "size"
 
 command "sizes:reset" do |c|
   c.description = "Reset available instance sizes"
@@ -21,3 +22,5 @@ command "sizes:reset" do |c|
     end
   end
 end
+
+alias_command "size:reset", "sizes:reset"

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

@@ -9,6 +9,7 @@ command "sshkeys" do |c|
     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"
@@ -23,6 +24,9 @@ command "sshkeys:upload" do |c|
     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"
@@ -44,3 +48,6 @@ command "sshkeys:remove" do |c|
     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

@@ -9,3 +9,4 @@ command "templates" do |c|
     end
   end
 end
+alias_command "template", "templates"

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

@@ -9,6 +9,7 @@ command "tokens" do |c|
     end
   end
 end
+alias_command "token", "tokens"
 
 command "tokens:save" do |c|
   c.description = "Save an API token supplied by Civo.com"
@@ -17,6 +18,7 @@ command "tokens:save" do |c|
     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"
@@ -25,6 +27,9 @@ command "tokens:default" do |c|
     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"
@@ -33,3 +38,4 @@ command "tokens:remove" do |c|
     Civo::Token.remove(args[0])
   end
 end
+alias_command "token:remove", "tokens:remove"

data/lib/civo/version.rb

@@ -1,3 +1,3 @@
 module Civo
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andy Jeffries
@@ -82,7 +82,6 @@ files:
 - lib/civo/cli/commands/sshkeys.rb
 - lib/civo/cli/commands/templates.rb
 - lib/civo/cli/commands/tokens.rb
-- lib/civo/cli/commands/version.rb
 - lib/civo/cli/config.rb
 - lib/civo/cli/token.rb
 - lib/civo/engine.rb

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

@@ -1,6 +0,0 @@
-command "version" do |c|
-  c.description = "Display the version of the CLI client"
-  c.action do |args, options|
-    puts "Civo CLI and Ruby API library v#{Civo::VERSION}"
-  end
-end