dokkufy 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa091fef4ffd1de6b3899b60e1603756555768d
-  data.tar.gz: 1940c9f1595903306ff99b46acda72d53183b61d
+  metadata.gz: b4b1d7d04e4d3451365de3f2d1fcce0e54b1adf9
+  data.tar.gz: 8b194433b6e1637a122e1a93638d66c4225174fd
 SHA512:
-  metadata.gz: 9592e56d94b21f2696f66e1c5da5e118de28eae3cca87b6f7352890c87b89605ed21521412528d1ba3b0fc93b5e9dd1ad9ed34b64c4cfe2e692f87afe61ad090
-  data.tar.gz: bd068363826cb8f346520064fb708eb73295fd971129ba9a99352640f5377252ba6cb7950d6b2ceacf435e15b7fced964acfb1b40a1e083961f9cb6c72cbc71b
+  metadata.gz: 4116b60507c37a17562b11d1c769b6577ea0185b698cd0e2008e28b9da267a0a357fca8c41ecb1fdac0b45f2eb6176481119a11b0e72c11489d44453c750c653
+  data.tar.gz: 8ed8142b4880e8eb72c1fd481166e6ce2c2d5dfbf7d7fb19522128f5047c356313541089f035530864e196bf2978fa4fa33686257c0c375d8ade181d49bc1707

data/README.md

@@ -122,6 +122,8 @@ $ ssh -t dokku@example.com run test_app ls
 
 ## Release notes
 
+* **0.1.5** Using classic style commander 
+* **0.1.4** Checks for SSH key before installing on server
 * **0.1.3** Applies double install fix on 14.04
 * **0.1.0** Adds the `dokku` command
 * **0.0.7** Adds the (un)dokkufication of apps

data/bin/dokkufy

@@ -1,86 +1,84 @@
 #!/usr/bin/env ruby
 require 'dokkufy'
-require 'commander'
+require 'commander/import'
 require 'terminal-table'
 
-Commander.configure do
-  program :name, 'Dokkufy'
-  program :version, Dokkufy::VERSION
-  program :description, 'An interactive script to enable Dokku on a server'
-  program :help, 'Author', 'Cristiano Betta <cbetta@gmail.com>'
+program :name, 'Dokkufy'
+program :version, Dokkufy::VERSION
+program :description, 'An interactive script to enable Dokku on a server'
+program :help, 'Author', 'Cristiano Betta <cbetta@gmail.com>'
 
-  command :'server' do |c|
-    c.syntax = 'dokkufy server [<hostname> <username> <domain>]'
-    c.description = "Installs Dokku on a Ubuntu 12.04 or 14.04 server"
-    c.option '--version', Float, 'Dokku version'
-    c.action do |args, options|
-      hostname = args[0] || ask('Server hostname or IP: ')
-      username = args[1] || ask('Username on server: ')
-      domain   = args[2] || ask('Desired root domain (e.g. example.com): ')
-      version  = options.version.nil? ? Dokkufy::Utils.stable_version : "v#{options.version}"
+command :'server' do |c|
+  c.syntax = 'dokkufy server [<hostname> <username> <domain>]'
+  c.description = "Installs Dokku on a Ubuntu 12.04 or 14.04 server"
+  c.option '--version', Float, 'Dokku version'
+  c.action do |args, options|
+    hostname = args[0] || ask('Server hostname or IP: ')
+    username = args[1] || ask('Username on server: ')
+    domain   = args[2] || ask('Desired root domain (e.g. example.com): ')
+    version  = options.version.nil? ? Dokkufy::Utils.stable_version : "v#{options.version}"
 
-      server = Dokkufy::Server.new(hostname, username)
-      server.dokkufy(version, domain)
-    end
+    server = Dokkufy::Server.new(hostname, username)
+    server.dokkufy(version, domain)
   end
+end
 
-  command :'plugin:list' do |c|
-    c.syntax = 'dokkufy plugin:list'
-    c.description = "Lists known Dokku plugins"
-    c.option('--with-notes'){ $with_notes = true }
-    c.action do |args, options|
-      puts Terminal::Table.new rows: Dokkufy::Plugin.all($with_notes), headings: ["ID", "Name", "Description"]
-    end
+command :'plugin:list' do |c|
+  c.syntax = 'dokkufy plugin:list'
+  c.description = "Lists known Dokku plugins"
+  c.option('--with-notes'){ $with_notes = true }
+  c.action do |args, options|
+    puts Terminal::Table.new rows: Dokkufy::Plugin.all($with_notes), headings: ["ID", "Name", "Description"]
   end
+end
 
-  command :'plugin:install' do |c|
-    c.syntax = 'dokkufy plugin:install <plugin_name_or_id> [<hostname> <username>]'
-    c.description = "Installs a known Dokku plugin"
-    c.action do |args, options|
-      id_or_name  = args[0] || ask('Plugin ID or Name: ')
-      hostname    = args[1] || ask('Server hostname or IP: ')
-      username    = args[2] || ask('Username on server: ')
-      Dokkufy::Plugin.new(hostname, username).install(id_or_name)
-    end
+command :'plugin:install' do |c|
+  c.syntax = 'dokkufy plugin:install <plugin_name_or_id> [<hostname> <username>]'
+  c.description = "Installs a known Dokku plugin"
+  c.action do |args, options|
+    id_or_name  = args[0] || ask('Plugin ID or Name: ')
+    hostname    = args[1] || ask('Server hostname or IP: ')
+    username    = args[2] || ask('Username on server: ')
+    Dokkufy::Plugin.new(hostname, username).install(id_or_name)
   end
+end
 
-  command :'plugin:uninstall' do |c|
-    c.syntax = 'dokkufy plugin:uninstall <plugin_name_or_id> [<hostname> <username>]'
-    c.description = "Uninstalls a known Dokku plugin"
-    c.action do |args, options|
-      id_or_name  = args[0] || ask('Plugin ID or Name: ')
-      hostname    = args[1] || ask('Server hostname or IP: ')
-      username    = args[2] || ask('Username on server: ')
-      Dokkufy::Plugin.new(hostname, username).uninstall(id_or_name)
-    end
+command :'plugin:uninstall' do |c|
+  c.syntax = 'dokkufy plugin:uninstall <plugin_name_or_id> [<hostname> <username>]'
+  c.description = "Uninstalls a known Dokku plugin"
+  c.action do |args, options|
+    id_or_name  = args[0] || ask('Plugin ID or Name: ')
+    hostname    = args[1] || ask('Server hostname or IP: ')
+    username    = args[2] || ask('Username on server: ')
+    Dokkufy::Plugin.new(hostname, username).uninstall(id_or_name)
   end
+end
 
-  command :'app' do |c|
-    c.syntax = 'dokkufy app <git_repo> [OR <hostname> <dokku_username>]'
-    c.description = "Binds this app to a Dokku instance through git and a config file"
-    c.action do |args, options|
-      if args.empty?
-        git = Dokkufy::Git.new
-        if git.dokku_remote_present?
-          args = [git.dokku_remote]
-        else
-          hostname    = ask('Server hostname or IP: ')
-          username    = ask('Dokku username on server [dokku]: ')
-          username    = "dokku" if username.strip == ""
-          args = [hostname, username]
-        end
+command :'app' do |c|
+  c.syntax = 'dokkufy app <git_repo> [OR <hostname> <dokku_username>]'
+  c.description = "Binds this app to a Dokku instance through git and a config file"
+  c.action do |args, options|
+    if args.empty?
+      git = Dokkufy::Git.new
+      if git.dokku_remote_present?
+        args = [git.dokku_remote]
+      else
+        hostname    = ask('Server hostname or IP: ')
+        username    = ask('Dokku username on server [dokku]: ')
+        username    = "dokku" if username.strip == ""
+        args = [hostname, username]
       end
-      Dokkufy::App.new(args).dokkufy
     end
+    Dokkufy::App.new(args).dokkufy
   end
+end
 
-  command :'app:clear' do |c|
-    c.syntax = 'dokkufy app:clear'
-    c.description = "Undokkufies this app"
-    c.action do |args, options|
-      Dokkufy::Git.new.clear
-    end
+command :'app:clear' do |c|
+  c.syntax = 'dokkufy app:clear'
+  c.description = "Undokkufies this app"
+  c.action do |args, options|
+    Dokkufy::Git.new.clear
   end
-
-  default_command :help
 end
+
+default_command :help

data/lib/dokkufy/info.rb

@@ -1,5 +1,5 @@
 module Dokkufy
-  VERSION = "0.1.4"                 unless defined? Dokkufy::VERSION
+  VERSION = "0.1.5"                 unless defined? Dokkufy::VERSION
   NAME = "dokkufy"                  unless defined? Dokkufy::NAME
   DESCRIPTION = "A Dokku toolchain" unless defined? Dokkufy::DESCRIPTION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dokkufy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Cristiano Betta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander