jossh 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21292d5cf9f6a4a812cb4b32950e56516b17ca5
-  data.tar.gz: 00c4ebc56ab4240f035ced04b1ccbd4917ad0a1d
+  metadata.gz: 065f5d98494010a3bc73bafd4317937e34aab7af
+  data.tar.gz: a293c204f348966006ae2d366d6f27ea9fa8a377
 SHA512:
-  metadata.gz: 3415b4accc2faf4d0bcadb7de6c570fadbd3e52376bcb8e14e30dc72b8200836576c0e846334ba2acdc52990e3d87cb656a76e9029a0ed7353c32788c1a367f8
-  data.tar.gz: 4a3e0f6b97c859f070d0840f7b62e3348b2d3b7fb000ad372a32a7ee6a142a48149a97fcc80fcfe054a62171c665776f280f343771e8294df6511993d6c76e89
+  metadata.gz: bee1fe6fa0b70d08cd4624d7e162dc27a1107c0559ef3290da3bfb41e97a5edd6197ffbc2b2706ccdc18baf7c6367acf5f6e4a7ee9099293e4a979100f6ae43f
+  data.tar.gz: 01505c2b98995e22f7bb0234c3708516476d7e7f40b374d79e02ba5adae68107d15d44f720346fe12b32b50814c24a4fa4f243221d5e39144ab9cea8708a720d

data/README.md

@@ -43,15 +43,22 @@ commands or a local script over SSH.
 $ jossh
 
 Usage: jossh <host> <script>
+       jossh -h
 
- <host>   - any key available in ./ssh_hosts.yml
- <script> - can be either a filename or one or more direct command
-            quotes are only needed if you include multiple commands
-            with && or semicolor (;)
+ <host> can be:
+   - :symbol    - in this case we will look in ./ssh_hosts.yml
+   - host       - in this case we will use the current logged in user
+   - user@host
+
+ <script> can be:
+   - a filename
+   - one or more direct command - quotes are only needed if you include
+     multiple commands with && or semicolor (;)
+
+Examples: jossh :production git status
+          jossh jack@server.com "cd ~ && ls -l"
+          jossh server.com deploy
 
-Examples: jossh production git status
-          jossh stage "cd ~ && ls -l"
-          jossh devhost deploy
 ```
 
 ## Library Usage

data/bin/jossh

@@ -1,32 +1,62 @@
 #!/usr/bin/env ruby
 
 require 'jossh'
+require 'etc'
 
 # for dev (not needed in most cases)
 # require File.dirname(__FILE__) + "/../lib/jossh"
 
 trap(:INT) { abort "\r\nGoodbye" }
 
+def short_usage
+  "\nUsage: jossh <host> <script>\n" +
+  "       jossh -h\n\n" 
+end
+
 def usage
-  "\nUsage: jossh <host> <script>\n\n" +
-  " <host>   - any key available in ./ssh_hosts.yml\n" +
-  " <script> - can be either a filename or one or more direct command\n" + 
-  "            quotes are only needed if you include multiple commands\n" + 
-  "            with && or semicolor (;)\n\n" +
-  "Examples: jossh production git status\n" +
-  "          jossh stage \"cd ~ && ls -l\"\n" +
-  "          jossh devhost deploy"
+  short_usage +
+  " <host> can be:\n"+
+  "   - :symbol    - in this case we will look in ./ssh_hosts.yml\n" +
+  "   - host       - in this case we will use the current logged in user\n" +
+  "   - user@host\n\n" +
+  " <script> can be:\n" +
+  "   - a filename\n" + 
+  "   - one or more direct command - quotes are only needed if you include\n" +
+  "     multiple commands with && or semicolor (;)\n\n" +
+  "Examples: jossh :production git status\n" +
+  "          jossh jack@server.com \"cd ~ && ls -l\"\n" +
+  "          jossh server.com deploy"
 end
 
 def run
-  host = ARGV.shift
+  ARGV.empty? and abort short_usage
+  ARGV[0] == '-h' and abort usage
+  host   = ARGV.shift.dup
   script = ARGV.join ' '
-  host and script or abort usage
-  if File.exist? script
-    ssh_script! host.to_sym, script
-  else
-    ssh host.to_sym, script
+  host and script or abort short_usage
+  host = standardize_host host
+  begin
+    if File.exist? script
+      ssh_script! host, script
+    else
+      ssh host, script
+    end
+  rescue => e
+    abort e.message
+  end
+end
+
+def standardize_host(str)
+  if str[0] == ':' 
+    str[0] = ''
+    return str.to_sym
+  end
+
+  if str =~ /^(.+)@(.+)$/
+    return { user: $1, host: $2 }
   end
+
+  return { user: Etc.getlogin, host: str }
 end
 
 run

data/lib/jossh/version.rb

@@ -1,3 +1,3 @@
 module Jossh
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jossh
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole