sct 1.9.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78451b6609af64f83b65821da05857810c1ed5c50443502c0a871a764955b74a
-  data.tar.gz: d23f6b827089ba2f9894d9c1aa7add295af8426d5015b34055ba40da073761c1
+  metadata.gz: 48f681aafa9124537e7313e47d6fd071e7003b307dae51695ac420b98533489c
+  data.tar.gz: 516ad86cf7bb374b091fe58ed62018c8fec88f4ef434f9744435a3a8735e43e5
 SHA512:
-  metadata.gz: 5605aacb5d98155c1e98f52d3eee13f03299aa2412f2d66e5bd55ea38e33e03009dc81b515ed36f008fe4e56b0ff3523b84addbc0911ca3c176aef31644cb39d
-  data.tar.gz: 92110447814e1a0fb7f325dbac52fb56fc569f37dd0ed559bac647bd949ea6ab3e88c2837ffbd2b7de5d2d50e1bea790efa29141c3fb9fef4131e4101a3fc5d3
+  metadata.gz: e8946ad1798ee15da692749b6e06cff745b3da0a8e42fcd9e0816856c4582d0c250de169a44c5de64c43d3ba2997f3181a1dc1a5cb1e45c14bce01f8f3280ddd
+  data.tar.gz: 4e37d590ac2ab58e28e5dae05459ab58d0fcd735c14f3974dc99294d2bf7d82b9ed8cb2d97dfe17a8031b1fd38b871e4a3b19cbf697398f100359d613bdf097f

data/henk/lib/henk/runner.rb

@@ -56,8 +56,8 @@ module Henk
 
             connected_to_network = `docker network inspect spend-cloud | jq '.[0] | .Containers | map(select((.Name | test("^#{required_containers.join('|^')}")))) | length'`
 
-            if connected_to_network.to_s.strip! != "5"
-                puts "Error: ".red + "Not all required services are running or connected to the cluster (#{connected_to_network}/5)"
+            if connected_to_network.to_s.strip! != "3"
+                puts "Error: ".red + "Not all required services are running or connected to the cluster (#{connected_to_network}/3)"
                 exit(1)
             end
 
@@ -88,7 +88,7 @@ module Henk
         def encrypt_config_data domain
             puts "Manually encrypting config data for #{domain}".green
             php_command = "php /var/www/scripts/encryptConfigData.php -c='#{domain}' --execute"
-            command = 'docker exec -it proactive-config-php bash -c "#{php_command}"'
+            command = 'docker exec -it proactive-config bash -c "#{php_command}"'
             self.run command
         end
 
@@ -223,10 +223,10 @@ module Henk
         end
 
         def copy_db_encryption_key customer, dir
-            run "docker exec proactive-config-php mkdir /data/#{customer}"
-            run "docker cp #{dir}/db_encryption.key proactive-config-php:/data/#{customer}/"
+            run "docker exec proactive-config mkdir /data/#{customer}"
+            run "docker cp #{dir}/db_encryption.key proactive-config:/data/#{customer}/"
 
-            puts "Copied db_encryption.key to proactive-config-php:/data/#{customer}/".green
+            puts "Copied db_encryption.key to proactive-config:/data/#{customer}/".green
         end
 
         def run_sql_files dir
@@ -249,7 +249,7 @@ module Henk
         def add_customer_account customer, customer_database
             account_data = "\n[#{customer}]\ndatabase = #{customer_database}\ndomain = NULL\nrewrite = #{customer}\nimport_planning = 1\njobs = 1\nscan_upload = 0\nfiatteren_mailbox = 1\ncontracten_mailbox = 1"
 
-            run "docker exec proactive-config-php sh -c 'echo \"#{account_data}\" >> /data/proactive_accounts.ini'"
+            run "docker exec proactive-config sh -c 'echo \"#{account_data}\" >> /data/proactive_accounts.ini'"
 
             puts "Added account to proactive_accounts.ini".green
         end
@@ -269,7 +269,7 @@ module Henk
 
             puts "Updated config values".green
 
-            run "docker exec proactive-config-php php /var/www/scripts/encryptConfigData.php -c='#{customer}' --execute"
+            run "docker exec proactive-config php /var/www/scripts/encryptConfigData.php -c='#{customer}' --execute"
 
             puts "Encrypted config values".green
         end

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

@@ -69,7 +69,12 @@ module Sct
         container = service_spec["container_name"]
         command = service_spec["command"] || ""
 
-        dc_dev "run --rm --service-ports --name #{container} #{service} #{command}", env
+        begin
+          dc_dev "up --remove-orphans --force-recreate --always-recreate-deps", env
+        rescue Interrupt
+          # user pressed Ctrl+C, do nothing
+        end
+        dc_dev "down --remove-orphans", env
       else
         begin
           dc_dev "up --remove-orphans --force-recreate --always-recreate-deps", env

data/sct/lib/sct/commands/shell.rb

@@ -9,7 +9,7 @@ module Sct
     end
 
     def execute args, options
-      command = args.empty? ? "sh" : args.join(" ")
+      command = args.empty? ? "bash" : args.join(" ")
 
       file = "docker-compose.dev.yml"
 

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.9.0"
+  VERSION = "1.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored