devup 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d01ca2f4289ff4e43debcf48281affb38e3a81a108e1404206a00c41585fc77f
-  data.tar.gz: '08befd6589ddd7f58728659dca4f852a207a976aadb80728a68cfa461f49e8c5'
+  metadata.gz: 6cac2c49e58ab10b2851c040543e3d0559ba2827ddb65c0194e902ddaedc7b77
+  data.tar.gz: 75645b22886ac2e5ed3935797b53ef16a0221bee4b312f0a9cb5617619b7535e
 SHA512:
-  metadata.gz: c9302d63bdf377844ee4dd4928ebb8d57a3a509c339aa1ae9374f4fb8bcf6f45506cd64f3bfde46341dfcab74c1af722c417dd7117adc39abf9eb79495bee7a6
-  data.tar.gz: 07f6b96af54b5fe8338935c287a3b380a5ac20c05a15686ab782f0c7dc77ca2213518b5c2f32145cfbcfe237695c52327f65f5512bf81cefbd0f17365517455e
+  metadata.gz: 80c00c1ba35664e0239b66aef478ee585b96b6000d8931ff27bce090448e002e2daa358d1e28f2ecaf896d55235ec21a6dcf69d28a0507f6dbd24009e58b243b
+  data.tar.gz: 1a94f305329fc701429203c17412b41406e4f14de59596d52895f68f4d7b1b4f92dca7f9212cbaa947b74949e6697acb7f146a2dfd6c353d487e90feba85c88c

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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devup (0.5.1)
+    devup (0.5.2)
       dotenv
       dry-cli
 

data/lib/devup.rb

@@ -1,11 +1,10 @@
 require "devup/version"
 require "devup/environment"
+require "devup/application"
 
 module Devup
   class Error < StandardError; end
 end
 
-if ENV.fetch("DEVUP_ENABLED", "true") == "true"
-  require "devup/boot"
-  require "devup/dotenv"
-end
+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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devup
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Sergei O. Udalov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -64,14 +64,13 @@ files:
 - docker-compose.devup.yml
 - exe/devup
 - 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

data/lib/devup/boot.rb

@@ -1,13 +0,0 @@
-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, NameError
-  # Spring is not available
-end

data/lib/devup/dotenv.rb

@@ -1,16 +0,0 @@
-require "dotenv"
-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)