sct 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06a1549735471b58e3b71a78c178d20f2b0286ab56aa033ec38939e72e753136
-  data.tar.gz: 03b53faf4b186f00b8ed7e90472987bf996f1bc0c7dfdfdaa99d2d312fdb1bcb
+  metadata.gz: a4e19d771e32524e38a9d685d161bdf57a17a71569536ce5af8fd51462b52960
+  data.tar.gz: 610520f2b59b575ccc858c80af79cd1b40b470c403c849e34415559461e9b4ee
 SHA512:
-  metadata.gz: e3774e0a9a48e460aaa4beaec523337f91b3f2e8c14d25175cb7af2cb74e3779da9daae1546af322afa3871ad3d77445cb63186b30a0dcc444c2b3747e91919c
-  data.tar.gz: 85b8be2a234f769f590ba26ff80ddff7736603427b54a75abfee25a05e28a524ed3f955a3c64f7446a91d7a9a0ec3acce9dce2cb50d590f8e1de4c4c3bed94d1
+  metadata.gz: cd68fb3fd3e6c5ba9c4a91232cb83427697631385367eefff7a5477fd99e10f8c524f9d7ea4327c56d7ab31a93fca09e4ee610aad3b099ce14d26f7ab4777e76
+  data.tar.gz: 2ab0d6e33f702ec64050126b05ee818e607ceae6b806a5ee91938295cf7e8e69824e3e3dacf41688e4f538041e67aaacfecd7c7708d168be3ce5311ef527e75b

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,37 @@
+module Sct
+    class DatabasePullCommand
+        def error message
+            UI.error message
+            exit 1
+        end
+        
+        def execute args, options
+            branch = ENV['CI_BRANCH']
+            if not branch or branch == ""
+                branch = 'master'
+            end
+
+            # 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=master -F variables[DB_PULL_FRAME]=true -F variables[REMOTE_BRANCH_NAME]=#{branch} #{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=master -F variables[DB_PULL_CONFIG]=true -F variables[REMOTE_BRANCH_NAME]=#{branch} #{pipeline_endpoint}`
+            end
+        end
+    end
+end

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

@@ -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.4"
+  VERSION = "1.0.9"
 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.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-06-22 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
@@ -238,7 +250,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - cluster/lib
-- shell/lib
 - sct/lib
 - sct_core/lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -252,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.1.2
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.

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