dokku-cli 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddaff5f5a26087b62129101aafa90e0847561e84
-  data.tar.gz: 83fe21be55646fc8e90fa1ddc09985fd32388461
+  metadata.gz: 66b111f35ffd639674af09b02f89b0b37a3d0604
+  data.tar.gz: 158a398dce6993965e22f10f13cf1c4acf456654
 SHA512:
-  metadata.gz: bfffcc5964a3a74b6c583fba74872a434b198c75661ea0654d52a5fe177055ba03d0bab6c7d5059e1bcb2570df43e57e936dd26b2b887a865f24603a1f91b3b2
-  data.tar.gz: 763c46b1832eb24f8cddf2466505ec27b906ca87698e3ad693922d6bc248ffa5f3bf1e6dc080e6ddecedfb0de88ab18f7dc43468f740c778754d3b383f8e04c5
+  metadata.gz: 3157441fdbb7b1a22a31d83714948ec8375e9da6f7e886c643c1f437f90e70a70a1eddad5a9e6cb34467b95d318c4c8addf0a26ab3678df5a48bd0c4b3ce3a71
+  data.tar.gz: 2e40868e620eb52b66f9f03cfe6717e736eecf63171e4df632b891758c555493188aab2c3d1ed795b44884da67e70a1f7d6b535513da1442062c4c94d6b15cae

data/lib/dokku_cli.rb

@@ -5,6 +5,9 @@ require "dokku_cli/config"
 require "dokku_cli/domains"
 require "dokku_cli/nginx"
 require "dokku_cli/ps"
+require "dokku_cli/events"
+require "dokku_cli/certs"
+require "dokku_cli/keys"
 
 module DokkuCli
   class Cli < Thor
@@ -24,7 +27,7 @@ module DokkuCli
       if args.empty?
         run_command "logs #{app_name}"
       else
-        command = "ssh dokku@#{domain} logs #{app_name} #{args}"
+        command = "ssh -p #{port} dokku@#{domain} logs #{app_name} #{args}"
         puts "Running #{command}..."
         exec(command)
       end
@@ -51,7 +54,7 @@ module DokkuCli
 
     desc "ssh", "Start an SSH session as root user"
     def ssh
-      command = "ssh root@#{domain}"
+      command = "ssh -p #{port} root@#{domain}"
       puts "Running #{command}..."
       exec(command)
     end
@@ -73,7 +76,7 @@ module DokkuCli
 
     def method_missing(method, *args, &block)
       if method.to_s.split(":").length >= 2
-        self.send(method.to_s.gsub(":", "_"), *args)
+        self.send(method.to_s.gsub(":", "_").gsub("-", "_"), *args)
       elsif method == :run
         self.walk(*args)
       else
@@ -84,24 +87,37 @@ module DokkuCli
     private
 
     def app_name
-      @app_name ||= git_config_match[2]
+      @app_name ||= git_config["app_name"]
     end
 
     def domain
-      @domain ||= git_config_match[1]
+      @domain ||= git_config["domain"]
     end
 
-    def git_config_match
+    def port
+      @port ||= git_config["port"]
+    end
+
+    def git_config
       remote = "dokku"
       remote = options[:remote] if options[:remote]
 
-      @git_config_match ||= begin
-        git_config = File.join(Dir.pwd, ".git", "config")
-        exit unless File.exist?(git_config)
+      @git_config ||= begin
+        config_path = File.join(Dir.pwd, ".git", "config")
+        exit unless File.exist?(config_path)
+        config_file = File.read(config_path)
+
+        # Default dokku config: dokku@host.com:app
+        default_style_regex = /\[remote "dokku"\]\s+url \= dokku@(?<domain>.*):(?<app_name>.*)$/
+        match ||= config_file.match(default_style_regex)
+
+        # SSH dokku config: ssh://dokku@host.com:1337/app
+        ssh_style_regex = /\[remote "dokku"\]\s+url \= ssh:\/\/dokku@(?<domain>.*):(?<port>.*)\/(?<app_name>.*)$/
+        match ||= config_file.match(ssh_style_regex)
 
-        git_config = File.read(git_config)
-        match = git_config.match(/\[remote "#{remote}"\]\s+url \= dokku@(.*):(.*)$/).to_a
         exit unless match
+        match = Hash[match.names.zip(match.captures)]
+        match["port"] ||= 22
 
         match
       end
@@ -109,7 +125,7 @@ module DokkuCli
 
     def run_command(command)
       command = command.gsub(/ --remote=[\S]*/, '')
-      dokku_command = "ssh -t dokku@#{domain} #{command}"
+      dokku_command = "ssh -t -p #{port} dokku@#{domain} #{command}"
 
       puts "Running #{dokku_command}..."
       exec(dokku_command)

data/lib/dokku_cli/certs.rb

@@ -0,0 +1,29 @@
+module DokkuCli
+  class Cli < Thor
+
+    desc "certs:add CRT KEY", "Add an ssl endpoint to an app. Can also import from a tarball on stdin."
+    def certs_add(crt, key)
+      run_command "certs:add #{app_name} #{crt} #{key}"
+    end
+
+    desc "certs:generate DOMAIN", "Generate a key and certificate signing request (and self-signed certificate)"
+    def certs_generate(domain)
+      run_command "certs:generate #{app_name} #{domain}"
+    end
+
+    desc "certs:info", "Show certificate information for an ssl endpoint."
+    def certs_info
+      run_command "certs:info #{app_name}"
+    end
+
+    desc "certs:remove", "Remove an SSL Endpoint from an app."
+    def certs_remove
+      run_command "certs:remove #{app_name}"
+    end
+
+    desc "certs:update CRT KEY", "Update an SSL Endpoint on an app. Can also import from a tarball on stdin"
+    def certs_remove(crt, key)
+      run_command "certs:update #{app_name} #{crt} #{key}"
+    end
+  end
+end

data/lib/dokku_cli/config.rb

@@ -34,7 +34,7 @@ module DokkuCli
         end
       }
 
-      command  = "ssh #{user}@#{domain} "
+      command  = "ssh -p #{port} #{user}@#{domain} "
       command += user == "root" ? "dokku " : ""
       command += "config:set #{app_name} #{args.join(' ')}"
 
@@ -46,7 +46,7 @@ module DokkuCli
     def config_unset(*args)
       run_command "config:unset #{app_name} #{args.join(' ')}"
     end
-    
+
     desc "config:set:file path/to/file", "Set one or more environment variables from file"
     def config_set_file(config_file)
       config_params = ""

data/lib/dokku_cli/events.rb

@@ -0,0 +1,24 @@
+module DokkuCli
+  class Cli < Thor
+
+    desc "events", "Show the last events (-t follows)"
+    def events
+      run_command "events #{app_name}"
+    end
+
+    desc "events:list", "List logged events"
+    def events_list
+      run_command "events:list #{app_name}"
+    end
+
+    desc "events:on", "Enable events logger"
+    def events_on
+      run_command "events:on #{app_name}"
+    end
+
+    desc "events:off", "Disable events logger"
+    def events_off
+      run_command "events:off #{app_name}"
+    end
+  end
+end

data/lib/dokku_cli/keys.rb

@@ -0,0 +1,12 @@
+module DokkuCli
+  class Cli < Thor
+
+    desc "keys:add PATH DESCRIPTION", "Add the ssh key to your dokku machine."
+    def keys_add(path, description)
+      command = "cat #{path} | ssh -p #{port} root@#{domain} 'sudo sshcommand acl-add dokku #{description}'"
+
+      puts "Adding #{path} to your dokku machine..."
+      exec(command)
+    end
+  end
+end

data/lib/dokku_cli/nginx.rb

@@ -5,5 +5,15 @@ module DokkuCli
     def nginx_build
       run_command "nginx:build-config #{app_name}"
     end
+
+    desc "nginx:access-logs", "Show the nginx access logs for an application"
+    def nginx_access_logs
+      run_command "nginx:access-logs #{app_name}"
+    end
+
+    desc "nginx:error-logs ", "Show the nginx access logs for an application"
+    def nginx_error_logs
+      run_command "nginx:error-logs #{app_name}"
+    end
   end
 end

data/lib/dokku_cli/version.rb

@@ -1,3 +1,3 @@
 module DokkuCli
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dokku-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Sebastian Szturo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -54,8 +54,11 @@ files:
 - bin/dokku
 - dokku-cli.gemspec
 - lib/dokku_cli.rb
+- lib/dokku_cli/certs.rb
 - lib/dokku_cli/config.rb
 - lib/dokku_cli/domains.rb
+- lib/dokku_cli/events.rb
+- lib/dokku_cli/keys.rb
 - lib/dokku_cli/nginx.rb
 - lib/dokku_cli/ps.rb
 - lib/dokku_cli/version.rb
@@ -79,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Command line tool for Dokku.