cloud-sh 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d542846c4ade970de1b85af0ea33def7b5c4d373c82e70b33e961f3cfbb6c51
-  data.tar.gz: cb699d91552a1174d7e424d20e5be9767b575be019bb62bc25293fdad3c91414
+  metadata.gz: fb6f375062f21115ff9b54d8acd36b5769531f9e0ee6e84e1e064bf45d7e049b
+  data.tar.gz: 6a93eaebf5227c3bd988ad8b1407689bd10dd0f1b2b1a5f310dd31db284a6e89
 SHA512:
-  metadata.gz: 30425d3f24bfb1481adf1ea89dc120e4e1f19ebea5b1b635ecbb03769831f29f738f572b94995e6459c68d7493076b5cfe4e53ce012eb5c83f8771a7de35fe8a
-  data.tar.gz: a71f8117f7909c240eea82d4f4aafb458aebca95a6b41852d0c18b4138c747e5023a4d6ea6098a4c5f371553699dd511a1ae367ace37dda894064608362f0830
+  metadata.gz: aac2cef05fe9cac7e3b327e772c2b5c9e94144f4e5686383dcb896b2afc48bee784c805f1ad8d0aa940773786415af1c04b0462d6b0644626ea665b6583a8a5d
+  data.tar.gz: cc74cd7a0da0c3c2a415d1a647d6c6e2a4ab18a75a484b5c9b6955ebd90e94feec10838bc144c0578360e43981a128d19f6bc243896a90164c8c378c4dcaf206

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloud-sh (1.0.0)
+    cloud-sh (1.0.2)
       gli
 
 GEM

data/lib/cloud/sh/cli.rb

@@ -10,6 +10,7 @@ module Cloud
 
       desc "Refresh aliases"
       command :refresh do |c|
+        c.switch :force, negatable: false, default_value: false, desc: "Force refresh"
         c.action do |global_options, options, args|
           Cloud::Sh::Commands::Refresh.execute(global_options, options, args)
         end

data/lib/cloud/sh/commands/refresh.rb

@@ -9,7 +9,7 @@ module Cloud
         attr_reader :aliases
 
         def execute
-          Cloud::Sh::Providers::DigitalOcean.refresh_k8s_configs
+          Cloud::Sh::Providers::DigitalOcean.refresh_k8s_configs(force: options[:force])
           build_aliases
           save_aliases
         end

data/lib/cloud/sh/config.rb

@@ -3,7 +3,7 @@
 module Cloud
   module Sh
     class Config
-      attr_reader :accounts
+      attr_reader :accounts, :raw
 
       def initialize
         @accounts = []
@@ -12,8 +12,12 @@ module Cloud
 
       def read_config
         return unless File.exist?(config_file)
-        config = YAML.safe_load(File.read(config_file))
-        config.each do |account_config|
+        @raw = YAML.safe_load(File.read(config_file))
+        load_accounts
+      end
+
+      def load_accounts
+        raw["accounts"].each do |account_config|
           accounts << Account.new(account_config)
         end
       end
@@ -56,11 +60,11 @@ module Cloud
       end
 
       def find_cluster(name)
-        clusters.find { |cluster| cluster.name == name }
+        clusters.find { |cluster| cluster.name == name } || clusters.push(Cluster.new("name" => name)).last
       end
 
       def find_database(name)
-        databases.find { |database| database.name == name }
+        databases.find { |database| database.name == name } || databases.push(Database.new("name" => name)).last
       end
 
       def ignore_database?(name)

data/lib/cloud/sh/providers/digital_ocean.rb

@@ -7,8 +7,8 @@ module Cloud
   module Sh
     module Providers
       class DigitalOcean < Base
-        def self.refresh_k8s_configs
-          return if File.exist?(kube_config) && (Time.now.to_i - File.mtime(kube_config).to_i) < 3600
+        def self.refresh_k8s_configs(force: false)
+          return if !force && File.exist?(kube_config) && (Time.now.to_i - File.mtime(kube_config).to_i) < 3600
           configs = Cloud::Sh.config.accounts.map { |account| new(account).k8s_configs }.flatten.compact
           config = configs.shift
           configs.each do |cfg|
@@ -16,7 +16,7 @@ module Cloud
             config["contexts"] += cfg["contexts"]
             config["users"] += cfg["users"]
           end
-          config["current-context"] = config["contexts"].first["name"]
+          config["current-context"] = Cloud::Sh.config.raw["default_kubectl_context"] || config["contexts"].first["name"]
           File.write(kube_config, YAML.dump(config))
         end
 

data/lib/cloud/sh/version.rb

@@ -2,6 +2,6 @@
 
 module Cloud
   module Sh
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-sh
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Cristian Bica