sct 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61cca19491733244389c6a46e8c8fd8fd226b3cdab4fb8537b17a4e6d51d196e
-  data.tar.gz: 3057200714457d8b312f34f542454019155e634137d8a0de5ffe4fee93538d90
+  metadata.gz: 795f84864a77f3e67efdbba2318ba62ca9958f665512f8d0b0f52eaffef5d191
+  data.tar.gz: 91ca3561de5f9418aaad5d99faf4f2d38cedf5e0063723ddad774345c96bff1d
 SHA512:
-  metadata.gz: 721bcf403b7292dad0bec08f9d0198ad64acc9ab5ffa0200299499d51b7fb3b15fb859f5812c03347484fe5175263d73af86072f65138bb3cdda39e3ba532621
-  data.tar.gz: 19386f51a743615e480a579ce3fbb7eb17859a0f8bd2e57c21b9ce57562ac6c6436bcee1d6b845004317d160e2b2d288703a07c5829dfd02374b286cbe8a9a4c
+  metadata.gz: feffcc74dba1ebdcce727e9718f70d88d22bacc6643d17a69f2dc05716bd7c440e95988a2387421185f6e0d0ea0294ad83cad166759a570fa70cd649120943fc
+  data.tar.gz: e40cbed1e28216b1e68190eef67e383966015bae5c6ad24ddcac745826279a01175ce42021aa175fe93e755aa154f2e6f51effc0c5a2e3a2c88f7623de2aa118

data/cluster/lib/cluster/commands_generator.rb

@@ -9,7 +9,7 @@ module Cluster
             self.new.run
         end
 
-        def run
+        def run 
             program :name, 'cluster'
             program :version, Sct::VERSION
             program :description, 'CLI for \'cluster\' - Manage your local kubernetes cluster'
@@ -22,8 +22,8 @@ module Cluster
                 c.description = "Start the cluster"
                 c.option '--clean', 'start a clean cluster. Old cluster will be purged if available.'
 
-                c.action do |args, options|
-                    if options.clean
+                c.action do |args, options| 
+                    if options.clean 
                         Cluster::Runner.new.reset
                     else
                         Cluster::Runner.new.launch
@@ -37,17 +37,17 @@ module Cluster
                 c.syntax = 'sct cluster down'
                 c.description = 'stop the cluster'
 
-                c.action do |args, options|
+                c.action do |args, options| 
                     Cluster::Runner.new.down
                 end
             end
 
-            command :reset do |c|
+            command :reset do |c| 
 
                 c.syntax = 'sct cluster reset'
                 c.description = 'reset your cluster and start with a clean cluster'
 
-                c.action do |args, options|
+                c.action do |args, options| 
                     Cluster::Runner.new.reset
                 end
             end
@@ -59,13 +59,13 @@ module Cluster
                 c.syntax = 'sct cluster status'
                 c.description = 'see the status of your cluster'
 
-                c.action do |args, options|
+                c.action do |args, options| 
                     Cluster::Runner.new.status
                 end
             end
 
             command :'update config' do |c|
-
+                
                 c.syntax = 'sct cluster update config'
                 c.description = 'update the cluster configuration'
 
@@ -84,7 +84,7 @@ module Cluster
 
                     Cluster::Runner.new.delete_stalled_pods if options.stalled
                     Cluster::Runner.new.delete_all_pods if options.all
-
+                    
                     Cluster::Runner.new.delete_pods(args) if !args.empty?
 
                 end
@@ -106,4 +106,4 @@ module Cluster
             run!
         end
     end
-end
+end

data/cluster/lib/cluster/runner.rb

@@ -11,11 +11,11 @@ module Cluster
 
         def start_cluster
             if SctCore::Helper.operatingSystem == SctCore::Helper::MAC_OS
-                run_command "#{minikube} start --cpus=$(sysctl -n hw.ncpu) --memory=8G"
+                run_command "#{SctCore::Helper.minikube} start --cpus=$(sysctl -n hw.ncpu) --memory=8G"
             else
-                run_command "#{minikube} start --cpus=$(cat /proc/cpuinfo | grep processor | wc -l) --memory=10G"
+                run_command "#{SctCore::Helper.minikube} start --cpus=$(cat /proc/cpuinfo | grep processor | wc -l) --memory=10G"
             end
-            run_command "#{minikube} ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'"
+            run_command "#{SctCore::Helper.minikube} ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'"
             update_config
         end
 
@@ -26,11 +26,11 @@ module Cluster
         end
 
         def down
-            run_command "#{minikube} stop"
+            run_command "#{SctCore::Helper.minikube} stop"
         end
 
         def reset
-            run_command "#{minikube} delete"
+            run_command "#{SctCore::Helper.minikube} delete"
             start_cluster
             create_secrets
             enable_addons
@@ -49,7 +49,7 @@ module Cluster
         end
 
         def enable_addon(addon)
-            run_command "#{minikube} addons enable #{addon}"
+            run_command "#{SctCore::Helper.minikube} addons enable #{addon}"
 
             deployment = deployments("kube-system").find { |deployment| deployment[:name].include? addon }
 
@@ -228,7 +228,7 @@ module Cluster
         end
 
         def get_minikube_status
-          output = `#{minikube} status`
+          output = `#{SctCore::Helper.minikube} status`
 
           lines = output.split "\n"
 
@@ -262,13 +262,5 @@ module Cluster
                 raise command.red
             end
         end
-
-        def minikube
-            if SctCore::Helper.operatingSystem == SctCore::Helper::WINDOWS
-                return "minikube.exe"
-            else
-                return "minikube"
-            end
-        end
     end
 end

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

data/sct_core/lib/sct_core/helper.rb

@@ -86,5 +86,13 @@ module SctCore
     def self.isSudo
       return !ENV["SUDO_USER"].nil? && !ENV["SUDO_USER"].empty?
     end
+
+    def self.minikube
+      if self.operatingSystem == WINDOWS
+          return "minikube.exe"
+      else
+          return "minikube"
+      end
+    end
   end
 end

data/shell/lib/shell/docker/composer.rb

@@ -6,11 +6,11 @@ module Shell
 
         # Configure the Yarn command
        def self.config
-            self.setImage("eu.gcr.io/dev-pasc-vcdm/helpers-composer:latest", true)
-            self.setPwdAsVolume("/app")
-            self.addVolume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.composer") , "/tmp")
-            self.setCurrentUserAndGroup()
-            self.setEntrypoint("composer")
+            self.set_image("eu.gcr.io/dev-pasc-vcdm/helpers-composer:latest", true)
+            self.set_pwd_as_volume("/app")
+            self.add_volume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.composer") , "/tmp")
+            self.set_current_user_and_group()
+            self.set_entrypoint("composer")
         end
     end
 end

data/shell/lib/shell/docker/docker.rb

@@ -4,7 +4,7 @@ require "shell/ClassLevelInheritableAttributes"
 module Shell
     class Docker
         include ClassLevelInheritableAttributes
-        inheritable_attributes :image, :is_private_registry, :entrypoint, :volumes, :ports, :extra_arguments
+        inheritable_attributes :image, :is_private_registry, :entrypoint, :volumes, :ports, :extra_arguments, :env_variables
 
         @image = nil
         @is_private_registry = false
@@ -14,6 +14,7 @@ module Shell
         @ports = {}
         @user_group = []
         @extra_arguments = {}
+        @env_variables = {}
 
         ###
         # The Docker command configuration. This has to be able to execute the command properly
@@ -27,28 +28,28 @@ module Shell
         ###
         def self.exec(cli_arguments)
 
-            self.addExtraArgument(cli_arguments)
+            self.add_extra_argument(cli_arguments)
 
-            self.config()
+            self.config
 
             # Check if the basic variables are set
             if !@image || @image.empty?
                 raise LoadError, "The required image is not defined for this command"
             end
 
-            if !self.checkForImage() && @is_private_registry
-                if !self.loginToPrivateRegistry()
+            if !self.check_for_image && @is_private_registry
+                unless self.login_to_private_registry
                     raise RuntimeError, "Could not authenticate to GCR (" + $?.exitstatus + ")"
                 end
             end
 
-            self.runCommand()
+            self.run_command
         end
 
         ###
         # The image for this Docker command
         ###
-        def self.setImage(image, is_private_registry=false)
+        def self.set_image(image, is_private_registry=false)
             @image = image
             @is_private_registry = is_private_registry
         end
@@ -56,27 +57,27 @@ module Shell
         ###
         # Set the current PWD as a volume on the specified path in the container
         ###
-        def self.setPwdAsVolume(volume_path)
+        def self.set_pwd_as_volume(volume_path)
             pwd = `pwd -P`
 
             if SctCore::Helper.operatingSystem == SctCore::Helper::WINDOWS
                 pwd=SctCore::Helper.convertWSLToWindowsPath(pwd)
             end
 
-            addVolume(pwd, volume_path)
+            add_volume(pwd, volume_path)
         end
 
         ###
         # Add an extra volume in the container
         ###
-        def self.addVolume(localPath, volume_path)
-            @volumes[localPath] = volume_path
+        def self.add_volume(local_path, volume_path)
+            @volumes[local_path] = volume_path
         end
 
         ###
         # Add a port mapping for the container
         ###
-        def self.mapPort(external_port, container_port = nil)
+        def self.map_port(external_port, container_port = nil)
 
             external_port=String(external_port)
             container_port=String(container_port)
@@ -91,7 +92,7 @@ module Shell
         ###
         # Set the current user and group in the container
         ###
-        def self.setCurrentUserAndGroup
+        def self.set_current_user_and_group
             @user_group = []
             @user_group << `id -u`
             @user_group << `id -g`
@@ -100,14 +101,14 @@ module Shell
         ###
         # Set the entrypoint for the command in the container
         ###
-        def self.setEntrypoint(entrypoint)
+        def self.set_entrypoint(entrypoint)
             @entrypoint=entrypoint
         end
 
         ###
         # Add extra arguments to be configured for the container
         ###
-        def self.addExtraArgument(argument, value=nil)
+        def self.add_extra_argument(argument, value=nil)
             argument = String(argument)
 
             if value
@@ -117,10 +118,17 @@ module Shell
             self.extra_arguments[argument] = value
         end
 
+        ###
+        # Set environment variables for the container
+        ###
+        def self.set_environment_variables(env_variables)
+            @env_variables = env_variables
+        end
+
         ###
         # Check if the image is already present in the system
         ###
-        def self.checkForImage
+        def self.check_for_image
             image_list=`docker images -q #{@image} 2> /dev/null`
 
             return image_list && !image_list.empty?
@@ -129,7 +137,7 @@ module Shell
         ###
         # Login to the private container registry with the cloud credentials
         ###
-        def self.loginToPrivateRegistry
+        def self.login_to_private_registry
             `docker login -u oauth2accesstoken -p "$(gcloud auth application-default print-access-token)" https://eu.gcr.io &> /dev/null`
             return $?.success?
         end
@@ -137,8 +145,8 @@ module Shell
         ###
         # Run the command
         ###
-        def self.runCommand()
-            command = self.compileCommand()
+        def self.run_command
+            command = self.compile_command
 
             SctCore::CommandExecutor.execute(command: command, print_all: true, suppress_output: false)
         end
@@ -146,42 +154,53 @@ module Shell
         ###
         # Compile the command with all options
         ###
-        def self.compileCommand()
+        def self.compile_command
             # Basic docker run command
-            command = self.addToCommandString("" , "docker run --rm -it")
+            command = self.add_to_command_string("" , "docker run --rm -it")
+
+            # Attach environment variables
+            if @env_variables
+                @env_variables.each do |key, value|
+                    if value && !value.empty?
+                        command  = self.add_to_command_string(command, "-e " + key+"="+value)
+                    else
+                        command  = self.add_to_command_string("-e " + key, value)
+                    end
+                end
+            end
 
             # Attach configured volumes
             if @volumes
                 @volumes.each do |local_path, container_path|
-                    command = self.addToCommandString(command, "--volume " + local_path +":"+ container_path)
+                    command = self.add_to_command_string(command, "--volume " + local_path +":"+ container_path)
                 end
             end
 
             # Map configured ports
             if @ports
                 @ports.each do |external_port, container_port|
-                    command = self.addToCommandString(command, "-p " + external_port +":"+ container_port)
+                    command = self.add_to_command_string(command, "-p " + external_port +":"+ container_port)
                 end
             end
 
             if @user_group
-                command  = self.addToCommandString(command, "--user "+ String(@user_group.shift()) +":"+ String(@user_group.shift()))
+                command  = self.add_to_command_string(command, "--user "+ String(@user_group.shift) +":"+ String(@user_group.shift))
             end
 
             # Add image to command
-            command  = self.addToCommandString(command, @image)
+            command  = self.add_to_command_string(command, @image)
 
             if @entrypoint
-                command  = self.addToCommandString(command, String(@entrypoint))
+                command  = self.add_to_command_string(command, String(@entrypoint))
             end
 
             # Append arguments and options to command
             if @extra_arguments
                 @extra_arguments.each do |argument, value|
                     if value && !value.empty?
-                        command  = self.addToCommandString(command, argument+"="+value)
+                        command  = self.add_to_command_string(command, argument+"="+value)
                     else
-                        command  = self.addToCommandString(command, argument)
+                        command  = self.add_to_command_string(command, argument)
                     end
                 end
             end
@@ -192,7 +211,7 @@ module Shell
         ###
         # Append a part to the command string and remove any unwanted characters
         ###
-        def self.addToCommandString(command_string, append)
+        def self.add_to_command_string(command_string, append)
             return command_string + append.gsub(/\r?\n/, "") + " "
         end
     end

data/shell/lib/shell/docker/php.rb

@@ -1,15 +1,52 @@
 require "sct_core"
+
 require_relative "docker"
 
 module Shell
-    class Php < Docker
-
-        # Configure the Yarn command
-       def self.config
-            self.setImage("eu.gcr.io/dev-pasc-vcdm/proactive-base:latest", true)
-            self.setPwdAsVolume("/var/www")
-            self.setCurrentUserAndGroup()
-            self.setEntrypoint("php")
+  class Php < Docker
+
+    attr_accessor :make
+
+    # Configure the Yarn command
+    def self.config
+      self.set_image("eu.gcr.io/dev-pasc-vcdm/proactive-base:latest", true)
+      self.set_pwd_as_volume("/var/www")
+      self.set_current_user_and_group
+      self.set_entrypoint("php")
+      self.set_environment_variables(get_service_ip_and_port)
+    end
+
+    def self.get_service_ip_and_port
+      service_names = %w[mysql-service redis-service]
+      environment_variables = {}
+
+      minikube_status
+
+      service_names.each { |service_name|
+        url = `#{SctCore::Helper.minikube} service #{service_name} --url`
+
+        ip_and_port = url.match /(?<ip>[0-9]+(?:\.[0-9]+){3}):(?<port>[0-9]+)/
+
+        case service_name
+        when "mysql-service"
+          environment_variables.store("DB_HOST", ip_and_port[:ip])
+          environment_variables.store("DB_PORT", ip_and_port[:port])
+        when "redis-service"
+          environment_variables.store("REDIS_HOST", ip_and_port[:ip])
+          environment_variables.store("REDIS_PORT", ip_and_port[:port])
         end
+      }
+
+      return environment_variables
+    end
+
+    def self.minikube_status
+      output = `#{SctCore::Helper.minikube} status`
+
+      if output.scan(/Running/).length != 3 && output.scan(/Configured/).length != 1
+        UI.important("Please check your minikube status. If all services are stopped you should start the minikube first.")
+        exit
+      end
     end
+  end
 end

data/shell/lib/shell/docker/yarn.rb

@@ -6,12 +6,12 @@ module Shell
 
         # Configure the Yarn command
        def self.config
-            self.setImage("eu.gcr.io/dev-pasc-vcdm/helpers-yarn:latest", true)
-            self.setPwdAsVolume("/app")
-            self.addVolume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.cache") , "/.cache")
-            self.mapPort(8081, 8080)
-            self.mapPort(9001)
-            self.setCurrentUserAndGroup()
+            self.set_image("eu.gcr.io/dev-pasc-vcdm/helpers-yarn:latest", true)
+            self.set_pwd_as_volume("/app")
+            self.add_volume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.cache") , "/.cache")
+            self.map_port(8081, 8080)
+            self.map_port(9001)
+            self.set_current_user_and_group()
         end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Reshad Farid
@@ -249,9 +249,9 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - cluster/lib
-- shell/lib
 - sct/lib
 - sct_core/lib
+- shell/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.