sct 1.0.1 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c949eeff7191cb2699ed0ed1ba26559d7a47ca5111e154204b4e1da42356069
-  data.tar.gz: 7c021037a4e3fc764d011e7d2e76024344a6a2b3e05672de4bc5dc0cad985042
+  metadata.gz: 6ecc8e55b65c59245e7d03238bb1218f47761e018c2ca2c0b14df9731b58dbb1
+  data.tar.gz: cb593b673991d65aa8ca36aad1629f26d18a4e0429b44d11d4a45c48b0f291f0
 SHA512:
-  metadata.gz: 9022840b61e7414056aef611325122d8c4e1c1dce4c370f99d2b67d5ddda35b9e395444ffc6b7d79b01d530d40117cfc08159148b276263d9b8958cce488e8c5
-  data.tar.gz: d5f967cd37ad3447f3566051894195b08ecda28773a95a9bdecc7f61bbb59efc339d6541c826b1f5a0efd6e06bc3519e1d1cce32c096b784ca1ad4518f71e0c3
+  metadata.gz: a85dcbcbb4cbc902cc9cd266b38539d71ec3ac4fdc4e2e1353ab66719eab607efc572c109c7c6efbd23403544dc4fb4aec01700d5858b144fd7fce99c6277e2d
+  data.tar.gz: 76a9ea0399f166725fa1da20fe3b6bf0b1913ec671c46db970d5460b8180eef089cd4eb76f57bb6145766f24c02fd6d2f513f9d60b15da33afa657663455fa12

data/cluster/lib/cluster/runner.rb

@@ -24,6 +24,8 @@ module Cluster
         run_dc "build #{options.pull ? "--pull" : ""}"
       end
 
+      run "docker container prune -f"
+
       run_dc "up --detach"
 
       if options.pull or options.build

data/sct/lib/sct/cli_tools_distributor.rb

@@ -1,6 +1,6 @@
 module Sct
     class CLIToolsDistributor
-        class << self 
+        class << self
             def take_off
                 require 'sct'
 
@@ -8,18 +8,18 @@ module Sct
 
                 if tool_name && Sct::TOOLS.include?(tool_name.to_sym)
                     # Triggering a specific tool
-          
+
                     require tool_name
                     begin
                       # First, remove the tool's name from the arguments
                       # Since it will be parsed by the `commander` at a later point
                       # and it must not contain the binary name
                       ARGV.shift
-          
+
                       # Import the CommandsGenerator class, which is used to parse
                       # the user input
                       require File.join(tool_name, "commands_generator")
-          
+
                       # Call the tool's CommandsGenerator class and let it do its thing
                       commands_generator = Object.const_get(tool_name.sct_module)::CommandsGenerator
                     rescue LoadError
@@ -28,15 +28,15 @@ module Sct
                       # When we launch this feature, this should never be the case
                       abort("#{tool_name} can't be called via `sct #{tool_name}`, run '#{tool_name}' directly instead".red)
                     end
-          
+
                     # Some of the tools might use other actions so need to load all
                     # actions before we start the tool generator here in the future
                     Sct.load_actions
-                    
+
                     # trigger start on tool
                     commands_generator.start
 
-                else 
+                else
                     require "sct/commands_generator"
                     Sct::CommandsGenerator.start
                 end
@@ -47,4 +47,4 @@ module Sct
 
         end
     end
-end
+end

data/sct/lib/sct/commands/dev.rb

@@ -10,12 +10,12 @@ module Sct
       exit 1
     end
 
-    def dc command
-      system "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
+    def dc command, env = {}
+      system env, "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
     end
 
-    def local_dc command
-      system "docker-compose -f #{@@file} #{command}"
+    def dc_dev command, env = {}
+      system env, "docker-compose -f #{@@file} #{command}"
     end
 
     def manifest
@@ -38,12 +38,28 @@ module Sct
       container = service_spec["container_name"]
       command = service_spec["command"] || ""
 
+      if Sct::Helper.is_windows?
+        host_machine_IP = (options.wsl_debugger ? `hostname -I | awk '{print $1}'` : `powershell.exe -c '(Test-Connection -ComputerName $env:computername -count 1).ipv4address.IPAddressToString' | dos2unix`).chomp
+      elsif Sct::Helper.is_mac_os?
+        host_machine_IP = `ipconfig getifaddr $(route get 8.8.8.8 | awk '/interface: / {print $2; }')`.chomp
+      else
+        host_machine_IP = `hostname -I | awk '{print $1}'`.chomp
+      end
+
+      env = {
+        "PUID" => `id -u`.chomp,
+        "PGID" => `id -g`.chomp,
+        "HOST_MACHINE_IP" => host_machine_IP,
+        "IDE_DEBUG_KEY" => "PHPSTORM",
+        "IDE_DEBUG_SERVER" => "docker",
+      }
+
       if options.pull
-        return unless local_dc "pull"
+        return unless dc_dev "pull"
       end
 
       if options.build
-        return unless local_dc "build --build-arg PUID=$(id -u) --build-arg PGID=$(id -g) #{options.pull ? "--pull" : ""}"
+        return unless dc_dev "build #{options.pull ? "--pull" : ""}", env
       end
 
       if options.pull or options.build
@@ -52,7 +68,7 @@ module Sct
 
       return unless dc "rm --stop --force #{service}"
 
-      local_dc "run --rm --service-ports --name #{container} #{service} #{command}"
+      dc_dev "run --rm --service-ports --name #{container} #{service} #{command}", env
 
       dc "up --detach #{service}"
     end

data/{shell/lib/shell/runner.rb → sct/lib/sct/commands/shell.rb}

@@ -1,15 +1,15 @@
 require 'yaml'
 
-module Shell
-  class Runner
+module Sct
+  class ShellCommand
 
     def error message
       UI.error message
       exit 1
     end
 
-    def launch
-      command = ARGV.empty? ? "sh" : ARGV.join(" ")
+    def execute args, options
+      command = args.empty? ? "sh" : args.join(" ")
 
       file = "docker-compose.dev.yml"
 
@@ -41,7 +41,9 @@ module Shell
         end
       end
 
-      system "docker exec -it --user $(id -u):$(id -g) #{container} #{command}"
+      user = options.root ? "root:root" : "$(id -u):$(id -g)"
+
+      system "docker exec -it --user #{user} #{container} #{command}"
     end
 
   end

data/sct/lib/sct/commands_generator.rb

@@ -35,6 +35,11 @@ module Sct
             command :'shell' do |c|
                 c.syntax = 'sct shell'
                 c.description = 'run commands from the shell using docker containers'
+                c.option '--root', 'run as root user in the container'
+
+                c.action do |args, options|
+                    Sct::ShellCommand.new.execute args, options
+                end
             end
 
             command :'dev' do |c|
@@ -42,6 +47,7 @@ module Sct
                 c.description = 'start development container in the current directory'
                 c.option '--build', '(re)build images before starting'
                 c.option '--pull', 'pull latest images before starting'
+                c.option '--wsl-debugger', 'use if running the PHP debugger from WSL'
 
                 c.action do |args, options|
                     Sct::DevCommand.new.execute args, options

data/sct/lib/sct/tools.rb

@@ -1,12 +1,9 @@
 module Sct
     TOOLS = [
       :sct,
-      :shell,
       :cluster
     ]
-  
+
     # a list of all the config files we currently expect
-    TOOL_CONFIG_FILES = [
-      
-    ]
-  end
+    TOOL_CONFIG_FILES = []
+  end

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.0.1"
+  VERSION = "1.0.7"
 end

data/sct_core/lib/sct_core/helper.rb

@@ -66,6 +66,10 @@ module SctCore
       return !ENV["SUDO_USER"].nil? && !ENV["SUDO_USER"].empty?
     end
 
+    def self.is_mac_os?
+      return self.operating_system == MAC_OS
+    end
+
     def self.is_windows?
       return self.operating_system == WINDOWS
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.7
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -208,6 +208,7 @@ files:
 - sct/lib/sct/command.rb
 - sct/lib/sct/commands/dev.rb
 - sct/lib/sct/commands/mysqlproxy.rb
+- sct/lib/sct/commands/shell.rb
 - sct/lib/sct/commands_generator.rb
 - sct/lib/sct/tools.rb
 - sct/lib/sct/version.rb
@@ -223,10 +224,6 @@ files:
 - 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/lib/shell.rb
-- shell/lib/shell/commands_generator.rb
-- shell/lib/shell/module.rb
-- shell/lib/shell/runner.rb
 homepage: https://gitlab.com/proactive-software/packages/sct
 licenses:
 - MIT
@@ -237,7 +234,6 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- shell/lib
 - cluster/lib
 - sct/lib
 - sct_core/lib

data/shell/lib/shell.rb

@@ -1,2 +0,0 @@
-require_relative 'shell/runner'
-require_relative 'shell/module'

data/shell/lib/shell/commands_generator.rb

@@ -1,14 +0,0 @@
-require_relative 'runner'
-
-module Shell
-    class CommandsGenerator
-
-        def self.start
-            self.new.run
-        end
-
-        def run
-            Shell::Runner.new.launch
-        end
-    end
-end

data/shell/lib/shell/module.rb

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