thrush 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWViNzg4YWFlOGEwYzUwZGU4YzY5YzAxZmU2ZGJhYmY2ZDQ5ZjgwMA==
+    ODIyMjFmYmU5MDYxNDI3N2M3MDMxNTdhYWI1MDllNDVmMTIxZDc2Yw==
   data.tar.gz: !binary |-
-    ZjhjNTE2ZTJkMzZhZjU1NzgyZTc2Mjg5NzVjMDZiZDVlODcyMDA1MA==
+    NjU0OTQxNGQ4NjM1Zjk4NWRhNmYzZjIyZmZmMjMwYmY1MWE2OTJmYw==
 SHA512:
   metadata.gz: !binary |-
-    YmNjMTBhODJlZWNjZDVlZGRkODQ1OGQyMjMyNzRlY2Y4OGQyNzM4MGU5Mjk2
-    ZGUzYjIyNGEwNTBmZWQ4ZTAzMTMwYWRhODJjYWU3YTU2MGJiOTI2NDRiNWVh
-    ZTg0NDgzN2Q4Mzc5MGE3MmI1MGYwZmM5NGNkYjAxYzcxYjQ5NmM=
+    ZGRhNTE4YzA2ZDlmYWVhNjdhYzJlOWU1NjM5YzQ5OGFlYjU0MGM3OTljNWQ4
+    ODQzMjlkYzhhMjU1MDNjZmY0MDJiZjdjOGQyMzU4ZmU4ZDVjNTUzNDM2NDE2
+    ZWM5YzZkODAxMjcxNTM1OGE5NjQ1YzEwZGIwZmE0ZjNmMTQ1ZmM=
   data.tar.gz: !binary |-
-    MzUyMmI5ZmIyZjU5Mjg3ZTA3YzM0MzYyZWY1NjI1ZThkMzhkYWM4N2VjMjk0
-    ZWIxYzU5ZjdkOGQ3MzYyNjU4MGM0NTU3MzhkYjIwNWM3NjAzMzQxODc0ZDQ1
-    Njc0ZWI2ZDk3MGFlZDAzMDhhY2UwZTBiODA0ZDZmZjc4OWE2YzE=
+    YTk2ZTNiNzBlOGYwNGM4YWIxZjVhZWFjOTk3MzQ1OGQ5NTEzZDY2YWYzNGQx
+    Zjg5MzZlZmQzNGRkMzA2ODY1MzAyYzdiOGEwMDEyODk5ODczZGY1N2I3Yzdi
+    YjA0NDdiZGJlYzY4NzUyODE4M2Y5MWJhMzg0ZDlhMDI5NWY4Y2Y=

data/lib/thrush.rb

@@ -75,6 +75,13 @@ def debug?
   flag? :debug
 end
 
+def flag(key)
+  k = key.to_sym
+  if flag? k
+    @flags[k]
+  end
+end
+
 # Defining commands
 @commands = []
 
@@ -129,7 +136,7 @@ def run!
       next unless found
     end
 
-    sudo = cmd_vals(:sudo, cmd_values)
+    sudo          = cmd_vals(:sudo, cmd_values)
     debug_command = ''
 
     case cmd_values[:type]
@@ -145,7 +152,13 @@ def run!
       end
     when :rsync
       debug = debug? ? 'n' : ''
-      cmd = ["rsync -#{ debug }vazcO --no-o --no-g -e ssh --exclude '.git' --exclude '.idea' --exclude '.DS_Store'"]
+      # TODO: The default rsync values I've hardcoded including --no-o, --no-g and other defaults should be flags that someone can pass in.
+      cmd   = ["rsync -#{ debug }vazcO --no-o --no-g"]
+
+      rsh = cmd_vals(:rsh, cmd_values)
+      cmd << "--rsh=#{ rsh }" unless rsh.nil?
+
+      cmd << "--exclude '.git' --exclude '.idea' --exclude '.DS_Store'"
 
       ignore = cmd_vals(:ignore, cmd_values)
       ignore.each { |exclude| cmd << "--exclude '#{ exclude }'" } unless ignore.nil? || ignore.empty?
@@ -156,7 +169,12 @@ def run!
       cmd << "--rsync-path='#{ path }'" unless path.nil? || path.empty?
 
       cmd << cmd_vals(:src, cmd_values)
-      cmd << "#{ cmd_vals(:hostname, cmd_values) }:#{ cmd_vals(:dest, cmd_values) }"
+
+      if rsh == 'ssh'
+        cmd << "#{ cmd_vals(:hostname, cmd_values) }:#{ cmd_vals(:dest, cmd_values) }"
+      else
+        cmd << cmd_vals(:dest, cmd_values)
+      end
 
       command = cmd.join(' ')
       debug_command = command if debug?
@@ -190,21 +208,42 @@ def run!
       #  break
       #end
 
-      status = Open4::popen4('sh') do |pid, stdin, stdout, stderr|
-        stdin.puts command
-        stdin.close
+      #status = Open4::popen4('sh') do |pid, stdin, stdout, stderr|
+      #  stdin.puts command
+      #  stdin.close
+      #
+      #  while (line = stdout.gets)
+      #    puts line
+      #  end
+      #
+      #  while (line = stderr.gets)
+      #    puts line.red
+      #  end
+      #end
+      #
+      #unless status == 0
+      #  puts "Command failed: #{ command }".red
+      #  break
+      #end
 
-        while (line = stdout.gets)
-          puts line
-        end
+      pid, stdin, stdout, stderr = Open4::popen4('sh')
+      stdin.puts command
+      stdin.close
 
+      output = false
+      while (line = stdout.gets)
+        output = true
+        puts line
+      end
+
+      ignored, status = Process.waitpid2 pid
+      if status.to_i == 0
+        puts "OK" unless output
+      else
+        puts "Command failed (#{ status.exitstatus }): #{ command }".red
         while (line = stderr.gets)
           puts line.red
         end
-      end
-
-      unless status == 0
-        puts "Command failed: #{ command }".red
         break
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrush
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Z.d. Peacock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile