rigup 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62efb1ff293f94f8729e1c494fc07e9cfc5d8c80
-  data.tar.gz: ead2e1620710ed87d57be6f7fe5edcf3e4a4f967
+  metadata.gz: 93976958d3e4fb8d72c039d7e8e2386d03db5699
+  data.tar.gz: a35ef540e688543b45e2653d5a4052b3b6c2bb0c
 SHA512:
-  metadata.gz: f9d33144732cb205306bf335b484dce1b4f84b07dacacbbf979be5234c5d30282e55b4d83440ad8956edd8a99f141b9295c3acda0bcc7c117fd8523f08e70fbd
-  data.tar.gz: dcc9ed34920e9a6f8fb168e504feba5ce107994b09253fead2fa50760da6ab04165a98142468bda7ff8de7d56f91a5c28f7d6e56b198e49745a5ff49ccbad9aa
+  metadata.gz: 42e0879308c9794c7eb0a327a261c27b9c06365f804115e0af3590e2f590df67926c85fc07305f0bc5c5f66a593db93b9c35feae725cc17c65dea601160f8d3f
+  data.tar.gz: d09e52aac08a191fb3983fcae42eff3c1c9d0dec57583a01dbb203ab70f39ef654001d4af1db3aee93f250ca29ce3c245a3ea88ab839228e1380487abd5aa84c

data/lib/rigup/cli.rb

@@ -18,7 +18,9 @@ module Rigup
 					file_config = YAML.load(String.from_file(f))
 					aConfig.merge!(file_config)
 				end
-				config = Rigup::Config.new(aConfig.merge(site_dir: @site_dir))
+				aConfig = aConfig.merge(site_dir: @site_dir)
+				aConfig[:user] ||= ENV['USER']
+				config = Rigup::Config.new(aConfig)
 				@context = Rigup::Context.new(
 					config: config,
 					logger: ::Logger.new(STDOUT),
@@ -100,7 +102,7 @@ module Rigup
 			end
 
 			def link_live
-				ensure_link(@release_path,File.expand_path(File.join(site_dir,'current')))
+				ensure_link(@release_path,File.expand_path(File.join(site_dir,'current')),"#{config[:user]}:#{config[:group]}")
 			end
 
 			def cleanup
@@ -125,7 +127,6 @@ module Rigup
 					run cmdline
 				end
 			end
-
 		end
 
 		public
@@ -152,6 +153,7 @@ module Rigup
 		def deploy(aPath=nil)
 			init(aPath)
 			update_cache
+			#gem 'debugger'; require 'debugger'; debugger
 			release
 			call_release_command(:install)     # call install_command if defined eg. defaults to "thor deploy:install" eg. make changes to files
 			call_release_command(:block)

data/lib/rigup/config.rb

@@ -11,6 +11,7 @@ module Rigup
 			branch: String,
 			commit: String,
 			stage: 'live',    # or 'staging' or 'development'
+			sudo: 'sudo',
 			block_command: nil,
 			install_command: 'thor deploy:install',
 			restart_command: 'thor deploy:restart',

data/lib/rigup/context.rb

@@ -4,10 +4,6 @@ module Rigup
 		attr_reader :config, :options, :argv, :env, :stdout, :stdin, :stderr, :key_chain, :credentials, :logger, :pwd, :variant
 		attr_writer :pwd
 
-		def sudo
-			''
-		end
-
 		def initialize(aValues=nil)
 			return if !aValues
 

data/lib/rigup/install_utils.rb

@@ -5,8 +5,8 @@ module Rigup
 			ext = Buzztools::File.extension(aFile,aExtendedExtension)
 			no_ext = Buzztools::File.no_extension(aFile,aExtendedExtension)
 			dir = File.dirname(aFile)
-			run "#{@context.sudo} mv -f #{no_ext}.#{@context.config[:stage]}.#{ext} #{aFile}"
-			run "#{@context.sudo} rm -f #{no_ext}.*.#{ext}"
+			run "#{@context.config[:sudo]} mv -f #{no_ext}.#{@context.config[:stage]}.#{ext} #{aFile}"
+			run "#{@context.config[:sudo]} rm -f #{no_ext}.*.#{ext}"
 		end
 
 		# Especially for modifiying behaviour eg. of FCKEditor without upsetting the standard files
@@ -17,8 +17,8 @@ module Rigup
 		def override_folder(aFolder,aOverrideFolder=nil,aRemove=true)
 			aFolder = aFolder.desuffix('/')
 			aOverrideFolder ||= (aFolder+'_override')
-			run "#{@context.sudo} cp -vrf #{aOverrideFolder}/* #{aFolder}/"
-			run "#{@context.sudo} rm -rf #{aOverrideFolder}" if aRemove
+			run "#{@context.config[:sudo]} cp -vrf #{aOverrideFolder}/* #{aFolder}/"
+			run "#{@context.config[:sudo]} rm -rf #{aOverrideFolder}" if aRemove
 		end
 
 
@@ -27,7 +27,7 @@ module Rigup
 			aUser ||= @user
 			aGroup ||= @group
 
-			run "#{@context.sudo} chown -R #{aUser}:#{aGroup} #{aPath.ensure_suffix('/')}"
+			run "#{@context.config[:sudo]} chown -R #{aUser}:#{aGroup} #{aPath.ensure_suffix('/')}"
 			run_for_all("chmod 755",aPath,:dirs)									# !!! perhaps reduce other permissions
 			run_for_all("chmod 644",aPath,:files)
 			run_for_all("chmod g+s",aPath,:dirs)
@@ -59,7 +59,7 @@ module Rigup
 					#permissions_for_web_writable("#{aPath}/tmp")
 					make_public_cache_dir("#{aPath}/tmp")
 
-					run "#{@context.sudo} chown #{@apache_user} #{aPath}/config/environment.rb" unless DEV_MODE	# very important for passenger, which uses the owner of this file to run as
+					run "#{@context.config[:sudo]} chown #{@apache_user} #{aPath}/config/environment.rb" unless DEV_MODE	# very important for passenger, which uses the owner of this file to run as
 
 				when 'spree' then
 					internal_permissions(aPath,'rails')
@@ -80,11 +80,11 @@ module Rigup
 			cmd << "#{aSudo} rm -rf #{aFrom}"
 			cmd << "#{aSudo} ln -sf #{aTo} #{aFrom}"
 			cmd << "#{aSudo} chown -h #{aUserGroup} #{aFrom}" if aUserGroup
-			run cmd.join(' && ')
+			run(cmd.join(' && '),raise: false)
 		end
 
 		def make_public_cache_dir(aStartPath)
-			run "#{@context.sudo} mkdir -p #{aStartPath}"
+			run "#{@context.config[:sudo]} mkdir -p #{aStartPath}"
 			permissions_for_web(aStartPath)
 			permissions_for_web_writable(aStartPath)
 		end

data/lib/rigup/runability.rb

@@ -1,12 +1,12 @@
 module Rigup
 	module Runability
 
-		def shell
-			@shell ||= ::Session::Bash.new
+		def bash
+			@bash ||= ::Session::Bash.new
 		end
 
 		def pwd
-			shell.execute("pwd", stdout: nil).first.strip
+			bash.execute("pwd", stdout: nil).first.strip
 		end
 
 		def cd(aPath,&block)
@@ -15,21 +15,24 @@ module Rigup
 			 		before_path = pwd
 					cd(aPath)
 					yield aPath,before_path
+				rescue Exception => e
+					@context.logger.info e.message
 				ensure
 					cd(before_path)
 				end
 			else
 				aPath = File.expand_path(aPath)
 				Dir.chdir(aPath)
-				shell.execute("cd \"#{aPath}\"")
+				bash.execute("cd \"#{aPath}\"")
 			end
 			aPath
 		end
 
-		def run(aCommand)
+		def run(aCommand,aOptions=nil)
+			aOptions ||= {}
 			@context.logger.debug aCommand
-			response,errout = @shell.execute(aCommand,stdout: STDOUT)  #   ::POpen4::shell(aCommand,aDir || @context.pwd)
-			raise Error, "Command Failed" unless @shell.exit_status==0
+			response,errout = bash.execute(aCommand,stdout: STDOUT)  #   ::POpen4::shell(aCommand,aDir || @context.pwd)
+			raise "Command Failed" unless bash.exit_status==0 or aOptions[:raise]==false
 			return response
 		end
 

data/lib/rigup/version.rb

@@ -1,3 +1,3 @@
 module Rigup
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/notes.txt

@@ -1,3 +1,11 @@
+Permissions for sudo :
+
+> sudo nano /etc/sudoers
+Add "%deploy ALL=NOPASSWD: ALL" after %sudo
+
+> groupadd deploy
+> sudo adduser gary deploy
+
 https://github.com/ahoward/wrap
 
 https://github.com/ahoward/session/tree/master

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rigup
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gary McGhee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler