shaddox 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57d55169746bf088a8f1808239e6bce9246bb3b2
-  data.tar.gz: 1b1e3f67edf2df39bcb17d271fc0dcff7dc3111d
+  metadata.gz: 419b93e06f0b3d5e130fd8cee8a2d4e0dc1571c0
+  data.tar.gz: c4b3e19104c9f25a8a6575b84ba7fedc924b405c
 SHA512:
-  metadata.gz: 91135741672ec330d1ec135f70a4d0e7cdc813b54683c7c12eaf2c61b701aab83bb5eaa02d1d713f6cc026a2a9a71083c3e75107c445d1ca9f6b9df942712f4c
-  data.tar.gz: c9ea2e0fd3834a5f774f3c2741d89cb1a1ac2e5d8bc31a3d96ac8b1d87363f238c6774394576940321cdaf775762e0b9d43db787acf12af8bc967106a143e9cf
+  metadata.gz: 3ffcd10523a382ae5c6f68a714ceae7cbe0cab7ec9772f0fa76560e0ea0e3febe61b9ff6be2e36a0d94525e82144038d6780b36637a732476feb2a9d468e21f0
+  data.tar.gz: a92844b5bb77ed1f009a1a053eae6e8a3ebca19eacc08ed60828856fd657b3fd1ebbd8a163fd1cf1181fead39400ea4c0cd06ca5fabf6fb8f7383abe51213f23

data/lib/shaddox/shadow.rb

@@ -53,7 +53,15 @@ module Shaddox
 			FileUtils::mkdir_p(path.exp_path)
 		end
 
+		def ensure_git()
+			unless @git_installed
+				install 'git'
+				@git_installed = true
+			end
+		end
+
 		def repo_clone(repo_key, path)
+			ensure_git()
 			repo = @repos[repo_key]
 			cd path do
 				case repo.vcs
@@ -78,7 +86,8 @@ module Shaddox
 			end
 			raise "No installer specified for this target!" unless @installer
 			info "Ensuring #{package} is installed with #{@installer}", 1 if @verbose
-			unless system("type #{package} >/dev/null 2>&1")
+			package_installed = lambda { system("type #{package} >/dev/null 2>&1") }
+			unless package_installed.call()
 				case @installer
 				when :apt
 					sh "sudo apt-get install -y #{package}"
@@ -86,6 +95,7 @@ module Shaddox
 					sh "brew install #{package}"
 				end
 			end
+			raise "#{package} could not be installed." unless package_installed.call()
 		end
 	end
 end

data/lib/shaddox/target.rb

@@ -121,6 +121,7 @@ module Shaddox
 				end
 			end
 			def exec(command, opts = {})
+				require 'highline/import'
 				exit_code = nil
 				@ssh.open_channel do |channel|
 					channel.request_pty do |c, success|
@@ -130,8 +131,7 @@ module Shaddox
 							if data =~ /\[sudo\]/ || data =~ /Password/i
 								warn "Target is asking for password: ", 1
 								$stdout.print data
-								puts ""
-								pass = $stdin.gets.chomp
+								pass = ask("") { |q| q.echo = false }
 								channel.send_data "#{pass}\n"
 							else
 								$stdout.print data unless opts[:quiet]

data/lib/shaddox/version.rb

@@ -1,3 +1,3 @@
 module Shaddox
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaddox
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - joshglendenning