rumination 0.11.5 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a017151fbe1f808354b7c926ba9ab6b1b2e5e7
-  data.tar.gz: 733f72c88adc92b382b19b2cb07b6df49a80c8b0
+  metadata.gz: 4db8607f09b3ee1aad402996f7f7d5b3e593fdf4
+  data.tar.gz: f10beea4befeb1b90ce0d5e52e57ff575a9cccdf
 SHA512:
-  metadata.gz: 42453f3eea7838e24553af0415086ac13925c341e9c64bb3839630d9eaee15dad976b707bc81f507770928f1c9354d3d0b44db481518e8dc400dd897a6669b62
-  data.tar.gz: 9426aaa257878f86feec7cf70b243991b64b3f27b98295d2da4a4bb0ffca231f01b8d0fbde58b2a36f74bc902b86bf87fe71416871b45a17bc40623cb78bf49a
+  metadata.gz: d0465ac699012527ca0cb92e0e6165cb63353d81c74281f7b42136095154379d50ebe6c5697ce00fbd72dfbe5e182cbe827169bed62d697c5b31f8f1606fa4ee
+  data.tar.gz: f497f85837a48dee0c8dd20c797bb8152f959d194c60a7f0b5a53bc6e7a63c428d1de08d04c2c0f0133f142f3863d55a4753e35f5bef9458887614685c61b825

data/lib/rumination/deploy.rb

@@ -1,5 +1,6 @@
 require "active_support/configurable"
 require_relative "deploy/class_methods"
+require "dotenv/parser"
 
 module Rumination
   module Deploy
@@ -10,5 +11,20 @@ module Rumination
     BootstrapError = Class.new(DeployError)
     BootstrappedAlready = Class.new(BootstrapError)
     DatabaseInitError = Class.new(BootstrapError)
+
+    def docker_env
+      env = {}
+      if config.docker_machine
+        dm_env_str = `docker-machine env #{config.docker_machine}`
+        env = env.merge(Dotenv::Parser.call(dm_env_str))
+      end
+      env["COMPOSE_FILE"] = config.compose_file if config.compose_file
+      env["VIRTUAL_HOST"] = config.virtual_host
+      if config.letsencrypt_email.present?
+        env["LETSENCRYPT_HOST"] = config.virtual_host
+        env["LETSENCRYPT_EMAIL"] = config.letsencrypt_email
+      end
+      env
+    end
   end
 end

data/lib/rumination/tasks/deploy.rake

@@ -1,5 +1,39 @@
-task :deploy, [:target] do |t, args|
-  require "rumination/deploy"
-  args.with_defaults target: :development
-  Rumination::Deploy.app(target: args.target)
+task :deploy, [:target] => "deploy:default"
+
+namespace :deploy do
+  task :env, [:target] => :load_target_config do |t, args|
+    Rumination::Deploy.docker_env.each do |var, val|
+      puts %Q[export #{var}="#{val}"]
+    end
+  end
+
+  task :default, [:target] => :setup_docker_env do |t, args|
+  end
+
+  task :bootstrap, [:target] => :setup_docker_env do |t, args|
+  end
+
+  task :setup_docker_env, [:target] => :load_target_config do |t, args|
+    ENV.update Rumination::Deploy.docker_env
+  end
+
+  task :load_target_config, [:target] do |t, args|
+    args.with_defaults target: :development
+    begin
+      load target_config_path
+    rescue LoadError => e
+      raise RuntimeError, e.message
+    end
+  end
+
+  namespace :bootstrap do
+    task :undo, [:target] => %w[confirm_undo] do |t, args|
+    end
+
+    task :confirm_undo do |t, args|
+      require "highline/import"
+      question = "Do you really want to undo the bootstrap (database will be dropped)?"
+      abort("Bootstrap undo canceled, you didn't mean it") unless agree(question)
+    end
+  end
 end

data/lib/rumination/version.rb

@@ -1,3 +1,3 @@
 module Rumination
-  VERSION = "0.11.5"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rumination
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - Artem Baguinski
@@ -157,8 +157,6 @@ files:
 - lib/rumination/tasks/db/dump.rake
 - lib/rumination/tasks/db/setup.rake
 - lib/rumination/tasks/deploy.rake
-- lib/rumination/tasks/deploy/bootstrap.rake
-- lib/rumination/tasks/deploy/env.rake
 - lib/rumination/tasks/deploy/inside.rake
 - lib/rumination/version.rb
 - rumination.gemspec

data/lib/rumination/tasks/deploy/bootstrap.rake

@@ -1,27 +0,0 @@
-namespace :deploy do
-  task :bootstrap, [:target] do |t, args|
-    require "rumination/deploy"
-    args.with_defaults target: :development
-    begin
-      Rumination::Deploy.bootstrap(target: args.target)
-    rescue Rumination::Deploy::BootstrappedAlready
-      abort "'#{args.target}' has already been bootstrapped"
-    end
-  end
-
-  namespace :bootstrap do
-    task :undo, [:target] => %w[confirm_undo start_undo] do |t, args|
-      require "rumination/deploy"
-      args.with_defaults target: :development
-      Rumination::Deploy.bootstrap_undo(target: args.target)
-    end
-
-    task :confirm_undo do |t, args|
-      require "highline/import"
-      question = "Do you really want to undo the bootstrap (database will be dropped)?"
-      abort("Bootstrap undo canceled, you didn't mean it") unless agree(question)
-    end
-
-    task :start_undo, [:target]
-  end
-end

data/lib/rumination/tasks/deploy/env.rake

@@ -1,9 +0,0 @@
-namespace :deploy do
-  task :env, [:target] do |t, args|
-    require "rumination/deploy"
-    args.with_defaults target: :development
-    Rumination::Deploy.env(target: args.target).each do |var, val|
-      puts %Q[export #{var}="#{val}"]
-    end
-  end
-end