conjure 0.2.2 → 0.2.3

data/History.md

@@ -1,3 +1,8 @@
+### Version 0.2.3
+2014-3-28
+
+* Create database when provisioning, for easier initial deployment
+
 ### Version 0.2.2
 2014-3-28
 

data/lib/conjure/provision/dockerfile.rb

@@ -41,7 +41,7 @@ module Conjure
         prepare_build_directory do |dir|
           `cd #{dir}; tar czf #{archive} *`
           server.send_file archive, "dockerfile.tar.gz"
-          server.run "mkdir #{build_dir}; cd #{build_dir}; tar xzf ~/dockerfile.tar.gz"
+          server.run "mkdir #{build_dir}; cd #{build_dir}; tar mxzf ~/dockerfile.tar.gz"
           result = yield "/tmp/docker_build"
           server.run "rm -Rf #{build_dir} ~/dockerfile.tar.gz"
           `rm #{archive}`

data/lib/conjure/provision/instance.rb

@@ -33,6 +33,7 @@ module Conjure
         file.run "echo \"ALTER USER db PASSWORD '#{db_password}'\" >/tmp/setpass"
         file.run "/sbin/my_init -- /sbin/setuser postgres sh -c \"sleep 1; psql -f /tmp/setpass\""
         file.run "rm /tmp/setpass"
+        file.run "/sbin/my_init -- /sbin/setuser db sh -c \"sleep 1; /usr/bin/createdb #{database_name}\""
         file
       end
 
@@ -54,9 +55,13 @@ module Conjure
         SecureRandom.urlsafe_base64 20
       end
 
+      def database_name
+        "#{@app_name}_#{@rails_env}"
+      end
+
       def database_yml(db_ip_address, db_password)
         require "yaml"
-        {@rails_env => {"adapter" => "postgresql", "database" => "application", "host" => db_ip_address, "username" => "db", "password" => db_password, "template" => "template0"}}.to_yaml
+        {@rails_env => {"adapter" => "postgresql", "database" => database_name, "host" => db_ip_address, "username" => "db", "password" => db_password, "template" => "template0"}}.to_yaml
       end
 
       def application_conf

data/lib/conjure/version.rb

@@ -1,3 +1,3 @@
 module Conjure
-  VERSION = "0.2.2" unless defined?(VERSION)
+  VERSION = "0.2.3" unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors: