dockland 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 907e0e3617b1cc30019c5372adb9f25141ad6bd2
-  data.tar.gz: a1d0bf00df87d99988e192a03b38fd7936f165ed
+  metadata.gz: c4aacb5b87342f2c03fafff0f6e2c92fd7231a3c
+  data.tar.gz: 328eb74242dcabc1200ec275068becec660cbf03
 SHA512:
-  metadata.gz: eb1ea5c5029f25827a1df65a179190281ba71669d933ce2b2d23199c83e7c156a4c95a30d59134607741fa6d5d91b064a06a4c5ad68684c41df7b562fca7d873
-  data.tar.gz: 889a5b5f832ea7b790f3974698e7c22150c94f08557b145436882c069f11087aae091e3e4cce5800f44f0f31fbf817bee6bab2f8f88c52bd971cd6c8f76bab5f
+  metadata.gz: 8ffdd4fe449d8e7576b8344a44df1b8d2cb37be971e91e5d01322b7f3329eebbfdff59429f1c544b8d9e295c773908239fde62142b7c28a6f533b2a51d4b1f35
+  data.tar.gz: 0fed6ecc2b3d0630294ca5326adc9ffc75fc779723df2aaec89ea2d66c9e75414b458c4e15f8831c8c2d34935c57afdd613157960046a66e772edf687d4b5dfc

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# 0.2.0
+
+- Dockland detects automatically that given command requires <app_name>
+
+# 0.0.1
+
+- First release

data/README.md

@@ -4,13 +4,13 @@ dokku pipeline
 
 ## Installation
 
-```zsh
+```bash
 $ gem install dockland
 ```
 
 ## Usage
 
-```zsh
+```bash
 $ cd dokku-ready-project
 $ git config remote.dokku.url
 dokku@example.com:dokku-ready-project
@@ -28,7 +28,7 @@ KEY1: VALUE
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/dockland/fork )
+1. Fork it ( https://github.com/oame/dockland/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/dockland.rb

@@ -4,10 +4,10 @@ require 'dockland/cli'
 module Dockland
 
   private
-  def self.dokku_remote
-    dokku_uri = `git config remote.dokku.url`.strip
+  def self.parse_git_remote
+    dokku_uri = `git config remote.dokku.url`.strip || `git config remote.deploy.url`.strip
     if dokku_uri.empty?
-      puts "dokku url not given. please add dokku url to git remote"
+      puts "dokku url not given. please run > $ git remote add dokku dokku@<host>:<app_name>"
       exit
     end
 
@@ -15,4 +15,16 @@ module Dockland
     return { username: username, host: host, app_name: app_name }
   end
 
+  def self.is_require_app_name?(command)
+    remote = parse_git_remote
+    line = `ssh -t #{remote[:username]}@#{remote[:host]} help 2> /dev/null | grep '    #{command}'`
+    line.include?('<app>')
+  end
+
+  def self.dokku_exec(command, options='')
+    remote = parse_git_remote
+    lines = `ssh -t #{remote[:username]}@#{remote[:host]} #{command} #{remote[:app_name] if is_require_app_name?(command)} #{options} 2> /dev/null`
+    lines.strip
+  end
+
 end

data/lib/dockland/cli.rb

@@ -11,11 +11,15 @@ module Dockland
       puts "AppName: #{remote[:app_name]}"
     end
 
+    def help
+      puts Dockland.dokku_exec( 'help' )
+    end
+
     def method_missing(*args)
       command, *opt = args
-      remote = Dockland.dokku_remote
-      lines = `ssh -t #{remote[:username]}@#{remote[:host]} #{command.to_s} #{remote[:app_name]} #{opt.join(' ')} 2> /dev/null`
-      puts lines.strip
+
+      lines = Dockland.dokku_exec( command.to_s, opt.join(' ') )
+      puts lines
     end
 
   end

data/lib/dockland/version.rb

@@ -1,3 +1,3 @@
 module Dockland
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockland
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - oame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md