devup 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a6b3579f7d44d86a42c61b5d5b55dcd32e8d7aac580c49e5bce9a95500ff02
-  data.tar.gz: 2a73831a4d8d1549d6150050c12d4806ab8cc41089cbb9ce2b81420d09b02c8a
+  metadata.gz: 6cac2c49e58ab10b2851c040543e3d0559ba2827ddb65c0194e902ddaedc7b77
+  data.tar.gz: 75645b22886ac2e5ed3935797b53ef16a0221bee4b312f0a9cb5617619b7535e
 SHA512:
-  metadata.gz: 709e5c38a2786273085eba92ab0fa70f70dd8fbbfe1200b631ab1bd527b072df097fe6b856bab1e57a5790952dd2476665bcca965e302a69fa8ea2d47cb0d2a4
-  data.tar.gz: 5c81a935db87d41f22be697fcce631d9f80262f155bbc5eac146c2782e8d1ff49a4a805a86ad0b2c14b3d91e118807c80e0f857ba8584927a1743eab3fd7d87a
+  metadata.gz: 80c00c1ba35664e0239b66aef478ee585b96b6000d8931ff27bce090448e002e2daa358d1e28f2ecaf896d55235ec21a6dcf69d28a0507f6dbd24009e58b243b
+  data.tar.gz: 1a94f305329fc701429203c17412b41406e4f14de59596d52895f68f4d7b1b4f92dca7f9212cbaa947b74949e6697acb7f146a2dfd6c353d487e90feba85c88c

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.1
+ruby-2.5.8

data/.travis.yml

@@ -12,15 +12,6 @@ services:
 before_install:
 - gem install bundler -v $BUNDLER_VERSION
 bundler_args: "--jobs=3 --retry=3"
-deploy:
-  provider: rubygems
-  api_key:
-    secure: sMr+AT3gK44uTM6PHPrPAN8zxFf4njsqp65tC7l69dnzzYCuz9xBpUlYW18XFTTkJaFsr9s4A5ptdQ4gi7D12LdjFbRUkLkrCcAedALQ4PoQVkAQoNPaEPI40F7GUxElyBqbbHlUzgsxf6YPmVPykl+sbaD+WLZM26P9rxFpjwwlVsG4aaQ1TKHXQ4PZUch0LZDjuA3Z6cs9Tb22Ep0kur+Lb8EYyvgB+p50gidsBuFy2fb7/PYApqq2NhZn7bgS0vd5tTfuPzhq8B0PJzBrio52Ymn8Ry7n3WVJRXtoG2ZuynL+nxkLtUHuC4HGt336d/kx+8hLGHDRbBQurF2B+UQowD6+EZVb1d5zqYGJAvMXVBZ73+aa99tCU4hUVK8TWmwfaRgrZyLbOpOfkMEO905nsqRVFduI0HRI3MhD8ZzzwPiXmmtx4/dxzx+UX1tQiBRMmBKUaeXB8iCry7C5IcKPuTFMs1qVYmFfDrcnpL8H4FWtZ2diCgop8ocqtRRqLF7ZgdGticNlYkI6jISn7ToDCH/V+brVI9B/QQWq9xUVCUw10kGBllWFd9TJ7eZ7coQ+tOFfTibFd92xyRyR0QLUXE0ECyXMLI2kW31VN3yWMYYm4k+rXXXOsdQ3CJI7ozSVGDAO/7V6BLlaOeNqe9dgW/nD2NMr8RuSJr2akUA=
-  gem: devup
-  on:
-    tags: true
-    repo: sergio-fry/devup
-  skip_cleanup: 'true'
 
 jobs:
   include:

data/Gemfile

@@ -8,4 +8,3 @@ gem "rspec", "~> 3.0"
 gem "standard"
 gem "simplecov", require: false
 gem "byebug"
-gem "lefthook"

data/Gemfile.lock

@@ -1,30 +1,28 @@
 PATH
   remote: .
   specs:
-    devup (0.4.0)
+    devup (0.5.2)
       dotenv
       dry-cli
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
     byebug (11.1.3)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    dotenv (2.7.5)
+    dotenv (2.7.6)
     dry-cli (0.6.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.3.0)
-    lefthook (0.7.2)
-    parallel (1.19.1)
-    parser (2.7.1.0)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (12.3.3)
-    rexml (3.1.9)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -38,26 +36,28 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.85.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.2)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
+    rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
-    simplecov (0.16.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    standard (0.2.4)
-      rubocop (~> 0.80.1)
-      rubocop-performance (~> 1.5.2)
-    unicode-display_width (1.6.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    standard (0.4.7)
+      rubocop (~> 0.85.0)
+      rubocop-performance (~> 1.6.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -65,11 +65,10 @@ PLATFORMS
 DEPENDENCIES
   byebug
   devup!
-  lefthook
   rake (~> 12.0)
   rspec (~> 3.0)
   simplecov
   standard
 
 BUNDLED WITH
-   2.1.4
+   1.17.3

data/README.md

@@ -38,12 +38,21 @@ and
 Update your database.yml to use ENV:
 
 ```yaml
-test:
-  url: <%= ENV.fetch("DATABASE_URL") %>
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  host: <%= ENV.fetch("POSTGRES_HOST") %>
+  port: <%= ENV.fetch("POSTGRES_PORT") %>
+  username: postgres
+  password:
 
 development:
-  url: <%= ENV.fetch("DATABASE_URL") %>
+  <<: *default
+  database: development
 
+test:
+  <<: *default
+  database: test
 ```
 
 
@@ -53,7 +62,7 @@ You are ready to use rails with PostgreSQL configured
     DevUp! INFO starting up...
     DevUp! INFO up
 
-    $ Created database 'dummy_rails_test'
+    $ Created database 'test'
 
 
 ## Without Rails
@@ -65,7 +74,7 @@ ENV vars from .env.services are loaded with dotenv automatically.
 require "devup"
 require "sequel"
 
-DB = Sequel.connect(ENV.fetch("DATABASE_URL"))
+DB = Sequel.connect(adapter: "postgres", host: ENV.fetch("POSTGRES_HOST"), port: ENV.fetch("POSTGRES_PORT"), database: "blog", user: 'postgres')
 ```
 
 
@@ -103,6 +112,26 @@ Now you can run app
 
 If you don't want devup to setup your dev services, you can disable it by using `DEVUP_ENABLED=false`. Just add it to .env.local file.
 
+### Override some service
+
+If you want to switch some service from DevUp! to another, you can override ENV in a local dotenv configs:
+
+   * .env.local
+   * .env.development.local
+   * .env.test.local
+
+Just put to your .env.local:
+
+    export POSTGRES_HOST=0.0.0.0
+    export POSTGRES_PORT=5432
+
+### Get some DATABASE_URL working
+
+
+Just put to your .env.test or .env.development something like:
+
+    DATABASE_URL=postgres://postgres@$POSTGRES_HOST:$POSTGRES_PORT/test_db
+
 ### Debug
 
     $ export DEVUP_LOG_LEVEL=debug

data/devup.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Sergei O. Udalov"]
   spec.email = ["sergei@udalovs.ru"]
 
-  spec.summary = "A tool to manage docker-compose for developmnet"
+  spec.summary = "A tool to manage docker-compose for development"
   # spec.description   = %q{TODO: Write a longer description or delete this line.}
   spec.homepage = "https://github.com/sergio-fry/devup"
   spec.license = "MIT"

data/lib/devup.rb

@@ -1,9 +1,10 @@
 require "devup/version"
 require "devup/environment"
+require "devup/application"
 
 module Devup
   class Error < StandardError; end
 end
 
-require "devup/boot"
-require "devup/dotenv"
+app = Devup::Application.new
+app.run

data/lib/devup/application.rb

@@ -0,0 +1,68 @@
+require "devup/dotenv_load_list"
+require "devup/environment"
+require "devup/logger"
+require "dotenv"
+
+module Devup
+  class Application
+    def run
+      return if devup_disabled?
+
+      boot
+      load_env
+    end
+
+    def boot
+      devup.up
+
+      begin
+        require "spring/commands"
+
+        Spring.watch devup.root.join("docker-compose.yml")
+      rescue LoadError, ArgumentError, NameError
+        # Spring is not available
+      end
+    end
+
+    def devup
+      @devup ||= Devup::Environment.new(
+        pwd: `pwd`,
+        logger: Devup::Logger.build(log_level)
+      )
+    end
+
+    def load_env
+      begin
+        Dotenv.instrumenter = ActiveSupport::Notifications
+        ActiveSupport::Notifications.subscribe(/^dotenv/) do |*args|
+          event = ActiveSupport::Notifications::Event.new(*args)
+          Spring.watch event.payload[:env].filename # if Rails.application
+        end
+      rescue LoadError, ArgumentError, NameError
+        # Spring is not available
+      end
+
+      Dotenv.load(*dotenv_list.to_a)
+    end
+
+    def app_env
+      (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development").to_sym
+    end
+
+    def dotenv_list
+      Devup::DotenvLoadList.new(env: app_env)
+    end
+
+    def dotenv_vars
+      Dotenv.parse(*dotenv_list.to_a)
+    end
+
+    def log_level
+      ENV.fetch("DEVUP_LOG_LEVEL", dotenv_vars["DEVUP_LOG_LEVEL"] || "info")
+    end
+
+    def devup_disabled?
+      ENV.fetch("DEVUP_ENABLED", dotenv_vars["DEVUP_ENABLED"] || "true") != "true"
+    end
+  end
+end

data/lib/devup/cli.rb

@@ -1,5 +1,6 @@
 require "dry/cli"
 
+require "devup/version"
 require "devup/cli/commands/up"
 require "devup/cli/commands/down"
 

data/lib/devup/compose.rb

@@ -29,8 +29,8 @@ module Devup
       config["services"][name]["ports"].map { |el| el.to_s.split(":")[-1].to_i }
     end
 
-    def port_mapping(service, port)
-      exec("port #{service} #{port}").split(":")[-1].strip.to_i
+    def port_mapping(port)
+      ComposeHelpers::Ps.new(exec_ps_cached).port_mapping(port)
     end
 
     def up
@@ -64,7 +64,15 @@ module Devup
     end
 
     def alive?
-      ComposeHelpers::Ps.new(exec("ps")).up?
+      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)

data/lib/devup/dotenv_load_list.rb

@@ -0,0 +1,35 @@
+module Devup
+  class DotenvLoadList
+    def initialize(env: nil)
+      @env = env.to_sym unless env.nil?
+    end
+
+    def to_a
+      list = []
+
+      list << ".env.#{@env}.local" if env_defined?
+      list << ".env.local" unless test?
+      list << ".env.services"
+      list << ".env.#{@env}" if env_defined?
+      list << ".env"
+
+      list
+    end
+
+    def include?(val)
+      to_a.include? val
+    end
+
+    def index(val)
+      to_a.index val
+    end
+
+    def test?
+      @env == :test
+    end
+
+    def env_defined?
+      !@env.nil?
+    end
+  end
+end

data/lib/devup/service.rb

@@ -19,7 +19,7 @@ module Devup
       compose.service_ports(name).map do |from|
         OpenStruct.new(
           from: from,
-          to: compose.port_mapping(name, from)
+          to: compose.port_mapping(from)
         )
       end
     end

data/lib/devup/service_presenter.rb

@@ -31,7 +31,7 @@ module Devup
     def ports_env
       res = []
 
-      res << port_env(to: service.ports.first.to) if service.ports.size == 1
+      res << port_env(to: service.ports.first.to)
 
       service.ports.each do |port|
         res << port_env(from: port.from, to: port.to)

data/lib/devup/version.rb

@@ -1,3 +1,3 @@
 module Devup
-  VERSION = "0.4.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Sergei O. Udalov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -63,16 +63,15 @@ files:
 - devup.gemspec
 - docker-compose.devup.yml
 - exe/devup
-- lefthook.yml
 - lib/devup.rb
-- lib/devup/boot.rb
+- lib/devup/application.rb
 - lib/devup/cli.rb
 - lib/devup/cli/commands/command.rb
 - lib/devup/cli/commands/down.rb
 - lib/devup/cli/commands/up.rb
 - lib/devup/compose.rb
 - lib/devup/compose/ps.rb
-- lib/devup/dotenv.rb
+- lib/devup/dotenv_load_list.rb
 - lib/devup/environment.rb
 - lib/devup/logger.rb
 - lib/devup/port_checker.rb
@@ -101,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
-summary: A tool to manage docker-compose for developmnet
+summary: A tool to manage docker-compose for development
 test_files: []

data/lefthook.yml

@@ -1,7 +0,0 @@
-pre-commit:
-  parallel: true
-  commands:
-    lint:
-      files: git diff --name-only --staged
-      glob: "*.rb"
-      run: standardrb --force-exclusion {files}

data/lib/devup/boot.rb

@@ -1,15 +0,0 @@
-if ENV.fetch("DEVUP_ENABLED", "true") == "true"
-  devup = Devup::Environment.new(
-    pwd: `pwd`,
-    logger: Devup::Logger.build(ENV.fetch("DEVUP_LOG_LEVEL", "info"))
-  )
-  devup.up
-
-  begin
-    require "spring/commands"
-
-    Spring.watch devup.root.join("docker-compose.yml")
-  rescue LoadError, ArgumentError
-    # Spring is not available
-  end
-end

data/lib/devup/dotenv.rb

@@ -1,2 +0,0 @@
-require "dotenv"
-Dotenv.load ".env.services"