sct 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da46c8483060b85fda39a7ee5a274be457f7f8a08aeddaa62d508e38f8aff92
-  data.tar.gz: 7185c99600e9fb1e382c4d70915e133e07d2a3bf9bbfa9302705a0e0f57b03d9
+  metadata.gz: f8ab8255d7a935a7d17cdd0899db8148030bd63f9e3e924449478ec318a6e098
+  data.tar.gz: 23f6cc5663676295d56c3df144dbc41612691fd1d020d3dbaec05c23b090ec9c
 SHA512:
-  metadata.gz: 4ee29b0cf5bbb7d1aa1f0b588783846709b56529b39663a7c864819de4a0e54e280a55f1f41ef6437ecc947ed99599ad9fc4358d1daa7e54f705a9274e295818
-  data.tar.gz: 75c5939844adba62b837ed12ac8abe949b4f17a412d750eb1f28f12ba1b951ce6efaffbdcb26232e1ba47625e6a7309e74f612ba492f04d6a0bd86abc0374aeb
+  metadata.gz: f750b739e23e6559260ee3f3c04a0a506e190493c61a30ecbff5e00f57c3e54bd0db3efad57a0a97cafb00aa01dcdbe1936b6b6c7b1116cc8a58032fcb1cd036
+  data.tar.gz: b6c30e4e6dac2bd145adbe068cf08daeddc72046a350f02e96e3615ddf4f11af24c9c870a9762f9a696d69e326aab1b5b282e191eed1c120cda3bb773aaf42be

data/lib/sct/commands/cluster.rb

@@ -5,35 +5,43 @@ module Sct
   class ClusterCommand
 
     IS_PUBLIC_COMMAND = true
-    SYNTAX = 'sct cluster up | sct cluster down'
-    SUMMARY = 'Starts or stops the minikube cluster'
-    EXAMPLE = 'sct cluster up | sct cluster down'
-    EXAMPLE_DESCRIPTION = 'Starts or stops the spend cloud cluster'
-    DESCRIPTION = "Sct cluster allows you to start and stop the Spend Cloud minikube cluster"
+    SYNTAX = 'sct cluster up | sct cluster down | sct cluster update-config'
+    SUMMARY = 'Starts/stops or updates the config of the minikube cluster'
+    EXAMPLE = 'sct cluster up | sct cluster down | sct cluster update-config'
+    EXAMPLE_DESCRIPTION = 'Starts/stops or updates the config of the minikube cluster'
+    DESCRIPTION = "Sct cluster allows you to start, stop or update the config of the Spend Cloud minikube cluster"
 
     OPTIONS = []
 
     def execute(args, options)
       return puts "SCT has not been initialized. Run 'sct init' first.".red unless Sct::Config.exists
 
-      if `uname -a`.match?("Microsoft")
-        minikube = "minikube.exe"
-      else
-        minikube = "minikube"
-      end
-
       case args[0]
         when "up"
-          system("#{minikube} start")
-          system("#{minikube} ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'")
-          system("kubectl config use-context minikube")
-          system("kubectl delete pod -n kube-system $(kubectl get pods -n kube-system | grep registry-creds | awk '{print $1}')")
-          system("sudo sct hostfile")
-          puts "\n✔️  You can now visit your environment at 👉 https://spend-cloud.spend.cloud.local 👌"
+            system("minikube start")
+            system("minikube ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'")
+            system("sct cluster update-config")
+            system("kubectl config use-context minikube")
+            system("kubectl delete pod -n kube-system $(kubectl get pods -n kube-system | grep registry-creds | awk '{print $1}')")
+            system("sudo sct hostfile")
+            puts "\n✔️  You can now visit your environment at 👉 https://spend-cloud.spend.cloud.local 👌"
         when "down"
-          system("#{minikube} stop")
+            system("minikube stop")
+        when "update-config"
+            return puts "Skipping minikube config ( only needed for windows )".yellow unless Sct::Config.operatingSystem == Sct::Config::WINDOWS
+
+            windows_home_path = Sct::Config.getTrueHomePath
+            kube_file_path = windows_home_path+"/.kube/config"
+
+            if !File.exists?(kube_file_path)
+                return puts "#{kube_file_path} doesn't exist".red
+            end
+
+            system("sed -e 's~\\\\~/~g' -e 's~C:~/mnt/c~g' < #{kube_file_path} > ~/.kube/minikube-config")
+
+            return puts "Windows minikube config copied to ~/.kube/minikube-config".green
         else
-          puts "Unknown or missing argument. Please run 'sct cluster up' or 'sct cluster down'"
+            puts "Unknown or missing argument. Please run 'sct cluster up','sct cluster down' or 'sct cluster update-config'".red
       end
     end
 

data/lib/sct/config.rb

@@ -8,7 +8,7 @@ module Sct
         def self.dir
             user = ENV["SUDO_USER"] || ENV["USER"]
 
-            if `uname -a`.match?("Darwin")
+            if self.operatingSystem == MAC_OS
                 home = "/Users"
             else
                 home = "/home"
@@ -59,5 +59,33 @@ module Sct
 
             return os
         end
+
+        ###
+        # Get the actual home path of the user. This may be different depending on the operating system
+        ###
+        def self.getTrueHomePath
+            home_path = `echo ~`
+            if self.operatingSystem == WINDOWS
+                home_path = self.convertWindowsToWSLPath(`cmd.exe /c echo %userprofile%`)
+            end
+
+            return home_path
+        end
+
+        def self.convertWindowsToWSLPath(path)
+            if self.operatingSystem == WINDOWS
+                return path.gsub(/C:\\/, '/mnt/c/').gsub(/\\\\/, "/").gsub(/\\/, '/').gsub(/\r\n?/, '')
+            end
+
+            return path
+        end
+
+        def self.convertWSLToWindowsPath(path)
+            if self.operatingSystem == WINDOWS
+                return path.gsub(/\/mnt\/c/, 'C:/').gsub(/\/\//, '/').gsub(/\\\\/, "/").gsub(/\r\n?/, '')
+            end
+
+            return path
+        end
     end
 end

data/lib/sct/docker/composer.rb

@@ -7,7 +7,7 @@ module Sct
        def self.config
             self.setImage("eu.gcr.io/dev-pasc-vcdm/helpers-composer:latest", true)
             self.setPwdAsVolume("/app")
-            self.addVolume(self.convertPath(self.getTrueHomePath()+"/.composer") , "/tmp")
+            self.addVolume(Sct::Config.convertWSLToWindowsPath(Sct::Config.getTrueHomePath()+"/.composer") , "/tmp")
             self.setCurrentUserAndGroup()
             self.setEntrypoint("composer")
         end

data/lib/sct/docker/docker.rb

@@ -61,7 +61,7 @@ module Sct
             pwd = `pwd -P`
 
             if Sct::Config.operatingSystem == Sct::Config::WINDOWS
-                pwd=self.convertPath(pwd)
+                pwd=Sct::Config.convertWSLToWindowsPath(pwd)
             end
 
             addVolume(pwd, volume_path)
@@ -198,28 +198,5 @@ module Sct
         def self.addToCommandString(command_string, append)
             return command_string + append.gsub(/\r?\n/, "") + " "
         end
-
-        ###
-        # Get the actual home path of the user. This may be different depending on the operating system
-        ###
-        def self.getTrueHomePath
-            home_path = `echo ~`
-            if Sct::Config.operatingSystem == Sct::Config::WINDOWS
-                home_path = self.convertPath(`cmd.exe /c echo %userprofile%`, false)
-            end
-
-            return home_path
-        end
-
-        ###
-        # Convert the unix paths to Windows paths for Windows systems
-        ###
-        def self.convertPath(path, to_native=true)
-            if Sct::Config.operatingSystem == Sct::Config::WINDOWS && to_native
-                return path.gsub(/\/mnt\/c/, 'C:/').gsub(/\/\//, '/').gsub(/\\\\/, "/").gsub(/\r\n?/, '')
-            else
-                return path.gsub(/C:\\/, '/mnt/c').gsub(/\\\\/, "/").gsub(/\\/, '/').gsub(/\r\n?/, '')
-            end
-        end
     end
 end

data/lib/sct/docker/yarn.rb

@@ -7,7 +7,7 @@ module Sct
        def self.config
             self.setImage("eu.gcr.io/dev-pasc-vcdm/helpers-yarn:latest", true)
             self.setPwdAsVolume("/app")
-            self.addVolume(self.convertPath(self.getTrueHomePath()+"/.cache") , "/.cache")
+            self.addVolume(Sct::Config.convertWSLToWindowsPath(Sct::Config.getTrueHomePath()+"/.cache") , "/.cache")
             self.mapPort(8081, 8080)
             self.mapPort(9001)
             self.setCurrentUserAndGroup()

data/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_interface
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.