sct 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f100b62e8d0d2bd70af3f5537b6c2c718c7296bc56e404b8cae56cabd287e481
-  data.tar.gz: 168407ad244468a1bf770043dd083cad1804129bc24185c7e60408a9ef74b3ca
+  metadata.gz: 7da46c8483060b85fda39a7ee5a274be457f7f8a08aeddaa62d508e38f8aff92
+  data.tar.gz: 7185c99600e9fb1e382c4d70915e133e07d2a3bf9bbfa9302705a0e0f57b03d9
 SHA512:
-  metadata.gz: 014d32a3773100dd29a7221551be2f5c999b85a4f212aef5d1970606aceb1127da8143ab1c21a7f934b9540bf165272584f626c091d53d75b759de9ee7ae4d14
-  data.tar.gz: 6113574bffe433da86ad29a0aa48470e84d4a070f9405b7a13da632abea463d5619d45a60d326edc581f84189a67c8478574d9b05cc60f2973277cc03c4b7f55
+  metadata.gz: 4ee29b0cf5bbb7d1aa1f0b588783846709b56529b39663a7c864819de4a0e54e280a55f1f41ef6437ecc947ed99599ad9fc4358d1daa7e54f705a9274e295818
+  data.tar.gz: 75c5939844adba62b837ed12ac8abe949b4f17a412d750eb1f28f12ba1b951ce6efaffbdcb26232e1ba47625e6a7309e74f612ba492f04d6a0bd86abc0374aeb

data/lib/sct/commands/cluster.rb

@@ -25,10 +25,10 @@ module Sct
       case args[0]
         when "up"
           system("#{minikube} start")
-          system("sudo sct hostfile")
           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 👌"
         when "down"
           system("#{minikube} stop")

data/lib/sct/commands/init.rb

@@ -31,11 +31,9 @@ module Sct
           q.default = "~/.config/gcloud/application_default_credentials.json"
       }
 
-      host_path = cli.choose do |menu|
-          menu.prompt = "What is the path of your hostfile?"
-          menu.choice(:unix) { "/etc/hosts" }
-          menu.choices(:windows) { "/mnt/c/Windows/System32/drivers/etc/hosts" }
-          menu.default = :unix
+      host_path = "/etc/hosts"
+      if Sct::Config.operatingSystem == Sct::Config::WINDOWS
+          host_path = "/mnt/c/Windows/System32/drivers/etc/hosts"
       end
 
       contents = ""

data/lib/sct/config.rb

@@ -1,6 +1,10 @@
 module Sct
     class Config
 
+        WINDOWS = "Windows"
+        MAC_OS = "MacOS"
+        UBUNTU = "Ubuntu"
+
         def self.dir
             user = ENV["SUDO_USER"] || ENV["USER"]
 
@@ -40,5 +44,20 @@ 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
     end
 end

data/lib/sct/docker/docker.rb

@@ -60,7 +60,7 @@ module Sct
         def self.setPwdAsVolume(volume_path)
             pwd = `pwd -P`
 
-            if self.operatingSystem() == "Windows"
+            if Sct::Config.operatingSystem == Sct::Config::WINDOWS
                 pwd=self.convertPath(pwd)
             end
 
@@ -199,30 +199,12 @@ module Sct
             return command_string + append.gsub(/\r?\n/, "") + " "
         end
 
-        ###
-        # Check the operating system on which this command is being run
-        ###
-        def self.operatingSystem()
-            proc = `uname -a`
-
-            case proc
-                when /Microsoft/
-                    os = "Windows"
-                when /Darwin/
-                    os = "MacOS"
-                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"
+            if Sct::Config.operatingSystem == Sct::Config::WINDOWS
                 home_path = self.convertPath(`cmd.exe /c echo %userprofile%`, false)
             end
 
@@ -233,7 +215,7 @@ module Sct
         # Convert the unix paths to Windows paths for Windows systems
         ###
         def self.convertPath(path, to_native=true)
-            if self.operatingSystem() == "Windows" && to_native
+            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?/, '')

data/lib/sct/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_interface