civo_cli 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024560b523d64e630b4171c5246c0e346a4b43ce0255f88891a2e38a6f6638d9
-  data.tar.gz: 13c84db2adba712473576272c6110703ab980105aa7a9d42c0aedcdc0f41d1b2
+  metadata.gz: 3363116c1b2b7de8c58c5c01924973acf7afc59ac458a64f0544ec5260d063cd
+  data.tar.gz: 07e510a81a639f95ca12b7f73efb3132157a1fefb8ed2e88f566518798c37c61
 SHA512:
-  metadata.gz: 2461ec652f57b9543781216fb8f65998673fa3a69b2ededcd2d655f232681bc320446ca5f975b0206b043472d964df6a7dd51f80d5dc1d356107ffa79add87a3
-  data.tar.gz: 1d0071b595864730781b8e0646b89382d47d95318dc424704587331b34c043e03c2827b17fbf68bba3d14215d4c3688dabf2346a8d7957ca518d53ab28ae2e57
+  metadata.gz: 4b4a417bc9fd45c00965cd53bc06bf683c3b56e6ad8e7489bcc659b0569ea38ae42aa4bdd98bbd9d0f69ffe84dc3d5980772ffe938cc3198d684aaee75d89616
+  data.tar.gz: 5a7c083587dfabca7e0625070c226b491bb16622aa092f6271c94fd7ac31f8e4e37a9395ca042be10da8e26a16f12c85fd3f49ca7edb608e90dba93c82b49e82

data/CHANGELOG.md

@@ -3,6 +3,11 @@ 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.11] - 2019-08-19
+### Changed
+- Updated `civo` gem dependency for correct Kubernetes endpoints.
+- Aliased `k8s`/`kubernetes` command to be `k3s`
+
 ## [0.3.10] - 2019-08-19
 ### Added
 - Alias for `instance public_ip` method as `instance ip`

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.3.10)
+    civo_cli (0.3.11)
       bundler (~> 1.17)
-      civo (>= 1.2.5)
+      civo (>= 1.2.7)
       colorize
       json
       terminal-table
@@ -19,7 +19,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    civo (1.2.5)
+    civo (1.2.7)
       commander
       flexirest (>= 1.4.6)
       toml

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Aboslute Devops Ltd
+Copyright (c) 2019 Civo Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/civo_cli.gemspec

@@ -49,6 +49,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency "bundler", "~> 1.17"
-  spec.add_runtime_dependency 'civo', ">= 1.2.5"
+  spec.add_runtime_dependency 'civo', ">= 1.2.7"
   spec.add_runtime_dependency 'json'
 end

data/lib/civo_cli/version.rb

@@ -1,3 +1,3 @@
 module CivoCLI
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/lib/civo_cli.rb

@@ -38,7 +38,7 @@ module CivoCLI
 
     desc "kubernetes", "manage kubernetess"
     subcommand "kubernetes", CivoCLI::Kubernetes
-    map "k8s" => "kubernetes"
+    map "k8s" => "kubernetes", "k3s" => "kubernetes"
 
     desc "loadbalancer", "manage load balancers"
     subcommand "loadbalancer", CivoCLI::LoadBalancer

data/lib/instance.rb

@@ -8,15 +8,22 @@ module CivoCLI
     DEFAULT_HOSTNAME = CivoCLI::NameGenerator.create
 
     desc "list", "list all instances"
+    option :quiet, type: :boolean, aliases: '-q'
     def list
       CivoCLI::Config.set_api_auth
-      rows = []
-      sizes = Civo::Size.all.items
-      Civo::Instance.all(per_page: 10_000_000).items.each do |instance|
-        size_name = sizes.detect {|s| s.name == instance.size}&.nice_name
-        rows << [instance.id, instance.hostname, size_name, instance.region, instance.public_ip, instance.status]
+      if options[:quiet]
+        Civo::Instance.all(per_page: 10_000_000).items.each do |instance|
+          puts instance.id
+        end
+      else
+        rows = []
+        sizes = Civo::Size.all.items
+        Civo::Instance.all(per_page: 10_000_000).items.each do |instance|
+          size_name = sizes.detect {|s| s.name == instance.size}&.nice_name
+          rows << [instance.id, instance.hostname, size_name, instance.region, instance.public_ip, instance.status]
+        end
+        puts Terminal::Table.new headings: ['ID', 'Hostname', 'Size', 'Region', 'Public IP', 'Status'], rows: rows
       end
-      puts Terminal::Table.new headings: ['ID', 'Hostname', 'Size', 'Region', 'Public IP', 'Status'], rows: rows
     end
     map "ls" => "list", "all" => "list"
 

data/lib/kubernetes.rb

@@ -3,13 +3,20 @@ require 'tempfile'
 module CivoCLI
   class Kubernetes < Thor
     desc "list", "list all kubernetes clusters"
+    option :quiet, type: :boolean, aliases: '-q'
     def list
       CivoCLI::Config.set_api_auth
-      rows = []
-      Civo::Kubernetes.all.items.each do |cluster|
-        rows << [cluster.id, cluster.name, cluster.num_target_nodes, cluster.target_nodes_size, cluster.status]
+      if options[:quiet]
+        Civo::Kubernetes.all.items.each do |cluster|
+        puts cluster.id
+        end
+      else
+        rows = []
+        Civo::Kubernetes.all.items.each do |cluster|
+          rows << [cluster.id, cluster.name, cluster.num_target_nodes, cluster.target_nodes_size, cluster.status]
+        end
+        puts Terminal::Table.new headings: ['ID', 'Name', '# Nodes', 'Size', 'Status'], rows: rows
       end
-      puts Terminal::Table.new headings: ['ID', 'Name', '# Nodes', 'Size', 'Status'], rows: rows
     rescue Flexirest::HTTPForbiddenClientException
       reject_user_access
     end
@@ -75,8 +82,9 @@ module CivoCLI
     desc "create [NAME] [...]", "create a new kubernetes cluster with the specified name and provided options"
     option :size, default: 'g2.medium', banner: 'size'
     option :nodes, default: '3', banner: 'node_count'
-    option :wait, type: :boolean
+    option :wait, type: :boolean, banner: 'wait until cluster is running'
     option :save, type: :boolean
+    option :switch, type: :boolean
     long_desc <<-LONGDESC
       Create a new Kubernetes cluster with name (randomly assigned if blank), instance size (default: g2.medium),
       \x5\x5Optional parameters are as follows:
@@ -84,6 +92,7 @@ module CivoCLI
       \x5 --nodes=<count> - '3' if blank
       \x5 --wait - wait for build to complete and show status. Off by default.
       \x5 --save - save resulting configuration to ~/.kube/config (requires kubectl and the --wait option)
+      \x5 --switch - switch context to newly-created cluster (requires kubectl and the --wait and --save options, as well as existing kubeconfig file)
     LONGDESC
     def create(name = CivoCLI::NameGenerator.create, *args)
       CivoCLI::Config.set_api_auth
@@ -197,10 +206,16 @@ module CivoCLI
       begin
         tempfile.write(cluster.kubeconfig)
         tempfile.size
-        result = `KUBECONFIG=#{tempfile.path}:~/.kube/config kubectl config view --flatten`
+        if options[:switch]
+          result = `KUBECONFIG=#{tempfile.path}:~/.kube/config kubectl config view --flatten`
+        else
+          result = `KUBECONFIG=~/.kube/config:#{tempfile.path} kubectl config view --flatten`
+        end
         Dir.mkdir("#{ENV['HOME']}/.kube/") unless Dir.exist?("#{ENV["HOME"]}/.kube/")
         File.write("#{ENV['HOME']}/.kube/config", result)
-        if config_file_exists
+        if config_file_exists && options[:switch]
+          puts "Merged".colorize(:green) + " config into ~/.kube/config and switched context to #{cluster.name}"
+        elsif config_file_exists && !options[:switch]
           puts "Merged".colorize(:green) + " config into ~/.kube/config"
         else
           puts "Saved".colorize(:green) + " config to ~/.kube/config"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Andy Jeffries
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: CLI for interacting with Civo.com