civo_cli 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6909eec1f760a177c067048403292519abf562d66c858e9f762409b9c2d07b0c
-  data.tar.gz: c31c41ff17747c06cf2caa2c8f7e9f387c85c9e9de357e5de26a1205e6a70a6f
+  metadata.gz: afd6eb59ccb5d4705c1ad9297b54a82b532156d4dce0fea48d22090e3023a247
+  data.tar.gz: 56963fcf395128dac55f6d4902de0f5f6a30adc7b998a18515632a410c3f5ff4
 SHA512:
-  metadata.gz: 77097a29dd62b4443ef7be1820d17cd1363f9f997e9f5db5f64e6dd513073501275b8d23526669a1b6bd69af5ac6d29e29b100fdc49926f596d75512272861a9
-  data.tar.gz: fb8e24d223890321899d030b473a51e7192321e866f43ddfd6935b2bfd0b8ee814d1e49e4634cc543301b03bbf0334db817246898d8c61981467b75223639ad7
+  metadata.gz: d1df2645cf61927040d5ee7f5b9025622255a328f208fdb2a736df1c92f9b8513c03cb67a0ac78f5ba00fc66e398cc6234ff83259850c1a6ffbd2023660688ef
+  data.tar.gz: 95596ea445dde062af24522d0d06c044b2fcd4fff526a75ff2af4df4baf828f276d211705e7da5f06203ea3049966e1372d616a8ff41c87b7846321d7d3d7967

data/CHANGELOG.md

@@ -3,12 +3,17 @@ 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.5.9] - 2020-04-08
+### Fixed
+- Issues with Windows merging KUBECONFIG should be resolved (thanks to Johannes Tegnér for the PR)
+- Allowed overriding of the KUBECONFIG file when merging (thanks to Jetchko Jekov for the suggestion)
+
 ## [0.5.8] - 2020-02-14
-### Changed
+### Fixed
 - Fix error with k3s versioning having plus signs
 
 ## [0.5.7] - 2019-12-04
-### Changed
+### Fixed
 - Set a minimum version of activesupport to fix https://github.com/civo/cli/issues/51 (thanks to Dr Nic Williams for the bug report)
 
 ## [0.5.6] - 2019-11-13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    civo_cli (0.5.8)
+    civo_cli (0.5.9)
       activesupport (>= 6.0.0)
       bundler (>= 1.17)
       civo (>= 1.2.9)
@@ -13,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -27,16 +27,16 @@ GEM
       toml
     coderay (1.1.2)
     colorize (0.8.1)
-    commander (4.4.7)
+    commander (4.5.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    faraday (0.17.1)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
-    flexirest (1.8.6)
+    flexirest (1.9.12)
       activesupport
       crack
       faraday
@@ -59,19 +59,19 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     hashdiff (1.0.0)
     highline (2.0.3)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    json (2.2.0)
+    json (2.3.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    minitest (5.13.0)
+    minitest (5.14.0)
     multi_json (1.14.1)
     multipart-post (2.1.1)
     nenv (0.3.0)
@@ -83,7 +83,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.1.1)
-    rake (10.5.0)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -110,14 +110,14 @@ GEM
     thread_safe (0.3.6)
     toml (0.2.0)
       parslet (~> 1.8.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     webmock (3.7.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -126,7 +126,7 @@ DEPENDENCIES
   civo_cli!
   guard
   guard-rspec
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   terminal-notifier-guard
   webmock

data/civo_cli.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"

data/lib/civo_cli/version.rb

@@ -1,3 +1,3 @@
 module CivoCLI
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/lib/kubernetes.rb

@@ -330,33 +330,33 @@ module CivoCLI
     end
 
     def save_config(cluster)
-      config_file_exists = File.exist?("#{ENV["HOME"]}/.kube/config")
+      config_file_exists = File.exist?(ENV['KUBECONFIG'] || "#{Dir.home}/.kube/config")
       tempfile = Tempfile.new('import_kubeconfig')
       begin
         tempfile.write(cluster.kubeconfig)
         tempfile.size
         if windows?
-          home = `echo %HOMEPATH%`.chomp
           if options[:switch]
-            ENV['KUBECONFIG'] = "#{tempfile.path};#{home}\\.kube\\config"
+            ENV['KUBECONFIG'] = "#{tempfile.path};" + (ENV['KUBECONFIG'] ? ENV['KUBECONFIG'] : "#{Dir.home}\\.kube\\config")
           else
-            ENV['KUBECONFIG'] = "#{home}\\.kube\\config;#{tempfile.path}"
+            ENV['KUBECONFIG'] = (ENV['KUBECONFIG'] ? ENV['KUBECONFIG'] : "#{Dir.home}\\.kube\\config") + ";#{tempfile.path}"
           end
           result = `kubectl config view --flatten`
         else
           if options[:switch]
-            result = `KUBECONFIG=#{tempfile.path}:~/.kube/config kubectl config view --flatten`
+            result = `KUBECONFIG=#{tempfile.path}:#{ENV['KUBECONFIG'] || "~/.kube/config"} kubectl config view --flatten`
           else
-            result = `KUBECONFIG=~/.kube/config:#{tempfile.path} kubectl config view --flatten`
+            puts "KUBECONFIG=#{ENV['KUBECONFIG'] || "~/.kube/config"}:#{tempfile.path} kubectl config view --flatten"
+            result = `KUBECONFIG=#{ENV['KUBECONFIG'] || "~/.kube/config"}:#{tempfile.path} kubectl config view --flatten`
           end
         end
         write_file(result)
         if config_file_exists && options[:switch]
-          puts "Merged".colorize(:green) + " config into ~/.kube/config and switched context to #{cluster.name}"
+          puts "Merged".colorize(:green) + " config into #{ENV['KUBECONFIG'] || "~/.kube/config"} and switched context to #{cluster.name}"
         elsif config_file_exists && !options[:switch]
-          puts "Merged".colorize(:green) + " config into ~/.kube/config"
+          puts "Merged".colorize(:green) + " config into #{ENV['KUBECONFIG'] || "~/.kube/config"}"
         else
-          puts "Saved".colorize(:green) + " config to ~/.kube/config"
+          puts "Saved".colorize(:green) + " config to #{ENV['KUBECONFIG'] || "~/.kube/config"}"
         end
       ensure
         tempfile.close
@@ -365,8 +365,12 @@ module CivoCLI
     end
 
     def write_file(result)
-      Dir.mkdir("#{ENV['HOME']}/.kube/") unless Dir.exist?("#{ENV["HOME"]}/.kube/")
-      File.write("#{ENV['HOME']}/.kube/config", result)
+      if ENV['KUBECONFIG']
+        File.write(ENV["KUBECONFIG"], result)
+      else
+        Dir.mkdir("#{Dir.home}/.kube/") unless Dir.exist?("#{Dir.home}/.kube/")
+        File.write("#{Dir.home}/.kube/config", result)
+      end
     end
 
     def reject_user_access

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Andy Jeffries
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: CLI for interacting with Civo.com