jossh 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3857009678775cc0439cfbc76d384550da761b35
-  data.tar.gz: bea78d4e9600dfb3d87b589c7529cbfe2a9ac071
+  metadata.gz: 7d18b383a8d45121c2f64df1ac726857fb44096d
+  data.tar.gz: bebcc43c96495901ff70c46b906e7fbd51bdf177
 SHA512:
-  metadata.gz: bb2711d5f7ca8ad17daf52d042a16d2590c5b182d2a0ad237b6f01a4bf8672f2a5923d2946837a169cbbb2cc899237e6b5640ce16b569c6ca8bd0ac74b6c2c28
-  data.tar.gz: f5108787af8a0048589d0503810113028672d20fb3fa58565302746114c68dcea8e50b85dd7de03fb89f53c3c7727f048e70f3482fc6920de1cf2034308522f6
+  metadata.gz: b3a456a8f5468b9384b0087b03d25e2e3b660536df1d6a16e62e0c5fd2a72b5f9caf2aba8a5272f723b8e6a4de9e7cdb26031da3da0cd55065a313063921d043
+  data.tar.gz: b43df4b36e426cfd037902654d79c20388988484a1e1c922e4c9d7c25884277e9201b99bbd1b8b2a39aeb0d01014ad536a506c22ac1ef9821b0a08783fdf712a

data/README.md

@@ -44,7 +44,7 @@ commands or a local script over SSH.
     Jossh
 
     Usage:
-      jossh <host> <script>
+      jossh <host> <script> [-- <arguments>...]
       jossh -m | --make-hostfile
       jossh -l | --list
       jossh -h | --help
@@ -62,6 +62,12 @@ commands or a local script over SSH.
         - a filename
         - one or more direct command
 
+      <arguments>...
+        When specifying a filename as the <script>, you may also pass additional
+        arguments to it.
+        Use $1 - $9 in your script file to work with these arguments.
+        Use $@ (or $*) to use the entire arguments string
+
     Options:
       -m --make-hostfile     Generate a template ssh_hosts.yml
       -l --list              Show hosts in ./ssh_hosts.yml or ~/ssh_hosts.yml
@@ -72,6 +78,7 @@ commands or a local script over SSH.
       jossh :production "git status"
       jossh jack@server.com "cd ~ && ls -l"
       jossh server.com deploy
+      jossh server.com rake -- db:migrate
 
 
 ## Library Usage

data/lib/jossh/api.rb

@@ -61,16 +61,16 @@ module Jossh
   #
   #   ssh_script :localhost, "deploy"
   #
-  def ssh_script(hostspec, script, callback: nil)
-    CommandRunner.instance.ssh_script hostspec, script, callback: callback
+  def ssh_script(hostspec, script, arguments: nil, callback: nil)
+    CommandRunner.instance.ssh_script hostspec, script, arguments: arguments, callback: callback
   end
 
   # Same as +ssh_script+, only this will print a pretty output. 
   #
   # This method accepts only +hostspec+ and +script+ (no +callback+).
   #
-  def ssh_script!(hostspec, script)
-    CommandRunner.instance.ssh_script! hostspec, script
+  def ssh_script!(hostspec, script, arguments: nil)
+    CommandRunner.instance.ssh_script! hostspec, script, arguments: arguments
   end
 
   # Set the name of the hostfile

data/lib/jossh/bin_handler.rb

@@ -23,15 +23,15 @@ module Jossh
       return show_version if args['--version']
       return make_hostfile if args['--make-hostfile']
       return list_hosts if args['--list']
-      handle_script args['<host>'].dup, args['<script>']
+      handle_script args['<host>'].dup, args['<script>'], arguments: args['<arguments>']
     end
 
-    def handle_script(host, script)
+    def handle_script(host, script, arguments: nil)
       host = standardize_host host
 
       begin
         if File.exist? script
-          ssh_script! host, script
+          ssh_script! host, script, arguments: arguments
         else
           ssh host, script
         end

data/lib/jossh/command_runner.rb

@@ -30,12 +30,12 @@ module Jossh
       end
     end
 
-    def ssh_script!(hostspec, script)
-      ssh! hostspec, load_script(script)
+    def ssh_script!(hostspec, script, arguments: nil)
+      ssh! hostspec, load_script(script, arguments)
     end
 
-    def ssh_script(hostspec, script, callback: nil)
-      ssh hostspec, load_script(script), callback: callback
+    def ssh_script(hostspec, script, arguments: nil, callback: nil)
+      ssh hostspec, load_script(script, arguments), callback: callback
     end
 
     def ssh_hostfile(file)
@@ -91,11 +91,18 @@ module Jossh
       "#{Dir.home}/#{hostfile}"
     end
 
-    def load_script(script)
-      File.read script
+    def load_script(script, arguments=nil)
+      evaluate_args File.read(script), arguments
+    end
+
+    def evaluate_args(string, arguments)
+      return string unless arguments.is_a? Array and !arguments.empty?
+      all_arguments = arguments.map{|a| a =~ /\s/ ? "\"#{a}\"" : a}.join ' '
+      string.gsub!(/\$(\d)/) { arguments[$1.to_i - 1] }
+      string.gsub!(/\$[*|@]/, all_arguments)
+      string
     end
 
   end
 
 end
-

data/lib/jossh/templates/docopt.txt

@@ -1,7 +1,7 @@
 Jossh
 
 Usage:
-  jossh <host> <script>
+  jossh <host> <script> [-- <arguments>...]
   jossh -m | --make-hostfile
   jossh -l | --list
   jossh -h | --help 
@@ -19,6 +19,12 @@ Arguments:
     - a filename
     - one or more direct command
 
+  <arguments>...
+    When specifying a filename as the <script>, you may also pass additional
+    arguments to it. 
+    Use $1 - $9 in your script file to work with these arguments.
+    Use $@ (or $*) to use the entire arguments string
+
 Options:
   -m --make-hostfile     Generate a template ssh_hosts.yml 
   -l --list              Show hosts in ./ssh_hosts.yml or ~/ssh_hosts.yml
@@ -29,4 +35,5 @@ Examples:
   jossh :production "git status"
   jossh jack@server.com "cd ~ && ls -l"
   jossh server.com deploy
+  jossh server.com rake -- db:migrate
 

data/lib/jossh/version.rb

@@ -1,3 +1,3 @@
 module Jossh
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

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