devup 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83b3c98d30a71d2414a1fc5106d9a907612911f4b05a2246404f08215be203c
-  data.tar.gz: 772cee331bdcd822f497cc7121a6d6201b971b65b930e47864770d7cbb30df62
+  metadata.gz: 99a6b3579f7d44d86a42c61b5d5b55dcd32e8d7aac580c49e5bce9a95500ff02
+  data.tar.gz: 2a73831a4d8d1549d6150050c12d4806ab8cc41089cbb9ce2b81420d09b02c8a
 SHA512:
-  metadata.gz: e29107cb8acd259d0e1f038e93cd7809e5b933abdedace59e17001e974220632ed95fe14aadb8e28007c6164665fbd4b4398268b1b476d35042c89457dde78b7
-  data.tar.gz: 7145ada30c07f14547ea5fc4c3d6ef9222a7dee288bb2d38b547a1907d844646e737d43a8f740668739465de60217d7e1a0501601618bb5e270c77e99903e713
+  metadata.gz: 709e5c38a2786273085eba92ab0fa70f70dd8fbbfe1200b631ab1bd527b072df097fe6b856bab1e57a5790952dd2476665bcca965e302a69fa8ea2d47cb0d2a4
+  data.tar.gz: 5c81a935db87d41f22be697fcce631d9f80262f155bbc5eac146c2782e8d1ff49a4a805a86ad0b2c14b3d91e118807c80e0f857ba8584927a1743eab3fd7d87a

data/Gemfile.lock

@@ -1,17 +1,21 @@
 PATH
   remote: .
   specs:
-    devup (0.3.3)
+    devup (0.4.0)
       dotenv
+      dry-cli
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
     byebug (11.1.3)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     docile (1.3.2)
     dotenv (2.7.5)
+    dry-cli (0.6.0)
+      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json (2.3.0)
     lefthook (0.7.2)

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.
 
@@ -77,7 +77,7 @@ Install DevUp!
 
 Start up services
 
-    $ devup
+    $ devup up
     DevUp! INFO starting up...
     DevUp! INFO up
 
@@ -106,7 +106,7 @@ If you don't want devup to setup your dev services, you can disable it by using
 ### Debug
 
     $ export DEVUP_LOG_LEVEL=debug
-    $ devup
+    $ devup up
 
 ## Development
 

data/devup.gemspec

@@ -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/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,6 +24,8 @@ 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
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devup
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Sergei O. Udalov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-23 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
@@ -52,6 +66,10 @@ files:
 - 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