aggkit 0.2.7.8356 → 0.2.7.8361

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78868a3a2110568dd024041051bf5fbeef7988f9
-  data.tar.gz: 27cf9ca6792c156ab43613c32b0bb10dcb96b713
+  metadata.gz: 94d9152a885e9765d49e1de7170e31c51412200d
+  data.tar.gz: 10f827f1afa1101deea97ee2fd3e94e02ebdda6e
 SHA512:
-  metadata.gz: 7985d52d82f75860a4cb474d834ee2689e3671f8200c74264e2b3642ba0240b868784e871a82c21ed144127b981857e36bc1e28d192f8f93d55c09fa84c36d3b
-  data.tar.gz: b55b3e2e17a3d405ef8beca0a4e156c25567b3fe90dad4d8ae57aede83855d3bf040ec043e32290cff1315ccae0d411996a844aa50df3409d5d65c82896294dd
+  metadata.gz: 234f16fc08e0ff76a79343241bee4f431d81c81c62ee7aad5b0228f8f025f51c87b533fceee076c4fcae82b6680ab93c2cafa7d5ae980d84dc2c174f9d92d9e6
+  data.tar.gz: 39800eb8beba4196a9380407acf2b29ac7436c5321d2b1590b59690b63e1bf6c152732bfc7832917086afe346d76ae269966449d0a9bf767d339f7c6538526f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.2.7.8356)
+    aggkit (0.2.7.8361)
       diplomat
       dotenv
       json

data/bin/aggci

@@ -38,9 +38,18 @@ parser = OptionParser.new do |o|
     @opts[:clean] = parse_services(services)
   end
 
+  o.on("--services services", 'list or services to process') do |services|
+    @opts[:services] = parse_services(services)
+  end
+
   o.on("--ssh-deploy env", 'ssh') do |env_and_server|
     env, server = env_and_server.strip.split('@')
-    @opts[:deploy] = {env: env, server: server}
+    @opts[:deploy] = {env: env, server: server})
+  end
+
+  o.on("--ssh-core-deploy env", 'ssh') do |env_and_server|
+    env, server = env_and_server.strip.split('@')
+    @opts[:core_deploy] = {env: env, server: server}
   end
 
   o.on("--tag tag=#{@opts[:tag].inspect}", 'Use tag as default tag for images') do |tag|
@@ -78,9 +87,19 @@ elsif services = @opts[:clean]
   exit 0
 
 elsif deploy = @opts[:deploy]
+  @opts[:services] ||= []
+  raise "tag not defined" if @opts[:tag].to_s.empty?
+  raise "stage not defined" if @opts[:stage].to_s.empty?
+  raise "services not defined" if @opts[:services].empty?
+  ssh_deploy @opts[:services], deploy[:env], deploy[:server], @opts[:tag], @opts[:stage]
+  exit 0
+
+elsif deploy = @opts[:core_deploy]
+  @opts[:services] ||= []
   raise "tag not defined" if @opts[:tag].to_s.empty?
   raise "stage not defined" if @opts[:stage].to_s.empty?
-  ssh_deploy 'service-fns', deploy[:env], deploy[:server], @opts[:tag], @opts[:stage]
+  raise "services not defined" if @opts[:services].empty?
+  ssh_core_deploy @opts[:services], deploy[:env], deploy[:server], @opts[:tag], @opts[:stage]
   exit 0
 end
 

data/lib/aggkit/ci.rb

@@ -196,6 +196,56 @@ module Aggkit
     end
 
     def ssh_deploy services, env, sshserver, tag, stage
+      with_remote_docker services, env, sshserver, tag, stage do |config, environment|
+        config_file = config['config_file'].to_s
+
+        execute('docker-compose ps')
+        execute('docker-compose pull')
+
+        consul = execute('docker ps | grep consul').split(' ').first.strip
+        puts "CONSULT ID: #{consul}"
+
+        if !config_file.empty?
+          execute("docker exec -i #{consul} aggwait -t 20 --consul")
+          execute("docker exec -i #{consul} aggconsul --init --override --config - < #{config_file}")
+        end
+
+        execute('docker-compose up -t 30 -d')
+      end
+    end
+
+    def ssh_core_deploy services, env, sshserver, tag, stage
+      with_remote_docker services, env, sshserver, tag, stage do |config, environment|
+        config_file = config['config_file'].to_s
+
+        execute('docker-compose ps')
+        execute('docker-compose pull')
+        execute('docker-compose up -t 30 -d consul')
+
+        consul = execute('docker ps | grep consul').split(' ').first.strip
+        puts "CONSULT ID: #{consul}"
+
+        if !config_file.empty?
+          execute("docker exec -i #{consul} aggwait -t 20 --consul")
+          execute("docker exec -i #{consul} aggconsul --init --override --config - < #{config_file}")
+        end
+
+        #echo " * Consul ready"
+        #echo " * Updatting database..."
+        execute('docker-compose up -t 30 -d db')
+        sleep 5
+        #echo " * Db ready"
+        #echo " * Bootstrapping admin..."
+        execute('docker-compose run --rm -T admin /home/app/docker/bootstrap.rb')
+        sleep 5
+        #echo " * Bootstrapping complete"
+        #echo " * Updating all containers..."
+        execute('docker-compose up -t 30 -d')
+        #echo " * Containers ready"
+      end
+    end
+
+    def with_remote_docker services, env, sshserver, tag, stage
       services = [services].flatten
       log_action "Deploy [#{services.inspect}] tag:#{tag.inspect} stage:#{stage.inspect} to #{sshserver.inspect}"
       with_ssh sshserver do |sockname|
@@ -208,25 +258,14 @@ module Aggkit
 
         localid = execute("docker info | grep ID").strip
 
-        Aggkit::Env.with_env(envs) do
+        Aggkit::Env.with_env(envs) do |environment|
           remoteid = execute("docker info | grep ID").strip
 
           if localid == remoteid
             raise "Can't get access to remote Docker"
           end
 
-          execute('docker-compose ps')
-          execute('docker-compose pull')
-
-          consul = execute('docker ps | grep consul').split(' ').first.strip
-          puts "CONSULT ID: #{consul}"
-
-          if !config_file.empty?
-            execute("docker exec -i #{consul} aggwait -t 20 --consul")
-            execute("docker exec -i #{consul} aggconsul --init --override --config - < #{config_file}")
-          end
-
-          execute('docker-compose up -d')
+          yield(env_config, environment)
 
           services.each do |service|
             deployed = promotedimage(service, stage, tag)

data/lib/aggkit/env.rb

@@ -30,7 +30,7 @@ module Aggkit
       env.each_pair do |k, v|
         ENV[k.to_s] = v.to_s
       end
-      yield
+      yield(env)
     ensure
       (env.keys.map(&:to_s) - current_env.keys).each do |key|
         ENV.delete(key.to_s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.2.7.8356
+  version: 0.2.7.8361
 platform: ruby
 authors:
 - Godko Ivan