sct 1.0.0 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be150a1d5ddc9339df696d2f7db5d6056dfdba0fbb48884e57cfacc700b79ea
-  data.tar.gz: d6fc67a9a3af7c51bf542353f476ec59b60f1c40e7387da64910c4287be857c7
+  metadata.gz: 1fc131f8bc317386225d5f4fc54e8a3949b890ed962478c76e4d0cf61a6c24c7
+  data.tar.gz: 8b5b694782cb53883193fcb79192b016e0a53085e492fa3ddd2222348186df16
 SHA512:
-  metadata.gz: e5046d7b3acb18f4cce8b17b7a8d32586758dfda47ba696b7e0f36192fd5b51d132fe2a770768410728279c08b70ebfeb263a79b82bad5531d889b3fe0b733cc
-  data.tar.gz: 3502a15df6d47b547af6dc7a15cd175a23f45700c6771ccf66055542d2df2d21baadb7c26c03c0736d469ead3108c5b09f968adc318c1d572fa036fea047f454
+  metadata.gz: d05370cc4b9c87de1d7dcdd2895003b8ef3c3d80175e1f5280ce28e66ab2d004387db2f949fbefd867627481171b64392763203105907567220936e49e794561
+  data.tar.gz: a6f5276d96f817ee6ef80b6323f6a184eb72a389a0fd99c2ed6595c9583ebbc67114f575bc19e2deaab8bed0f4293d9d48c2b9e26e977abfb847af80e606d859

data/cluster/lib/cluster/commands_generator.rb

@@ -63,15 +63,6 @@ module Cluster
         end
       end
 
-      command :pull do |c|
-        c.syntax = 'sct cluster pull'
-        c.description = 'pull new image versions'
-
-        c.action do |args, options|
-          Cluster::Runner.new.pull
-        end
-      end
-
       command :status do |c|
         c.syntax = 'sct cluster status'
         c.description = 'see the status of your cluster'

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
@@ -50,11 +52,6 @@ module Cluster
       start args, options
     end
 
-    def pull
-      run_dc "pull"
-      run "docker image prune -f"
-    end
-
     def status
       run_dc "ps"
     end

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

@@ -3,24 +3,34 @@ require 'yaml'
 module Sct
   class DevCommand
 
+    @@file = "docker-compose.dev.yml"
+
     def error message
       UI.error message
       exit 1
     end
 
-    def execute args, options
-      file = "docker-compose.dev.yml"
+    def dc command, env = {}
+      system env, "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
+    end
 
-      if !File.exist? file
-        error "Could not find file '#{file}'."
+    def dc_dev command, env = {}
+      system env, "docker-compose -f #{@@file} #{command}"
+    end
+
+    def manifest
+      if !File.exist? @@file
+        error "Could not find file '#{@@file}'."
       end
 
-      manifest = YAML.load File.read file
+      YAML.load File.read @@file
+    end
 
+    def execute args, options
       services = manifest["services"].to_a
 
       if services.length != 1
-        error "Currently sct only supports a single service declaration in '#{file}'. Contact the infra guild if you consider this a limitation."
+        error "Currently sct only supports a single service declaration in '#{@@file}'. Contact the infra guild if you consider this a limitation."
       end
 
       service, service_spec = services.first
@@ -28,15 +38,31 @@ module Sct
       container = service_spec["container_name"]
       command = service_spec["command"] || ""
 
+      env = {
+        "PUID" => `id -u`.chomp,
+        "PGID" => `id -g`.chomp,
+        "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,
+        "IDE_DEBUG_KEY" => "PHPSTORM",
+        "IDE_DEBUG_SERVER" => "docker",
+      }
+
+      if options.pull
+        return unless dc_dev "pull"
+      end
+
       if options.build
-        return unless system "docker-compose -f #{file} build #{options.pull ? "--pull" : ""}"
+        return unless dc_dev "build #{options.pull ? "--pull" : ""}", env
+      end
+
+      if options.pull or options.build
+        system "docker image prune -f"
       end
 
-      return unless system "docker-compose -f ~/development/spend-cloud/docker-compose.yml rm --stop --force #{service}"
+      return unless dc "rm --stop --force #{service}"
 
-      system "docker-compose -f #{file} run --rm --service-ports --name #{container} #{service} #{command}"
+      dc_dev "run --rm --service-ports --name #{container} #{service} #{command}", env
 
-      system "docker-compose -f ~/development/spend-cloud/docker-compose.yml up --detach #{service}"
+      dc "up --detach #{service}"
     end
 
   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 #{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,13 +35,19 @@ 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|
                 c.syntax = 'sct dev'
                 c.description = 'start development container in the current directory'
-                c.option '--build', '(re)build image from Dockerfile before starting'
-                c.option '--pull', 'pull latest base image from Dockerfile before (re)building. only used in combination with --build flag'
+                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.0"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.6
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-04-22 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
@@ -240,7 +237,6 @@ require_paths:
 - cluster/lib
 - sct/lib
 - sct_core/lib
-- shell/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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