buzzville 0.1.3 → 0.1.4

data/Rakefile

@@ -11,10 +11,10 @@ begin
     gem.homepage = "http://github.com/buzzware/buzzville"
     gem.authors = ["buzzware"]
     gem.rubyforge_project = "buzzware"
-    gem.add_dependency('buzzcore', '>= 0.2.5')
-    gem.add_dependency('yore', '>= 0.0.5')
+    gem.add_dependency('buzzcore', '>= 0.3.3')
+    gem.add_dependency('yore', '>= 0.2.1')
     gem.add_dependency('cmdparse', '>= 2.0.2')
-    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "shoulda"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::RubyforgeTasks.new do |rubyforge|

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/buzzville.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{buzzville}
+  s.version = "0.1.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["buzzware"]
+  s.date = %q{2010-01-28}
+  s.description = %q{Capistrano recipes and ruby code relating to deployment}
+  s.email = %q{contact@buzzware.com.au}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "buzzville.gemspec",
+     "buzzville.vpj",
+     "buzzville.vpw",
+     "lib/buzzville.rb",
+     "lib/buzzville/cap_utils.rb",
+     "lib/buzzville/ftp_extra.rb",
+     "lib/buzzville/recipes.rb",
+     "lib/buzzville/recipes/data.rb",
+     "lib/buzzville/recipes/files.rb",
+     "lib/buzzville/recipes/ssl.rb",
+     "lib/buzzville/recipes/user.rb",
+     "lib/buzzville_dev.rb",
+     "test/buzzville_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/buzzware/buzzville}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{buzzware}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Capistrano recipes and ruby code relating to deployment}
+  s.test_files = [
+    "test/buzzville_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<buzzcore>, [">= 0.3.3"])
+      s.add_runtime_dependency(%q<yore>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<cmdparse>, [">= 2.0.2"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<buzzcore>, [">= 0.3.3"])
+      s.add_dependency(%q<yore>, [">= 0.2.1"])
+      s.add_dependency(%q<cmdparse>, [">= 2.0.2"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<buzzcore>, [">= 0.3.3"])
+    s.add_dependency(%q<yore>, [">= 0.2.1"])
+    s.add_dependency(%q<cmdparse>, [">= 2.0.2"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+  end
+end

data/lib/buzzville/cap_utils.rb

@@ -8,6 +8,18 @@ require 'net/sftp'
 
 module CapUtils
 
+	# for debugging deploy :
+	#
+	# same as original, but without file removal on rollback
+	#task :update_code, :except => { :no_release => true } do
+	#	on_rollback do
+	#		require 'ruby-debug'; debugger
+	#	end
+	#	strategy.deploy!
+	#	finalize_update
+	#end
+
+
 	# upload the given local file to the remote server and set the given mode.
 	# 0644 is the default mode
 	#
@@ -101,7 +113,7 @@ module CapUtils
 	def file_exists?(path)
 		result = nil
 		run "if [[ -e #{path} ]]; then echo 'true'; else echo 'false'; fi", :shell => false do |ch,stream,text|
-			result = (text.strip! == 'true')
+			result = (text.strip == 'true')
 		end
 		result
 	end
@@ -124,9 +136,9 @@ module CapUtils
 		ensure_link("#{aSharedFolder}","#{aReleaseFolder}",nil,"#{user}:#{apache_user}")
 	end
 
-	def select_target_file(aFile)
-		ext = MiscUtils.file_extension(aFile,false)
-		no_ext = MiscUtils.file_no_extension(aFile,false)
+	def select_target_file(aFile,aExtendedExtension=false)
+		ext = MiscUtils.file_extension(aFile,aExtendedExtension)
+		no_ext = MiscUtils.file_no_extension(aFile,aExtendedExtension)
 		dir = File.dirname(aFile)
 		run "#{sudo} mv -f #{no_ext}.#{target}.#{ext} #{aFile}"
 		run "#{sudo} rm -f #{no_ext}.*.#{ext}"
@@ -147,7 +159,7 @@ module CapUtils
 		#sudo find . -type f -exec echo {} \;
 		cmd = []
 		cmd << "sudo" if aSudo
-		cmd << "find #{aPath}"
+		cmd << "find #{MiscUtils.append_slash(aPath)}"
 		cmd << "-wholename '#{aPattern}'" if aPattern
 		cmd << "-prune -o" if aInvertPattern
 		cmd << case aFilesOrDirs.to_s[0,1]
@@ -157,13 +169,42 @@ module CapUtils
 		end
 		cmd << "-exec"		
 		cmd << aCommand
-		cmd << '{} \;'		
+		cmd << "'{}' \\;"		
 		cmd = cmd.join(' ')
 		run cmd
 	end
 	
-	#run_for_all("chmod g+s #{File.expand_path(dir,public_dir)}",public_dir,:dirs)
+	# just quickly ensures user can deploy. Only for use before deploying, and should be followed by
+	# more secure settings
+	def permissions_for_deploy(aUser=nil,aGroup=nil,aPath=nil)
+		aUser ||= user
+		aGroup ||= apache_user
+		aPath ||= deploy_to
+		run "#{sudo} chown -R #{aUser}:#{aGroup} #{MiscUtils.append_slash(aPath)}"
+		run "#{sudo} chmod u+rw #{MiscUtils.append_slash(aPath)}"
+		run_for_all("chmod u+x",aPath,:dirs)		
+	end
+	
+	# set standard permissions for web sites - readonly for apache user
+	def permissions_for_web(aPath=nil,aUser=nil,aApacheUser=nil,aHideScm=nil)
+		aPath ||= deploy_to
+		aUser ||= user
+		aApacheUser ||= apache_user
+	
+		run "#{sudo} chown -R #{aUser}:#{aApacheUser} #{MiscUtils.append_slash(aPath)}"
+		run "#{sudo} chmod -R 644 #{MiscUtils.append_slash(aPath)}"
+		run_for_all("chmod +x",aPath,:dirs)
+		run_for_all("chmod g+s",aPath,:dirs)
+		case aHideScm
+			when :svn then run_for_all("chown -R #{aUser}:#{aUser}",aPath,:dirs,"*/.svn")
+		end
+	end
 	
+	# run this after permissions_for_web() on dirs that need to be writable by group (apache)
+	def permissions_for_web_writable(aPath)
+		run "#{sudo} chmod -R g+w #{MiscUtils.append_slash(aPath)}"
+	end
+
 	def set_dir_permissions_r(aStartPath,aUser=nil,aGroup=nil,aMode=nil,aSetGroupId=false)
 		cmd = []
 		if aGroup
@@ -200,6 +241,12 @@ module CapUtils
 		set_permissions(aStartPath,aUser,aGroup,aMode,aSetGroupId,aSudo)
 	end
 
+	def make_public_cache_dir(aStartPath)
+		run "#{sudo} mkdir -p #{aStartPath}"
+		permissions_for_web(aStartPath)
+		permissions_for_web_writable(aStartPath)
+	end
+
 	# if aGroup is given, that will be the users only group
 	def adduser(aNewUser,aPassword,aGroup=nil)
 		run "#{sudo} adduser --gecos '' #{aGroup ? '--ingroup '+aGroup : ''} #{aNewUser}" do |ch, stream, out|
@@ -288,7 +335,8 @@ module CapUtils
 
 		cmd << ensure_folder(design_views,aUser,aApacheUser,750)
 		# copy files from database to shared/design
-		cmd << "cp -rf #{aBrowserCmsRoot}/tmp/views/* #{design_views}/"
+		# if [[ ! -L libtool ]]; then echo 'true'; fi !!! need NOT
+		cmd << "if [ ! -L #{aBrowserCmsRoot}/tmp/views ]; then cp -rf #{aBrowserCmsRoot}/tmp/views/* #{design_views}/ ; fi"
 		cmd << ensure_folder(design_views+'/layouts/templates',aUser,aApacheUser,750)
 		cmd << ensure_folder(design_views+'/partials',aUser,aApacheUser,750)
 	
@@ -306,7 +354,7 @@ module CapUtils
 		## link templates into ftp folder
 		cmd << ensure_link_cmd(design_views,'views',aFtpPath,"#{aUser}:#{aApacheUser}")
 		#run "#{sudo} chgrp -h www-data #{deploy_to}/current"  # this is to change owner of link, not target
-		cmd_s = cmd.join(" && ")
+		cmd_s = cmd.join("\n")
 	end
 
 	def install_script_from_string(aScriptString,aFilepath)
@@ -316,6 +364,10 @@ module CapUtils
 		set_permissions(aFilepath,'root',user,750,false,true)
 	end
 
+	def svn_command(aCommand)
+		run "#{sudo} svn --trust-server-cert --non-interactive --username #{svn_user} --password #{svn_password} #{aCommand}"
+	end
+	
 end
 
 class CapUtilsClass

data/lib/buzzville/recipes.rb

@@ -2,8 +2,6 @@
 # require 'buzzville/recipes' or 
 # require 'buzzville/recipes/data'
 
-require 'ruby-debug'; debugger
-
 require 'capistrano'
 require 'capistrano/cli'
 

data/lib/buzzville/recipes/data.rb

@@ -1,7 +1,6 @@
+require_paths_first File.join(File.dirname(__FILE__),'../../../../yore/lib');
 require 'yore/yore_core'
 
-require 'ruby-debug'; debugger
-
 @@cap_config.load do
 	# cap stage -Dapp=spree yore:pull:p_to_d
 	# cap stage -Dapp=spree yore:push:d_to_p
@@ -19,22 +18,24 @@ require 'ruby-debug'; debugger
 			end
 	
 			def pull_internal(aRemoteEnv,aLocalEnv)
-				remote_app_path = ''
-				local_app_path = ''
-				remote_file = 'blah'
-				local_file = 'something'
+				local_yore = YoreCore::Yore.launch(nil,{:kind => kind,:RAILS_ENV => aLocalEnv},{:basepath=>ENV['PWD']})
+				remote_app_path = File.join(cap.deploy_to,'current')
+				local_app_path = local_yore.config[:basepath]
+				filename = cap.unique_app_name+"-"+Time.now.strftime('%Y%m%d-%H%M%S')
+				remote_file = File.join("/tmp",filename)
+				local_file = File.join("/tmp",filename) 
+
 				# assume yore installed remotely
 				cmd = "cd #{remote_app_path}; yore save"
 				cmd += " --kind=#{kind}" if kind
 				cmd += " --RAILS_ENV=#{aRemoteEnv} #{remote_file}"
 				run cmd
 				download(remote_file,local_file,:via => :scp)			
-				local_yore = YoreCore::Yore.launch(nil,{:kind => kind,:RAILS_ENV => aLocalEnv,:basepath=>ENV['PWD']})
 				local_yore.load(local_file)
 			end
 			
 			def push_internal(aLocalEnv,aRemoteEnv)
-				local_yore = YoreCore::Yore.launch(nil,{:kind => kind,:RAILS_ENV => aLocalEnv,:basepath=>ENV['PWD']})
+				local_yore = YoreCore::Yore.launch(nil,{:kind => kind,:RAILS_ENV => aLocalEnv},{:basepath=>ENV['PWD']})
 				remote_app_path = File.join(cap.deploy_to,'current')
 				local_app_path = local_yore.config[:basepath]
 				filename = cap.unique_app_name+"-"+Time.now.strftime('%Y%m%d-%H%M%S')
@@ -42,7 +43,6 @@ require 'ruby-debug'; debugger
 				local_file = File.join("/tmp",filename) 
 				local_yore.save(local_file)
 				upload(local_file,remote_file,:via => :scp)
-	
 				run "echo $PATH"
 				# assume yore installed remotely
 				cmd = "cd #{remote_app_path}; yore load"
@@ -60,6 +60,8 @@ require 'ruby-debug'; debugger
 			end
 			namespace :push do
 				task :d2p  do
+					extend CapUtils
+					files.apply_deploy_permissions
 					push_internal('development','production')
 					files.apply_permissions
 					deploy.restart

data/lib/buzzville/recipes/files.rb

@@ -9,10 +9,33 @@ require 'yore/yore_core'
 				@@cap_config
 			end
 			
-			def internal_permissions
-				case kind
+			def internal_apply_deploy_permissions(aKind)
+				cap.extend CapUtils
+				case aKind
+					when 'rails' then
+						permissions_for_deploy(cap.user,cap.apache_user,cap.current_path)
+						uploads = cap.shared_path+'/uploads'
+						if remote_file_exists?(uploads)
+							permissions_for_web(uploads,cap.user,cap.apache_user,true)
+							permissions_for_web_writable(uploads) 
+						end
+						#uploads_path = File.expand_path('../shared/uploads',current_path)
+						#mkdir_permissions(uploads_path,user,apache_user,770,true)
 					when 'spree' then
-					
+						internal_apply_deploy_permissions('rails')					
+					when 'browsercms' then
+						internal_apply_deploy_permissions('rails')
+				end
+			end
+
+			task :apply_deploy_permissions do
+				internal_apply_deploy_permissions(cap.kind)
+			end			
+			
+			def internal_permissions(aKind)
+				cap.extend CapUtils
+				case aKind
+					when 'rails' then
 						#puts "set permissions for dirs and files"
 						#run_for_all("chmod 750",app_dir,:dirs)
 						#run_for_all("chmod 640",app_dir,:files)
@@ -21,19 +44,35 @@ require 'yore/yore_core'
 						#run_for_all("chmod 770","#{public_dir}/images",:dirs)
 						#run_for_all("chmod 660","#{public_dir}/images",:files)
 
+
 						run "#{sudo} chgrp -h #{cap.apache_user} #{cap.current_path}"  # this is to change owner of link, not target
-						run "#{sudo} chown -R #{cap.user}:#{cap.apache_user} #{cap.current_path}/"	# the # is reqd to work for symlinks
-						run "#{sudo} chmod -R g+w #{cap.current_path}/"									# unfortunately necessary as capistrano forgets to do this later with sudo
-						run "#{sudo} chown #{cap.apache_user}:#{cap.apache_user} #{cap.current_path}/config/environment.rb"	# very important for passenger, which uses the owner of this file to run as
+
+						cap.permissions_for_web(cap.current_path,cap.user,cap.apache_user,true)
+
+						#run "#{sudo} chown -R #{cap.user}:#{cap.apache_user} #{cap.current_path}/"	# the # is reqd to work for symlinks
+						#run "#{sudo} chmod -R g+w #{cap.current_path}/"									# unfortunately necessary as capistrano forgets to do this later with sudo
+
+						uploads = cap.shared_path+'/uploads'
+						if remote_file_exists?(uploads)
+							permissions_for_web(uploads,cap.user,cap.apache_user,true)
+							permissions_for_web_writable(uploads) 
+						end
+						#uploads_path = File.expand_path('../shared/uploads',current_path)
+						#mkdir_permissions(uploads_path,user,apache_user,770,true)
+
+						run "#{sudo} chown #{cap.user}:#{cap.user} #{cap.current_path}/config/environment.rb"	# very important for passenger, which uses the owner of this file to run as
 						run "#{sudo} touch #{cap.current_path}/log/production.log"				
 						run "#{sudo} chmod 666 #{cap.current_path}/log/production.log"
-					when 'rails' then
-						# dfdsf
+
+					when 'spree' then
+						internal_permissions('rails')					
+					when 'browsercms' then
+						internal_permissions('rails')
 				end
 			end
 
 			task :apply_permissions do
-				internal_permissions
+				internal_permissions(cap.kind)
 			end
 
 		end

data/lib/buzzville/recipes/ssl.rb

@@ -8,12 +8,16 @@
 				@@cap_config
 			end
 	
+			#task :check_key do
+			#	#sudo openssl rsa -check -noout -in ~/.ssh/iarts.ppk
+			#end	
+	
 			# should set key_dir
 			task :new_key do	
 				set :local_key_dir,File.expand_path('~/.ssh') unless (local_key_dir rescue false)
 				if !(key_name rescue false)				
 					default_key_name = (new_user rescue nil) || 'new_key'
-					key_name_response = Capistrano::CLI.ui.ask("Enter a name for the key without extension (default: #{default_key_name}):").strip!
+					key_name_response = Capistrano::CLI.ui.ask("Enter a name for the key without extension (default: #{default_key_name}):").strip
 					set :key_name, (key_name_response.nil? || key_name_response.empty?) ? default_key_name : key_name_response
 				end
 				pub = File.join(local_key_dir,key_name+'.pub')
@@ -21,14 +25,14 @@
 				raise StandardError.new("#{pub} or #{ppk} already exists") if File.exists?(pub) || File.exists?(ppk)
 				passphrase = Capistrano::CLI.password_prompt("Enter a passphrase (>= 5 characters):")
 				# create key - asks for name & passphrase and stores in ~/.ssh
-				shell "ssh-keygen -N #{passphrase} -f #{File.join(local_key_dir,key_name)}"
+				shell "ssh-keygen #{passphrase.to_s.empty? ? '' : '-N '+passphrase} -f #{File.join(local_key_dir,key_name)}"
 				shell "#{sudo} mv #{File.join(local_key_dir,key_name)} #{ppk}"
 				shell "#{sudo} sed -i -e 's/== .*$/== #{key_name}.pub/' #{pub}"
 				shell "#{sudo} chown $USER #{pub}"
 				shell "#{sudo} chown $USER #{ppk}"
 				Capistrano::CLI.ui.say "created #{pub}"
 				Capistrano::CLI.ui.say "created #{ppk}"
-				Capistrano::CLI.ui.say "Recommended: ssh-add #{ppk}"
+				Capistrano::CLI.ui.say "Recommended: ssh-add -k #{ppk}"
 			end	
 			
 			task :install_key do
@@ -57,7 +61,7 @@
 					run "#{sudo} echo '' | #{sudo} tee -a #{auth_keys}"				# new line 
 					run "#{sudo} cat #{File.join(admin_dir,key_name+'.pub')} | #{sudo} tee -a #{auth_keys}"
 					run "#{sudo} rm #{File.join(admin_dir,key_name+'.pub')}"
-					run "#{sudo} sudo /etc/init.d/ssh restart"
+					run "#{sudo} /etc/init.d/ssh restart"
 				end
 				
 				# add to sshd_config AllowUsers if not already
@@ -75,11 +79,15 @@
 
 You probably need to append :
 
-Host #{host}
+Host #{new_user}
         IdentityFile #{File.join(local_key_dir,key_name+'.ppk')}
         User #{new_user}
+        Hostname #{host}
         Port #{sessions.values.first.transport.peer[:port]}				
-				
+        TCPKeepAlive yes
+        IdentitiesOnly yes
+        PreferredAuthentications publickey				
+
 to your ~/.ssh/config file
 
 and run locally :
@@ -88,7 +96,7 @@ and run locally :
 
 and then you should be able to  :
 
-        ssh #{new_user}@#{host}
+        ssh #{new_user}
 				
 without entering a password and the passphrase will be in your keychain.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: buzzville
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - buzzware
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 +08:00
+date: 2010-01-28 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.5
+        version: 0.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: yore
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.5
+        version: 0.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -68,6 +68,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- buzzville.gemspec
 - buzzville.vpj
 - buzzville.vpw
 - lib/buzzville.rb