dokkufy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceb50dc113332ec5b965ad73c745b0e7753f7e3d
-  data.tar.gz: 41047fe98e3d4f7d3c92f90ff6ec3029cd62e4c0
+  metadata.gz: 105fbfc0e0dc47918f360cdb2ca51e71f16477ac
+  data.tar.gz: db0cc58a072c41305e876deac01f7e357669baaa
 SHA512:
-  metadata.gz: 169e372670a094818b49d502f759144e7337df7bcd1a0816c1fb335f12d1f3df1cee2b2524b36ce0e1ce457141f2d1ed6b6a4ad5c47491dc5769e33691458eb3
-  data.tar.gz: de1cb36a4a7921b847334bb97c44ac2592a19a772725fd1b8dfd2ea7e20466b3a423c38830fa98ab306eb5f6358fc01402c10783fb9812010de6796c4c547a6d
+  metadata.gz: 21d64a72135fdef4fd796e32ae00440f399be509ce55ec60980824d51b564102e20cdb3c2f27cc570615a29722c5a4932018f499466b173141ff3b44e7eb6d3f
+  data.tar.gz: f724b939f2b53f712062e0d8e5c4b5ba5b0995f8197193bd4946799d4756a16be4b9d99c2782d3e2d60000ef23f9bcc0175348050259db5ed0da370e5c8fabc5

data/README.md

@@ -9,8 +9,9 @@ dokkufy <command>
   help              shows this list
   server            installs Dokku on a Ubuntu 12.04 or 14.04 server
   server:upgrade    upgrades a Dokku server
-  plugin            shows a list of Dokku plugins
+  plugin:list       shows a list of Dokku plugins
   plugin:install    installs a plugin on the server
+  plugin:uninstall  uninstalls a plugin on the server
   app               adds a dokku remote for a server to an app
 
 dokku <command>     runs dokku commands on the server attached to this app
@@ -18,19 +19,40 @@ dokku <command>     runs dokku commands on the server attached to this app
 
 ## Implemented commands
 
+Most commands take their parameters as command line arguments or through an interactive prompt.
+
 ### dokkufy server
 
 ```sh
 dokkufy server <hostname> <username> <domain> --version <version>
 ```
 
-Installs dokku on server at IP or Hostname `<hostname>`, using the `<username>` account to install the software.
+Installs Dokku on server at IP or Hostname `<hostname>`, using the `<username>` account to install the software.
 
 It also sets up the app on domain `<domain>`, resulting in all apps being served as a subdomain of that domain.
 
 Optionally this takes a `<version>` to specify the [Dokku tag](https://github.com/progrium/dokku/tags).
+
+### dokkufy plugin:list
+
+```sh
+dokkufy plugin:list
+```
+
+Lists all plugins as listed on the [Dokku wiki](https://github.com/progrium/dokku/wiki/Plugins). Only supports plugins that follow the standard install procedure.
+
+### dokkufy plugin:install
+
+```sh
+dokkufy plugin:install <plugin_name_or_id> [<hostname> <username>]
+```
+
+Installs a Dokku plugin either by name or ID (as received by `dokkufy plugin:list`) on a server. Only supports the standard install procedure. Check the plugins wiki for any additional install notes.
+
 ## Release notes
 
+* **0.0.5** Small bug fix to plugin installs
+* **0.0.4** Adds plugin listing and installing
 * **0.0.3** Determines latest version from Dokku github page
 * **0.0.2** Added `server` command
 * **0.0.1** Gem skeleton

data/bin/dokkufy

@@ -20,10 +20,7 @@ Commander.configure do
       version  = options.version.nil? ? Dokkufy::Utils.stable_version : "v#{options.version}"
 
       server = Dokkufy::Server.new(hostname, username)
-      server.ensure_passwordless_sudo
-      server.install_dokku(version)
-      server.configure_vhost(domain)
-      server.setup_key
+      server.dokkufy(version, domain)
     end
   end
 
@@ -32,8 +29,7 @@ Commander.configure do
     c.description = "Lists known Dokku plugins"
     c.option('--with-notes'){ $with_notes = true }
     c.action do |args, options|
-      plugins = Dokkufy::Plugin.all($with_notes)
-      puts Terminal::Table.new rows: plugins, headings: ["ID", "Name", "Description"]
+      puts Terminal::Table.new rows: Dokkufy::Plugin.all($with_notes), headings: ["ID", "Name", "Description"]
     end
   end
 

data/lib/dokkufy/info.rb

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

data/lib/dokkufy/plugin.rb

@@ -4,7 +4,7 @@ require 'hpricot'
 module Dokkufy
   class Plugin
 
-    attr_accessor :hostname, :username, :id
+    attr_accessor :hostname, :username, :path
 
     def initialize hostname, username
       self.hostname = hostname
@@ -12,18 +12,20 @@ module Dokkufy
     end
 
     def install id_or_name
-      self.id = id_or_name
-      Dokkufy::Server.new(hostname, username).install_plugin(id)
+      self.path = id_or_name
+      Dokkufy::Server.new(hostname, username).install_plugin(path, name)
     end
 
     def self.all with_notes = false
+      return @plugins if @plugins
       open("https://github.com/progrium/dokku/wiki/Plugins") do |f|
         hp = Hpricot(f)
-        plugins = hp.search("tbody:first tr td").each_slice(3)
-        return plugins.each_with_index.map do |plugin, index|
+        plugins = hp.search("tbody tr td").each_slice(3)
+        @plugins = plugins.each_with_index.map do |plugin, index|
+          first_element = plugin.first.children.reject{|e| e.inner_text.strip == ""}.first
           entry = [index+1,
-            plugin.first.children.first.attributes["href"].split("github.com/").last,
-            plugin.first.children.first.inner_text]
+            first_element.attributes["href"].split("github.com/").last,
+            first_element.inner_text]
           entry << plugin.last.inner_text if with_notes
           entry
         end
@@ -32,11 +34,11 @@ module Dokkufy
 
     private
 
-    def id=(id_or_name)
+    def path=(id_or_name)
       if id_or_name.to_i.to_s == id_or_name
         Dokkufy::Plugin.all.each do |plugin|
           if plugin[0] == id_or_name.to_i
-            @id = plugin[1]
+            @path = plugin[1]
             return
           end
         end
@@ -45,6 +47,14 @@ module Dokkufy
       end
     end
 
+    def name
+      Dokkufy::Plugin.all.each do |plugin|
+        if plugin[1] == path
+          return plugin[2].split(" ").first.downcase
+        end
+      end
+    end
+
 
   end
 end

data/lib/dokkufy/server.rb

@@ -7,6 +7,13 @@ module Dokkufy
       self.username = username
     end
 
+    def dokkufy(version, domain)
+      ensure_passwordless_sudo
+      install_dokku(version)
+      configure_vhost(domain)
+      setup_key
+    end
+
     def setup_key
       user = `echo $USER`
       command = "cat ~/.ssh/id_rsa.pub | ssh #{username}@#{hostname} 'sudo sshcommand acl-add dokku #{user}'"
@@ -18,8 +25,8 @@ module Dokkufy
       filename = Dokkufy::Utils.script method_name
       server = "#{username}@#{hostname}"
       `scp #{filename} #{server}:`
-      system("ssh -t #{server} 'OPTION=#{args.first} ./#{method_name}.sh'")
-      `ssh -t -q #{server} 'rm #{method_name}.sh'`
+      system("ssh -t #{server} 'OPTION1=#{args[0]} OPTION2=#{args[1]} ./#{method_name}.sh'")
+      `ssh -t -q #{server} 'rm ~/#{method_name}.sh'`
     end
   end
 end

data/scripts/configure_vhost.sh

@@ -1 +1 @@
-sudo bash -c "echo $OPTION > /home/dokku/VHOST"
+sudo bash -c "echo $OPTION1 > /home/dokku/VHOST"

data/scripts/install_dokku.sh

@@ -6,4 +6,4 @@ if [ "$VERSION" == "$OLD_VERSION" ]; then
   sudo apt-get install -y python-software-properties
 fi
 
-wget -qO- https://raw.github.com/progrium/dokku/$OPTION/bootstrap.sh | sudo DOKKU_TAG=v0.2.3 bash
+wget -qO- https://raw.github.com/progrium/dokku/$OPTION1/bootstrap.sh | sudo DOKKU_TAG=v0.2.3 bash

data/scripts/install_plugin.sh

@@ -1,3 +1,3 @@
 cd /var/lib/dokku/plugins
-sudo git clone https://github.com/$OPTION
+sudo git clone https://github.com/$OPTION1 $OPTION2
 sudo dokku plugins-install

metadata

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