rumination 0.12.15 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cb9209a6606d4c0abac069401647b5d15eb4770
-  data.tar.gz: 148af99713e68d13f7e079fb6cc9cae860fafa06
+  metadata.gz: f37ff443ac4ef4093c22b5fcf6d541433c0e6fc6
+  data.tar.gz: 884ba6986f9a85d092a58825e5916db578979e9c
 SHA512:
-  metadata.gz: ad1ebd44572f6fec90797a3bfc5db771b32121eca714a1503167422f0142eb9111f89db9f25c0ea6449f1e91837672fb1d1c52adc4674305c6fbe8da44ef2eb8
-  data.tar.gz: f28194587536f0affa9b4f412e1b421e59728876dd0acc600eb720871b87b5bfe9456956c6e070ac911b028efb5d8ac1edde608a4d4f73e01f2653650c29b816
+  metadata.gz: 7c59350b7d85331d45617617635047d5ab4ffc300e01566c070eceaa1b9a863a4efb9fbe41f44544cd81be8afca00fbbdf4dbb5dba45d24770ceb85733dbbabf
+  data.tar.gz: 7d9a018ce6310d3c12d03aa3f54ade2c765fad9622e41a7bd961f919306bd454d77105b30ea6c6bb8b984293a3eb993074295cbb970b987bf57708f89105237e

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/spec/fixtures/client_app/tmp/

data/lib/rumination/deploy/base.rb

@@ -3,89 +3,12 @@ require "dotenv/parser"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/object/blank"
 require_relative "../docker_compose"
-require_relative "../generate"
 
 module Rumination
   module Deploy
-    Base ||= Struct.new(:target) do
+    class Base
       delegate :config, to: Deploy
 
-      def initialize *args
-        super
-        load_application_config_if_exists
-        load_target_config
-      end
-
-      def call
-        setup_outside_env
-        DockerCompose.build.down("--remove-orphans").up
-        app_container.run("bundle install") if cached_gems?
-        yield self if block_given?
-        app_container.run("rake deploy:inside:unload[#{target}]")
-        raise DeployError unless $? == 0
-        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:write_env_file[#{target}]")
-        app_container.run("rake deploy:inside:bootstrap[#{target}]")
-        raise BootstrapError unless $? == 0
-      end
-
-      def bootstrap_undo
-        setup_outside_env
-        DockerCompose.down("--remove-orphans", "-v")
-        raise BootstrapError unless $? == 0
-      end
-
-      def load_target_config
-        load target_config_path
-      rescue LoadError => e
-        raise UnknownTarget, e.message
-      end
-
-      def setup_outside_env
-        ENV.update env
-      end
-
-      def env
-        env = docker_machine_env
-        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["COMPOSE_FILE"] = config.compose_file if config.compose_file
-        env
-      end
-
-      def write_env_file
-        File.open(env_file_path, "w") do |io|
-          persistent_env.merge(generated_passwords).each do |var, val|
-            io.puts %Q[export #{var}="#{val}"]
-          end
-        end
-      end
-
-      def rm_env_file
-        FileUtils.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
-
       private
 
       def copy_dump_if_requested
@@ -96,21 +19,10 @@ module Rumination
         app_container.cp_to_container source, target
       end
 
-      def load_application_config_if_exists
-        load application_config_path if File.exists?(application_config_path)
-      end
-
-      def application_config_path
-        "./config/deploy/application.rb"
-      end
-
       def target_config_path
         (config.target_config_path || "./config/deploy/targets/%s.rb") % target
       end
 
-      def password_vars
-        config.generate_passwords || Array(config.generate_password)
-      end
 
       def docker_machine_env
         dm_env_str = if config.docker_machine
@@ -125,10 +37,6 @@ module Rumination
         app_container.has_file?(env_file_path)
       end
 
-      def env_file_path
-        "/opt/app/env"
-      end
-
       def container(name)
         DockerCompose::Container.new(name)
       end

data/lib/rumination/deploy/class_methods.rb

@@ -1,8 +1,17 @@
-require_relative "base"
+require "ostruct"
+require_relative "../generate"
 
 module Rumination
   module Deploy
     module ClassMethods
+      def factory_reset!
+        config.clear
+        configure do |config|
+          config.bootstrap = OpenStruct.new
+        end
+        self.target = nil
+      end
+
       def docker_env
         env = {}
         if config.docker_machine
@@ -25,34 +34,46 @@ module Rumination
         raise UnknownTarget, e.message
       end
 
-      def bootstrap target:
-        deploy_class.new(target).call do |deploy|
-          deploy.bootstrap
+      def write_env_file path
+        File.open(path, "w") do |io|
+          persistent_env.merge(generated_passwords).each do |var, val|
+            io.puts %Q[export #{var}="#{val}"]
+          end
         end
       end
 
-      def bootstrap_undo target:
-        deploy_class.new(target).bootstrap_undo
+      def files_to_copy_on_bootstrap
+        (config.bootstrap && config.bootstrap.copy_files) || []
+      end
+
+      def files_to_copy_on_deploy
+        config.copy_files || []
+      end
+
+      def app_container_name
+        config.app_container || :app
       end
 
-      def app target:
-        deploy_class.new(target).call
+      def app_container_full_name
+        "#{compose_project_name}_#{app_container_name}_1"
       end
 
-      def env target:
-        deploy_class.new(target).env
+      def compose_project_name
+        (ENV["COMPOSE_PROJECT_NAME"] || File.basename(Dir.pwd)).gsub("_","")
       end
 
-      def write_env_file target:
-        deploy_class.new(target).write_env_file
+      private
+
+      def persistent_env
+        config.persistent_env || {}
       end
 
-      def rm_env_file target:
-        deploy_class.new(target).rm_env_file
+      def generated_passwords
+        password_vars.map{|var| [var, Generate.password]}.to_h
       end
 
-      def deploy_class
-        config.deploy_class || Base
+      def password_vars
+        config.generate_passwords || Array(config.generate_password)
       end
     end
   end

data/lib/rumination/deploy.rb

@@ -13,5 +13,6 @@ module Rumination
     BootstrapError = Class.new(DeployError)
     BootstrappedAlready = Class.new(BootstrapError)
     DatabaseInitError = Class.new(BootstrapError)
+    factory_reset!
   end
 end

data/lib/rumination/tasks/deploy.rake

@@ -1,43 +1,73 @@
+require "dotenv"
+require "active_support/core_ext/string/strip"
+
 task :deploy, [:target] => "deploy:default"
 
-module Kernel
-  alias_method :orig_puts, :puts
-  def hash_puts *args
-    print "# "
-    orig_puts *args
-  end
+namespace :deploy do
+  task :default, [:target] => %w[
+    start
+    finish
+  ]
 
-  def with_hash_puts
-    Kernel.send :alias_method, :puts, :hash_puts
-    yield
-  ensure
-    Kernel.send :alias_method, :puts, :orig_puts
-  end
-end
+  task :bootstrap, [:target] => %w[
+    start
+    bootstrap:env_file
+    bootstrap:copy_files
+    bootstrap:db
+    on:bootstrapped
+    finish
+  ]
 
-namespace :deploy do
   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}])
-
+    puts <<-__.strip_heredoc
+      # 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|
+  namespace :on do
+    task :deployed
+    task :bootstrapped
   end
 
-  task :bootstrap, [:target] => :setup_docker_env do |t, args|
+  namespace :bootstrap do
+    task :env_file do
+      env_file_path = "/opt/app/env"
+      temp_file_path = "tmp/#{Rumination::Deploy.target}.env"
+      mkdir_p File.dirname(temp_file_path)
+      Rumination::Deploy.write_env_file(temp_file_path)
+      container = Rumination::Deploy.app_container_full_name
+      sh "docker cp #{temp_file_path} #{container}:#{env_file_path}"
+    end
+
+    task :copy_files do
+      container = Rumination::Deploy.app_container_full_name
+      Rumination::Deploy.files_to_copy_on_bootstrap.each do |source, target|
+        sh "docker cp #{source} #{container}:#{target}"
+      end
+    end
+
+    task :db
+
+    task :undo, [:target] => %w[confirm_undo] do |t, args|
+      sh "docker-compose down --remove-orphans -v"
+    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
 
   task :setup_docker_env, [:target] => :load_target_config do |t, args|
     puts "Setting up '#{Rumination::Deploy.target}' target docker environment"
+    Dotenv.load
     ENV.update Rumination::Deploy.docker_env
   end
 
@@ -53,14 +83,38 @@ namespace :deploy do
     end
   end
 
-  namespace :bootstrap do
-    task :undo, [:target] => %w[confirm_undo] do |t, args|
-    end
+  task :start, [:target] => %w[
+    setup_docker_env
+    switch_containers
+  ]
 
-    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)
+  task :finish => %w[
+    copy_files
+    on:deployed
+  ]
+
+  task :switch_containers => %w[
+    build_containers
+    shut_down_services
+    start_services
+  ]
+
+  task :build_containers do
+    sh "docker-compose build"
+  end
+
+  task :shut_down_services do
+    sh "docker-compose down --remove-orphans"
+  end
+
+  task :start_services do
+    sh "docker-compose up -d"
+  end
+
+  task :copy_files do
+    container = Rumination::Deploy.app_container_full_name
+    Rumination::Deploy.files_to_copy_on_deploy.each do |source, target|
+      sh "docker cp #{source} #{container}:#{target}"
     end
   end
 end

data/lib/rumination/tasks/with_hash_puts.rake

@@ -0,0 +1,14 @@
+module Kernel
+  alias_method :orig_puts, :puts
+  def hash_puts *args
+    print "# "
+    orig_puts *args
+  end
+
+  def with_hash_puts
+    Kernel.send :alias_method, :puts, :hash_puts
+    yield
+  ensure
+    Kernel.send :alias_method, :puts, :orig_puts
+  end
+end

data/lib/rumination/version.rb

@@ -1,3 +1,3 @@
 module Rumination
-  VERSION = "0.12.15"
+  VERSION = "0.13"
 end

data/lib/rumination.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumination
 version: !ruby/object:Gem::Version
-  version: 0.12.15
+  version: '0.13'
 platform: ruby
 authors:
 - Artem Baguinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,7 @@ files:
 - lib/rumination/tasks/db/setup.rake
 - lib/rumination/tasks/deploy.rake
 - lib/rumination/tasks/deploy/inside.rake
+- lib/rumination/tasks/with_hash_puts.rake
 - lib/rumination/version.rb
 - rumination.gemspec
 homepage: https://github.com/artm/rumination