swarm_cluster_cli_ope 0.6 → 0.7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 956724efc48101ced01f9b90733cb45f4e7278a7e8da2d54edf7e85a1b103cab
-  data.tar.gz: e3d20867dcd4bc2cafa42b9997bfdbbf4cfeea4cbeb50881bdbebf615320056a
+  metadata.gz: 2b1b531caf2e5ae14fa47befec029b67c8c5b414bdf9d7378597a69254a7fcd6
+  data.tar.gz: 6b0903a0694ce1601a604c1efc0ab5cbb80d496c2758c257935dd4386fd125e3
 SHA512:
-  metadata.gz: 898033f68020b639df391e38728e8ac63fc284b29dbb7ead531578f10fc11aaa102d2109ebe4d43db9254a1ca2df63149ff8d50341bf7bf509a2d1e0dea5f611
-  data.tar.gz: 85f316b0cef0d08ce7f768d7d35a67b023b728a86315433cb4bcaaf45fdaf1c71e46d609f7255a593a2aea61860d037f84bf259a5e39d417f8b64a9850c610b0
+  metadata.gz: 477f99d4021367e7200fe425dd00887faaefa2fe708f73c3ce175996410917daee50e38a1209cf5f80186cc97c9f0ac16d45a9531da9b6e2ce039752b3df647b
+  data.tar.gz: 86caa366eba35e60fcda660f1f2fd55ffe81bd357e2d9f1df8bd52ecc95ae4a845cb56ec357c51711a02473432fa9e79b72458f0e51359048c1831f6e54825d8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+# 0.7
+- riconoscimento delle immagini durante rsync per installare correttamente pacchetto, 
+  viene riconosciuto ubuntu ed alpine
+
 # 0.6
 - sync con MongoDB
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    swarm_cluster_cli_ope (0.6)
-      activesupport
+    swarm_cluster_cli_ope (0.7.2.1)
+      activesupport (< 7)
       open4
       thor (~> 1.0)
       zeitwerk (~> 2.3)
@@ -10,22 +10,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.8)
-    i18n (1.8.9)
+    concurrent-ruby (1.1.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
+    minitest (5.16.1)
     open4 (1.3.4)
     rake (12.3.3)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -35,4 +35,4 @@ DEPENDENCIES
   swarm_cluster_cli_ope!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -231,9 +231,12 @@ docker-compose -f test_folder/test_k8s/docker-compose-local.yml up -d
 ```
 
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version 
-number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git 
-commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+## Release
+
+To install this gem onto your local machine, run `bundle exec rake install`. 
+
+To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, 
+which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 
 ## License

data/lib/swarm_cluster_cli_ope/kubernetes/pod.rb

@@ -31,8 +31,9 @@ module SwarmClusterCliOpe
 
       # @param [String,Array<String>] cmd -> comando da passare a kubectl exec -- CMD
       # @return [SwarmClusterCliOpe::ShellCommandResponse]
-      def exec(cmd)
-        base_cmd(["exec", name, "--", cmd].flatten).execute
+      # @param [FalseClass] allow_failure -> parametro per lasciar fallire o meno il comando senza bloccarsi e poi gestirlo
+      def exec(cmd, allow_failure: false)
+        base_cmd(["exec", name, "--", cmd].flatten).execute(allow_failure: allow_failure)
       end
 
       ##

data/lib/swarm_cluster_cli_ope/kubernetes/sync_configs/rsync.rb

@@ -45,22 +45,24 @@ module SwarmClusterCliOpe
 
             # controllo presenza comandi necessari
             command_installed = false
-            cmd_ricerca = container.exec(['bash -c "command -v rsync && command -v killall"'])
-            unless cmd_ricerca.failed?
-              num_commands = cmd_ricerca.raw_result[:stdout].split("\n").count rescue 0
-              if num_commands == 2
-                command_installed = true
-              end
+            install_rsync = false
+            install_psmisc = false
+            if container.exec(['sh -c "command -v apt"'], allow_failure: true).success?
+              puts "Container Ubuntu"
+              install_rsync = container.exec(['sh -c "command -v rsync || apt update && apt install -yq rsync "'], allow_failure: true).success?
+              install_psmisc = container.exec(['sh -c "command -v killall || apt update && apt install -yq psmisc"'], allow_failure: true).success?
             end
 
-            unless command_installed
-              # tentiamo di installarlo
-              cmd = container.exec(['bash -c "apt update && apt install -yq rsync psmisc"'])
-              if cmd.failed?
-                puts "Problemi nell'installazione di rsync nel pod"
-              else
-                command_installed = true
-              end
+            if container.exec(['sh -c "command -v apk"'], allow_failure: true).success?
+              puts "Container Alpine"
+              install_rsync = container.exec(['sh -c "command -v rsync || apk add rsync"'], allow_failure: true).success?
+              install_psmisc = true
+            end
+
+            if install_rsync and install_psmisc
+              command_installed = true
+            else
+              puts "Problemi nell'installazione di rsync nel pod"
             end
 
             if command_installed

data/lib/swarm_cluster_cli_ope/models/compose_container.rb

@@ -4,7 +4,14 @@ module SwarmClusterCliOpe
 
       # @return [SwarmClusterCliOpe::Models::ComposeContainer]
       def self.find_by_service_name(service_name, stack_name: '')
-        res = ShellCommandExecution.new("docker inspect #{[stack_name, service_name, "1"].compact.join("_".strip)}").execute
+        # prima controlliamo se siamo con il vecchio sistema di docker-compose dove i nomi dei servizi venivano
+        # costruiti con _ oppure se siamo nella nuova versione di docker compose dove c'è il - che fà da spaziatore
+        res = nil
+        ["_", "-"].each do |separatore|
+          res = ShellCommandExecution.new("docker inspect #{[stack_name, service_name, "1"].compact.join(separatore)}").execute(allow_failure: true)
+          break unless res.failed?
+        end
+        raise "Non siamo riusciti ad identificare il servizio in locale" if res.failed?
         self.new(JSON.parse(res.raw_result[:stdout]).first)
       end
 

data/lib/swarm_cluster_cli_ope/stack_sync_concern.rb

@@ -66,7 +66,19 @@ module SwarmClusterCliOpe
         - pg_user: "postgres"                   -> valore in chiaro, in sostituzione della variabile ambiente, DEFAULT: postgres
         - database_name_env: "POSTGRES_DB"      -> variabile ambiente interna al servizio contenente NOME DB, DEFAULT: POSTGRES_DB         
         - database_name: "nome_db"              -> valore in chiaro, in sostituzione della variabile ambiente     
-              
+      mongo:
+      -- local:  -> hash di configurazioni per il DB locale
+        - service: "db"                         -> nome del servizio nel compose locale, DEFAULT: quello definito sopra
+        - password: ""                          -> password per DB
+        - username: ""                          -> username per DB
+        - database_name: "nome_db"              -> nome del DB
+        - exclude_from_sync: "coll1,coll2"      -> elenco di collections di cui non eseguire il dump quando facciamo PUSH, DEFAULT: ''
+      -- remote: -> hash di configurazioni per il DB remoto
+        - service: "db"                         -> nome del servizio nel compose locale, DEFAULT: quello definito sopra
+        - password: ""                          -> password per DB
+        - username: ""                          -> username per DB
+        - database_name: "nome_db"              -> nome del DB
+        - exclude_from_sync: "coll1,coll2"      -> elenco di collections di cui non eseguire il dump quando facciamo PULL, DEFAULT: ''        
 
       EXAMPLE:
       Esempio di sincronizzazione di un file sqlite3 e una cartella

data/lib/swarm_cluster_cli_ope/version.rb

@@ -1,3 +1,3 @@
 module SwarmClusterCliOpe
-  VERSION = "0.6"
+  VERSION = "0.7.2.1"
 end

data/swarm_cluster_cli_ope.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", '~>1.0'
   spec.add_dependency "zeitwerk", '~>2.3'
   spec.add_dependency "open4"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", '<7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swarm_cluster_cli_ope
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.7.2.1
 platform: ruby
 authors:
 - Marino Bonetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -56,16 +56,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
 description: |-
   Gestione di varie operazioni come sincronia con le cartelle bindate dei container (rsync) up o
                           down e possibilità di scaricare/caricare i file direttamente all'interno del cluster, in
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: WIP Gemma per la gestione del cluster swarm