shell_helpers 0.6.0 → 0.7.0

data/lib/shell_helpers/utils.rb

@@ -29,7 +29,7 @@ module ShellHelpers
 				return ShLog.sh(r)
 			when :exec_quiet
 				require 'shell_helpers/sh'
-				return Sh.sh(r)
+				return Sh.sh(*r)
 			end
 			return r
 		end
@@ -202,7 +202,7 @@ module ShellHelpers
 			path.map { |dir| Pathname.glob(dir+pattern) }.flatten
 		end
 
-		def rsync(*files, out, default_opts: "-vcz", preserve: true, partial: true, keep_dirlinks: false, sudo: false, backup: false, relative: false, delete: false, clean_out: false, expected: 23, chown: nil, sshcommand: nil, exclude: [], **opts)
+		def rsync(*files, out, default_opts: "-vczz", preserve: true, partial: true, keep_dirlinks: false, backup: false, relative: false, delete: false, clean_out: false, clobber: true, expected: 23, chown: nil, sshcommand: nil, exclude: [], **opts, &b)
 			require 'shell_helpers/sh'
 			rsync_opts=[*opts.delete(:rsync_opts)] || []
 			rsync_opts << default_opts
@@ -210,6 +210,7 @@ module ShellHelpers
 			rsync_opts << "-P" if partial #--partial --progress
 			rsync_opts+=%w(--no-owner --no-group) if preserve==:nochown
 			rsync_opts+=["--chown", chown] if chown
+			rsync_opts << "--ignore-existing" unless clobber
 			#on dest: do not replace a symlink to a directory with the real directory
 			#use --copy-dirlinks for the same usage on source
 			rsync_opts << "--keep-dirlinks" if keep_dirlinks
@@ -237,17 +238,18 @@ module ShellHelpers
 				rsync_opts << sshcommand.shellescape
 			end
 			rsync_opts+=opts.delete(:rsync_late_opts)||[]
-			Sh.sh( (sudo ? ["sudo"] : [])+["rsync"]+rsync_opts+files.map(&:to_s)+[out.to_s], expected: expected, **opts)
+			cmd=["rsync"]+rsync_opts+files.map(&:to_s)+[out.to_s]
+			Sh.sh(*cmd, expected: expected, **opts, &b)
 			#expected: rsync error code 23 is some files/attrs were not transferred
 		end
 
 		# host can be of the form user@host:port
 		# warning this is different from standard ssh syntax of user@host:path
-		def ssh(host, *commands, mode: :exec, ssh_command: 'ssh',
+		def ssh(host, *commands, mode: :system, ssh_command: 'ssh',
 			ssh_options: [], ssh_Ooptions: [],
 			port: nil, forward: nil, x11: nil, user: nil, path: nil, parse: true,
-			pty: nil,
-			**opts)
+			pty: nil, ssh_env:nil,
+			**opts, &b)
 
 			#sshkit has a special setting for :local
 			host=host.to_s unless mode==:sshkit and host.is_a?(Symbol)
@@ -276,11 +278,12 @@ module ShellHelpers
 			case mode
 			when :system,:spawn,:capture,:exec
 				host="#{user}@#{host}" if user
-				Sh.sh([ssh_command]+ssh_options+[host]+commands, mode: mode, **opts)
+				env_commands= ssh_env ? [Export.export_variables(ssh_env, inline: true)]+commands : commands
+				Sh.sh(* [ssh_command]+ssh_options+[host]+env_commands, mode: mode, **opts)
 			when :net_ssh
 				require 'net/ssh'
 				user=nil;
-				Net::SSH.start(host, user, ssh_options)
+				Net::SSH.start(host, user, ssh_options, &b)
 			when :sshkit
 				require 'sshkit'
 				host=SSHKit::Host.new(host)
@@ -298,6 +301,7 @@ module ShellHelpers
 				  ssh_command_options: ([ssh_command]+ssh_options).shelljoin,
 				  user: user,
 				  host: host,
+				  path: path,
 				  hostssh: user ? "#{user}@#{host}" : host,
 				  command: commands }
 			end

data/lib/shell_helpers/version.rb

@@ -1,4 +1,4 @@
 module ShellHelpers
   # shell_helpers version
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/test/test_logger.rb

@@ -0,0 +1,48 @@
+require 'helper'
+require 'shell_helpers'
+
+describe ShellHelpers::ColorLogger do
+	before do
+		@buffer=StringIO.new
+		@logger=SH::ColorLogger.new(@buffer, default_formatter: :color)
+	end
+	it "Has a info mode" do
+		@logger.info "foo"
+		@buffer.string.must_equal "foo\n"
+	end
+	it "Has a color mark mode" do
+		@logger.mark "foo"
+		@buffer.string.must_equal "\e[1mfoo\e[0m\n"
+	end
+	it "Has a colored important mode" do
+		@logger.important "foo"
+		@buffer.string.must_equal "\e[34;1mfoo\e[0m\n"
+	end
+	it "The colored mode can add colors" do
+		@logger.important "foo", color: [:red]
+		@buffer.string.must_equal "\e[34;1;31mfoo\e[0m\n"
+	end
+	it "Has a raw important mode" do
+		@logger.important "foo", format: :blank
+		@buffer.string.must_equal "foo\n"
+	end
+	it "Can give a numeric level" do
+		@logger.add(@logger.severity_lvl(:important), "foo")
+		@buffer.string.must_equal "foo\n"
+	end
+	it "Default to info level" do
+		@logger.debug("foo")
+		@buffer.string.must_equal ""
+	end
+	it "Don't show below debug level" do
+		@logger.debug3("foo")
+		@buffer.string.must_equal ""
+	end
+	it "Can change level" do
+		old_level=@logger.level
+		@logger.level=:debug3
+		@logger.debug3("foo")
+		@logger.level=old_level
+		@buffer.string.must_equal "foo\n"
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shell_helpers
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Damien Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drain
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: simplecolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +96,7 @@ dependencies:
         version: '0.8'
 description: 'Collection of script to ease working with the shell with ruby.
 
-'
+  '
 email: Damien.Olivier.Robert+gems@gmail.com
 executables:
 - abs_to_rel.rb
@@ -107,6 +121,7 @@ files:
 - gemspec.yml
 - lib/shell_helpers.rb
 - lib/shell_helpers/export.rb
+- lib/shell_helpers/logger.bak.rb
 - lib/shell_helpers/logger.rb
 - lib/shell_helpers/options.rb
 - lib/shell_helpers/pathname.rb
@@ -118,6 +133,7 @@ files:
 - shell_helpers.gemspec
 - test/helper.rb
 - test/test_export.rb
+- test/test_logger.rb
 - test/test_shell_helpers.rb
 homepage: https://github.com/DamienRobert/shell_helpers#readme
 licenses:
@@ -139,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Shell Helpers