rumination 0.10.9 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5384bb277ec551dddb47b389db70d4fd2c1f43c
-  data.tar.gz: b528e6dfd50b9f72c7a904306faf4eaa65c04099
+  metadata.gz: 66594db74940cc8e881895374f4db6fcb127f88b
+  data.tar.gz: af8b9b0f57b35eb6c07e8a38d132c61c4f7d8c1a
 SHA512:
-  metadata.gz: 7e43b0f126db5a26f8335b6cefeb51d7c550b8577ceb4ebb3c6cbf6fa8e3343fa1f9e3bf3de1bb00bcfeb0e1b70d87181ec443e27c3bb9b04a4adcd4b3527c97
-  data.tar.gz: 7f3692973513d4c547b2f714c45b58e48e79550570386e70a6b884267c51c6b99689cc80b289b3393607810368238f178f8bac4c3b069bba942dba5205eef937
+  metadata.gz: 1a96cfe47c6ed05f07e496a4c627f16c985833be199d725d8ef9d0cc082cc2bacbfeabeec57d889c3c3b684580ee8d48212297a97838efcf961372293bbf9f69
+  data.tar.gz: 99eb7b026868a0fdbf2f6f1d58f28e49e6e84e31c19406f9be94148493ab57405141fc108c25641f08c8eb595dc628e25bf5377df1be1cfa25dead9b0a19dc7a

data/lib/rumination/deploy/base.rb

@@ -15,26 +15,30 @@ module Rumination
         load_target_config
       end
 
-      def bootstrap
-        call do
-          raise BootstrappedAlready if bootstrapped?
-          copy_dump_if_requested
-          app_container.run("rake deploy:bootstrap:inside[#{target}]")
-          raise BootstrapError unless $? == 0
-        end
-      end
-
       def call
         setup_outside_env
         DockerCompose.build.down("--remove-orphans").up
         app_container.run("bundle install") if cached_gems?
-        yield if block_given?
-        app_container.run("rake deploy:unload[#{target}]")
+        yield self if block_given?
+        app_container.run("rake deploy:inside:unload[#{target}]")
         raise DeployError unless $? == 0
-        app_container.run("rake deploy:finish[#{target}]")
+        app_container.run("rake deploy:inside:finish[#{target}]")
         raise DeployError unless $? == 0
       end
 
+      def bootstrap
+        raise BootstrappedAlready if bootstrapped?
+        copy_dump_if_requested
+        app_container.run("rake deploy:inside:bootstrap[#{target}]")
+        raise BootstrapError unless $? == 0
+      end
+
+      def bootstrap_undo
+        raise NotBootstrappedYet unless bootstrapped?
+        app_container.run("rake deploy:inside:bootstrap:undo[#{target}]")
+        raise BootstrapError unless $? == 0
+      end
+
       def load_target_config
         load target_config_path
       rescue LoadError => e
@@ -58,13 +62,24 @@ module Rumination
 
       def write_env_file
         File.open(env_file_path, "w") do |io|
-          password_vars.each do |var|
-            puts "Generating #{var}"
-            io.puts %Q[export #{var}="#{generate_password}"]
+          persistent_env.merge(generated_passwords).each do |var, val|
+            io.puts %Q[export #{var}="#{val}"]
           end
         end
       end
 
+      def rm_env_file
+        File.rm(env_file_path)
+      end
+
+      def persistent_env
+        config.persistent_env || {}
+      end
+
+      def generated_passwords
+        password_vars.map{|var| [var, generate_password]}.to_h
+      end
+
       def generate_password
         Generate.password
       end
@@ -72,12 +87,11 @@ module Rumination
       private
 
       def copy_dump_if_requested
-        return unless config.copy_dumpfile.present?
-        return unless File.exists?(config.copy_dumpfile)
-        app_container.cp_to_container(
-          config.copy_dumpfile,
-          Rumination.config.pg.dumpfile_path
-        )
+        source = config.copy_dumpfile
+        return unless source.present?
+        return unless File.exists?(source)
+        target = Rumination.config.pg.dumpfile_path
+        app_container.cp_to_container source, target
       end
 
       def load_application_config_if_exists

data/lib/rumination/deploy/class_methods.rb

@@ -4,7 +4,13 @@ module Rumination
   module Deploy
     module ClassMethods
       def bootstrap target:
-        deploy_class.new(target).bootstrap
+        deploy_class.new(target).call do |deploy|
+          deploy.bootstrap
+        end
+      end
+
+      def bootstrap target:
+        deploy_class.new(target).bootstrap_undo
       end
 
       def app target:
@@ -19,6 +25,10 @@ module Rumination
         deploy_class.new(target).write_env_file
       end
 
+      def rm_env_file target:
+        deploy_class.new(target).rm_env_file
+      end
+
       def deploy_class
         config.deploy_class || Base
       end

data/lib/rumination/deploy.rb

@@ -9,6 +9,7 @@ module Rumination
     UnknownTarget = Class.new(DeployError)
     BootstrapError = Class.new(DeployError)
     BootstrappedAlready = Class.new(BootstrapError)
+    NotBootstrappedYet = Class.new(BootstrapError)
     DatabaseInitError = Class.new(BootstrapError)
   end
 end

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

@@ -10,12 +10,20 @@ namespace :deploy do
   end
 
   namespace :bootstrap do
-    # these are invoked inside the containers
-    task :inside, [:target] => %w[write_env_file db:setup:maybe_load_dump]
-
-    task :write_env_file, [:target] do |t, args|
+    task :undo, [:target] => %w[confirm_undo] do |t, args|
       require "rumination/deploy"
-      Rumination::Deploy.write_env_file(target: args.target)
+      args.with_defaults target: :development
+      begin
+        Rumination::Deploy.bootstrap_undo(target: args.target)
+      rescue Rumination::Deploy::NotBootstrappedYet
+        abort "'#{args.target}' has not been bootstrapped yet"
+      end
+    end
+
+    task :confirm_undo, [:target] 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/tasks/deploy/inside.rake

@@ -0,0 +1,48 @@
+namespace :deploy do
+  namespace :inside do
+    # these are invoked inside the containers
+    task :bootstrap, [:target] => %w[write_env_file db:setup:maybe_load_dump]
+
+    namespace :bootstrap do
+      task :undo, [:target] => %w[db:drop remove_env_file]
+
+      task :remove_env_file, [:target] do |t, args|
+        Rumination::Deploy.rm_env_file(target: args.target)
+      end
+    end
+
+    task :write_env_file, [:target] do |t, args|
+      require "rumination/deploy"
+      Rumination::Deploy.write_env_file(target: args.target)
+    end
+
+    task :unload, [:target] do |t, args|
+      vhost = ENV["VIRTUAL_HOST"]
+      if vhost.present?
+        sh "rm -f /etc/nginx/vhost.d/#{vhost}*"
+      end
+    end
+
+    task :finish, [:target] => %w[static_files vhost_conf]
+
+    task :static_files, [:target] do |t, args|
+      vhost = ENV["VIRTUAL_HOST"]
+      if vhost
+        sh "rsync -av public/ /var/www/#{vhost}"
+      end
+    end
+
+    task :vhost_conf, [:target] do |t, args|
+      def erb_config basename, vhost
+        template = "config/nginx/vhost.d/#{basename}.erb"
+        if vhost && File.exists?(template)
+          new_name = basename.sub("app", vhost)
+          sh "erb #{template} > /etc/nginx/vhost.d/#{new_name}"
+        end
+      end
+      vhost = ENV["VIRTUAL_HOST"]
+      erb_config "app", vhost
+      erb_config "app_location", vhost
+    end
+  end
+end

data/lib/rumination/version.rb

@@ -1,3 +1,3 @@
 module Rumination
-  VERSION = "0.10.9"
+  VERSION = "0.11.0"
 end

data/rumination.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activemodel"
   spec.add_dependency "railties"
   spec.add_dependency "dotenv"
+  spec.add_dependency "highline"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumination
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.11.0
 platform: ruby
 authors:
 - Artem Baguinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  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: development utilities
 email:
 - abaguinski@depraktijkindex.nl
@@ -145,7 +159,7 @@ files:
 - lib/rumination/tasks/deploy.rake
 - lib/rumination/tasks/deploy/bootstrap.rake
 - lib/rumination/tasks/deploy/env.rake
-- lib/rumination/tasks/deploy/finish.rake
+- lib/rumination/tasks/deploy/inside.rake
 - lib/rumination/version.rb
 - rumination.gemspec
 homepage: https://github.com/artm/rumination

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

@@ -1,30 +0,0 @@
-namespace :deploy do
-  task :unload, [:target] do |t, args|
-    vhost = ENV["VIRTUAL_HOST"]
-    if vhost.present?
-      sh "rm -f /etc/nginx/vhost.d/#{vhost}*"
-    end
-  end
-
-  task :finish, [:target] => %w[static_files vhost_conf]
-
-  task :static_files, [:target] do |t, args|
-    vhost = ENV["VIRTUAL_HOST"]
-    if vhost
-      sh "rsync -av public/ /var/www/#{vhost}"
-    end
-  end
-
-  task :vhost_conf, [:target] do |t, args|
-    def erb_config basename, vhost
-      template = "config/nginx/vhost.d/#{basename}.erb"
-      if vhost && File.exists?(template)
-        new_name = basename.sub("app", vhost)
-        sh "erb #{template} > /etc/nginx/vhost.d/#{new_name}"
-      end
-    end
-    vhost = ENV["VIRTUAL_HOST"]
-    erb_config "app", vhost
-    erb_config "app_location", vhost
-  end
-end