dokkufy 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deeaa8ef59c14b0a4c4aadcda3199642f769713e
-  data.tar.gz: e5ad29c3a2e29cc78c8f64fe6993ba96ab0eb9db
+  metadata.gz: ffa091fef4ffd1de6b3899b60e1603756555768d
+  data.tar.gz: 1940c9f1595903306ff99b46acda72d53183b61d
 SHA512:
-  metadata.gz: 3c9fb43cddf2b1570b96b7671806714535b32d862e044d6cac639500118e7192d698d4e978e335372576d342f75ca950a760481a4ad562867140347045fe9397
-  data.tar.gz: 6cf7daa5e7c7dcb91b585bb83e994ec70b535822aa679261f54e47ad2319ef9cdb3666c4d077f4c92bb0463cef037559bf03502886dae8cd2093d9c95583609e
+  metadata.gz: 9592e56d94b21f2696f66e1c5da5e118de28eae3cca87b6f7352890c87b89605ed21521412528d1ba3b0fc93b5e9dd1ad9ed34b64c4cfe2e692f87afe61ad090
+  data.tar.gz: bd068363826cb8f346520064fb708eb73295fd971129ba9a99352640f5377252ba6cb7950d6b2ceacf435e15b7fced964acfb1b40a1e083961f9cb6c72cbc71b

data/README.md

@@ -1,5 +1,8 @@
 # Dokkufy
 
+[![Gem Version](https://badge.fury.io/rb/dokkufy.svg)](http://badge.fury.io/rb/dokkufy) [![Code Climate](https://codeclimate.com/github/cbetta/dokkufy/badges/gpa.svg)](https://codeclimate.com/github/cbetta/dokkufy) ![](http://ruby-gem-downloads-badge.herokuapp.com/dokkufy?type=total)
+
+
 A [Dokku](https://github.com/progrium/dokku) toolbelt inspired by the [Heroku toolbelt](https://toolbelt.heroku.com/)
 
 ## Installation
@@ -119,7 +122,6 @@ $ ssh -t dokku@example.com run test_app ls
 
 ## Release notes
 
-<<<<<<< HEAD
 * **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/lib/dokkufy/info.rb

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

data/lib/dokkufy/server.rb

@@ -16,7 +16,11 @@ module Dokkufy
 
     def setup_key
       user = `echo $USER`
-      command = "cat ~/.ssh/id_rsa.pub | ssh #{username}@#{hostname} 'sudo sshcommand acl-add dokku #{user}'"
+      public_key = "id_rsa.pub"
+      until File.exists?(File.expand_path("~/.ssh/#{public_key}")) do
+        public_key = ask "Enter public key file name(e.g. id_rsa.pub):"
+      end
+      command = "cat ~/.ssh/#{public_key} | ssh #{username}@#{hostname} 'sudo sshcommand acl-add dokku #{user}'"
       system command
     end
 
@@ -29,4 +33,4 @@ module Dokkufy
       `ssh -t -q #{server} 'rm ~/#{method_name}.sh'`
     end
   end
-end
+end

metadata

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