sct 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f69f48e36f97431cf118494409bb2f326d94c4373144cb55a49c1414b367e18
-  data.tar.gz: 9ccba2ad04721031f78ae8ce5d13c4a40ad0d0d7e3decf7780c5e52a678ce096
+  metadata.gz: fa4a9c05109327130b6c1b08f44e0658be4db63e1c8402118ee9b7c7a14463cf
+  data.tar.gz: 88e20c8c3e6ff0fac970955b03ae2d95010544cd158c733507cba312b5507499
 SHA512:
-  metadata.gz: 64d70d3ec8a1cb25d2996f086503433f059bd3825a67ce370c3b072cb5b59e4e109cfc726e1258a6b68d34569e59f713775f654bb4cf3ee48798fe014d981519
-  data.tar.gz: c4816aa4ac66903b48d843a277a1a9b17e4fd92698e1d0321f60d077fdaa36e16c164398169c53533a10e0e1448e8dc191a1b6d894d0c08327d8bdd628c2d53a
+  metadata.gz: b153495574021b51ee936580da13b4a177a22e0e8c5ad8e74be877e21cbb65be0570bfa24945941599807f1658786ffbe7d8d68002cb7759e8ce07f6cb3628b7
+  data.tar.gz: 3b2dba1bd88a72519a8043fae447568b9d8927e6c5e26ce40ba45c35275927ea18949371e88011f195af2dae2986df83d0110c2aa39a43dcadc45e6395bbbbef

data/lib/sct/commands/cluster.rb

@@ -16,7 +16,7 @@ module Sct
         def execute(args, options)
             return puts "SCT has not been initialized. Run 'sct init' first.".red unless Sct::Config.exists
 
-            if Sct::Config::WINDOWS
+            if Sct::Helpers.operatingSystem == Sct::Helpers::WINDOWS
                 minikube = "minikube.exe"
             else
                 minikube = "minikube"
@@ -26,7 +26,7 @@ module Sct
                 when "up"
                     system("#{minikube} start")
                     system("#{minikube} ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'")
-                    system("sct cluster update-config")
+                    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")
@@ -34,21 +34,25 @@ module Sct
                 when "down"
                     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"
+                    update_config
+                else
+                    puts "Unknown or missing argument. Please run 'sct cluster up','sct cluster down' or 'sct cluster update-config'".red
+            end
+        end
 
-                    if !File.exists?(kube_file_path)
-                        return puts "#{kube_file_path} doesn't exist".red
-                    end
+        def update_config
+            return puts "Skipping minikube config (only needed for Windows)".yellow unless Sct::Helpers.operatingSystem == Sct::Helpers::WINDOWS
 
-                    system("sed -e 's~\\\\~/~g' -e 's~C:~/mnt/c~g' < #{kube_file_path} > ~/.kube/minikube-config")
+            windows_home_path = Sct::Helpers.windowsHomePath
+            kube_file_path = windows_home_path+"/.kube/config"
 
-                    return puts "Windows minikube config copied to ~/.kube/minikube-config".green
-                else
-                    puts "Unknown or missing argument. Please run 'sct cluster up','sct cluster down' or 'sct cluster update-config'".red
+            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
         end
 
         implements CommandInterface

data/lib/sct/commands/hostfile.rb

@@ -1,3 +1,4 @@
+require 'hosts'
 require 'sct/command_interface'
 
 module Sct
@@ -16,34 +17,36 @@ module Sct
     end
 
     def execute(args, options)
-
       return puts "SCT has not been initialized. Run 'sct init' first.".red unless Sct::Config.exists
 
-      require 'hosts'
+      return puts "This command needs to be run with sudo.".red unless Sct::Helpers.isSudo
 
-      return unless ingressUrl
+      return unless Sct::Helpers.ingressAddress
 
-      url = ingressUrl
-      host_path = Sct::Config.get("host-path")
+      ingressAddress = Sct::Helpers.ingressAddress
 
-      if !options.path.nil?
-        hosts = Hosts::File.read(options.path)
-      elsif host_path
-        hosts = Hosts::File.read(host_path)
+      if options.path
+        hosts_paths = [options.path]
       else
-        puts "No hostpath found in config file. Using default /etc/hosts".yellow
-        hosts = Hosts::File.read('/etc/hosts')
-      end
+        hosts_paths = ["/etc/hosts"]
 
-      if ([url].any? { |ip| hosts.to_s =~ /#{ip}/ })
-        puts "Already exist and skipped.".green
-      else
-        validate_if_exist(hosts)
-        add_entry(url, hosts)
-        hosts.write
-        puts "patched: #{url}".green
+        if Sct::Helpers.operatingSystem == Sct::Helpers::WINDOWS
+          hosts_paths << "/mnt/c/Windows/System32/drivers/etc/hosts"
+        end
       end
 
+      hosts_paths.each do |hosts_path|
+        hosts = Hosts::File.read(hosts_path)
+
+        if ([ingressAddress].any? { |ip| hosts.to_s =~ /#{ip}/ })
+          puts "Skipped patching #{hosts_path} (already up to date)".green
+        else
+          validate_if_exist(hosts)
+          add_entry(ingressAddress, hosts)
+          hosts.write
+          puts "Patched #{hosts_path} with #{ingressAddress}".green
+        end
+      end
     end
 
     def add_entry(url, hosts)
@@ -100,10 +103,6 @@ module Sct
 
     end
 
-    def ingressUrl
-      return Sct::Helpers.ingressUrl
-    end
-
     implements CommandInterface
 
   end

data/lib/sct/commands/init.rb

@@ -31,15 +31,9 @@ module Sct
           q.default = "~/.config/gcloud/application_default_credentials.json"
       }
 
-      host_path = "/etc/hosts"
-      if Sct::Config.operatingSystem == Sct::Config::WINDOWS
-          host_path = "/mnt/c/Windows/System32/drivers/etc/hosts"
-      end
-
       contents = ""
       contents << "email=#{email}\n"
       contents << "cloud-proxy-path=#{File.expand_path(cloud_proxy_path)}\n"
-      contents << "host-path=#{File.expand_path(host_path)}\n"
 
       if !File.directory?(Sct::Config.dir)
           FileUtils.mkdir_p(Sct::Config.dir)

data/lib/sct/config.rb

@@ -1,20 +1,8 @@
 module Sct
     class Config
 
-        WINDOWS = "Windows"
-        MAC_OS = "MacOS"
-        UBUNTU = "Ubuntu"
-
         def self.dir
-            user = ENV["SUDO_USER"] || ENV["USER"]
-
-            if self.operatingSystem == MAC_OS
-                home = "/Users"
-            else
-                home = "/home"
-            end
-
-            return "#{home}/#{user}/.config/sct"
+            return "#{Sct::Helpers.homePath}/.config/sct"
         end
 
         def self.path
@@ -44,48 +32,5 @@ module Sct
 
             return Sct::Helpers.to_hash(contents)
         end
-
-        def self.operatingSystem
-            proc = `uname -a`
-
-            case proc
-                when /Microsoft/
-                    os = WINDOWS
-                when /Darwin/
-                    os = MAC_OS
-                else
-                    os = UBUNTU
-            end
-
-            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(Sct::Config.convertWSLToWindowsPath(Sct::Config.getTrueHomePath()+"/.composer") , "/tmp")
+            self.addVolume(Sct::Helpers.convertWSLToWindowsPath("#{Sct::Helpers.windowsHomePath || Sct::Helpers.homePath}/.composer") , "/tmp")
             self.setCurrentUserAndGroup()
             self.setEntrypoint("composer")
         end

data/lib/sct/docker/docker.rb

@@ -60,8 +60,8 @@ module Sct
         def self.setPwdAsVolume(volume_path)
             pwd = `pwd -P`
 
-            if Sct::Config.operatingSystem == Sct::Config::WINDOWS
-                pwd=Sct::Config.convertWSLToWindowsPath(pwd)
+            if Sct::Helpers.operatingSystem == Sct::Helpers::WINDOWS
+                pwd=Sct::Helpers.convertWSLToWindowsPath(pwd)
             end
 
             addVolume(pwd, volume_path)
@@ -131,7 +131,7 @@ module Sct
         # Login to the private container registry with the cloud credentials
         ###
         def self.loginToPrivateRegistry
-            `docker login -u oauth2accesstoken -p "$(gcloud auth application-default print-access-token)" https://eu.gcr.io &>2`
+            `docker login -u oauth2accesstoken -p "$(gcloud auth application-default print-access-token)" https://eu.gcr.io &> /dev/null`
             return $?.success?
         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(Sct::Config.convertWSLToWindowsPath(Sct::Config.getTrueHomePath()+"/.cache") , "/.cache")
+            self.addVolume(Sct::Helpers.convertWSLToWindowsPath("#{Sct::Helpers.windowsHomePath || Sct::Helpers.homePath}/.cache") , "/.cache")
             self.mapPort(8081, 8080)
             self.mapPort(9001)
             self.setCurrentUserAndGroup()

data/lib/sct/setup/helpers.rb

@@ -1,16 +1,29 @@
 module Sct
   class Helpers
 
-    def self.ingressUrl 
-      ip = `kubectl get ingress`
-    
-      if ip.nil? || ip.empty? 
-        puts "Can't fetch ip from kubectl".yellow
+    WINDOWS = "Windows"
+    MAC_OS = "MacOS"
+    UBUNTU = "Ubuntu"
+
+    def self.ingressAddress
+      if self.operatingSystem == WINDOWS
+        kubeconfig_file = "minikube-config"
+      else
+        kubeconfig_file = "config"
+      end
+
+      kubeconfig_path= "#{self.homePath}/.kube/#{kubeconfig_file}"
+
+      ip = `KUBECONFIG="#{kubeconfig_path}" kubectl get ingress`
+
+      if ip.nil? || ip.empty?
+        puts "Can't fetch IP from kubectl".yellow
         return nil
       end
-    
-      match = ip.scan(/((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3})/);
-      return match[0].first
+
+      match = ip.scan(/((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3})/)
+
+      return match.first.first
     end
 
     def self.to_hash(str)
@@ -18,5 +31,60 @@ module Sct
         str.split("\n").map{|i|i.split('=')}
       ]
     end
+
+    def self.operatingSystem
+      proc = `uname -a`
+
+      case proc
+        when /Microsoft/
+          os = WINDOWS
+        when /Darwin/
+          os = MAC_OS
+        else
+          os = UBUNTU
+      end
+
+      return os
+    end
+
+    def self.homePath
+      user = ENV["SUDO_USER"] || ENV["USER"]
+
+      if self.operatingSystem == MAC_OS
+          home = "/Users"
+      else
+          home = "/home"
+      end
+
+      return "#{home}/#{user}"
+    end
+
+    def self.windowsHomePath
+      if self.operatingSystem == WINDOWS
+        return self.convertWindowsToWSLPath(`cmd.exe /c echo %userprofile%`)
+      end
+
+      return nil
+    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
+
+    def self.isSudo
+      return !ENV["SUDO_USER"].nil? && !ENV["SUDO_USER"].empty?
+    end
   end
-end
+end

data/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_interface