sct 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ca92e3c8b95fa282f479795b17cd3b0c349afee8f07c50ee53626396e1473fd
-  data.tar.gz: 61313bc641c95704bf4c4591914f3a9a8b33b29b4962ec5c22f4cfc6a84d990b
+  metadata.gz: aa71b183edc2b021f2c3399d5ca7dffe713e3b7b1a26ceada2e49bb224ae50b8
+  data.tar.gz: 32f4f9e7d27f5f9a77fdb34138150c5b336c21504695dfa174448e5fd6152f88
 SHA512:
-  metadata.gz: f6453c0b80246ab00dbcb6ea69c36801259f3666867c0a78ec4bb56827647740a245d1df47d3e4e207a068c969689264cd0668373e036a3420e3c603b45ec3db
-  data.tar.gz: ce6bced4dce7f734ef8b724c1400974ee1a8a51136b0ca6d3e506108ee62ce571dd3375289caef18f8474ebd5b7ed974b4869d118b9f8e13778633ae0ca92ae6
+  metadata.gz: 77cdf1a0d171c64d0e90e54e218a4bb904bfba9d806f4f0b56f8bae7b2f8494c88e74d5496890f188acf3058835ea149154582077af5174977809e75f152bab8
+  data.tar.gz: d3b0dcccad17ecd873a9f2288b66c81d82f0e8786e94365b7aa7790a970a794146a9701e9dc510c50dfbf28d6fb03f4fdc50d748b003584d72d4be06676cad41

data/cluster/lib/cluster/runner.rb

@@ -11,11 +11,16 @@ module Cluster
       end
     end
 
+    def dc_system
+      return executer = system("which docker-compose") ? 'docker-compose' : 'docker compose'
+    end
+
     def run_dc command, options = {}
-      run "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}", options
+      run "#{dc_system} -f ~/development/spend-cloud/docker-compose.yml #{command}", options
     end
 
     def start args, options
+      print "DC_SYSTEM: #{dc_system}"
       if options.pull
         run_dc "pull"
       end

data/henk/lib/henk/commands_generator.rb

@@ -115,7 +115,7 @@ module Henk
             end
 
             command :"import" do |c|
-                c.syntax = 'sct henk import <URL>'
+                c.syntax = 'sct henk import'
                 c.description = 'Import a customer dump from GCP.'
 
                 c.action do |args, options|
@@ -124,13 +124,17 @@ module Henk
                         puts "Loading available customer dumps...".blue
 
                         available_dumps = `sct henk list-dumps`.lines chomp: true
+                        begin
+                            dump_url = choose do |menu|
+                                menu.prompt = "Please choose a dump to import:"
 
-                        dump_url = choose do |menu|
-                            menu.prompt = "Please choose a dump to import:"
-
-                            for dump in available_dumps
-                                menu.choice dump
+                                for dump in available_dumps
+                                    menu.choice dump
+                                end
                             end
+                        rescue Interrupt
+                            print "\nStopping import"
+                            exit
                         end
                     when 1
                         dump_url = args.first

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

@@ -10,12 +10,17 @@ module Sct
       exit 1
     end
 
+    def dc_system
+      return executer = system("which docker-compose") ? 'docker-compose' : 'docker compose'
+    end
+
     def dc command, env = {}
-      system env, "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
+      system env, "#{dc_system} -f ~/development/spend-cloud/docker-compose.yml #{command}"
     end
 
     def dc_dev command, env = {}
-      system env, "docker-compose -f #{@@file} #{command}"
+
+      system env, "#{dc_system} -f #{@@file} #{command}"
     end
 
     def manifest
@@ -27,6 +32,9 @@ module Sct
     end
 
     def execute args, options
+
+      UI.message('Trying to start development environment')
+
       services = manifest["services"].to_a
 
       if Sct::Helper.is_windows?

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored