sct 0.1.18 → 0.1.23

data/{lib/sct → shell/lib/shell}/docker/docker.rb

@@ -1,9 +1,10 @@
-require "sct/ClassLevelInheritableAttributes"
+require "sct_core"
+require "shell/ClassLevelInheritableAttributes"
 
-module Sct
+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
@@ -13,6 +14,7 @@ module Sct
         @ports = {}
         @user_group = []
         @extra_arguments = {}
+        @env_variables = {}
 
         ###
         # The Docker command configuration. This has to be able to execute the command properly
@@ -26,30 +28,28 @@ module Sct
         ###
         def self.exec(cli_arguments)
 
-            cli_arguments.each do | argument |
-                self.addExtraArgument(argument)
-            end
+            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
@@ -57,27 +57,27 @@ module Sct
         ###
         # 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 Sct::Helpers.operatingSystem == Sct::Helpers::WINDOWS
-                pwd=Sct::Helpers.convertWSLToWindowsPath(pwd)
+            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)
@@ -92,7 +92,7 @@ module Sct
         ###
         # 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`
@@ -101,14 +101,14 @@ module Sct
         ###
         # 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
@@ -118,10 +118,17 @@ module Sct
             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?
@@ -130,7 +137,7 @@ module Sct
         ###
         # 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
@@ -138,53 +145,62 @@ module Sct
         ###
         # Run the command
         ###
-        def self.runCommand()
-            command = self.compileCommand()
-
-            system(command)
+        def self.run_command
+            command = self.compile_command
 
-            return $?.success?
+            SctCore::CommandExecutor.execute(command: command, print_all: true, suppress_output: false)
         end
 
         ###
         # 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
@@ -195,7 +211,7 @@ module Sct
         ###
         # 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

@@ -0,0 +1,52 @@
+require "sct_core"
+
+require_relative "docker"
+
+module Shell
+  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

@@ -0,0 +1,17 @@
+require "sct_core"
+require_relative "docker"
+
+module Shell
+    class Yarn < Docker
+
+        # Configure the Yarn command
+       def self.config
+            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

data/shell/lib/shell/module.rb

@@ -0,0 +1,9 @@
+require 'sct_core/helper'
+
+module Shell
+
+    # import the helper functionality from SCT
+    Helpers = Sct::Helper
+    UI = Sct::UI 
+
+end

data/shell/lib/shell/runner.rb

@@ -0,0 +1,34 @@
+module Shell
+    class Runner
+        # define launch work
+        def launch 
+
+            tool_name = ARGV.first ? ARGV.first.downcase : nil
+
+            if tool_name && Shell::TOOLS.include?(tool_name.to_sym)
+                
+                require_relative "docker/#{tool_name}"
+                command = "#{ARGV[1..(ARGV.length+1)].join(" ")}"
+
+                case ARGV.first
+                when 'php'
+                    Shell::Php.exec(command)
+                when 'composer'
+                    Shell::Composer.exec(command)
+                when 'yarn'
+                    Shell::Yarn.exec(command)
+                else
+                    show_error
+                end
+                
+            else
+                show_error
+            end
+        end
+
+        def show_error 
+            tools = Shell::TOOLS.map { |tool| tool.to_s }.join(", ")
+            UI.error("Tool not found. Try one of these: #{tools}")
+        end
+    end
+end

data/shell/lib/shell/tools.rb

@@ -0,0 +1,7 @@
+module Shell
+    TOOLS = [
+      :yarn,
+      :composer,
+      :php
+    ]
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.23
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: class_interface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,80 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.71.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.71.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,47 +187,57 @@ description: Spend Cloud Tool enables to setup a local development environment f
 email:
 - reshad.farid@visma.com
 executables:
+- console
 - sct
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
-- ".gitignore"
-- ".gitlab/merge_request_templates/DefinitionOfDone.md"
-- ".rspec"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.md
-- Rakefile
 - bin/console
 - bin/sct
 - bin/setup
-- lib/.DS_Store
-- lib/sct.rb
-- lib/sct/.DS_Store
-- lib/sct/ClassLevelInheritableAttributes.rb
-- lib/sct/command.rb
-- lib/sct/command_interface.rb
-- lib/sct/command_option.rb
-- lib/sct/commands/cluster.rb
-- lib/sct/commands/composer.rb
-- lib/sct/commands/hostfile.rb
-- lib/sct/commands/init.rb
-- lib/sct/commands/mysqlproxy.rb
-- lib/sct/commands/php.rb
-- lib/sct/commands/yarn.rb
-- lib/sct/config.rb
-- lib/sct/docker/composer.rb
-- lib/sct/docker/docker.rb
-- lib/sct/docker/php.rb
-- lib/sct/docker/yarn.rb
-- lib/sct/setup/helpers.rb
-- lib/sct/version.rb
-- resources/corefile.yml
-- sct.gemspec
+- cluster/lib/.DS_Store
+- cluster/lib/cluster.rb
+- cluster/lib/cluster/commands_generator.rb
+- cluster/lib/cluster/module.rb
+- cluster/lib/cluster/resources/.DS_Store
+- cluster/lib/cluster/resources/corefile.yml
+- cluster/lib/cluster/runner.rb
+- sct/lib/.DS_Store
+- sct/lib/sct.rb
+- sct/lib/sct/.DS_Store
+- sct/lib/sct/cli_tools_distributor.rb
+- sct/lib/sct/command.rb
+- sct/lib/sct/commands/hostfile.rb
+- sct/lib/sct/commands/init.rb
+- sct/lib/sct/commands/mysqlproxy.rb
+- sct/lib/sct/commands_generator.rb
+- sct/lib/sct/tools.rb
+- sct/lib/sct/version.rb
+- sct_core/lib/.DS_Store
+- sct_core/lib/sct_core.rb
+- sct_core/lib/sct_core/.DS_Store
+- sct_core/lib/sct_core/command_executor.rb
+- sct_core/lib/sct_core/config.rb
+- sct_core/lib/sct_core/core_ext/string.rb
+- sct_core/lib/sct_core/helper.rb
+- sct_core/lib/sct_core/module.rb
+- sct_core/lib/sct_core/sct_pty.rb
+- sct_core/lib/sct_core/ui/implementations/shell.rb
+- sct_core/lib/sct_core/ui/interface.rb
+- sct_core/lib/sct_core/ui/ui.rb
+- sct_core/lib/sct_core/update_checker/update_checker.rb
+- shell/README.md
+- shell/lib/shell.rb
+- shell/lib/shell/ClassLevelInheritableAttributes.rb
+- shell/lib/shell/commands_generator.rb
+- shell/lib/shell/docker/composer.rb
+- shell/lib/shell/docker/docker.rb
+- shell/lib/shell/docker/php.rb
+- shell/lib/shell/docker/yarn.rb
+- shell/lib/shell/module.rb
+- shell/lib/shell/runner.rb
+- shell/lib/shell/tools.rb
 homepage: https://gitlab.com/proactive-software/packages/sct
 licenses:
 - MIT
@@ -178,19 +248,22 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- cluster/lib
+- sct/lib
+- sct_core/lib
+- shell/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.