dokkufy 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04789fa5bbd4f59f47a969ef3a5ddb13a64c221b
-  data.tar.gz: 961bff96b825c09fdcd7cbef8b022cbe6b32bf0d
+  metadata.gz: 2a5fbd971614a49e1d38fb65cee53959a32ad8e9
+  data.tar.gz: 82891b6ff6a0284dc896f6912b25e5b00bb0870b
 SHA512:
-  metadata.gz: 13dcbb9bd528df50311a78f217aafde4febcf5c337df9c0de1e9aa832edebfdfdbfd71d7b97b86cd07b072d420ccf23f7bcd7f8582f4aabb20ff5cfbcb184176
-  data.tar.gz: 0902c6fc1876b6614362d005b29c7126963b3334297198abe55b3f62a577c5493f6e0c4b855057548888a0e81346bcac37cd031194019e0bd4a75ec121d5879e
+  metadata.gz: 331c2434da0c75e00f9d5004adae4cafacb53e6868a111d9f6f27ef6a66dd0520ff65ed06927162237659c8ca6cc5cef631522e239a6352bc969fac61c8fa16d
+  data.tar.gz: 391d73568f03cf840190a58941bea2cc47aeff03b9a1f83c4914be2efd8bf0aff2c14aa48feee861ce6894d28c12901c05e0832079efa88241c75f03e645f376

data/README.md

@@ -2,7 +2,20 @@
 
 A [Dokku](https://github.com/progrium/dokku) toolbelt inspired by the [Heroku toolbelt](https://toolbelt.heroku.com/)
 
-## Planned commands
+## Basic usage
+
+Want to build your own Heroku? Dokku and Dokkufy make this possible.
+
+1. Spin up a Ubuntu 12.04 or 14.04 server
+2. Dokkufy your server using `dokkufy server`
+3. Change directories to your app
+4. Dokkufy your app `dokkufy app`
+5. Deploy your app `git push dokku master`
+6. Control your app using the `dokku` command (see `dokku help` for available commands)
+
+## Commands
+
+Most commands take their parameters as command line arguments or through an interactive prompt.
 
 ```
 dokkufy <command>
@@ -18,10 +31,6 @@ dokkufy <command>
 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
@@ -74,8 +83,37 @@ dokkufy app:clear
 
 Removes any `dokku` remotes for the local git repository and deletes the `.dokkurc` file.
 
+### dokku
+
+```sh
+dokku <command>
+```
+
+Runs the command on the Dokku server attached to this app. Intelligently determines the remote address if the app has been dokkufied, and automatically adds the app name where needed.
+
+Some examples:
+
+```sh
+dokku help    # runs `dokku help` on server
+dokku run ls  # runs `dokku run <app_name> ls` on server
+```
+
+Every `dokku` command translates to an auto generated ssh call. The `<app_name>` is automatically added if the response returns a "App <command> not found".
+
+Some examples
+
+```sh
+cat .dokkurc # content of the .dokkurc
+$ dokku@example.com:test_app
+dokku help
+$ ssh -t dokku@example.com help # the actual command executed
+dokku run ls # a command that requires an app name
+$ ssh -t dokku@example.com run test_app ls
+```
+
 ## Release notes
 
+* **0.1.0** Adds the `dokku` command
 * **0.0.7** Adds the (un)dokkufication of apps
 * **0.0.6** Adds plugin uninstall
 * **0.0.5** Small bug fix to plugin installs

data/bin/dokku

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'dokkufy'
+
+git = Dokkufy::Git.new
+if !git.dokku_remote_present?
+  puts "No Dokku remote found. Run `dokkufy app` first."
+else
+  Dokkufy::Dokku.new(git.dokku_remote).run(ARGV)
+end

data/lib/dokkufy/app.rb

@@ -22,6 +22,7 @@ module Dokkufy
     def dokkufy
       puts "Using #{repo}"
       Dokkufy::Git.new.dokku_remote = repo
+      puts "You can now push your app using `git push dokku master`"
     end
 
   end

data/lib/dokkufy/dokku.rb

@@ -0,0 +1,33 @@
+module Dokkufy
+  class Dokku
+    attr_accessor :repo
+
+    def initialize repo
+      self.repo = repo
+    end
+
+    def run args
+      output = `#{command(args)}`
+      if output.strip.end_with?("does not exist")
+        args = args.insert(1,app_name)
+        output = `#{command(args)}`
+      end
+      puts output
+    end
+
+    private
+
+    def command args
+      command = "ssh -t -q #{server} #{args.join(" ")}"
+    end
+
+    def server
+      @server ||= self.repo.split(":").first
+    end
+
+    def app_name
+      @app_name ||= self.repo.split(":").last
+    end
+
+  end
+end

data/lib/dokkufy/info.rb

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

data/lib/dokkufy.rb

@@ -4,6 +4,7 @@ require 'dokkufy/server'
 require 'dokkufy/plugin'
 require 'dokkufy/app'
 require 'dokkufy/git'
+require 'dokkufy/dokku'
 
 module Dokkufy
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dokkufy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Cristiano Betta
@@ -56,6 +56,7 @@ description: A Dokku toolchain
 email:
 - cbetta@gmail.com
 executables:
+- dokku
 - dokkufy
 extensions: []
 extra_rdoc_files: []
@@ -66,10 +67,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/dokku
 - bin/dokkufy
 - dokkufy.gemspec
 - lib/dokkufy.rb
 - lib/dokkufy/app.rb
+- lib/dokkufy/dokku.rb
 - lib/dokkufy/git.rb
 - lib/dokkufy/info.rb
 - lib/dokkufy/plugin.rb