rsync-deploy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7099df327d321811dbc7056ecf72b193192b8f6
-  data.tar.gz: 20ae2c3b2bbf1efc270f990435d868f1c2725c81
+  metadata.gz: 80aa81ee9aefde54415bb913a4a152f65b0d91bb
+  data.tar.gz: 363a12926ca9645270994c1f22ac01f04b8bc1d2
 SHA512:
-  metadata.gz: adbd2c994dd599b7d93e63e36a6136134971cb9380f7fdc0a261583b2c94c4a7889d0b0fbae8c8b5515a500ea52f6ebe1d65b0f459dbae1b092071a163d71e48
-  data.tar.gz: 085119d2dbc794f42fb42c92bc98142180341fa9ceea5bd0e483accd4c5b1245003721fa4ae43b7c7eae1bd7b06f514efd62725345fc4e52f0c4e0f97b643e03
+  metadata.gz: 7aeec1046f5cf4df6f2cf883c95b3141aecb9902b1150b916331ffc5f4130388b7dc612d599c2fb391e4aa1366fd6199abe6e3832778560efffedeb55252766b
+  data.tar.gz: 210c97cc4bef39212a225ffd1508633f4fcc63fbd6d5d132ebc296f8ae309cc827a0d53233103d801683bbc4f33fb6d22204c6b34195cd0252f161c9d3694f0f

data/README.md

@@ -132,13 +132,6 @@ The port that the connection should happen over
 
 The username to login to the server. If no username is set, your computer account username will be used.
 
-### pass
-
-- Type: `String`
-- Default: `none`
-
-The password to login to the server. If SSH keys aren't available, then the `pass` option will be used. If neither SSH keys nor `pass` are set, a prompt will be given.
-
 ### privateKey
 
 - Type: `String`
@@ -245,7 +238,7 @@ Deploy is almost identical to [DPLOY](https://github.com/LeanMeanFightingMachine
 
 ## Uninstall
 
-To uninstall Deploy, download the [project files](https://github.com/rosszurowski/deploy/archive/master.zip), navigate to the unzipped directory, and run:
+To uninstall Deploy, just run:
 
 ```
 gem uninstall rsync-deploy

data/bin/deploy

@@ -59,7 +59,7 @@ def install
 		
 		if(answer == 'y')
 			File.open(Deploy::CONFIG_PATH, 'w+') do |file|
-				file.puts 'server_name:','  host: ""','  user: ""','  pass: ""','  path:','    local: "/"','    remote: "/public_html/"'
+				file.puts 'server_name:','  host: ""','  user: ""','  path:','    local: "/"','    remote: "/public_html/"'
 			end
 			puts "Configuration file `#{Deploy::CONFIG_PATH}` created."
 		else
@@ -69,7 +69,7 @@ def install
 	else
 		
 		File.open(Deploy::CONFIG_PATH, 'w+') do |file|
-			file.puts 'server_name:','  host: ""','  user: ""','  pass: ""','  path:','    local: "/"','    remote: "/public_html/"'
+			file.puts 'server_name:','  host: ""','  user: ""','  path:','    local: "/"','    remote: "/public_html/"'
 		end
 		puts "Configuration file `#{Deploy::CONFIG_PATH}` created."
 		

data/lib/deploy/environment.rb

@@ -12,14 +12,13 @@ module Deploy
 		def initialize(name, hash)
 
 			@name = name
-			@config = { :host => '', :port => '',  :user => '', :pass => '', :private_key => '', :local => '', :remote => '' }
+			@config = { :host => '', :port => '',  :user => '', :private_key => '', :local => '', :remote => '' }
 			@options = { :verbose => false, :sync => true }
 
 			@config[:host] = hash['host']
 			@config[:port] = hash['port'] || '22'
 			
 			@config[:user] = hash['user'] || ''
-			@config[:pass] = hash['pass'] || ''
 			@config[:private_key] = hash['privateKey'] || ''
 
 			@config[:local] = hash['path']['local'].gsub(/\s+/, "")
@@ -58,15 +57,10 @@ module Deploy
 				end
 				# Don't upload the deploy configuration file
 				tmp_exclude.puts Deploy::CONFIG_PATH 
+				tmp_exclude.puts ".git" # Never sync git files
 				tmp_exclude.close
 			end
 
-			unless @config[:pass].empty?
-				tmp_pass = Tempfile.new(['pass','.txt'])
-				tmp_pass.puts @config[:pass]
-				tmp_pass.close
-			end
-
 			rsync_cmd = 'rsync -a'																																# Always keep permissions
 			rsync_cmd += 'v' if @options[:verbose]																									# Verbose if requested
 			rsync_cmd += 'z'																																			# Always zip files
@@ -77,14 +71,10 @@ module Deploy
 				rsync_cmd += ' --force --delete --delete-excluded'    																# Sync unless explicitly requested or downloading
 			end
 			rsync_cmd += " --exclude-from=#{tmp_exclude.path}" unless @config[:excludes].empty?			# Include exclude file if it exists
-			rsync_cmd += " --password-file=#{tmp_pass.path}" unless @config[:pass].empty?						# Include password file if it exists
-			rsync_cmd += " -e \"ssh "
 			
-			if(@config[:pass].empty? and @config[:private_key].empty?)
-				rsync_cmd += " -i #{@config[:private_key]} " 																				# Include a custom private key if requested
-			end
-
-			rsync_cmd += "-p#{@config[:port]}\" "																									# Choose port if specified
+			rsync_cmd += " -e \"ssh "																															# Pass custom ssh options
+			rsync_cmd += " -i #{@config[:private_key]} " unless @config[:private_key].empty?					# Include a custom private key if requested
+			rsync_cmd += "-p #{@config[:port]}\" "																									# Choose port if specified
 
 			unless @options[:reverse]
 				rsync_cmd += `pwd`.gsub(/\s+/, "") + "#{@config[:local]} "														# The local path from the current directory
@@ -102,9 +92,8 @@ module Deploy
 			# puts rsync_cmd
 			system(rsync_cmd)
 
-			# Remove excludes/pass file if needed
+			# Remove excludes file if needed
 			tmp_exclude.unlink unless @config[:excludes].empty?
-			tmp_pass.unlink unless @config[:pass].empty?
 		
 		end
 		
@@ -112,7 +101,7 @@ module Deploy
 		
 		def validate
 		
-			# Fail without hostname (user/password are optional)
+			# Fail without hostname (username is optional)
 			(puts "Error: no hostname set for `#{@name}`"; exit;) if @config[:host].empty?
 
 			# Fail if local/remote paths not set (because they should be in initialize

data/lib/deploy/version.rb

@@ -1,5 +1,5 @@
 module Deploy
   
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsync-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ross Zurowski