deployku 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03888fb6851ccbe49f3ed0c71f574a246e8d398f
-  data.tar.gz: bde52a2e8d1e47c74ef09ae3c96e180e777d60ac
+  metadata.gz: d820a40a2faa5a55dbf1ec2950e2e8493f956006
+  data.tar.gz: 368c32c1335fe5498bf9671619e0cdef0b86e27f
 SHA512:
-  metadata.gz: 31d9cf58462f5a0bde7bda68dd33b71a63b070b2a4d193b4f82ec887af3047915eccf9102f47e4ac6f0863477f60c18066f5c27d4e0ec172e3c5239f8eac30d2
-  data.tar.gz: 3cdc657325c5d2562b5282d387e48b813f4f787964eef5f926851f413922b8b7c56a5d0f4564d2608daa149713b331a5d7e8e01281a6ac813fa675a60c8130f8
+  metadata.gz: 781b9948f250c22a1408ca6b9a3d7ffcf59bd72a03507ef5b40f44c7ef61b46a742c142a20dd0575439991c3ff405641546009fa71099bf135b2a32aa0675ead
+  data.tar.gz: 0f24913606ce3b6a03685283c83f43ab98d24283c336e22721593d4be57b4925b2fd5919434ae68fcc725e47cdc4c795203780d572e00086878c0ee61857bff9

data/README.md

@@ -230,11 +230,27 @@ git push deployku master
 ```
 
 ### Connect to database
-Use ssh with `-t` option.
+To connect as postgres user use ssh with `-t` option.
 ```bash
 ssh -t deployku@localhost postgres:db:connect dbserver myappdb
 ```
 
+and to connect as linked application:
+```bash
+ssh -t deployku@localhost postgres:db:connect:app dbserver myapp
+```
+
+### Backup database
+To backup all databases use:
+```bash
+ssh deployku@localhost postgres:dumpall dbserver
+```
+
+and to backup only one database use:
+```bash
+ssh deployku@localhost postgres:db:dump dbserver myappdb
+```
+
 ### Exec command in container environment
 Following will run bash inside container. Use ssh with `-t` option.
 ```bash

data/deployku.gemspec

@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
   s.email = "pejuko@gmail.com"
   s.authors = ["Petr Kovář"]
   s.name = 'deployku'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.date = Time.now.strftime("%Y-%m-%d")
   s.require_path = 'lib'
   s.files = ["bin/deployku", "README.md", "deployku.gemspec", "Rakefile", "LICENSE"]

data/lib/deployku/configurable.rb

@@ -21,6 +21,11 @@ module Deployku::Configurable
     config_save(app_name)
   end
 
+  def config_get(app_name, var)
+    config_load(app_name)
+    @config['env'][var.to_s]
+  end
+
   def config_set_from(app_name, value)
     config_load(app_name)
     @config['from'] = value

data/lib/deployku/plugins/postgres.rb

@@ -26,6 +26,7 @@ module Deployku
     def delete(name)
       app_dir = dir(name)
       if Dir.exists?(app_dir)
+        puts "removing: #{app_dir}"
         FileUtils.rm_rf(app_dir)
       end
     end
@@ -37,6 +38,31 @@ module Deployku
       end
     end
 
+    describe :dumpall, '<NAME>', 'calls pg_dumpall on specified PostgreSQL instance', acl_sys: :admin
+    def dumpall(name)
+      config_load(name)
+      cid = get_container_id(name)
+      unless Deployku::Engine.running?(cid)
+        puts "Database instance '#{name}' is not running."
+        exit 1
+      end
+      ip = Deployku::Engine.ip(cid)
+      system "PGPASSWORD=\"#{@config['env']['POSTGRES_PASSWORD']}\" pg_dumpall -h #{ip} -U postgres"
+    end
+
+    describe 'db:dump', '<NAME> <DB_NAME>', 'calls pg_dump on specified database', acl_sys: :admin
+    def db_dump(name, db_name)
+      config_load(name)
+      cid = get_container_id(name)
+      unless Deployku::Engine.running?(cid)
+        puts "Database instance '#{name}' is not running."
+        exit 1
+      end
+      ip = Deployku::Engine.ip(cid)
+      db = Deployku.sanitize_app_name(db_name)
+      system "PGPASSWORD=\"#{@config['env']['POSTGRES_PASSWORD']}\" pg_dump -h #{ip} -d #{db} -U postgres"
+    end
+
     describe 'db:create', '<NAME> <DB_NAME>', 'create a database in postgres instance', acl_sys: :admin
     def db_create(name, db_name)
       config_load(name)
@@ -47,7 +73,8 @@ module Deployku
       end
       ip = Deployku::Engine.ip(cid)
       db = Deployku.sanitize_app_name(db_name)
-      system "echo \"#{@config['env']['POSTGRES_PASSWORD']}\n\" 'CREATE DATABASE #{db};' | psql -h #{ip} -U postgres"
+      system "echo 'CREATE DATABASE #{db};' | PGPASSWORD=\"#{@config['env']['POSTGRES_PASSWORD']}\" psql -h #{ip} -U postgres"
+      #system "echo \"#{@config['env']['POSTGRES_PASSWORD']}\n\" 'CREATE DATABASE #{db};' | psql -h #{ip} -U postgres"
     end
 
     describe 'db:drop', '<NAME> <DB_NAME>', 'destroy a database in postgres instance', acl_sys: :admin
@@ -60,7 +87,8 @@ module Deployku
       end
       ip = Deployku::Engine.ip(cid)
       db = Deployku.sanitize_app_name(db_name)
-      system "echo \"#{@config['env']['POSTGRES_PASSWORD']}\n\" 'DROP DATABASE #{db};' | psql -h #{ip} -U postgres"
+      #system "echo \"#{@config['env']['POSTGRES_PASSWORD']}\n\" 'DROP DATABASE #{db};' | psql -h #{ip} -U postgres"
+      system "echo 'DROP DATABASE #{db};' | PGPASSWORD=\"#{@config['env']['POSTGRES_PASSWORD']}\" psql -h #{ip} -U postgres"
     end
 
     describe 'db:link', '<NAME> <DB_NAME> <APP>', 'connect appliaction with database', acl_sys: :admin
@@ -72,8 +100,8 @@ module Deployku
       user_name = 'user_' + SecureRandom.uuid.gsub('-','')
       user_passwd = SecureRandom.uuid
       database_url = "postgres://#{user_name}:#{user_passwd}@#{container_name(name)}/#{db}"
-      system "echo \"#{@config['env']['POSTGRES_PASSWORD']}\n\" \"CREATE USER #{user_name} WITH PASSWORD '#{user_passwd}';\" | psql -h #{ip} -U postgres"
-      system "echo \"#{@config['env']['POSTGRES_PASSWORD']}\n\" 'GRANT ALL ON DATABASE #{db} TO #{user_name};' | psql -h #{ip} -U postgres"
+      system "echo \"CREATE USER #{user_name} WITH PASSWORD '#{user_passwd}';\" | PGPASSWORD=\"#{@config['env']['POSTGRES_PASSWORD']}\" psql -h #{ip} -U postgres"
+      system "echo 'GRANT ALL ON DATABASE #{db} TO #{user_name};' | PGPASSWORD=\"#{@config['env']['POSTGRES_PASSWORD']}\" psql -h #{ip} -U postgres"
       if $?.exitstatus == 0
         Deployku::AppPlugin.run('config:set', [app_name, 'DATABASE_URL', database_url])
         Deployku::AppPlugin.run(:link, [app_name, container_name(name)])
@@ -92,6 +120,20 @@ module Deployku
       system "PGPASSWORD=\"#{@config['env']['POSTGRES_PASSWORD']}\" psql -h #{ip} -U postgres #{dbname}"
     end
 
+    describe 'db:connect:app', '<NAME> <APP_NAME>', 'connect to database as an app user and enter prompt', acl_app: { 1 => :admin }
+    def db_connect_app(name, app_name)
+      config_load(name)
+      db_id = get_container_id(name)
+      ip = Deployku::Engine.ip(db_id)
+      database_url = Deployku::AppPlugin.instance.config_get(app_name, 'DATABASE_URL')
+      if database_url =~ /postgres:\/\/([^:]+):([^@]+)@[^\/]+\/([^\/]+)/
+        user_name, password, dbname = $1, $2, $3
+        system "PGPASSWORD=\"#{password}\" psql -h #{ip} -U #{user_name} #{dbname}"
+      else
+        puts "Wrong DATABASE_URL: #{database_url}"
+      end
+    end
+
     # methods from containerable
     describe :start, '<NAME>', 'starts container', acl_sys: :admin
     def start(app_name)
@@ -103,6 +145,7 @@ module Deployku
       end
       @config['env']['PGDATA'] = '/postgresql/' unless @config['env']['PGDATA']
       @config['env']['POSTGRES_PASSWORD'] = SecureRandom.uuid unless @config['env']['POSTGRES_PASSWORD']
+      @config['env']['PGPASSWORD'] = @config['env']['POSTGRES_PASSWORD']
       config_save(app_name)
 
       Deployku::Config.merge!(@config)
@@ -112,6 +155,13 @@ module Deployku
       puts "Container #{app_hash} started."
     end
 
+    describe :run, '<NAME> <CMD>', 'starts a cmd in postgresql environment', acl_sys: :admin
+    def run(app_name, *cmd)
+      config_load(app_name)
+      Deployku::Config.merge!(@config)
+      Deployku::Engine.run(@config['from'], dir(app_name), *cmd)
+    end
+
     describe :status, '<NAME>', 'show container status', acl_sys: :admin
     describe :stop, '<NAME>', 'stops running container', acl_sys: :admin
     describe :restart, '<NAME>', 'restarts container', acl_sys: :admin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deployku
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Petr Kovář
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: pejuko@gmail.com