sct 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa71b183edc2b021f2c3399d5ca7dffe713e3b7b1a26ceada2e49bb224ae50b8
-  data.tar.gz: 32f4f9e7d27f5f9a77fdb34138150c5b336c21504695dfa174448e5fd6152f88
+  metadata.gz: 12ac7ca75a6616f5e4bb671a8bcd02e10ce44b896336f5ff730f17a49e625489
+  data.tar.gz: 4549975fd4d799e06fb65de205baee7479bf104e298b21f6a6e53a4fdfadc46c
 SHA512:
-  metadata.gz: 77cdf1a0d171c64d0e90e54e218a4bb904bfba9d806f4f0b56f8bae7b2f8494c88e74d5496890f188acf3058835ea149154582077af5174977809e75f152bab8
-  data.tar.gz: d3b0dcccad17ecd873a9f2288b66c81d82f0e8786e94365b7aa7790a970a794146a9701e9dc510c50dfbf28d6fb03f4fdc50d748b003584d72d4be06676cad41
+  metadata.gz: 2e355b398d7d49d5e12ce7212254db901cee4fe0b5452518f9b8c4d02d3acb51b33ca5bd5c12aaae4bec22d9417eb4e312973fb7ba1a00f55573b4a6ac71bd59
+  data.tar.gz: c0d05d3519ee4af245ecb7586537a2a0480d8fec08b241ce66203195b833677c05806774286ce152133143bff35e81bd769952a807081caed13ef50e76da1e64

data/cluster/lib/cluster/commands_generator.rb

@@ -18,7 +18,7 @@ module Cluster
 
       command :start do |c|
         c.syntax = "sct cluster start"
-        c.description = "start the cluster"
+        c.description = "(re)start the cluster"
         c.option '--build', '(re)build images before starting'
         c.option '--pull', 'pull latest images before starting'
 
@@ -36,15 +36,6 @@ module Cluster
         end
       end
 
-      command :restart do |c|
-        c.syntax = "sct cluster restart"
-        c.description = "restart the cluster"
-
-        c.action do |args, options|
-          Cluster::Runner.new.restart
-        end
-      end
-
       command :delete do |c|
         c.syntax = "sct cluster delete"
         c.description = "delete the cluster"

data/cluster/lib/cluster/runner.rb

@@ -1,6 +1,8 @@
 module Cluster
   class Runner
 
+    @@dc = system("docker compose version", out: "/dev/null", err: "/dev/null") ? "docker compose" : "docker-compose"
+
     def run command, options = {}
       begin
         if !system command, options
@@ -11,27 +13,22 @@ module Cluster
       end
     end
 
-    def dc_system
-      return executer = system("which docker-compose") ? 'docker-compose' : 'docker compose'
-    end
-
-    def run_dc command, options = {}
-      run "#{dc_system} -f ~/development/spend-cloud/docker-compose.yml #{command}", options
+    def dc command, options = {}
+      run "#{@@dc} -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"
+        dc "pull"
       end
 
       if options.build
-        run_dc "build #{options.pull ? "--pull" : ""}"
+        dc "build #{options.pull ? "--pull" : ""}"
       end
 
       run "docker container prune -f"
 
-      run_dc "up --detach --remove-orphans --force-recreate --always-recreate-deps"
+      dc "up --detach --remove-orphans --force-recreate --always-recreate-deps"
 
       if options.pull or options.build
         system "docker image prune -f"
@@ -41,15 +38,11 @@ module Cluster
     end
 
     def stop
-      run_dc "down --remove-orphans"
-    end
-
-    def restart
-      run_dc "restart"
+      dc "down --remove-orphans"
     end
 
     def delete
-      run_dc "down --remove-orphans -v"
+      dc "down --remove-orphans -v"
     end
 
     def reset args, options
@@ -58,7 +51,7 @@ module Cluster
     end
 
     def status
-      run_dc "ps"
+      dc "ps"
     end
 
     def logs args, options
@@ -68,7 +61,7 @@ module Cluster
       command << " --timestamps" if options.t or options.timestamps
       command << " --tail #{options.tail}" if options.tail
 
-      run_dc "#{command} #{args.join " "}"
+      dc "#{command} #{args.join " "}"
     end
 
   end

data/henk/lib/henk/commands_generator.rb

@@ -105,17 +105,8 @@ module Henk
                 end
             end
 
-            command :"list-dumps" do |c|
-                c.syntax = 'sct henk list-dumps'
-                c.description = 'List the customer dumps currently available for import.'
-
-                c.action do |args, options|
-                    Henk::Runner.new.list_dumps args, options
-                end
-            end
-
             command :"import" do |c|
-                c.syntax = 'sct henk import'
+                c.syntax = 'sct henk import [<URL>]'
                 c.description = 'Import a customer dump from GCP.'
 
                 c.action do |args, options|
@@ -123,7 +114,8 @@ module Henk
                     when 0
                         puts "Loading available customer dumps...".blue
 
-                        available_dumps = `sct henk list-dumps`.lines chomp: true
+                        available_dumps = `gsutil ls gs://henk-db-dumps/`.lines chomp: true
+
                         begin
                             dump_url = choose do |menu|
                                 menu.prompt = "Please choose a dump to import:"
@@ -133,8 +125,8 @@ module Henk
                                 end
                             end
                         rescue Interrupt
-                            print "\nStopping import"
-                            exit
+                            # user pressed Ctrl+C, return in order to exit gracefully
+                            return
                         end
                     when 1
                         dump_url = args.first

data/henk/lib/henk/runner.rb

@@ -172,10 +172,6 @@ module Henk
             return options_str
         end
 
-        def list_dumps args, options
-            run "gsutil ls gs://henk-db-dumps/"
-        end
-
         def import args, options, dump_url
             puts "Going to import #{dump_url}".blue
 

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

@@ -3,6 +3,8 @@ require 'yaml'
 module Sct
   class DevCommand
 
+    @@dc = system("docker compose version", out: "/dev/null", err: "/dev/null") ? "docker compose" : "docker-compose"
+
     @@file = "docker-compose.dev.yml"
 
     def error message
@@ -10,17 +12,12 @@ 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, "#{dc_system} -f ~/development/spend-cloud/docker-compose.yml #{command}"
+      system env, "#{@@dc} -f ~/development/spend-cloud/docker-compose.yml #{command}"
     end
 
     def dc_dev command, env = {}
-
-      system env, "#{dc_system} -f #{@@file} #{command}"
+      system env, "#{@@dc} -f #{@@file} #{command}"
     end
 
     def manifest
@@ -32,9 +29,6 @@ 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/commands_generator.rb

@@ -17,28 +17,21 @@ module Sct
 
             global_option('--verbose') { $verbose = true }
 
-            command :'mysql-proxy' do |c|
-                c.syntax = 'sct mysql-proxy'
-                c.description = 'setup google mysql proxy'
-
-                c.action do |args, options|
-                    UI.important("Trying to setup mysql proxy")
-                    Sct::MysqlproxyCommand.new.execute args, options
-                end
-            end
-
             command :'cluster' do |c|
                 c.syntax = 'sct cluster'
                 c.description = 'make changes to the cluster'
             end
 
-            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'
+            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|
-                    Sct::ShellCommand.new.execute args, options
+                    UI.important("Trying to pull database")
+                    Sct::DatabasePullCommand.new.execute args, options
                 end
             end
 
@@ -54,16 +47,28 @@ module Sct
                 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'
+            command :'henk' do |c|
+                c.syntax = 'sct henk'
+                c.description = 'manage clients on your cluster'
+            end
+
+            command :'mysql-proxy' do |c|
+                c.syntax = 'sct mysql-proxy'
+                c.description = 'setup google mysql proxy'
 
                 c.action do |args, options|
-                    UI.important("Trying to pull database")
-                    Sct::DatabasePullCommand.new.execute args, options
+                    UI.important("Trying to setup mysql proxy")
+                    Sct::MysqlproxyCommand.new.execute args, options
+                end
+            end
+
+            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
 

data/sct/lib/sct/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -253,10 +253,10 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- cluster/lib
-- henk/lib
 - sct/lib
+- henk/lib
 - sct_core/lib
+- cluster/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.