dokku_client 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b305671c05ed116254b085aeb57e5ddd9d956d9c
-  data.tar.gz: e5a8b6f50737af0944cee926701144a857b552a8
+  metadata.gz: f04a83b266a594b2501262c1bbacaaa0cb10031e
+  data.tar.gz: 3b4d65d14a553d58d5b9d1110fe7283aa5b50684
 SHA512:
-  metadata.gz: 732ebe7437f8b3927b4d3f95812a579302e6bf36e0ceb9339c78c1da00279d8f09238aa742adbca992b3841f50755ec37eef03a017afd051a83eb7b111cb0c9e
-  data.tar.gz: 5a9b447b80378788f783346a7690450462e294acea6c6d7624bd2f18696e34ef28c9f8b8e144c2484d0da1b2c6b9cd11069f2c7fdef1d0da40de72bc606bbc5c
+  metadata.gz: bbceabbf61f7c9640eaba827a1836302d481f1ac84e5034df598fc854f6b68cd56fb87ea880ac562d306f60b5f9bf4cd4d712a6b9764faa6aff73658075b1d1b
+  data.tar.gz: fe64d135a13bccd0cf234c312e3f0d9ffe27d6786a2f05c61bded8a83d62fd146f954c2d4bbd8709ee66e0246dc708719d26434eeec0628fcedfbb5dc267999d

data/CHANGELOG

@@ -1,6 +1,11 @@
-=== 1.1 Current release
+=== 1.4 Current release
 
-* **TODO** more commands (mysql)
+* **TODO** more commands (mariadb)
+
+=== 1.3
+
+* fix redis command
+* added mysql commands
 
 === 1.2
 

data/README.md

@@ -46,7 +46,7 @@ In 'active commands' question when you configuring dokku client type plugin name
 + mongodb
 + redis
 
-Common and Config commands are enabled by default. If you don't answer to 'active commands' then all commands will be visible.
+Common and Config commands are enabled by default. If you want all commands to be visible you need to type 'all' in the question.
 
 
 ## Show help
@@ -71,40 +71,47 @@ or
 
       Config commands:
         config (c)                                show environment variables for project
-        get_config (gc) <KEY>                     show exact environment variable
-        set_config (sc) KEY=VALUE [KEY2=VALUE2]   set new environment variables
-        unset_config (uc) KEY [KEY2]              remove environment variables
+        config:get (gc) <KEY>                     show exact environment variable
+        config:set (sc) KEY=VALUE [KEY2=VALUE2]   set new environment variables
+        config:unset (uc) KEY [KEY2]              remove environment variables
 
       Memcached commands:
-        create_mem                                create memcached container
-        delete_mem                                delete memcached container
-        info_mem                                  display container informations
-        logs_mem                                  display last logs from memcached container
-        link_mem <container>                      link an app to memcached container
+        memcached:create                          create memcached container
+        memcached:delete                          delete memcached container
+        memcached:info                            display container informations
+        memcached:logs                            display last logs from memcached container
+        memcached:link <container>                link an app to memcached container
 
       MongoDB commands:
-        create_mongo                              create a mongo database
-        delete_mongo                              delete a mongo database
-        console_mongo                             lunch mongodb console as admin
-        link_mongo                                link mongo container to application
-        logs_mongo                                display logs for mongo container
-        list_mongo                                list all mongo databases
-        status_mongo                              display status of mongo container
+        mongodb:create                            create a mongo database
+        mongodb:delete                            delete a mongo database
+        mongodb:console                           lunch mongodb console as admin
+        mongodb:link                              link mongo container to application
+        mongodb:logs                              display logs for mongo container
+        mongodb:list                              list all mongo databases
+        mongodb:status                            display status of mongo container
 
       Postgresql commands:
-        create_postgres <db>                      create a postgresql database
-        delete_postgres <db>                      delete specified postgresql database
-        info_postgres <db>                        display database information
-        link_postgres <db>                        link an app to a postgresql container
-        list_postgres <db>                        display list of postgresql containers
-        logs_postgres                             display last logs from postgresql container
+        postgresql:create <db>                    create a postgresql database
+        postgresql:delete <db>                    delete specified postgresql database
+        postgresql:info <db>                      display database information
+        postgresql:link <db>                      link an app to a postgresql container
+        postgresql:list <db>                      display list of postgresql containers
+        postgresql:logs                           display last logs from postgresql container
 
       Redis commands:
-        create_redis                              create a redis container
-        delete_redis                              delete redis container
-        info_redis                                display container informations
-        link_redis <container>                    link an app to a redis container
-        logs_redis                                display last logs from redis container
+        redis:create                              create a redis container
+        redis:delete                              delete redis container
+        redis:info                                display container informations
+        redis:link <container>                    link an app to a redis container
+        redis:logs                                display last logs from redis container
+
+      Mysql commands:
+        mysql:create                              create a mysql container
+        mysql:delete                              delete mysql container
+        mysql:info                                display container informations
+        mysql:link <container>                    link an app to a mysql container
+        mysql:logs                                display last logs from mysql container
 
 ## Contributing
 
@@ -117,3 +124,4 @@ or
 ## Thanks
 
 This gem is inspired by https://github.com/lubieniebieski/pivo_flow. Thanks to it's author for the inspiration and idea.
+

data/dokku_client.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "grit"
   gem.add_runtime_dependency "highline"
   gem.add_runtime_dependency "colorize"
+  gem.add_runtime_dependency "konf"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "pry"

data/lib/dokku.yml

@@ -0,0 +1,49 @@
+no_argument:
+  - "logs"
+  - "reconfig"
+  - "config"
+  - "c"
+  - "l"
+  - "memcached:create"
+  - "memcached:delete"
+  - "memcached:info"
+  - "memcached:logs"
+  - "p"
+  - "url"
+  - "u"
+  - "postgresql:list"
+  - "rdm"
+  - "redis:create"
+  - "redis:delete"
+  - "redis:info"
+  - "redis:logs"
+  - "mongodb:create"
+  - "mongodb:delete"
+  - "mongodb:console"
+  - "mongodb:link"
+  - "mongodb:logs"
+  - "mongodb:list"
+  - "mongodb:status"
+  - "mysql:create"
+  - "mysql:delete"
+  - "mysql:info"
+  - "mysql:logs"
+single_argument:
+  - "config:get"
+  - "gc"
+  - "memcached:link"
+  - "postgresql:create"
+  - "rc"
+  - "postgresql:info"
+  - "postgresql:delete"
+  - "postgresql:logs"
+  - "postgresql:link"
+  - "redis:link"
+  - "mysql:link"
+multiple_arguments:
+  - "run_command"
+  - "r"
+  - "sc"
+  - "confi:set"
+  - "config:unset"
+  - "uc"

data/lib/dokku_client.rb

@@ -3,6 +3,7 @@ require 'grit'
 require 'optparse'
 require 'highline'
 require 'fileutils'
+require 'konf'
 
 require 'dokku_client/core_extensions'
 require 'dokku_client/errors'

data/lib/dokku_client/base.rb

@@ -48,6 +48,17 @@ module DokkuClient
       @options["plugins"].include?(plugin) ||  @options["plugins"].include?('all')
     end
 
+    def common_description name, opts
+      if plugin_enabled(name)
+        opts.separator  "\n   #{name.capitalize} commands:"
+        opts.separator  "     #{name}:create                          create a #{name} container"
+        opts.separator  "     #{name}:delete                          delete #{name} container"
+        opts.separator  "     #{name}:info                            display container informations"
+        opts.separator  "     #{name}:link <container>                link an app to a #{name} container"
+        opts.separator  "     #{name}:logs                            display last logs from #{name} container"
+      end
+    end
+
     private
 
     def config_update_success

data/lib/dokku_client/cli.rb

@@ -21,6 +21,8 @@ module DokkuClient
       end
     end
 
+    List = Konf.new(YAML.load(File.read(File.expand_path('../../dokku.yml', __FILE__))))
+
     private
 
     # available commands
@@ -115,6 +117,18 @@ module DokkuClient
 
     def_delegator :dokku_redis, :logs_redis, :redis_logs
 
+    ### mysql commands
+
+    def_delegator :dokku_mysql, :create_mysql, :mysql_create
+
+    def_delegator :dokku_mysql, :delete_mysql, :mysql_delete
+
+    def_delegator :dokku_mysql, :info_mysql, :mysql_info
+
+    def_delegator :dokku_mysql, :link_mysql, :mysql_link
+
+    def_delegator :dokku_mysql, :logs_mysql, :mysql_logs
+
     def reconfig
       DokkuClient::Base.new.reconfig
     end
@@ -149,6 +163,10 @@ module DokkuClient
       @dokku_redis ||= DokkuClient::Plugins::Redis.new(@options)
     end
 
+    def dokku_mysql
+      @dokku_mysql ||= DokkuClient::Plugins::Mysql.new(@options)
+    end
+
     def no_argument_error
       puts "You forgot argument - look into help"
     end
@@ -165,6 +183,10 @@ module DokkuClient
       arg.include?(':') ? arg.gsub(':', '_').to_sym : arg.to_sym
     end
 
+    def get_list list, arg
+      List.public_send(list).include?(arg) ? arg : ""
+    end
+
     def parse_argv(args)
       @options = {}
 
@@ -174,10 +196,11 @@ module DokkuClient
         opts.separator  "\n     version                               show gem version"
         dokku_common.commands(opts)
         dokku_config.commands(opts)
-        dokku_memcached.commands(opts)
         dokku_mongodb.commands(opts)
         dokku_postgresql.commands(opts)
         dokku_redis.commands(opts)
+        dokku_mysql.commands(opts)
+        dokku_memcached.commands(opts)
         opts.separator  ""
         opts.separator  "\nOptions"
 
@@ -203,15 +226,15 @@ module DokkuClient
 
       opt_parser.parse!(args)
 
-      case args[0]
-      when "config:get", "gc", "memcached:link", "postgresql:create", "rc", "postgresql:info", "postgresql:delete", "postgresql:logs", "postgresql:link", "redis:link"
-        self.send(get_method(args[0]), args[1])
+      case arg = args[0]
+      when get_list("single_argument", arg)
+        self.send(get_method(arg), args[1])
       when "help"
         puts opt_parser
-      when "logs", "reconfig", "config", "c", "l", "memcached:create", "memcached:delete", "memcached:info", "memcached:logs", "p", "url", "u", "postgresql:list", "rdm", "redis:create", "redis:delete", "redis:info", "redis:logs", "mongodb:create", "mongodb:delete", "mongodb:console", "mongodb:link", "mongodb:logs", "mongodb:list", "mongodb:status"
-        self.send(get_method(args[0]))
-      when "run_command", "r", "sc", "confi:set", "config:unset", "uc"
-        first = get_method(args[0])
+      when get_list("no_argument", arg)
+        self.send(get_method(arg))
+      when get_list("multiple_arguments", arg)
+        first = get_method(arg)
         args.shift
         self.send(first, args.join(' '))
       when nil

data/lib/dokku_client/plugins/memcached.rb

@@ -26,14 +26,7 @@ module DokkuClient
       end
 
       def commands opts
-        if plugin_enabled('memcached')
-          opts.separator  "\n   Memcached commands:"
-          opts.separator  "     memcached:create                      create memcached container"
-          opts.separator  "     memcached:delete                      delete memcached container"
-          opts.separator  "     memcached:info                        display container informations"
-          opts.separator  "     memcached:logs                        display last logs from memcached container"
-          opts.separator  "     memcached:link <container>            link an app to memcached container"
-        end
+        common_description('memcached', opts)
       end
 
     end

data/lib/dokku_client/plugins/mysql.rb

@@ -2,6 +2,33 @@ module DokkuClient
   module Plugins
     class Mysql < Base
 
+      def run
+      end
+
+      def create_mysql
+        dokku "mysql:create #{@options["project-name"]}"
+      end
+
+      def delete_mysql
+        dokku "mysql:delete #{@options["project-name"]}"
+      end
+
+      def info_mysql
+        dokku "mysql:info #{@options["project-name"]}"
+      end
+
+      def link_mysql db
+        dokku "mysql:link #{@options["project-name"]} #{db}"
+      end
+
+      def logs_mysql
+        dokku "mysql:logs #{@options["project-name"]}"
+      end
+
+      def commands opts
+        common_description('mysql', opts)
+      end
+
     end
   end
 end

data/lib/dokku_client/plugins/redis.rb

@@ -18,7 +18,7 @@ module DokkuClient
       end
 
       def link_redis container
-        dokku "redis:link #{@options["project-name"]} container"
+        dokku "redis:link #{@options["project-name"]} #{container}"
       end
 
       def logs_redis
@@ -26,14 +26,7 @@ module DokkuClient
       end
 
       def commands opts
-        if plugin_enabled('redis')
-          opts.separator  "\n   Redis commands:"
-          opts.separator  "     redis:create                          create a redis container"
-          opts.separator  "     redis:delete                          delete redis container"
-          opts.separator  "     redis:info                            display container informations"
-          opts.separator  "     redis:link <container>                link an app to a redis container"
-          opts.separator  "     redis:logs                            display last logs from redis container"
-        end
+        common_description('redis', opts)
       end
 
     end

data/lib/dokku_client/version.rb

@@ -1,3 +1,3 @@
 module DokkuClient
-  VERSION = '1.2'
+  VERSION = '1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dokku_client
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Kuba Łasecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: konf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,7 @@ files:
 - Rakefile
 - bin/dokku
 - dokku_client.gemspec
+- lib/dokku.yml
 - lib/dokku_client.rb
 - lib/dokku_client/base.rb
 - lib/dokku_client/cli.rb