aggkit 0.3.1.8768 → 0.3.4

data/lib/aggkit/ci.rb

@@ -9,75 +9,76 @@ module Aggkit
 
   module Ci
 
-    def log_action action
+    def log_action(action)
       puts " => #{action}"
     end
 
-    def info message
+    def info(message)
       puts " => #{message}"
     end
 
-    def execute cmd
+    def execute(cmd)
       puts "  - executing: #{cmd}"
       result = `#{cmd}`
       puts result
-      if !$?.success?
-        raise "Execution failed cmd: #{cmd.inspect}"
-      end
+      raise "Execution failed cmd: #{cmd.inspect}" unless $?.success?
+
       result
     end
 
-    #Уровни образов
+    # Уровни образов
     # 1. Без модификатора - не протестирован, отсутсвует в репозитории.
     # 2. С модификатором dev - протестирован автотестами, ДОЛЖЕН быть в репозитории.
     # 3. С модификатором stage - протестирован руками, ДОЛЖЕН быть в репозитории(как и его предшественник dev).
     # 4. С модификатором release - помечен для релиза, ДОЛЖЕН быть в репозитории(как и его предшественник dev и stage).
 
-    #Работа должна вестить ТОЛЬКО с workimage
+    # Работа должна вестить ТОЛЬКО с workimage
 
     # Базовое имя образа
     # Например docker.rnds.pro/aggredator-mq
-    def baseimage service
+    def baseimage(service)
       raise "Service name invalid: #{service.inspect}" if service.to_s.length < 2
+
       "docker.rnds.pro/aggredator-#{service}"
     end
 
-
     # Текущее имя образа без модификаторов продвижения, но с тегом
     # Например docker.rnds.pro/aggredator-mq:7e6420b5
-    def workimage service, tag
+    def workimage(service, tag)
       raise "Service tag invalid: #{tag.inspect}" if tag.to_s.length < 2
+
       "#{baseimage(service)}:#{tag}"
     end
 
     # Образ с модификатором версии
     # Например docker.rnds.pro/aggredator-mq-dev:7e6420b5
-    def promotedimage service, stage, tag
+    def promotedimage(service, stage, tag)
       raise "Service stage invalid: #{stage.inspect}" if stage.to_s.length < 2
       raise "Service tag invalid: #{tag.inspect}" if tag.to_s.length < 2
+
       "#{baseimage(service)}-#{stage}:#{tag}"
     end
 
     # Образ с модификатором протестированной автотестами версии
     # Например docker.rnds.pro/aggredator-mq-dev:7e6420b5
-    def devimage service, tag
+    def devimage(service, tag)
       promotedimage(service, 'dev', tag)
     end
 
     # Образ с модификатором стабильной версии
     # Например docker.rnds.pro/aggredator-mq-stage:7e6420b5
-    def stageimage service, tag
+    def stageimage(service, tag)
       promotedimage(service, 'stage', tag)
     end
 
     # Образ с модификатором релизной версии
-    #Например docker.rnds.pro/aggredator-mq-release:7e6420b5
-    def releaseimage service, tag
+    # Например docker.rnds.pro/aggredator-mq-release:7e6420b5
+    def releaseimage(service, tag)
       promotedimage(service, 'release', tag)
     end
 
-    # Протегировать образ тегом 
-    def tagimage! image, newimage, push: false, ignoreerror: false
+    # Протегировать образ тегом
+    def tagimage!(image, newimage, push: false, ignoreerror: false)
       log_action "Tag #{image.inspect} as #{newimage.inspect}"
 
       if ignoreerror
@@ -86,28 +87,26 @@ module Aggkit
         execute("docker tag #{image} #{newimage}")
       end
 
-      if push
-        execute("docker push #{newimage}")
-      end
+      execute("docker push #{newimage}") if push
 
-      return newimage
+      newimage
     end
 
-    #Удалить образ образ тегом 
-    def rmimage! image
+    # Удалить образ образ тегом
+    def rmimage!(image)
       log_action "Remove #{image.inspect}"
       execute("docker rmi #{image} &> /dev/null || true")
     end
 
-    def label! image, label, value
+    def label!(image, label, value)
       raise "Image label invalid: #{label.inspect}" if label.to_s.length < 2
       raise "Image label value invalid: #{value.inspect}" if value.to_s.length < 2
 
-      execute("echo #{image} | docker build -t #{image} --label=\"#{label.to_s}=#{value.to_s}\" - ")
+      execute("echo #{image} | docker build -t #{image} --label=\"#{label}=#{value}\" - ")
     end
 
     # Растегировать все модификатора образа сервиса и возможно удалить его
-    def untagservice service, tag
+    def untagservice(service, tag)
       if tag != 'latest'
         rmimage! workimage(service, tag)
         rmimage! devimage(service, tag)
@@ -117,7 +116,7 @@ module Aggkit
     end
 
     # Продвинуть текущий образ сервиса по уровню - добавить модификатор и залить в репозиторий
-    def promote! service, tag, stage, fromstage: nil
+    def promote!(service, tag, stage, fromstage: nil)
       fromimage = if fromstage
         promotedimage(service, fromstage, tag)
       else
@@ -127,52 +126,50 @@ module Aggkit
       toimage = promotedimage(service, stage, tag)
 
       log_action "Promote #{fromimage} to #{toimage}"
-      return tagimage! fromimage, toimage, push: true
+      tagimage! fromimage, toimage, push: true
     end
 
     # Продвинуть текущий образ по уровню - добавить модификатор dev(протестировано) и залить в репозиторий
-    def promote_to_dev! service, tag
+    def promote_to_dev!(service, tag)
       promote!(service, tag, 'dev')
     end
 
     # Продвинуть текущий образ по уровню - добавить модификатор stage(стабильно) и залить в репозиторий
-    def promote_to_stage! service, tag
+    def promote_to_stage!(service, tag)
       promoted = tagimage!(devimage(service, tag), stageimage(service, tag), push: true)
       # Тегируем этот образ как latest
-      return tagimage!(promoted, stageimage(service, 'latest'), push: true)
+      tagimage!(promoted, stageimage(service, 'latest'), push: true)
     end
 
     # Продвинуть стабильный образ до указанного тега
-    def promote_to_tag! service, tag, newtag
-      return tagimage!(devimage(service, tag), stageimage(service, newtag), push: true)
+    def promote_to_tag!(service, tag, newtag)
+      tagimage!(devimage(service, tag), stageimage(service, newtag), push: true)
     end
 
     # Продвинуть список образов или упасть с ошибкой
-    def promote_services_to_dev! services, tag
+    def promote_services_to_dev!(services, tag)
       [services].flatten.each do |service|
         promote_to_dev!(service, tag)
       end
     end
 
     # Продвинуть список образов или упасть с ошибкой
-    def promote_services_to_stage! services, tag
+    def promote_services_to_stage!(services, tag)
       [services].flatten.each do |service|
         promote_to_stage!(service, tag)
       end
     end
 
-    #Протегировать образы  до указанного тега
-    def promote_services_to_tag! services, tag, newtag
+    # Протегировать образы  до указанного тега
+    def promote_services_to_tag!(services, tag, newtag)
       [services].flatten.each do |service|
         promote_to_tag!(service, tag, newtag)
       end
     end
 
-
-
     # Попытаться взять все модификаторы образов из репозитория
     # Скачивает образы и тегирует их как workimage
-    def pull_images_cache services, tag
+    def pull_images_cache(services, tag)
       log_action "Puling images#{[services].flatten.inspect} from cache...."
       [services].flatten.each do |service|
         execute("docker pull #{workimage(service, tag)} 2> /dev/null || true")
@@ -186,15 +183,15 @@ module Aggkit
     end
 
     # Залить образы в репозиторий
-    def push_images_cache services, tag
+    def push_images_cache(services, tag)
       log_action "Pushing images#{[services].flatten.inspect} to cache...."
       [services].flatten.each do |service|
         tagimage! workimage(service, tag), workimage(service, tag), push: true
       end
     end
 
-    #Растегировать все образы для дальнейшего удаления. Помечает как latest для поддержки кеширования docker
-    def clean_services services, tag
+    # Растегировать все образы для дальнейшего удаления. Помечает как latest для поддержки кеширования docker
+    def clean_services(services, tag)
       [services].flatten.each do |service|
         tagimage! workimage(service, tag), workimage(service, 'latest'), ignoreerror: true
         tagimage! devimage(service, tag), workimage(service, 'latest'), ignoreerror: true
@@ -204,17 +201,17 @@ module Aggkit
       end
     end
 
-    def ssh_deploy services, env, sshserver, tag, stage
-      with_remote_docker services, env, sshserver, tag, stage do |config, environment|
+    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
+        consul = execute('docker-compose ps | grep consul').split(' ').first.strip
         puts "CONSULT ID: #{consul}"
 
-        if !config_file.empty?
+        unless config_file.empty?
           execute("docker exec -i #{consul} aggwait -t 20 --consul")
           execute("docker exec -i #{consul} aggconsul --init --override --config - < #{config_file}")
         end
@@ -223,38 +220,38 @@ module Aggkit
       end
     end
 
-    def ssh_core_deploy services, env, sshserver, tag, stage
-      with_remote_docker services, env, sshserver, tag, stage do |config, environment|
+    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
+        consul = execute('docker-compose ps | grep consul').split(' ').first.strip
         puts "CONSULT ID: #{consul}"
 
-        if !config_file.empty?
+        unless 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..."
+        # echo " * Consul ready"
+        # echo " * Updatting database..."
         execute('docker-compose up -t 30 -d db')
         sleep 5
-        #echo " * Db ready"
-        #echo " * Bootstrapping admin..."
+        # 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..."
+        # echo " * Bootstrapping complete"
+        # echo " * Updating all containers..."
         execute('docker-compose up -t 30 -d')
-        #echo " * Containers ready"
+        # echo " * Containers ready"
       end
     end
 
-    def with_remote_docker services, env, sshserver, tag, stage
+    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|
@@ -265,14 +262,12 @@ module Aggkit
         envs['CORE_TAG'] = tag
         envs['CORE_SUFFIX'] = "-#{stage}"
 
-        localid = execute("docker info | grep ID").strip
+        localid = execute('docker info | grep ID').strip
 
         Aggkit::Env.with_env(envs) do |environment|
-          remoteid = execute("docker info | grep ID").strip
+          remoteid = execute('docker info | grep ID').strip
 
-          if localid == remoteid
-            raise "Can't get access to remote Docker"
-          end
+          raise "Can't get access to remote Docker" if localid == remoteid
 
           yield(env_config, environment)
 
@@ -282,12 +277,11 @@ module Aggkit
             tagimage! deployed, current
             untagservice(service, tag)
           end
-
         end
       end
     end
 
-    def with_ssh server, user: 'root', &block
+    def with_ssh(server, user: 'root')
       file = Tempfile.new
       @ssh_sockname = file.path
       file.unlink
@@ -304,3 +298,4 @@ module Aggkit
   end
 
 end
+

data/lib/aggkit/env.rb

@@ -4,6 +4,7 @@ require 'English'
 require 'dotenv'
 
 module Dotenv
+
   module_function
 
   def load_without_export(*filenames)
@@ -13,19 +14,21 @@ module Dotenv
       end
     end
   end
+
 end
 
 module Aggkit
 
   class Env
+
     attr_accessor :project, :name, :env_root, :environment
 
-    def self.list path = Dir.pwd
+    def self.list(path = Dir.pwd)
       root = Project.new(path).project_root
       Pathfinder.new(root).each_env
     end
 
-    def self.with_env env, &block
+    def self.with_env(env)
       current_env = ENV.to_h
       env.each_pair do |k, v|
         ENV[k.to_s] = v.to_s
@@ -41,7 +44,7 @@ module Aggkit
       end
     end
 
-    def initialize path
+    def initialize(path)
       @project = if File.directory?(File.expand_path(path))
         @name = File.basename(File.realpath(File.expand_path(path)))
         Project.new(path)
@@ -50,19 +53,19 @@ module Aggkit
         Project.new(Dir.pwd)
       end
 
-      if !self.class.list.include?(@name)
+      unless self.class.list.include?(@name)
         raise "There no env #{@name.inspect} in project: #{project.project_root.inspect}"
       end
 
       @env_root = File.join(project_root, 'envs', @name)
     end
 
-    def prepare release: false
+    def prepare(release: false)
       @environment = prepare_environment(release: release)
     end
 
-    def with_env &block
-      Env.with_env(environment) &block
+    def with_env(&block)
+      Env.with_env(environment) & block
     end
 
     def project_root
@@ -82,148 +85,161 @@ module Aggkit
     end
 
     def core_dot_file
-      File.join(core_root, '.env') rescue nil
+      begin
+        File.join(core_root, '.env')
+      rescue StandardError
+        nil
+      end
     end
 
     def env_files
-      [core_dot_file, project_dot_file, dot_file].compact.select{|f| File.exists?(f)}.uniq
+      [core_dot_file, project_dot_file, dot_file].compact.select{|f| File.exist?(f) }.uniq
     end
 
     def config_file
-      [File.join(env_root, 'config.yml'), File.join(env_root, 'config.yaml')].compact.select{|f| File.exists?(f)}.uniq.first
+      [File.join(env_root, 'config.yml'), File.join(env_root, 'config.yaml')].compact.select{|f| File.exist?(f) }.uniq.first
     end
 
     def show
       {
-        name: name,
+        name:         name,
         project_root: project_root,
-        core_root: core_root,
-        envfiles: env_files,
-        config_file: config_file,
-        envs: environment,
+        core_root:    core_root,
+        envfiles:     env_files,
+        config_file:  config_file,
+        envs:         environment
       }
     end
 
-private
-
+    private
 
-    def prepare_environment release: false
-      base_env = {
-        'ENV_ROOT'      => env_root,
-        'PROJECT_ROOT'  => project_root,
-        'CORE_ROOT'     => core_root,
-        'PATH'          => check_path_variable(env_root),
-      }
 
-      dot_env = prepare_dot(base_env)
+      def prepare_environment(release: false)
+        base_env = {
+          'ENV_ROOT'     => env_root,
+          'PROJECT_ROOT' => project_root,
+          'CORE_ROOT'    => core_root,
+          'PATH'         => check_path_variable(env_root)
+        }
 
-      compose_env = prepare_compose(dot_env.merge(base_env), release: release)
+        dot_env = prepare_dot(base_env)
 
-      dot_env.merge(base_env).merge(compose_env)
-    end
+        compose_env = prepare_compose(dot_env.merge(base_env), release: release)
 
-    def prepare_dot env
-      Env.with_env(env) do
-        Dotenv.load_without_export(*env_files)
+        dot_env.merge(base_env).merge(compose_env)
       end
-    end
 
-    def prepare_compose env, release: false
-      compose_files = if env['COMPOSE_FILE']
-        env['COMPOSE_FILE']
-      elsif File.exists?(File.join(env_root, "docker-compose.yml"))
-        File.join(env_root, "docker-compose.yml")
-      elsif File.exists?(File.join(env_root, "docker-compose.yaml"))
-        File.join(env_root, "docker-compose.yaml")
+      def prepare_dot(env)
+        Env.with_env(env) do
+          Dotenv.load_without_export(*env_files)
+        end
       end
 
-      if compose_files
-        result_file = File.join(env_root, "compose-result.yml")
-        Env.with_env(env.merge('COMPOSE_FILE' => compose_files)) do
-          if release
-            `aggmerge #{result_file} --skip-build`
-          else
-            `aggmerge #{result_file}`
+      def prepare_compose(env, release: false)
+        compose_files = if env['COMPOSE_FILE']
+          env['COMPOSE_FILE']
+        elsif File.exist?(File.join(env_root, 'docker-compose.yml'))
+          File.join(env_root, 'docker-compose.yml')
+        elsif File.exist?(File.join(env_root, 'docker-compose.yaml'))
+          File.join(env_root, 'docker-compose.yaml')
+        end
+
+        if compose_files
+          result_file = File.join(env_root, 'compose-result.yml')
+          Env.with_env(env.merge('COMPOSE_FILE' => compose_files)) do
+            if release
+              `aggmerge #{result_file} --skip-build`
+            else
+              `aggmerge #{result_file}`
+            end
           end
+          {
+            'COMPOSE_FILE' => result_file
+          }
+        else
+          {}
         end
-        {
-          'COMPOSE_FILE' => result_file
-        }
-      else
-        {}
       end
-    end
 
-    def check_path_variable path
-      if ENV['PATH'][path]
-        ENV['PATH']
-      else
-        "#{ENV['PATH']}:#{path}"
+      def check_path_variable(path)
+        if ENV['PATH'][path]
+          ENV['PATH']
+        else
+          "#{ENV['PATH']}:#{path}"
+        end
       end
-    end
 
-    class Pathfinder
-      attr_accessor :path
+      class Pathfinder
 
-      def initialize path
-        @path = File.realpath(File.expand_path(path))
-      end
 
-      def each_parent
-        current = path.split(File::SEPARATOR)
-        Enumerator.new do |y|
-          while !current.empty? do
-            y << current.join(File::SEPARATOR)
-            current.pop
+        attr_accessor :path
+
+        def initialize(path)
+          @path = File.realpath(File.expand_path(path))
+        end
+
+        def each_parent
+          current = path.split(File::SEPARATOR)
+          Enumerator.new do |y|
+            until current.empty?
+              y << current.join(File::SEPARATOR)
+              current.pop
+            end
           end
         end
-      end
 
-      def each_env
-        Dir.chdir(File.join(path, 'envs')) do 
-          Dir.glob('**/*').select do |f|
-            File.directory? f
-          end.select do |f|
-            File.exists?(File.join(f, '.env')) || File.exists?(File.join(f, 'docker-compose.yml')) || File.exists?(File.join(f, 'docker-compose.yaml')) 
-          end.sort
+        def each_env
+          Dir.chdir(File.join(path, 'envs')) do
+            Dir.glob('**/*').select do |f|
+              File.directory? f
+            end.select do |f|
+              File.exist?(File.join(f, '.env')) || File.exist?(File.join(f, 'docker-compose.yml')) || File.exist?(File.join(f, 'docker-compose.yaml'))
+            end.sort
+          end
         end
-      end
-    end
 
-    class Project
-      attr_accessor :env_root
 
-      def initialize path
-        raise "env path #{path} is not directory!" if !File.directory?(File.expand_path(path))
-        @env_root = File.realpath(File.expand_path(path))
       end
 
-      def project_root
-        @project_root = Pathfinder.new(env_root).each_parent.find do |path|
-          root?(path)
-        end || (raise "Can't find project root")
-      end
+      class Project
+
 
-      def core_root
-        @core_root = Pathfinder.new(project_root).each_parent.find do |path|
-          core?(path)
+        attr_accessor :env_root
+
+        def initialize(path)
+          raise "env path #{path} is not directory!" unless File.directory?(File.expand_path(path))
+
+          @env_root = File.realpath(File.expand_path(path))
         end
-      end
 
-      def root? path
-        return File.realpath(File.expand_path(path)) if File.directory?("#{path}/.git") ||
-          File.exists?("#{path}/base-service.yml") ||
-          File.exists?("#{path}/common-services.yml") ||
-          File.directory?("#{path}/envs")
-      end
+        def project_root
+          @project_root = Pathfinder.new(env_root).each_parent.find do |path|
+            root?(path)
+          end || (raise "Can't find project root")
+        end
 
-      def core? path
-        return File.realpath(File.expand_path(path)) if File.exists?("#{path}/.core")
-      end
+        def core_root
+          @core_root = Pathfinder.new(project_root).each_parent.find do |path|
+            core?(path)
+          end
+        end
 
-    end
+        def root?(path)
+          return File.realpath(File.expand_path(path)) if File.directory?("#{path}/.git") ||
+            File.exist?("#{path}/base-service.yml") ||
+            File.exist?("#{path}/common-services.yml") ||
+            File.directory?("#{path}/envs")
+        end
+
+        def core?(path)
+          return File.realpath(File.expand_path(path)) if File.exist?("#{path}/.core")
+        end
+
+
+      end
 
 
   end
 
 end
+