sct 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d8446d9ad177cfe1423a229687670d9731830389539014fda62491d09ca054
-  data.tar.gz: fa3083af252bb67c0b776d270a69b29605e6ce33e06cfe8b6625998ab0cff29a
+  metadata.gz: 8fad01fe00c948d248dae7390285021760ae28ad592411a3cbc18ffdef650cd8
+  data.tar.gz: 1ba8d43b23ade6f4316767b8759c91bf98f2dac1327cb9903a2c8fa66b2f7a5e
 SHA512:
-  metadata.gz: d62a9c18d78ce4a821d32cb0848c4bbc2dc88e1ca526f7600c1bb8b7945a36522f157e94a365036cc68e7549ae76f90368d2c54a1335b43d2cc2233c4c354d54
-  data.tar.gz: 98381741d7493183b420c176843062d005b8f6620d0a67ce0739d53da77ae2bf11c73c60817b2a0965dfd41a338a249446ec482ee27ba465f8b92708cb768db8
+  metadata.gz: 88c67f14fb87bc1ca891527e46b78b7552fb5021832347fdff73e4af0a8066e6b25cd17344b295ba2588af7265682a79248b245d6d2f0b1fe93fa5e9d5b4050c
+  data.tar.gz: 392db33f0c88bdc2f36025b24a85614865bcf54d99f22970b8da874bf8abf1f956ec194ab5dc3d2659ee708fc5d34940d59689d6f2e0e9bf433139c3262dd5d0

data/sct/lib/sct/commands/databasepull.rb

@@ -0,0 +1,50 @@
+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.all
+                UI.important("Requesting to pull database changes for proactive frame and proactive config")
+                process_request = `curl -X POST -F token=#{private_token} -F ref=master -F variables[DB_PULL_FRAME]=true -F variables[DB_PULL_CONFIG]=true -F variables[REMOTE_BRANCH_NAME]=#{branch} #{pipeline_endpoint}`
+            else
+                db_pull_frame = ""
+                if options.proactive_frame
+                    UI.important("Requesting to pull database for proactive frame")
+                    db_pull_frame = "-F variables[DB_PULL_FRAME]=true"
+                end
+
+                db_pull_config = ""
+                if options.proactive_config
+                    UI.important("Requesting to pull database for proactive config")
+                    db_pull_config = "-F variables[DB_PULL_CONFIG]=true"
+                end
+
+                if db_pull_frame != "" or db_pull_config != ""
+                    process_request = `curl -X POST -F token=#{private_token} -F ref=master #{db_pull_frame} #{db_pull_config} -F variables[REMOTE_BRANCH_NAME]=#{branch} #{pipeline_endpoint}`
+                else
+                    error "Missing options. Use --help to see the available options"
+                end
+            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/sct/lib/sct/commands_generator.rb

@@ -47,12 +47,26 @@ 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 '--all', 'pull the database changes for all repositories'
+                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/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 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.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-06-30 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,6 +220,7 @@ 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
@@ -248,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.