civo 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f2f3efe7d12a09a1f5bf5560b1ef16d92305be2
-  data.tar.gz: 3220e7033a111fd8d110046277ffb7260cb57bcf
+  metadata.gz: 1082d3b978ce84ff03add64d9a1f20883b83e2f9
+  data.tar.gz: 462382d9c3352af1d28fce02410df740db249f1b
 SHA512:
-  metadata.gz: 110ca63190ade1a4e7ac6f626cd209f6b48c937da11f637a78d3d5ee4d79d2efe64b325a5b82d797faa962d0526928e65c8867a5f94b7b1972c965952eb22f4d
-  data.tar.gz: f109913db65e322b20752eb1ddb1e83dde362d85423b8526354b4651721fc3447d39f233f9fa8b3a234a84a669b32fb868dd4741b006b428288b8101147b14a1
+  metadata.gz: aec42aea434594ced9cb25461ad188e91dce2dad87dbbbce8dbcc6bb547dc5dc01d9ede072358036f3c63cb266a022948096610863507e1a0dd1954f0bdd5b98
+  data.tar.gz: 0cad5e94b3c539d411734043b6558fd6e7c566f5d9197e70533b08eae866b39f51a4441a3944e0bb910e15eda5af6cf8080a9d4e3685f5e80d458a00417bd9c4

data/app/models/civo/template.rb

@@ -1,5 +1,7 @@
 module Civo
   class Template < Base
     get :all, "/v1/templates"
+    put :save, "/v1/templates/:id"
+    post :create, "/v1/templates"
   end
 end

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

@@ -15,7 +15,7 @@ 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(args[1])
+    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."

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

@@ -10,3 +10,65 @@ command "templates" do |c|
   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
+      cloud_init_file = File.expand_path(options.cloud_init_file)
+      params[:cloud_config] = File.read(cloud_init_file) if options.cloud_init_file && File.exist?(cloud_init_file)
+      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]
+      }
+      cloud_init_file = File.expand_path(options.cloud_init_file)
+      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
+      params[:cloud_config] = File.read(cloud_init_file) if options.cloud_init_file && File.exist?(cloud_init_file)
+      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/version.rb

@@ -1,3 +1,3 @@
 module Civo
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Andy Jeffries