dokku-installer-cli 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77c55952348afc6f97cb4262a61b8bbd4fecf15a
-  data.tar.gz: ee588ed6b3ac1cdaf963bd09e9eaad6e94d420e4
+  metadata.gz: 25020f2b95b8dcff21290f451cf31c3bb288a424
+  data.tar.gz: 4d2f383fb98e9c810792f3c5e06fb890456231e0
 SHA512:
-  metadata.gz: 00df6dfbdfc530434c4214f0ff72c97e49be3c9b1b6c73ba7f91674ee68147b10dfb6f29ab5868cdcdc4b05175474b1ce4a30f738b7ec9539d56a5f5d8a1ba4a
-  data.tar.gz: 1c94715ce03a72ac17941da93095753e5db128cbd6cf96a00d92ca3444dd4d835297b6528f205079de1cf9209dea565e86f349fc2534df6a6204019aa11f565e
+  metadata.gz: 24ad507fb472e346ebaa848b6d0fcef0a875e83f3820c72ac46edc82d80c0d4583a29b47c35e9c66c42b5fec1b306447233d82829193f3ce8e2f31294b1bcfec
+  data.tar.gz: 91f9f6ac6ca6a70390eaadf6e242e3f5eecdb1c82bb9504a5f246084f41f209058094466651ad9ecaaa9e244c41b99dad666486b73a3c3cbce4833ada57bee2f

data/bin/dokku

@@ -2,6 +2,7 @@
 
 require "shellwords"
 require "thor"
+require "YAML"
 
 module DokkuInstaller
   class Cli < Thor
@@ -78,21 +79,9 @@ module DokkuInstaller
 
     desc "postgres:backups:download <number>", "Download the numbered PostgreSQL backup"
     def postgres_backups_download(*args)
-      # Make sure the number is valid
       number = args.first ? args.first : 1
-      number = number.to_s.gsub(/\D/, "").to_i
-      if number < 1
-        puts "Invalid backup number"
-        return
-      end
 
-      # Get the file name for the numbered backup
-      puts "Getting list of backups..."
-      command = "ssh -t dokku@#{domain} postgres:backups #{app_name}"
-      backups = `#{command}`
-      index = number - 1
-      backup = backups.split("\n").reverse[index].strip
-      if backup
+      if backup = backup_filename(number)
         command = "postgres:backups:download #{app_name} #{backup} > #{backup}"
         puts "Saving to local file: #{backup}"
         run_command(command)
@@ -106,6 +95,28 @@ module DokkuInstaller
       run_command "postgres:backups:enable #{app_name}"
     end
 
+    desc "postgres:backups:restore:local <number>", "Restore the numbered PostgreSQL backup locally"
+    def postgres_backups_restore_local(*args)
+      # Download the backup file
+      number = args.first ? args.first : 1
+
+      if backup = backup_filename(number)
+        command = "ssh -t dokku@#{domain} postgres:backups:download #{app_name} #{backup} > #{backup}"
+        puts "Saving to local file: #{backup}"
+        `#{command}`
+
+        if psql_options
+          command = "psql #{psql_options} --file=#{backup}"
+          puts "Running #{command}..."
+          `#{command}`
+          puts "Deleting #{backup}..."
+          `rm #{backup}`
+        end
+      else
+        puts "Invalid backup number"
+      end
+    end
+
     desc "restart", "Restart the application"
     def restart(*args)
       run_command "restart #{app_name}"
@@ -175,6 +186,23 @@ module DokkuInstaller
       @app_name ||= git_config_match[2]
     end
 
+    def backup_filename(number)
+      # Make sure the number is valid or use 1
+      number = number.to_s.gsub(/\D/, "").to_i
+      number = 1 if number < 1
+
+      # Get the file name for the numbered backup
+      puts "Getting list of backups..."
+      command = "ssh -t dokku@#{domain} postgres:backups #{app_name}"
+      backups = `#{command}`
+      index = number - 1
+      if filename = backups.split("\n").reverse[index]
+        filename.strip
+      else
+        nil
+      end
+    end
+
     def domain
       @domain ||= git_config_match[1]
     end
@@ -192,6 +220,32 @@ module DokkuInstaller
       end
     end
 
+    def psql_options
+      @psql_options ||= begin
+        restore_options = nil
+
+        if File.exist?("./config/database.yml")
+          if development_config = YAML::load(IO.read("./config/database.yml"))["development"]
+            restore_options = "--host=#{development_config['host']} --dbname=#{development_config['database']}"
+
+            if username = development_config["username"]
+              restore_options += " --username=#{username}"
+            end
+
+            if port = development_config["port"]
+              restore_options += " --port=#{port}"
+            end
+          else
+            puts "Missing database.yml config for development environment"
+          end
+        else
+          puts "Missing file config/database.yml"
+        end
+
+        restore_options
+      end
+    end
+
     def run_command(command)
       dokku_command = "ssh -t dokku@#{domain} #{command}"
 

data/lib/dokku_installer/version.rb

@@ -1,3 +1,3 @@
 module DokkuInstaller
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dokku-installer-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Brian Pattison