dokku-installer-cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b362f64ffe33bf2332b30bccf6dfc0566a9e2ad9
-  data.tar.gz: 875be774fb38f75bbf46c226886f24a3c4cd3bc2
+  metadata.gz: 5c104c86300fc07513b25c7c5588d60001ad523b
+  data.tar.gz: 791d4a07292db5e75cd8476160f773fcce6ba553
 SHA512:
-  metadata.gz: 7b0ad9a8d8cb557a58706d99530a71091b74df15e223fb6eb32757aa130c2d90ee3659327b07c1c9a8d8c480f7590ea8e8ec65aece1b5fd21e684daca5511a84
-  data.tar.gz: 8f235856ca998bedd643d990e656624cc59b206ad378b0b4526415121225ce22011d668c19d0273c32f602b2a96d289c0273722e701f1439888a839930ea15b9
+  metadata.gz: b2c32c98ef467298ea3cdc4c21bce5979b6efbc0a35be902050f99ebc8aa8a20a6bedc87a417255556bd464835d5a41620842df4ad2e2f4ee1735124ae4e1c4a
+  data.tar.gz: 0373575a4e801a9b33c3b1d76fa7a03e42de7249caeaf0230d036b7464a5f3cc076fc8875ac9660203f0ca93f8eb34b7fd15465426788ca51a61c340b7e758d0

data/bin/dokku

@@ -24,7 +24,7 @@ module DokkuInstaller
     end
 
     desc "restart", "Restart the application"
-    def restart(*args)
+    def restart
       run_command "restart #{app_name}"
     end
 
@@ -74,23 +74,6 @@ 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

data/lib/dokku_installer/config.rb

@@ -7,8 +7,8 @@ module DokkuInstaller
     end
 
     desc "config:get KEY", "Display an environment variable value"
-    def config_get(*args)
-      run_command "config:get #{app_name} #{args.first}"
+    def config_get(key)
+      run_command "config:get #{app_name} #{key}"
     end
 
     desc "config:set KEY1=VALUE1 [KEY2=VALUE2 ...]", "Set one or more environment variables"

data/lib/dokku_installer/domains.rb

@@ -2,7 +2,7 @@ module DokkuInstaller
   class Cli < Thor
 
     desc "domains", "Display the app's domains"
-    def domains(*args)
+    def domains
       run_command "domains #{app_name}"
     end
 

data/lib/dokku_installer/postgres.rb

@@ -1,17 +1,17 @@
 module DokkuInstaller
   class Cli < Thor
 
-    desc "postgres:backups", "List available PostgreSQL backups"
+    desc "postgres:backups", "List available PostgreSQL backups as a numbered list"
     def postgres_backups
       command = "ssh -t dokku@#{domain} postgres:backups #{app_name}"
       puts "Running #{command}..."
       backups = `#{command}`
-      backups.split("\n").reverse.each_with_index do |line, index|
+      backups.split("\n").select{|backup| backup != "" }.reverse.each_with_index do |line, index|
         number = "#{index + 1}"
         if number.length < 2
           number = " #{number}"
         end
-        puts "#{number}. #{line}"
+        puts "[#{number}] #{line}"
       end
     end
 
@@ -34,8 +34,8 @@ module DokkuInstaller
     end
 
     desc "postgres:backups:download <number>", "Download the numbered PostgreSQL backup"
-    def postgres_backups_download(*args)
-      number = args.first ? args.first : 1
+    def postgres_backups_download(number = nil)
+      number ||= 1
 
       if backup = backup_filename(number)
         command = "postgres:backups:download #{app_name} #{backup} > #{backup}"
@@ -53,10 +53,25 @@ module DokkuInstaller
       exec(command)
     end
 
-    desc "postgres:backups:restore:local <number>", "Restore the numbered PostgreSQL backup locally"
-    def postgres_backups_restore_local(*args)
+    desc "postgres:backups:restore <number>", "Restore a numbered PostgreSQL backup"
+    def postgres_backups_restore(number = nil)
+      if number.nil?
+        puts "You must specify a numbered backup."
+        exit
+      end
+
+      if backup = backup_filename(number)
+        command = "postgres:backups:restore #{app_name} #{backup}"
+        run_command(command)
+      else
+        puts "Invalid backup number"
+      end
+    end
+
+    desc "postgres:backups:restore:local <number>", "Restore a numbered PostgreSQL backup locally"
+    def postgres_backups_restore_local(number = nil)
       # Download the backup file
-      number = args.first ? args.first : 1
+      number ||= 1
 
       if backup = backup_filename(number)
         command = "ssh -t dokku@#{domain} postgres:backups:download #{app_name} #{backup} > #{backup}"
@@ -75,8 +90,37 @@ module DokkuInstaller
       end
     end
 
+    desc "postgres:export <file.sql>", "Export Postgres data to local file"
+    def postgres_export(file = "export.sql")
+      command = "postgres:dump #{app_name} > #{file}"
+      run_command(command)
+    end
+
+    desc "postgres:import <file.sql>", "Restore database data from a local file"
+    def postgres_import(file)
+      command = "postgres:restore #{app_name} < #{file}"
+      run_command(command)
+    end
+
   private
 
+    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").select{|backup| backup != "" }.reverse[index]
+        filename.strip
+      else
+        nil
+      end
+    end
+
     def psql_options
       @psql_options ||= begin
         restore_options = nil

data/lib/dokku_installer/ssl.rb

@@ -40,8 +40,7 @@ module DokkuInstaller
     end
 
     desc "ssl:force DOMAIN", "Force SSL on the given domain."
-    def ssl_force(*args)
-      domain = args.first
+    def ssl_force(domain = nil)
       if domain.nil?
         puts "Specify a domain to force SSL."
         exit

data/lib/dokku_installer/version.rb

@@ -3,7 +3,7 @@ require "net/http"
 require "thor"
 
 module DokkuInstaller
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 
   class Cli < Thor
 

metadata

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