devup 0.4.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96dfaf1740d9680c2a7060ac68cec0e442df06c459a802f96509429b19ff7ac7
-  data.tar.gz: 01423f04ef9c067798d12d595421ba51ef75410ebfe42c55c66f16dbf265aef2
+  metadata.gz: 511e80ba2fee56f5436b039bed0a4971bd862d72b567212ce9d308c67ee8a1e2
+  data.tar.gz: d6ee87d4b3072ec10b9b5f4cba552e9c3227ff2541ac94ad8e2811a71b5d0f88
 SHA512:
-  metadata.gz: d33c8f40d01c63d1c1d3738e095b7975d78cd7e08a5abecfdc6f5d2349f06216d993e382bf94ccafe117c4e750b5e5973723228ec028d4a86aa2b3212dd2bfad
-  data.tar.gz: c43fb7fd47119bbfe821f26e06d6b081fcfcb93f31310a9e89bf0d7e61544822d5d5051db26b3574f3b42e02504464ef39733fedbc6f5f3eb8eb82cf73f1e990
+  metadata.gz: 43b8fef236dda464cd9264096534f997dce81a1b71f266a3892161008f036d77053345324ad7f2f936ce34fc58708f5b24f499ad9d0b9f19c2bbe10642f4eaf5
+  data.tar.gz: 1c54bc229b93496280b47bd81d2e8a900db0d08fd9acc7c774f857e19ddbf05fb73a38aad292b65b78fdb8bd855666e2ef26f28d34f4083b83d1212c8b8eb658

data/.ruby-version

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

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.3.1)
+    devup (0.5.0)
       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/dotenv.rb

@@ -1,2 +1,16 @@
 require "dotenv"
-Dotenv.load ".env.services"
+require "devup/dotenv_load_list"
+
+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
+  # Spring is not available
+end
+
+env = (ENV["RAILS_ENV"] || "development").to_sym
+list = Devup::DotenvLoadList.new(env: env)
+Dotenv.load(*list.to_a)

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/version.rb

@@ -1,3 +1,3 @@
 module Devup
-  VERSION = "0.4.3.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devup
 version: !ruby/object:Gem::Version
-  version: 0.4.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Sergei O. Udalov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -63,7 +63,6 @@ files:
 - devup.gemspec
 - docker-compose.devup.yml
 - exe/devup
-- lefthook.yml
 - lib/devup.rb
 - lib/devup/boot.rb
 - lib/devup/cli.rb
@@ -73,6 +72,7 @@ files:
 - 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 +101,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}