devup 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f63ff0ee5ffd8b69739caec5f9feee5c9f881e34f866de04a3f1e379ae1cb792
-  data.tar.gz: 51d840a02ce6e6469dc056d1992c87c450020bad0eeeb3cfe7e465f61508cd20
+  metadata.gz: a73dd3dfc833e3fd92c4960b1ad1655a96ffd26db828fda47a9a7cea89c16742
+  data.tar.gz: 36682d3cb1e60d6f0d4a830c4c1f0f49f0d0f1db0a902e5c431eeb958a1ddc74
 SHA512:
-  metadata.gz: 887ddd31283c4a6220c2a28ce119f0f22a6b22cfbd812c73baf9957af1d21fe3dc46c3799abbcdf647572c6ee41fce197093489e96d51c9f97891f5aa52dbfa2
-  data.tar.gz: db5711a5e2a3c5a47532693908f67514b3c69214ab0e30c29fa52b3836fec9980c4e372df15c89de7d26fb142e39b9ab4d633da7daf29b53a6962ad563ad431f
+  metadata.gz: e9058dbbe0cab9580659df18b1d4b306efca5cdeadb2d8d6436539db8aecc474917f9b8db83da9c7375468e72d82b6810aae854c16aeb305546f033887ae10a6
+  data.tar.gz: 9003d6bf8c3b6b2ec2a59d087b9943738763138d6917f20bf9449e5b152db9045ddcf259d1f745e5ebd2b5cd6b1296d6a4833f302bca4451e430ad6d03aae679

data/.gitignore

@@ -9,12 +9,14 @@
 /tmp/
 
 # rspec failure tracking
-.rspec_status
+/spec/examples.txt
 
 # Editor config
 .vimrc
+.nvimrc
 
-.env.services
+/.env.services
+/.env.local
 spec/dummy/.env.services
 spec/dummy_rails/.env.services
 

data/.rspec

@@ -1,3 +1,4 @@
---format documentation
+--format progress
 --color
 --require spec_helper
+--tag ~@integration

data/.travis.yml

@@ -23,7 +23,8 @@ jobs:
         - chmod +x ./cc-test-reporter
         - "./cc-test-reporter before-build"
       script:
-        - bundle exec rake spec
+        - bundle exec rspec
+        - SIMPLECOV_COMMAND_NAME=integration bundle exec rspec --tag @integration
       after_script:
         - "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
     - stage: test

data/.vimrc

@@ -1 +1,3 @@
+let g:ale_linters = {'ruby': ['standardrb'], 'javascript': ['standard'], 'json': ['jsonlint']}
+let g:ale_fixers = {'ruby': ['standardrb'], 'javascript': ['standard'], 'json': ['jq']}
 let g:ale_fix_on_save = 1

data/CHANGELOG.md

@@ -0,0 +1,71 @@
+# Change Log
+
+## master (unreleased)
+
+## 0.6.0
+  * Docker Compose v2.x support added
+  * refactoring
+
+
+## 0.5.3
+
+  * readme updated
+  * fix disabled mode
+
+## 0.5.2
+
+  * NameError rescue
+  * version display fixed
+
+## 0.5.0
+
+  * local envs
+  * readme updated
+
+## 0.4.3.1
+
+  * env shortcut for a first port
+
+## 0.4.2
+
+  * performance optimization
+
+## 0.4.0
+
+  * commands rework with dry-cli
+  * hits of code metric added
+  * better spring support
+  * no port errro fixed
+
+## 0.3.3
+
+  * refactoring
+  * debug option added
+  * up timeout added
+  * magic env names removed
+
+## 0.3.2
+
+  * reverted "remove old volumes (--renew-anon-volumes)"
+
+## 0.3.1
+
+  * do not clear env each time
+
+## 0.3.0
+
+  * magic ENV names for postgres, redis, mysql
+  * readme updated
+  * Spring integaration
+  * ability to disable
+  * log errors
+  * remove old volumes (--renew-anon-volumes)
+
+## 0.2.0
+
+  * CI configured
+  * proof of concept
+
+## 0.1.0
+
+  * repo init

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devup (0.5.3)
+    devup (0.6.0)
       dotenv
       dry-cli
 
@@ -12,7 +12,7 @@ GEM
     byebug (11.1.3)
     concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
-    docile (1.3.2)
+    docile (1.4.0)
     dotenv (2.7.6)
     dry-cli (0.6.0)
       concurrent-ruby (~> 1.0)
@@ -50,10 +50,12 @@ GEM
     rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
-    simplecov (0.18.5)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
     standard (0.4.7)
       rubocop (~> 0.85.0)
       rubocop-performance (~> 1.6.0)

data/devup.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email = ["sergei@udalovs.ru"]
 
   spec.summary = "A tool to manage docker-compose for development"
-  # spec.description   = %q{TODO: Write a longer description or delete this line.}
+  spec.description = "Describe development services with YAML"
   spec.homepage = "https://github.com/sergio-fry/devup"
   spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  spec.metadata["changelog_uri"] = "https://github.com/sergio-fry/devup/blob/master/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/devup/application.rb

@@ -25,7 +25,7 @@ module Devup
     def devup
       @devup ||= Devup::Environment.new(
         pwd: `pwd`,
-        logger: Devup::Logger.build(log_level)
+        logger: Devup::Logger.new(level: log_level)
       )
     end
 

data/lib/devup/cli/commands/command.rb

@@ -13,7 +13,7 @@ module Devup
         attr_reader :opts
 
         def logger
-          @logger ||= Devup::Logger.build(log_level)
+          @logger ||= Devup::Logger.new(level: log_level)
         end
 
         def log_level

data/lib/devup/compose/port_config.rb

@@ -0,0 +1,17 @@
+module Devup
+  module Compose
+    class PortConfig
+      def initialize(config)
+        @config = config
+      end
+
+      def from
+        @config.split(":")[-1].to_i
+      end
+
+      def ==(another)
+        from == another.from
+      end
+    end
+  end
+end

data/lib/devup/compose/v1/compose.rb

@@ -0,0 +1,103 @@
+require "yaml"
+
+require "devup/compose/v1/processes"
+require "devup/compose/port_config"
+
+module Devup
+  module Compose
+    module V1
+      class Compose
+        attr_reader :path, :project, :logger, :shell
+
+        class Error < StandardError; end
+
+        def initialize(path, project: "devup", logger:, shell:)
+          @path = path
+          @project = project
+          @logger = logger
+          @shell = shell
+        end
+
+        def check
+          true
+        end
+
+        def services
+          config["services"].keys
+        end
+
+        def service_ports(name)
+          return [] if config["services"][name]["ports"].nil?
+
+          config["services"][name]["ports"].map { |el| PortConfig.new(el.to_s) }
+        end
+
+        def port_mapping(port)
+          processes.port_mapping(port)
+        end
+
+        def up
+          exec "up -d --remove-orphans"
+
+          wait_alive 3
+        end
+
+        def stop
+          exec "stop"
+        end
+
+        def rm
+          exec "rm -f"
+        end
+
+        private
+
+        def wait_alive(timeout, retry_sleep: 0.3)
+          start = Time.now
+
+          loop {
+            break if alive?
+
+            if Time.now - start > timeout
+              logger.error "can't run services"
+              break
+            end
+            sleep retry_sleep
+          }
+        end
+
+        def alive?
+          processes(cached: false).up?
+        end
+
+        def processes(cached: true)
+          Processes.new(cached ? exec_ps_cached : exec_ps)
+        end
+
+        def exec_ps
+          @exec_ps_output = exec("ps")
+        end
+
+        def exec_ps_cached
+          @exec_ps_output ||= exec("ps")
+        end
+
+        def exec(cmd)
+          resp = shell.exec "docker-compose -p #{project} -f #{path} #{cmd}"
+
+          raise(Error) unless resp.success?
+
+          resp.data
+        end
+
+        def config
+          YAML.safe_load(config_content)
+        end
+
+        def config_content
+          File.read(path)
+        end
+      end
+    end
+  end
+end

data/lib/devup/compose/v1/processes.rb

@@ -0,0 +1,34 @@
+require "devup/port_mapping"
+
+module Devup
+  module Compose
+    module V1
+      class Processes
+        attr_reader :output
+        def initialize(output)
+          @output = output
+        end
+
+        def up?
+          service_lines.map { |line|
+            line.match(/Up/) && !line.match(/Exit/)
+          }.all?
+        end
+
+        def port_mapping(port)
+          m = output.match(/\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}:(\d+)->#{port}\/tcp/)
+
+          return PortMapping.new(port, nil) if m.nil?
+
+          PortMapping.new(port, m[1].to_i)
+        end
+
+        private
+
+        def service_lines
+          output.split("\n")[2..-1]
+        end
+      end
+    end
+  end
+end

data/lib/devup/compose/v2/compose.rb

@@ -0,0 +1,14 @@
+require "devup/compose/v1/compose"
+require "devup/compose/v2/processes"
+
+module Devup
+  module Compose
+    module V2
+      class Compose < V1::Compose
+        def processes(cached: true)
+          Processes.new(cached ? exec_ps_cached : exec_ps)
+        end
+      end
+    end
+  end
+end

data/lib/devup/compose/v2/processes.rb

@@ -0,0 +1,21 @@
+require "devup/compose/v1/processes"
+
+module Devup
+  module Compose
+    module V2
+      class Processes < V1::Processes
+        def up?
+          service_lines.map { |line|
+            line.match(/running/) && !line.match(/exited/)
+          }.all?
+        end
+
+        private
+
+        def service_lines
+          output.split("\n")[1..-1]
+        end
+      end
+    end
+  end
+end

data/lib/devup/compose.rb

@@ -1,94 +1,17 @@
-require "yaml"
-
-require "devup/compose/ps"
+require "devup/compose/v1/compose"
+require "devup/compose/v2/compose"
 
 module Devup
-  class Compose
-    attr_reader :path, :project, :logger, :shell
-
-    class Error < StandardError; end
-
-    def initialize(path, project: "devup", logger:, shell:)
-      @path = path
-      @project = project
-      @logger = logger
-      @shell = shell
-    end
-
-    def check
-      true
-    end
-
-    def services
-      config["services"].keys
-    end
-
-    def service_ports(name)
-      return [] if config["services"][name]["ports"].nil?
-
-      config["services"][name]["ports"].map { |el| el.to_s.split(":")[-1].to_i }
-    end
-
-    def port_mapping(port)
-      ComposeHelpers::Ps.new(exec_ps_cached).port_mapping(port)
-    end
-
-    def up
-      exec "up -d --remove-orphans"
-
-      wait_alive 3
-    end
-
-    def stop
-      exec "stop"
-    end
-
-    def rm
-      exec "rm -f"
-    end
-
-    private
-
-    def wait_alive(timeout, retry_sleep: 0.3)
-      start = Time.now
-
-      loop {
-        break if alive?
-
-        if Time.now - start > timeout
-          logger.error "can't run services"
-          break
-        end
-        sleep retry_sleep
-      }
-    end
-
-    def alive?
-      ComposeHelpers::Ps.new(exec_ps).up?
-    end
-
-    def exec_ps
-      @exec_ps_output = exec("ps")
-    end
-
-    def exec_ps_cached
-      @exec_ps_output ||= exec("ps")
-    end
-
-    def exec(cmd)
-      resp = shell.exec "docker-compose -p #{project} -f #{path} #{cmd}"
-
-      raise(Error) unless resp.success?
-
-      resp.data
-    end
-
-    def config
-      YAML.safe_load(config_content)
-    end
-
-    def config_content
-      File.read(path)
+  module Compose
+    def self.current_version(version = `docker-compose -v`)
+      case version.match(/(\d).\d+.\d+/)[1].to_i
+      when 1
+        V1::Compose
+      when 2
+        V2::Compose
+      else
+        raise "Can't detect compose version"
+      end
     end
   end
 end

data/lib/devup/dotenv_load_list.rb

@@ -1,7 +1,7 @@
 module Devup
   class DotenvLoadList
     def initialize(env: nil)
-      @env = env.to_sym unless env.nil?
+      @env = env&.to_sym
     end
 
     def to_a

data/lib/devup/environment.rb

@@ -1,16 +1,17 @@
 require "yaml"
 
 require "devup/logger"
-require "devup/compose"
 require "devup/service"
-require "devup/service_presenter"
+require "devup/service_dotenv"
 require "devup/shell"
 
+require "devup/compose"
+
 module Devup
   class Environment
     attr_reader :pwd, :logger, :shell
 
-    def initialize(pwd:, compose: nil, logger: Logger.build, shell: Shell.new(pwd: pwd, logger: logger))
+    def initialize(pwd:, compose: nil, logger:, shell: Shell.new(pwd: pwd, logger: logger))
       @pwd = pwd.to_s.strip
       @compose = compose
       @logger = logger
@@ -75,7 +76,7 @@ module Devup
     end
 
     def service_env(service)
-      ServicePresenter.new(service, project: project).call
+      ServiceDotenv.new(service, project: project).text
     end
 
     def write_dotenv
@@ -103,7 +104,7 @@ module Devup
 
     def compose
       @compose ||= begin
-                     Compose.new(
+                     Compose.current_version.new(
                        root.join("docker-compose.devup.yml"),
                        project: project, logger: logger, shell: shell
                      )

data/lib/devup/logger.rb

@@ -1,14 +1,36 @@
 require "logger"
 
 module Devup
-  class Logger < ::Logger
-    def self.build(level = :info)
-      formatter = ->(severity, _time, _progname, msg) { "DevUp! #{severity} #{msg}\n" }
-      logger = new(STDOUT, formatter: formatter)
+  class Logger
+    def initialize(device: STDOUT, level: :info)
+      @level = level
+      @device = device
+    end
+
+    def debug(msg)
+      logger.debug msg
+    end
 
-      logger.level = level
+    def info(msg)
+      logger.info msg
+    end
+
+    def error(msg)
+      logger.error msg
+    end
+
+    private
+
+    def logger
+      logger = ::Logger.new(@device, formatter: formatter)
+
+      logger.level = @level
 
       logger
     end
+
+    def formatter
+      ->(severity, _time, _progname, msg) { "DevUp! #{severity} #{msg}\n" }
+    end
   end
 end

data/lib/devup/port_checker.rb

@@ -2,6 +2,7 @@ require "socket"
 require "timeout"
 
 module Devup
+  # TODO we should use this to check ports are ready
   class PortChecker
     def call(port)
       s = TCPSocket.new("0.0.0.0", port)

data/lib/devup/port_mapping.rb

@@ -0,0 +1,14 @@
+module Devup
+  class PortMapping
+    def initialize(from, to)
+      @from = from
+      @to = to
+    end
+
+    attr_reader :from, :to
+
+    def ==(another)
+      @from == another.from && @to == another.to
+    end
+  end
+end

data/lib/devup/service.rb

@@ -1,4 +1,4 @@
-require "ostruct"
+require_relative "port_mapping"
 
 module Devup
   class Service
@@ -16,11 +16,8 @@ module Devup
     private
 
     def fetch_ports
-      compose.service_ports(name).map do |from|
-        OpenStruct.new(
-          from: from,
-          to: compose.port_mapping(from)
-        )
+      compose.service_ports(name).map do |el|
+        compose.port_mapping(el.from)
       end
     end
   end

data/lib/devup/{service_presenter.rb → service_dotenv.rb}

@@ -1,5 +1,5 @@
 module Devup
-  class ServicePresenter
+  class ServiceDotenv
     attr_reader :service, :project
 
     def initialize(service, project: nil)
@@ -7,7 +7,7 @@ module Devup
       @project = project
     end
 
-    def call
+    def text
       res = []
 
       res << "# #{service.name}"

data/lib/devup/shell.rb

@@ -9,6 +9,7 @@ module Devup
       @logger = logger
     end
 
+    # TODO maybe it should become somthing like ExecutedShellCommand ?
     Result = Struct.new(:data, :status) {
       def success?
         status

data/lib/devup/version.rb

@@ -1,3 +1,3 @@
 module Devup
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devup
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Sergei O. Udalov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: Describe development services with YAML
 email:
 - sergei@udalovs.ru
 executables:
@@ -52,6 +52,7 @@ files:
 - ".standard.yml"
 - ".travis.yml"
 - ".vimrc"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -70,13 +71,18 @@ files:
 - lib/devup/cli/commands/down.rb
 - lib/devup/cli/commands/up.rb
 - lib/devup/compose.rb
-- lib/devup/compose/ps.rb
+- lib/devup/compose/port_config.rb
+- lib/devup/compose/v1/compose.rb
+- lib/devup/compose/v1/processes.rb
+- lib/devup/compose/v2/compose.rb
+- lib/devup/compose/v2/processes.rb
 - lib/devup/dotenv_load_list.rb
 - lib/devup/environment.rb
 - lib/devup/logger.rb
 - lib/devup/port_checker.rb
+- lib/devup/port_mapping.rb
 - lib/devup/service.rb
-- lib/devup/service_presenter.rb
+- lib/devup/service_dotenv.rb
 - lib/devup/shell.rb
 - lib/devup/version.rb
 homepage: https://github.com/sergio-fry/devup
@@ -85,6 +91,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sergio-fry/devup
   source_code_uri: https://github.com/sergio-fry/devup
+  changelog_uri: https://github.com/sergio-fry/devup/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/devup/compose/ps.rb

@@ -1,30 +0,0 @@
-module Devup
-  module ComposeHelpers
-    class Ps
-      attr_reader :output
-      def initialize(output)
-        @output = output
-      end
-
-      def up?
-        service_lines.map { |line|
-          line.match(/Up/) && !line.match(/Exit/)
-        }.all?
-      end
-
-      def port_mapping(port)
-        m = output.match(/\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}:(\d+)->#{port}\/tcp/)
-
-        return if m.nil?
-
-        m[1].to_i
-      end
-
-      private
-
-      def service_lines
-        output.split("\n")[2..-1]
-      end
-    end
-  end
-end