civo_cli 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29a15dd8532ed3da03c1c8700fed2ffec55b88deca863a7aec78e8bea1ac0fca
-  data.tar.gz: c7f315c2f92adf4731f2b92b6508b39535519f0644281b95934d793fb6ab1928
+  metadata.gz: a990a4394121647d574094b564c731d6c0b3d0c578449a7b3a3242d09073d11a
+  data.tar.gz: 2e9ab309f83c89f56939ced1394f46f4e412cdc8053526dc6b5084ca57a9328b
 SHA512:
-  metadata.gz: 749d4fd19ee9d0689db4dd76177a1aaf19bcc1897444144a1dd287919b567b58bb6a241979f5a3e9a95215019f4d80da919cad80bc8d125922738832672f0e6e
-  data.tar.gz: 9755bea0ac088f4f0d9d6376e0a12c60550357c2533858c153d37070475fd5f73cbe515911328c44fea3263d750d87852a0a8fca8942c775e0b9cf09895a683b
+  metadata.gz: 02f29d1426fbeee3e56c7ebb536008694a9dd5eaec3af6047283656fa051d093a7d94909d3053ca8530ee0dceb8b3e6745e88f853996cf4a31f2322223c85eab
+  data.tar.gz: f5dae08ebcdf7f1e0e0c0206034cda730339932cc1c2ab22facc6a775c6a15ab96dca5ad58c15cb07d53ca00032341f6ebc6accc999602b1e89cd2d2a3a1fcb3

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.3.4] - 2019-07-10
+### Fixed
+- Template ID in `instance create` default wasn't working nicely, now defaults to Ubuntu if not provided and no snapshot specified
+### Added
+- Verbose mode switch `-v` / `--verbose` to `template list`
+- `public_ip` method to `instance` to output public IP of the chosen instance
+
 ## [0.3.3] - 2019-07-08
 ### Fixed
 - Instances list was only showing first twenty servers, now shows all

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.3.3)
+    civo_cli (0.3.4)
+      bundler (~> 1.17)
       civo (>= 1.2.1)
       colorize
       json
@@ -18,7 +19,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    civo (1.2.3)
+    civo (1.2.1)
       commander
       flexirest (>= 1.4.6)
       toml
@@ -115,7 +116,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
   civo_cli!
   guard
   guard-rspec

data/README.md

@@ -27,6 +27,8 @@ Civo CLI is a tool to manage your [Civo.com](https://www.civo.com) account from
 ## Set-up
 Civo CLI is built with Ruby and distributed as a Gem. If you have Ruby (2.0.0 or later) installed, you can simply run `gem install civo_cli` in your terminal to get the gem and its dependencies.
 
+You may need to use `sudo` if you get an error about `You don't have write permissions` when installing the gem. The syntax is `sudo gem install civo_cli`.
+
 If you need to install Ruby, follow the installation instructions appropriate for your operating system, and return to this guide after you have successfully installed the gem.
 
  - [Microsoft Windows](https://rubyinstaller.org/)

data/civo_cli.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "guard"
@@ -49,6 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'terminal-table'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'colorize'
+  spec.add_runtime_dependency "bundler", "~> 1.17"
   spec.add_runtime_dependency 'civo', ">= 1.2.1"
   spec.add_runtime_dependency 'json'
 end

data/lib/civo_cli/version.rb

@@ -1,3 +1,3 @@
 module CivoCLI
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/instance.rb

@@ -83,9 +83,9 @@ module CivoCLI
     option :region, default: 'lon1', banner: 'civo_region'
     option :public_ip, default: 'true', banner: 'true | false | from [instance_id]'
     option :initial_user, default: 'civo', banner: 'username', aliases: '--user'
-    option :template, lazy_default: '811a8dfb-8202-49ad-b1ef-1e6320b20497', banner: 'template_id'
+    option :template, banner: 'template_id'
     option :snapshot, banner: 'snapshot_id'
-    option :ssh_key, banner: 'ssh_key_id'
+    option :ssh_key, banner: 'ssh_key_id', aliases: '--ssh'
     option :tags, banner: "'tag1 tag2 tag3...'"
     option :wait, type: :boolean
     long_desc <<-LONGDESC
@@ -97,22 +97,27 @@ module CivoCLI
       \x5 --snapshot=<snapshot_id> - Snapshot ID of a previously-made snapshot. Leave blank if using a template.
       \x5 --public_ip=<true | false | from=instance_id> - 'true' if blank. 'from' requires an existing instance ID configured with a public IP address to move to this new instance.
       \x5 --initial_user=<yourusername> - 'civo' if blank
-      \x5 --ssh_key=<ssh_key_id> - for specifying a SSH login key for the default user. Random password assigned if blank, visible by calling `civo instance show hostname`
+      \x5 --ssh_key=<ssh_key_id> - for specifying a SSH login key for the default user from saved SSH keys. Random password assigned if blank, visible by calling `civo instance show hostname`
       \x5 --region=<regioncode> from available Civo regions. Randomly assigned if blank
       \x5 --tags=<'tag1 tag2 tag3...'> - space-separated tag(s)
       \x5 --wait - wait for build to complete and show status. Off by default.
     LONGDESC
     def create(hostname = CivoCLI::NameGenerator.create, *args)
       CivoCLI::Config.set_api_auth
-      if options[:template] && options[:snapshot] || !options[:template] && !options[:snapshot]
+      if options[:template] && options[:snapshot]
         puts "Please provide either template OR snapshot ID".colorize(:red)
         exit 1
       end
 
+      if !options[:template] && !options[:snapshot]
+        options[:template] = '811a8dfb-8202-49ad-b1ef-1e6320b20497'
+      end
+
+
       if options[:template]
-        @instance = Civo::Instance.create(hostname: hostname, size: options[:size], template: options[:template], initial_user: options[:initial_user], region: options[:region], ssh_key_id: options[:ssh_key], tags: options[:tags])
+        @instance = Civo::Instance.create(hostname: hostname, size: options[:size], template: options[:template], public_ip: options[:public_ip], initial_user: options[:initial_user], region: options[:region], ssh_key_id: options[:ssh_key], tags: options[:tags])
       elsif options[:snapshot]
-        @instance = Civo::Instance.create(hostname: hostname, size: options[:size], snapshot_id: options[:snapshot], initial_user: options[:initial_user], region: options[:region], ssh_key_id: options[:ssh_key], tags: options[:tags])
+        @instance = Civo::Instance.create(hostname: hostname, size: options[:size], snapshot_id: options[:snapshot], public_ip: options[:public_ip], initial_user: options[:initial_user], region: options[:region], ssh_key_id: options[:ssh_key], tags: options[:tags])
       end
 
       if options[:wait]
@@ -281,6 +286,23 @@ module CivoCLI
       exit 1
     end
 
+    desc "public_ip ID/HOSTNAME", "Show public IP of ID/hostname"
+    def public_ip(id)
+      CivoCLI::Config.set_api_auth
+  
+      instance = detect_instance(id)
+      unless instance.public_ip.nil?
+        puts instance.public_ip
+      else 
+        puts "Error: Instance has no public IP"
+        exit 2
+      end
+
+    rescue Flexirest::HTTPException => e
+      puts e.result.reason.colorize(:red)
+      exit 1
+    end
+
     default_task :list
 
     private

data/lib/template.rb

@@ -1,17 +1,32 @@
 module CivoCLI
   class Template < Thor
     desc "list", "list all templates"
+    option :verbose, type: :boolean, desc: "Show verbose template detail", aliases: ["-v"] 
     def list
       CivoCLI::Config.set_api_auth
       rows = []
-      Civo::Template.all.items.each do |template|
-        rows << [template.id, template.name, template.image_id, template.volume_id, template.default_username]
+
+      if options[:verbose]
+        Civo::Template.all.items.each do |template|
+          rows << [template.id, template.name, template.image_id, template.volume_id, template.default_username]
+        end
+        puts Terminal::Table.new headings: ['ID', 'Name', 'Image ID', 'Volume ID', "Default Username"], rows: rows
+      
+      else
+        Civo::Template.all.items.each do |template|
+          rows << [template.id, template.name]
+        end
+        puts Terminal::Table.new headings: ['ID', 'Name'], rows: rows
+   
       end
-      puts Terminal::Table.new headings: ['ID', 'Name', 'Image ID', 'Volume ID', "Default Username"], rows: rows
-    rescue Flexirest::HTTPException => e
+
+    
+      rescue Flexirest::HTTPException => e
       puts e.result.reason.colorize(:red)
       exit 1
     end
+    map "ls" => "list"
+
 
     desc "show ID", "show the details for a single template"
     def show(id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Andy Jeffries
@@ -10,22 +10,8 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +138,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: civo
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CLI for interacting with Civo.com