thrush 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODIyMjFmYmU5MDYxNDI3N2M3MDMxNTdhYWI1MDllNDVmMTIxZDc2Yw==
+    NTA5ZDMxOWQxODI2ZmQ0YTViMGFmN2M0N2FjYzdkMTk0ODAxZWU2ZQ==
   data.tar.gz: !binary |-
-    NjU0OTQxNGQ4NjM1Zjk4NWRhNmYzZjIyZmZmMjMwYmY1MWE2OTJmYw==
+    ZDNkYmI3Y2NjYTA1ZjlhODllMWRmNTViOWFiODEyZDcwMGY2ZmY0ZA==
 SHA512:
   metadata.gz: !binary |-
-    ZGRhNTE4YzA2ZDlmYWVhNjdhYzJlOWU1NjM5YzQ5OGFlYjU0MGM3OTljNWQ4
-    ODQzMjlkYzhhMjU1MDNjZmY0MDJiZjdjOGQyMzU4ZmU4ZDVjNTUzNDM2NDE2
-    ZWM5YzZkODAxMjcxNTM1OGE5NjQ1YzEwZGIwZmE0ZjNmMTQ1ZmM=
+    ZTEwZGI1ZDBhOTJlZGZhN2ZlYjcxZTZkN2JkZGQ3NDIzMDc4MmViZGQxOWEy
+    MTQ4YmQwNTU1MGM1MDdlNjA1NzZlNTI3OGRiMGEzMDMxNGFjMzAzZjg2NDBm
+    MzIwY2Q1NTkxZmQ4YmFkMjVhZTc5ZWFjYzllMjYzM2E3YTIxOWE=
   data.tar.gz: !binary |-
-    YTk2ZTNiNzBlOGYwNGM4YWIxZjVhZWFjOTk3MzQ1OGQ5NTEzZDY2YWYzNGQx
-    Zjg5MzZlZmQzNGRkMzA2ODY1MzAyYzdiOGEwMDEyODk5ODczZGY1N2I3Yzdi
-    YjA0NDdiZGJlYzY4NzUyODE4M2Y5MWJhMzg0ZDlhMDI5NWY4Y2Y=
+    NGE0MzViNTBmNmE5NTcyZTgwNGYyM2U2ZDdiN2JkMWEwNzBjYWRiNDY4ZThj
+    YTk3NmY5Nzk3MjU1OWY5YTcwODA0YjU3NTQzNTAzZWRiNTdjNzIwYjc4OThj
+    MzNmM2I1ZGQ0OTAwN2M4NjA0NjhkZTZlMjM0NmU0ZGUwZDk5MjA=

data/lib/thrush.rb

@@ -113,13 +113,14 @@ def header(h)
 end
 
 def run!
+  client = env(:client).nil? ? 'Thrush' : env(:client)
   if @flags.has_key?(:help)
-    puts header("Thrush client help for (ENV = #{ @current_env.upcase })").blue.bold
+    puts header("#{ client } client help for (ENV = #{ @current_env.upcase })").blue.bold
     puts "#{ env(:help) }\n"
     exit
   end
 
-  puts header("Thrush client for (ENV = #{ @current_env.upcase })").blue.bold
+  puts header("#{ client } client for (ENV = #{ @current_env.upcase })").blue.bold
   puts "** DEBUG MODE **".yellow if debug?
   i = 1
 
@@ -152,21 +153,24 @@ def run!
       end
     when :rsync
       debug = debug? ? 'n' : ''
-      # 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)
 
-      rsh = cmd_vals(:rsh, cmd_values)
+      # 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   = []
+      cmd << 'sudo' if rsh.nil? && sudo
+      cmd << "rsync -#{ debug }vazcO --no-o --no-g"
       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?
 
-      cmd << "--rsync-path='sudo rsync'" if sudo
+      if rsh == 'sync'
+        cmd << "--rsync-path='sudo rsync'" if sudo
 
-      path = cmd_vals(:path, cmd_values)
-      cmd << "--rsync-path='#{ path }'" unless path.nil? || path.empty?
+        path = cmd_vals(:path, cmd_values)
+        cmd << "--rsync-path='#{ path }'" unless path.nil? || path.empty?
+      end
 
       cmd << cmd_vals(:src, cmd_values)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrush
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Z.d. Peacock