rumination 0.13.7 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa1f07d6509dbb4f3f186f5792d493878d14efc0
-  data.tar.gz: 09a272371b589bbc7e27a76b7b444975a66f39c1
+  metadata.gz: 1a93cd5828bc697497ee31a4a7260bad0fa38a38
+  data.tar.gz: e7c055fb32f02dd425f78a88b8ecb36c401310f0
 SHA512:
-  metadata.gz: f462f613f9959710190f384b1078cf7d1e106d5e02f6d5991e60a78de1c7df712dc9bc9083fcd8378cf5491b3fa383bbdfda7db961f6b4852720f10c8ce6e84f
-  data.tar.gz: 5b1856ed41cf72ee73f096c43f8105ed4cdbaa9e2deb0cea8c39844927a2c55853e77de0f1ececaf5d29c8cc12fe2fa77de83d013902d4788a9f2fc37672a5f0
+  metadata.gz: 5b9ea7893c7ed39fc6ca37317a1508c26ebe458eb91f4947eb786e88a5248c657ab7d509dc3c5be554ddb760d259cb319fad6914c31de37fed6e7c59e518acb6
+  data.tar.gz: c19592bdf38a19e7b80c410eaa3cf44cff13307538e5f1cbef85680b707ada8946257f4bdc9a4547ac7a2101b669dc5257e3452deb2c797e4d9704781f0939d5

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

@@ -0,0 +1,37 @@
+require "rumination/deploy"
+require "dotenv"
+require "active_support/core_ext/string/strip"
+
+namespace :deploy do
+  task :env => :load_target_config_filterd do
+    puts
+    Rumination::Deploy.docker_env.each do |var, val|
+      puts %Q[export #{var}="#{val}"]
+    end
+    puts <<-__.strip_heredoc
+      # to load this into a bash environment run:
+      #
+      #   eval "$(rake deploy:env[#{Rumination::Deploy.target}])"
+      #
+      # Quotes aren't optional
+    __
+  end
+
+  task :load_target_config do
+    target = ENV["TARGET"] || "development"
+    puts "Loading '#{target}' target config"
+    Rumination::Deploy.load_target_config target
+  end
+
+  task :load_target_config_filterd do
+    with_hash_puts do
+      Rake::Task["deploy:load_target_config"].invoke
+    end
+  end
+
+  task :setup_docker_env => :load_target_config do
+    puts "Setting up '#{Rumination::Deploy.target}' target docker environment"
+    Dotenv.load
+    ENV.update Rumination::Deploy.docker_env
+  end
+end

data/lib/rumination/tasks/deploy.rake

@@ -1,16 +1,14 @@
 require "rumination/deploy"
-require "dotenv"
-require "active_support/core_ext/string/strip"
 
-task :deploy, [:target] => "deploy:default"
+task :deploy => "deploy:default"
 
 namespace :deploy do
-  task :default, [:target] => %w[
+  task :default => %w[
     start
     finish
   ]
 
-  task :bootstrap, [:target] => %w[
+  task :bootstrap => %w[
     start
     bootstrap:check_flag
     bootstrap:env_file
@@ -21,20 +19,6 @@ namespace :deploy do
     bootstrap:flag_success
   ]
 
-  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 <<-__.strip_heredoc
-      # to load this into a bash environment run:
-      #
-      #   eval "$(rake deploy:env[#{Rumination::Deploy.target}])"
-      #
-      # Quotes aren't optional
-    __
-  end
-
   namespace :on do
     task :deployed
     task :bootstrapped
@@ -76,39 +60,18 @@ namespace :deploy do
       end
     end
 
-    task :undo, [:target] => %w[
-      confirm_undo
-      setup_docker_env
-    ] do |t, args|
+    task :undo => %w[confirm_undo setup_docker_env] do
       sh "docker-compose down --remove-orphans -v"
     end
 
-    task :confirm_undo do |t, args|
+    task :confirm_undo do
       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
-
-  task :load_target_config, [:target] do |t, args|
-    args.with_defaults target: :development
-    puts "Loading '#{args.target}' target config"
-    Rumination::Deploy.load_target_config args.target
-  end
-
-  task :load_target_config_filterd, [:target] do |t, args|
-    with_hash_puts do
-      Rake::Task["deploy:load_target_config"].invoke args.target
-    end
-  end
-
-  task :start, [:target] => %w[
+  task :start => %w[
     setup_docker_env
     switch_containers
   ]

data/lib/rumination/version.rb

@@ -1,3 +1,3 @@
 module Rumination
-  VERSION = "0.13.7"
+  VERSION = "0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumination
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: '0.14'
 platform: ruby
 authors:
 - Artem Baguinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,7 +154,7 @@ files:
 - lib/rumination/tasks/db/dump.rake
 - lib/rumination/tasks/db/setup.rake
 - lib/rumination/tasks/deploy.rake
-- lib/rumination/tasks/deploy/inside.rake
+- lib/rumination/tasks/deploy/env.rake
 - lib/rumination/tasks/with_hash_puts.rake
 - lib/rumination/version.rb
 - rumination.gemspec

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

@@ -1,48 +0,0 @@
-namespace :deploy do
-  namespace :inside do
-    # these are invoked inside the containers
-    task :bootstrap, [:target] => %w[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