rumination 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdf21f60b8f36e80e229ddc63ea167a380c7de61
-  data.tar.gz: eb07d89f9f8de725b769ad5d23308e8df99e91ea
+  metadata.gz: e7931a40d3cb98cf96e8e14900ef6aaa5e0f9454
+  data.tar.gz: 245694f7be405f460c75603bb96fcce08b384a45
 SHA512:
-  metadata.gz: d06a724823baaebaf19429277da8c2c2e26e4c541249ccc05305062c8d34820230ddddfd9c0ac2a3c53524e8470f591d5e28e8528b6ccc393bc14e023bd01b49
-  data.tar.gz: abf980ccbdcf87f560b0f60916ff9f3be6592b2f88b1db2716b407f8d1a6428fba6246a0c28c4c245e8e94af3408dfce013054ada92bb2a62e401086fe0ac7fa
+  metadata.gz: 74ff7b7d46e237adb183f5fd0d8bfae0550a6e630ce7260e5604186ef3826eb62d7fd9bdc10b4baeec5bb2d725b142f355043385fd50391926cc68f216a73ad7
+  data.tar.gz: 0b349992d6d69a12a4a3ebaa40aae6e037f83c334be454f0239f869ad007a7283658668b8434aa0af5bf318d86283cff5fad4dc4088728e854b25721f889f88c

data/lib/rumination/deploy/base.rb

@@ -24,11 +24,31 @@ module Rumination
           .run("rake deploy:finish[#{target}]")
       end
 
+      def env
+        load target_config_path
+        env = docker_machine_env
+        env["VIRTUAL_HOST"] = config.virtual_host
+        env["COMPOSE_FILE"] = config.compose_file if config.compose_file
+        env
+      end
+
+      def write_env_file
+        File.open(env_file_path) do |io|
+          password_vars.each do |var|
+            io.puts %Q[export #{var}="#{generate_password}"]
+          end
+        end
+      end
+
+      def generate_password
+        Generate.password
+      end
+
+      private
+
       def on_fresh_containers
-        puts "Bootstrapping '#{target}'"
         raise BootstrappedAlready if bootstrapped?
-        write_env_file
-        initialize_database
+        container(:backend).run("rake deploy:bootstap:inside[#{target}]")
       end
 
       def load_application_config_if_exists
@@ -53,39 +73,15 @@ module Rumination
         config.generate_passwords || Array(config.generate_password)
       end
 
-      def env
-        load target_config_path
-        env = docker_machine_env
-        env["VIRTUAL_HOST"] = config.virtual_host
-        env["COMPOSE_FILE"] = config.compose_file if config.compose_file
-        env
-      end
-
       def docker_machine_env
         dm_env_str = `docker-machine env #{config.docker_machine}`
         Dotenv::Parser.call(dm_env_str)
       end
 
-      def write_env_file
-        password_vars.each do |var|
-          container(:backend)
-            .run(%Q[echo "#{var}=#{generate_password}" >> #{env_file_path}])
-        end
-      end
-
-      def generate_password
-        Generate.password
-      end
-
       def bootstrapped?
         container(:backend).has_file?(env_file_path)
       end
 
-      def initialize_database
-        container(:backend).run("rake db:setup:maybe_load_dump")
-        raise DatabaseInitError unless $? == 0
-      end
-
       def env_file_path
         "/opt/app/env"
       end

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

@@ -7,5 +7,13 @@ namespace :deploy do
       abort "'#{args.target}' has already been bootstrapped"
     end
   end
-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|
+      Rumination::Deploy.new(args.target).write_env_file
+    end
+  end
+end

data/lib/rumination/version.rb

@@ -1,3 +1,3 @@
 module Rumination
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

metadata

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