rumination 0.12.12 → 0.12.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb2eff90ce84762e22035343307ebbb40a348c63
-  data.tar.gz: a1a91d4909b13e0169c0490acd25182bd3946ee7
+  metadata.gz: d9b62a14a8e881d50577eb3271f601d48b170649
+  data.tar.gz: 3518ef2c808e7e8d6e9c4f82e6048eddfa81d0c4
 SHA512:
-  metadata.gz: 4d24bf02e175ad4368307a41094de0ccf347d94eed6329a3137d024be7a3f70a4580df4457436a2d06c4ee39cff47f4fddaae8d519fd33c398e4035d06c788c0
-  data.tar.gz: 0f94f2f118ec84f22a46237b9eeba3e1b9b1ff6a2123f0351204fd82ebc3fd76e1e29c77558e75d3fee27a409e801a88517fd90f9cae30518616dac9da5e5f4a
+  metadata.gz: b172d181638946f12b527fddc71d5fa756562692bd56a3ccd5418b500dd9ace70616d75bcd21ccc12e6e0e4068c8a9f13797471fd51220bf9ec3afcb9fecd593
+  data.tar.gz: eadf29336de5e1341536943c15dcfdcf5d1306466db95b16b89347ae0c65dba3cb9ab750288bcea2f2319145a50ad9d82f3fb6813d56cb8c772e1d6d6e452028

data/lib/rumination/deploy/class_methods.rb

@@ -9,8 +9,8 @@ module Rumination
           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
+        env["COMPOSE_FILE"] &&= 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

data/lib/rumination/tasks/deploy.rake

@@ -1,10 +1,27 @@
 task :deploy, [:target] => "deploy:default"
 
+module WithHashPuts
+  refine Object do
+    def puts *args
+      print "# "
+      Kernel.puts *args
+    end
+  end
+end
+
 namespace :deploy do
-  task :env, [:target] => [:puts_comments, :load_target_config] do |t, args|
+  task :env, [:target] => :load_target_config_filterd do |t, args|
+    puts
     Rumination::Deploy.docker_env.each do |var, val|
       puts %Q[export #{var}="#{val}"]
     end
+    puts <<-__
+
+# to load this into a bash environment run:
+#
+#   eval $(rake deploy:env[#{Rumination::Deploy.target}])
+
+    __
   end
 
   task :default, [:target] => :setup_docker_env do |t, args|
@@ -24,12 +41,9 @@ namespace :deploy do
     Rumination::Deploy.load_target_config args.target
   end
 
-  task :puts_comments do
-    alias_method :old_puts, :puts
-    def puts *args
-      print "# "
-      old_puts *args
-    end
+  task :load_target_config_filterd, [:target] do |t, args|
+    using WithHashPuts
+    Rake::Task["deploy:load_target_config"].invoke args.target
   end
 
   namespace :bootstrap do

data/lib/rumination/version.rb

@@ -1,3 +1,3 @@
 module Rumination
-  VERSION = "0.12.12"
+  VERSION = "0.12.13"
 end

data/lib/rumination.rb

@@ -9,6 +9,16 @@ require_relative "rumination/version"
 require_relative "rumination/dev_user"
 require_relative "rumination/pg"
 
-Rumination.configure do |config|
-  config.pg = Rumination::Pg.config
+module Rumination
+  def self.factory_reset
+    config.clear
+    if defined? Rumination::Deploy
+      Rumination::Deploy.config.clear
+    end
+    configure do |config|
+      config.pg = Rumination::Pg.config
+    end
+  end
+
+  factory_reset
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rumination
 version: !ruby/object:Gem::Version
-  version: 0.12.12
+  version: 0.12.13
 platform: ruby
 authors:
 - Artem Baguinski