devup 0.3.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83b3c98d30a71d2414a1fc5106d9a907612911f4b05a2246404f08215be203c
-  data.tar.gz: 772cee331bdcd822f497cc7121a6d6201b971b65b930e47864770d7cbb30df62
+  metadata.gz: d01ca2f4289ff4e43debcf48281affb38e3a81a108e1404206a00c41585fc77f
+  data.tar.gz: '08befd6589ddd7f58728659dca4f852a207a976aadb80728a68cfa461f49e8c5'
 SHA512:
-  metadata.gz: e29107cb8acd259d0e1f038e93cd7809e5b933abdedace59e17001e974220632ed95fe14aadb8e28007c6164665fbd4b4398268b1b476d35042c89457dde78b7
-  data.tar.gz: 7145ada30c07f14547ea5fc4c3d6ef9222a7dee288bb2d38b547a1907d844646e737d43a8f740668739465de60217d7e1a0501601618bb5e270c77e99903e713
+  metadata.gz: c9302d63bdf377844ee4dd4928ebb8d57a3a509c339aa1ae9374f4fb8bcf6f45506cd64f3bfde46341dfcab74c1af722c417dd7117adc39abf9eb79495bee7a6
+  data.tar.gz: 07f6b96af54b5fe8338935c287a3b380a5ac20c05a15686ab782f0c7dc77ca2213518b5c2f32145cfbcfe237695c52327f65f5512bf81cefbd0f17365517455e

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,26 +1,28 @@
 PATH
   remote: .
   specs:
-    devup (0.3.3)
+    devup (0.5.1)
       dotenv
+      dry-cli
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
     byebug (11.1.3)
-    diff-lcs (1.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    dotenv (2.7.5)
-    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)
+    dotenv (2.7.6)
+    dry-cli (0.6.0)
+      concurrent-ruby (~> 1.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)
@@ -34,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
@@ -61,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

@@ -1,4 +1,4 @@
-# DevUp!  [![Travis (.com) branch](https://img.shields.io/travis/com/sergio-fry/devup/master)](https://travis-ci.com/github/sergio-fry/devup) [![Gem](https://img.shields.io/gem/v/devup)](https://rubygems.org/gems/devup) [![Code Climate coverage](https://img.shields.io/codeclimate/coverage/sergio-fry/devup)](https://codeclimate.com/github/sergio-fry/devup) [![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/sergio-fry/devup)](https://codeclimate.com/github/sergio-fry/devup) [![Gem](https://img.shields.io/gem/dt/devup)](https://rubygems.org/gems/devup)
+# DevUp!  [![Travis (.com) branch](https://img.shields.io/travis/com/sergio-fry/devup/master)](https://travis-ci.com/github/sergio-fry/devup) [![Gem](https://img.shields.io/gem/v/devup)](https://rubygems.org/gems/devup) [![Code Climate coverage](https://img.shields.io/codeclimate/coverage/sergio-fry/devup)](https://codeclimate.com/github/sergio-fry/devup) [![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/sergio-fry/devup)](https://codeclimate.com/github/sergio-fry/devup) [![Gem](https://img.shields.io/gem/dt/devup)](https://rubygems.org/gems/devup) [![Hits-of-Code](https://hitsofcode.com/github/sergio-fry/devup)](https://hitsofcode.com/view/github/sergio-fry/devup)
 
 Describe development dependencies with docker-compose. It is not required to remember any fancy command to start docker. Just start developing your app. Rails is a first-class citizen, but could be used without ruby.
 
@@ -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')
 ```
 
 
@@ -77,7 +86,7 @@ Install DevUp!
 
 Start up services
 
-    $ devup
+    $ devup up
     DevUp! INFO starting up...
     DevUp! INFO up
 
@@ -103,10 +112,30 @@ 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
-    $ devup
+    $ devup up
 
 ## Development
 

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"
@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dotenv"
+  spec.add_dependency "dry-cli"
 end

data/docker-compose.devup.yml

@@ -6,3 +6,6 @@ services:
     ports:
       - "5432"
 
+  web:
+    image: nginx
+

data/exe/devup

@@ -1,16 +1,5 @@
 #!/usr/bin/env ruby
 
-require "devup/environment"
+require "devup/cli"
 
-devup = Devup::Environment.new(
-  pwd: `pwd`,
-  logger: Devup::Logger.build(ENV.fetch("DEVUP_LOG_LEVEL", "info"))
-)
-
-# TODO: use dry-cli here
-case ARGV[0]
-when "down"
-  devup.down
-else
-  devup.up
-end
+Dry::CLI.new(Devup::CLI::Commands).call

data/lib/devup.rb

@@ -5,5 +5,7 @@ module Devup
   class Error < StandardError; end
 end
 
-require "devup/boot"
-require "devup/dotenv"
+if ENV.fetch("DEVUP_ENABLED", "true") == "true"
+  require "devup/boot"
+  require "devup/dotenv"
+end

data/lib/devup/boot.rb

@@ -1,15 +1,13 @@
-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
+devup = Devup::Environment.new(
+  pwd: `pwd`,
+  logger: Devup::Logger.build(ENV.fetch("DEVUP_LOG_LEVEL", "info"))
+)
+devup.up
 
-  begin
-    require "spring/commands"
+begin
+  require "spring/commands"
 
-    Spring.watch devup.root.join("docker-compose.yml")
-  rescue LoadError, ArgumentError
-    # Spring is not available
-  end
+  Spring.watch devup.root.join("docker-compose.yml")
+rescue LoadError, ArgumentError, NameError
+  # Spring is not available
 end

data/lib/devup/cli.rb

@@ -0,0 +1,22 @@
+require "dry/cli"
+
+require "devup/cli/commands/up"
+require "devup/cli/commands/down"
+
+module Devup
+  module CLI
+    module Commands
+      extend Dry::CLI::Registry
+
+      class Version < Dry::CLI::Command
+        def call(*)
+          puts Devup::VERSION
+        end
+      end
+    end
+  end
+end
+
+Devup::CLI::Commands.register "version", Devup::CLI::Commands::Version, aliases: ["v", "-v", "--version"]
+Devup::CLI::Commands.register "up", Devup::CLI::Commands::Up
+Devup::CLI::Commands.register "down", Devup::CLI::Commands::Down

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

@@ -0,0 +1,38 @@
+require "devup/logger"
+
+module Devup
+  module CLI
+    module Commands
+      class Command < Dry::CLI::Command
+        def call(**options)
+          @opts = options
+        end
+
+        private
+
+        attr_reader :opts
+
+        def logger
+          @logger ||= Devup::Logger.build(log_level)
+        end
+
+        def log_level
+          if opts.fetch(:verbose)
+            :debug
+          else
+            :info
+          end
+        end
+
+        def devup
+          require "devup/environment"
+
+          @devup ||= Devup::Environment.new(
+            pwd: `pwd`,
+            logger: logger
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Devup
+  module CLI
+    module Commands
+      class Down < Command
+        desc "Stop dev services"
+
+        option :verbose, type: :boolean, default: false, desc: "Verbose"
+
+        def call(**options)
+          super
+
+          devup.down
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require "devup/cli/commands/command"
+module Devup
+  module CLI
+    module Commands
+      class Up < Command
+        desc "Run dev services"
+
+        option :verbose, type: :boolean, default: false, desc: "Verbose"
+
+        def call(**options)
+          super
+
+          devup.up
+          print_info
+        end
+
+        private
+
+        def print_info
+          puts <<~INFO
+
+            Now you are ready to use services. All variables are available
+            in a .env.services file. Just start you ruby application if
+            gem "devup" is used. Or load variable manually with
+
+                $ source .env.services
+
+          INFO
+        end
+      end
+    end
+  end
+end

data/lib/devup/compose.rb

@@ -24,11 +24,13 @@ module Devup
     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(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
@@ -62,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.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, NameError
+  # 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/environment.rb

@@ -35,6 +35,7 @@ module Devup
       clear_dotenv
       logger.debug ex
       logger.error "halted"
+      raise ex
     end
 
     def down

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.3.3"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devup
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.1
 platform: ruby
 authors:
 - Sergei O. Udalov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - sergei@udalovs.ru
@@ -49,12 +63,16 @@ files:
 - devup.gemspec
 - docker-compose.devup.yml
 - exe/devup
-- lefthook.yml
 - lib/devup.rb
 - lib/devup/boot.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
@@ -83,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}