dokku-installer-cli 0.0.9.1 → 0.0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c5179bf5289d296ba2a1e33360b026302996985
-  data.tar.gz: c038a76fda5e4e58724758f1d535203bdc1c040e
+  metadata.gz: 0c945b34c9882b87432e855b86f5612a760abe39
+  data.tar.gz: c393ae67b9aec13d04aa2db8702eb3d601c23d14
 SHA512:
-  metadata.gz: 6faf86460a56e7fdf7d19a1f47ce9ce9c85d6a0430dceda21d875420c3ed9922e6aec0ce24e0f54159b71ca1e4e65f97932b9d2fa915461b823bd4d0002542e8
-  data.tar.gz: 81d3b6820e604e364c14a23da4e4a69e9b3c0f7ef52702ae662f6f3840786de2f25026948f47e4f49e0540f84e2629c3e1f302ae67f1cee659c2943dd936f337
+  metadata.gz: 7b2d401fab02a575e21f1d8ea86213981244beaf752947666996ef0008b04e9e94e2d790d72117dc9eceed8097ed89cc448974357cc387119d05dc58acecfe1b
+  data.tar.gz: 6abaad81c6af7c6121b27ed408940caf86098b6cb2c22e1c78b242e55d1090c9570cf3661b5ef35e1b8b61e614eb1c66fd5cfea3109502a1bbab928c15c7a6fb

data/bin/dokku

@@ -1,42 +1,12 @@
 #!/usr/bin/env ruby
 
-require "shellwords"
 require "thor"
 require "YAML"
+require_relative "../lib/dokku_installer"
 
 module DokkuInstaller
   class Cli < Thor
 
-    desc "config", "Display the app's environment variables"
-    def config
-      run_command "config #{app_name}"
-    end
-
-    desc "config:get KEY", "Display an environment variable value"
-    def config_get(*args)
-      run_command "config:get #{app_name} #{args.first}"
-    end
-
-    desc "config:set KEY1=VALUE1 [KEY2=VALUE2 ...]", "Set one or more environment variables"
-    def config_set(*args)
-      run_command "config:set #{app_name} #{args.join(' ')}"
-    end
-
-    desc "config:unset KEY1 [KEY2 ...]", "Unset one or more environment variables"
-    def config_unset(*args)
-      run_command "config:unset #{app_name} #{args.join(' ')}"
-    end
-
-    desc "domains", "Display the app's domains"
-    def domains(*args)
-      run_command "domains #{app_name}"
-    end
-
-    desc "domains:set DOMAIN1 [DOMAIN2 ...]", "Set one or more domains"
-    def domains_set(*args)
-      run_command "domains:set #{app_name} #{args.join(' ')}"
-    end
-
     desc "logs [-t]", "Show the last logs for the application (-t follows)"
     def logs(*args)
       if args.first && args.first.strip == "-t"
@@ -53,70 +23,6 @@ module DokkuInstaller
       exec("open http://#{app_name}.#{domain}")
     end
 
-    desc "postgres:backups", "List available PostgreSQL backups"
-    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|
-        number = "#{index + 1}"
-        if number.length < 2
-          number = " #{number}"
-        end
-        puts "#{number}. #{line}"
-      end
-    end
-
-    desc "postgres:backups:create", "Create a new PostgreSQL backup"
-    def postgres_backups_create
-      run_command "postgres:backups:create #{app_name}"
-    end
-
-    desc "postgres:backups:disable", "Disable daily PostgreSQL backups"
-    def postgres_backups_disable
-      run_command "postgres:backups:disable #{app_name}"
-    end
-
-    desc "postgres:backups:download <number>", "Download the numbered PostgreSQL backup"
-    def postgres_backups_download(*args)
-      number = args.first ? args.first : 1
-
-      if backup = backup_filename(number)
-        command = "postgres:backups:download #{app_name} #{backup} > #{backup}"
-        puts "Saving to local file: #{backup}"
-        run_command(command)
-      else
-        puts "Invalid backup number"
-      end
-    end
-
-    desc "postgres:backups:enable", "Enable daily PostgreSQL backups"
-    def postgres_backups_enable
-      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}"
@@ -142,26 +48,6 @@ module DokkuInstaller
       exec(command)
     end
 
-    desc "ssl:certificate <file path>", "Add a signed certificate for SSL (server.crt)"
-    def ssl_certificate(*args)
-      file_path = args.first
-      file_contents = File.read(file_path)
-      command = "echo \"#{file_contents}\" | ssh dokku@#{domain} ssl:certificate #{app_name}"
-
-      puts "Running #{command}..."
-      exec(command)
-    end
-
-    desc "ssl:key <file path>", "Add a private key for SSL (server.key)"
-    def ssl_key(*args)
-      file_path = args.first
-      file_contents = File.read(file_path)
-      command = "echo \"#{file_contents}\" | ssh dokku@#{domain} ssl:key #{app_name}"
-
-      puts "Running #{command}..."
-      exec(command)
-    end
-
     desc "url", "Show the URL for the application"
     def url
       puts "http://#{app_name}.#{domain}"
@@ -227,32 +113,6 @@ 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.rb

@@ -0,0 +1,5 @@
+require_relative "dokku_installer/config"
+require_relative "dokku_installer/domains"
+require_relative "dokku_installer/postgres"
+require_relative "dokku_installer/ssl"
+require_relative "dokku_installer/version"

data/lib/dokku_installer/config.rb

@@ -0,0 +1,47 @@
+module DokkuInstaller
+  class Cli < Thor
+
+    desc "config", "Display the app's environment variables"
+    def config
+      run_command "config #{app_name}"
+    end
+
+    desc "config:get KEY", "Display an environment variable value"
+    def config_get(*args)
+      run_command "config:get #{app_name} #{args.first}"
+    end
+
+    desc "config:set KEY1=VALUE1 [KEY2=VALUE2 ...]", "Set one or more environment variables"
+    def config_set(*args)
+      # FIXME: Requires root to send config values with spaces
+      user = "dokku"
+
+      args = args.map{|arg|
+        key_value = arg.split("=")
+        if key_value.length == 2
+          user = "root" if key_value[1].index(" ")
+          return_value  = "#{key_value[0]}="
+          return_value += '\"'
+          return_value += key_value[1].gsub(/"|'/, "")
+          return_value += '\"'
+          return_value
+        else
+          arg
+        end
+      }
+
+      command  = "ssh #{user}@#{domain} "
+      command += user == "root" ? "dokku " : ""
+      command += "config:set #{app_name} #{args.join(' ')}"
+
+      puts "Running #{command}..."
+      exec(command)
+    end
+
+    desc "config:unset KEY1 [KEY2 ...]", "Unset one or more environment variables"
+    def config_unset(*args)
+      run_command "config:unset #{app_name} #{args.join(' ')}"
+    end
+
+  end
+end

data/lib/dokku_installer/domains.rb

@@ -0,0 +1,15 @@
+module DokkuInstaller
+  class Cli < Thor
+
+    desc "domains", "Display the app's domains"
+    def domains(*args)
+      run_command "domains #{app_name}"
+    end
+
+    desc "domains:set DOMAIN1 [DOMAIN2 ...]", "Set one or more domains"
+    def domains_set(*args)
+      run_command "domains:set #{app_name} #{args.join(' ')}"
+    end
+
+  end
+end

data/lib/dokku_installer/postgres.rb

@@ -0,0 +1,97 @@
+module DokkuInstaller
+  class Cli < Thor
+
+    desc "postgres:backups", "List available PostgreSQL backups"
+    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|
+        number = "#{index + 1}"
+        if number.length < 2
+          number = " #{number}"
+        end
+        puts "#{number}. #{line}"
+      end
+    end
+
+    desc "postgres:backups:create", "Create a new PostgreSQL backup"
+    def postgres_backups_create
+      run_command "postgres:backups:create #{app_name}"
+    end
+
+    desc "postgres:backups:disable", "Disable daily PostgreSQL backups"
+    def postgres_backups_disable
+      run_command "postgres:backups:disable #{app_name}"
+    end
+
+    desc "postgres:backups:download <number>", "Download the numbered PostgreSQL backup"
+    def postgres_backups_download(*args)
+      number = args.first ? args.first : 1
+
+      if backup = backup_filename(number)
+        command = "postgres:backups:download #{app_name} #{backup} > #{backup}"
+        puts "Saving to local file: #{backup}"
+        run_command(command)
+      else
+        puts "Invalid backup number"
+      end
+    end
+
+    desc "postgres:backups:enable", "Enable daily PostgreSQL backups"
+    def postgres_backups_enable
+      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
+
+  private
+
+    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
+
+  end
+end

data/lib/dokku_installer/ssl.rb

@@ -0,0 +1,25 @@
+module DokkuInstaller
+  class Cli < Thor
+
+    desc "ssl:certificate <file path>", "Add a signed certificate for SSL (server.crt)"
+    def ssl_certificate(*args)
+      file_path = args.first
+      file_contents = File.read(file_path)
+      command = "echo \"#{file_contents}\" | ssh dokku@#{domain} ssl:certificate #{app_name}"
+
+      puts "Running #{command}..."
+      exec(command)
+    end
+
+    desc "ssl:key <file path>", "Add a private key for SSL (server.key)"
+    def ssl_key(*args)
+      file_path = args.first
+      file_contents = File.read(file_path)
+      command = "echo \"#{file_contents}\" | ssh dokku@#{domain} ssl:key #{app_name}"
+
+      puts "Running #{command}..."
+      exec(command)
+    end
+
+  end
+end

data/lib/dokku_installer/version.rb

@@ -1,3 +1,3 @@
 module DokkuInstaller
-  VERSION = "0.0.9.1"
+  VERSION = "0.0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dokku-installer-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9.1
+  version: 0.0.9.2
 platform: ruby
 authors:
 - Brian Pattison
@@ -40,6 +40,10 @@ files:
 - bin/dokku
 - dokku_installer_cli.gemspec
 - lib/dokku_installer.rb
+- lib/dokku_installer/config.rb
+- lib/dokku_installer/domains.rb
+- lib/dokku_installer/postgres.rb
+- lib/dokku_installer/ssl.rb
 - lib/dokku_installer/version.rb
 homepage: https://github.com/brianpattison/dokku-installer-cli
 licenses: