sct 1.0.2 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea8384d7d7c3ab04eb3d184f66953b6f4cc4ce7e669da1ce82533d8964fa2f3a
-  data.tar.gz: 45e6800f8369e921f19452c191f27c9ced727676923952590fc9af8ad9bad558
+  metadata.gz: 77a9f9b0da2f262d9c336ee3f6f912bb0e097f0caf9d91adbe1b3dd9ad33059d
+  data.tar.gz: 58cbc6da8d20cb35fdc6f1d12d326472ff0a40466010f7b9e4130c7f201a52ec
 SHA512:
-  metadata.gz: e87a61ac439d0e0737963d42bba9f81e0cb43b529fa78a6d1e638e56356760d050daa3fbb84dad74f8ba550277d2cd59a18434996d9cf04018ec21ba57776594
-  data.tar.gz: 8d0bd664311e72d1b980fb0485c90d3da29ce302f2d2045df76595ca0d9747811d4732fe70974c68d39aa3a9675338434cfcbbf3079335ed54e1b1a136d3830b
+  metadata.gz: d8379c969766240db807fb92dea072eea56d7e3e0f0148ee2e9c4318e32eb60903cc5bd9a20353ac5bb031582795e7f20661cfe7a7829151dd6d1d5a12264d57
+  data.tar.gz: 30eded070cff1db7d533c2d3f36e850204ff78c7be2696d504e0d4e1eb86f8564da26278f04621b021f3cfb2f29805f4ece5d9c6a3b156a7f6c145118acfb74e

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/databasepull.rb

@@ -0,0 +1,34 @@
+module Sct
+    class DatabasePullCommand
+        def error message
+            UI.error message
+            exit 1
+        end
+        
+        def execute args, options
+            branch = ENV['CI_BRANCH'] || 'master'
+
+            # We need to set this locally, so that we don't save this at the repository 
+            pipeline_endpoint = ENV['CI_MERGE_REQUEST_PIPELINE']
+            if not pipeline_endpoint
+                error "Pipeline endpoint not set"
+            end
+
+            # We need to set this locally, so that we don't save this at the repository
+            private_token = ENV['CI_PRIVATE_TOKEN']
+            if not private_token
+                error "Private token not set"
+            end
+
+            if options.proactive_frame
+                UI.important("Requesting to pull database for proactive frame")
+                process_request = `curl -X POST -F token=#{private_token} -F ref=#{branch} -F variables[DB_PULL_FRAME]=true #{pipeline_endpoint}`
+            end
+            
+            if options.proactive_config
+                UI.important("Requesting to pull database for proactive config")
+                process_request = `curl -X POST -F token=#{private_token} -F ref=#{branch} -F variables[DB_PULL_CONFIG]=true #{pipeline_endpoint}`
+            end
+        end
+    end
+end

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

@@ -11,11 +11,11 @@ module Sct
     end
 
     def dc command, env = {}
-      system env, "docker-compose #{command}"
+      system env, "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
     end
 
     def dc_dev command, env = {}
-      dc "-f #{@@file} #{command}", env
+      system env, "docker-compose -f #{@@file} #{command}"
     end
 
     def manifest
@@ -38,7 +38,21 @@ module Sct
       container = service_spec["container_name"]
       command = service_spec["command"] || ""
 
-      env = { "PUID" => `id -u`.chomp, "PGID" => `id -g`.chomp }
+      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 dc_dev "pull"

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,12 +47,25 @@ 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
                 end
             end
 
+            command :'database-pull' do |c|
+                c.syntax = 'sct database pull'
+                c.description = 'pull database changes for proactive frame and proactive config'
+                c.option '--proactive-frame', 'pull the database changes from proactive-frame'
+                c.option '--proactive-config', 'pull the database changes from proactive-config'
+
+                c.action do |args, options|
+                    UI.important("Trying to pull database")
+                    Sct::DatabasePullCommand.new.execute args, options
+                end
+            end
+
             run!
         end
     end

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.2"
+  VERSION = "1.0.8"
 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.2
+  version: 1.0.8
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -100,6 +100,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: gitlab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.17.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.17.0
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -206,8 +220,10 @@ files:
 - sct/lib/sct/.DS_Store
 - sct/lib/sct/cli_tools_distributor.rb
 - sct/lib/sct/command.rb
+- sct/lib/sct/commands/databasepull.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 +239,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 +249,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