rigup 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bd213b9441445c62e0fc69fba5161efcc6800f0
-  data.tar.gz: bb70b3a65e78ccdf4d8d4dba82e0867eb8522517
+  metadata.gz: 95b30c63738163b65a0865b0f1a9d254c609640c
+  data.tar.gz: d31adf3237a4c76ff0cf5fb623cd4c608edcb1a1
 SHA512:
-  metadata.gz: 4e20c19f4cde6aa31c0ca561f4f8c1c9d43df640704a95c9c32bde372fafad017c0230de67a42efaecc348c6de6b978d381cca63218e3e054513375d63a33a25
-  data.tar.gz: ad3230ac2d49a3c150a0c44afada8eaad68410890c2bbe7dca6789055dea0eb556b225a703a9a9f036ebdb7a32c9ccdad86ce8fbcde5f3fce2c77817a46c8105
+  metadata.gz: 88c817645adfdf47a9f0ff3f4749763ce279904c936120777c701ea6524034e3d8b0efb0fe411548dbc65da874cd44b18ee92e250c9d303b4fcc8379706086bb
+  data.tar.gz: a66440a2d61f0753977d20894b4ba20bf01753c206762c3dfc1e3abc894d5e5c7e10879f2da6213eb6f9fb592ce6c6607b7e982b7f5154b045a66440a5c2b141

data/bin/rigup

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require "rubygems"
-require_relative '../lib/rigup.rb'
-
+#require "rubygems" - checkout rake for an interesting example of the bin command
+require 'rigup'
 Rigup::Cli.start(ARGV)

data/lib/rigup/base.rb

@@ -0,0 +1,48 @@
+module Rigup
+	module Base
+
+		def self.included(aClass)
+	    aClass.class_eval do
+		    no_commands do
+
+			    def logger
+				    @logger ||= ::Logger.new(STDOUT)
+			    end
+
+			    def config
+				    unless @config
+					    @config = {}
+							if File.exists?(f=File.join(release_path,'rigup.yml'))
+								file_config = YAML.load(String.from_file(f))
+								@config.merge!(file_config)
+								@config = Rigup::Config.new(@config)
+							end
+					  end
+				    @config
+			    end
+
+			    def context
+				    @context ||= Rigup::Context.new(
+							config: config,
+							logger: logger,
+							pwd: Dir.pwd,
+						)
+			    end
+
+			    def release_path
+				    @release_path ||= File.expand_path('.')
+			    end
+
+			    def site_dir
+				    @site_dir ||= File.expand_path('../..',release_path)
+			    end
+
+			    def shared_path
+			      @shared_path ||= File.expand_path('shared',site_dir)
+			    end
+			  end
+	    end
+
+		end
+	end
+end

data/lib/rigup/cli.rb

@@ -1,13 +1,19 @@
 module Rigup
 	class Cli < Thor
 
-		include Rigup::Runability
-		include Rigup::InstallUtils
-
-		attr_reader :context, :release_path
+		include Rigup::Utils::Run
+		include Rigup::Utils::Install
 
 		no_commands do
 
+			def logger
+		    @logger ||= ::Logger.new(STDOUT)
+      end
+
+			def config
+				@context.config
+			end
+
 			def init(aPath=nil,aConfig={})
 				return if @initialised
 				@initialised = true
@@ -28,20 +34,18 @@ module Rigup
 				)
 			end
 
-			def site_dir
-				@site_dir
-			end
+			attr_reader :context, :release_path, :site_dir
+
+			def shared_path
+        @shared_path ||= File.expand_path('shared',site_dir)
+      end
 
 			def cache_dir
-				File.join(@site_dir,'shared','cached-copy')
+				File.join(site_dir,'shared','cached-copy')
 			end
 
-			def config
-				@context.config
-			end
-			
 			def repo
-				@repo ||= GitRepo.new(@context)
+				@repo ||= GitRepo.new(context)
 			end
 
 			# Prepares repo in cache dir for site
@@ -102,16 +106,16 @@ module Rigup
 			end
 
 			def link_live
-				ensure_link(@release_path,File.expand_path(File.join(site_dir,'current')),"#{config[:user]}:#{config[:group]}")
+				ensure_link(release_path,File.expand_path(File.join(site_dir,'current')),"#{config[:user]}:#{config[:group]}")
 			end
 
 			def cleanup
 				@releases = run("ls -x #{@releases_path}").split.sort
 		    count = (@keep_releases || 3).to_i
 		    if count >= @releases.length
-		      @context.logger.info "no old releases to clean up"
+		      logger.info "no old releases to clean up"
 		    else
-			    @context.logger.info "keeping #{count} of #{@releases.length} deployed releases"
+			    logger.info "keeping #{count} of #{@releases.length} deployed releases"
 
 		      directories = (@releases - @releases.last(count)).map { |r|
 		        File.join(@releases_path, r)
@@ -123,7 +127,7 @@ module Rigup
 
 			def call_release_command(aCommand)
 				return unless cmdline = config["#{aCommand}_command".to_sym].to_s.strip.to_nil
-				cd @release_path do
+				cd release_path do
 					run cmdline
 				end
 			end
@@ -162,5 +166,15 @@ module Rigup
 			call_release_command(:unblock)
 			cleanup
 		end
+
+		desc "restart [PATH]", "restart the given site"
+		def restart(aPath=nil)
+			init(aPath)
+			return unless cmdline = config["restart_command".to_sym].to_s.strip.to_nil
+			cd File.join(site_dir,'current') do
+				run cmdline
+			end
+		end
+
 	end
 end

data/lib/rigup/deploy_base.rb

@@ -1,32 +1,11 @@
 module Rigup
 
+	# Thor base class extended with rigup utilities
 	class DeployBase < Thor
 
-		include Rigup::Runability
-		include Rigup::InstallUtils
-
-		no_commands do
-			def initialize(*args)
-				super
-				@release_path = Dir.pwd
-				@site_dir = File.expand_path('../..')
-				@shared_path = File.expand_path('shared',@site_dir)
-				config = {}
-				if File.exists?(f=File.join(@release_path,'rigup.yml'))
-					file_config = YAML.load(String.from_file(f))
-					config.merge!(file_config)
-				end
-				@context = Rigup::Context.new(
-					config: Rigup::Config.new(config),
-					logger: ::Logger.new(STDOUT),
-					pwd: Dir.pwd,
-				)
-			end
-
-			def config
-				@context.config
-			end
-		end
+		include Rigup::Base
+		include Rigup::Utils::Run
+		include Rigup::Utils::Install
 
 	end
 

data/lib/rigup/git_repo.rb

@@ -3,7 +3,7 @@ require 'git'
 module Rigup
 	class GitRepo
 
-		include Rigup::Runability
+		include Rigup::Utils::Run
 
 		attr_reader :git,:configured
 

data/lib/rigup/svn.rb

@@ -46,7 +46,7 @@ module Rigup
 				'repository' => @repository,
 				'source' => @vcs_app_path,
 				'branch' => @branch,
-				'destination' => @release_path,
+				'destination' => release_path,
 				'revision' => @revision
 			}
 			result.merge!(aMergeOptions) if aMergeOptions

data/lib/rigup/utils/install.rb

@@ -0,0 +1,95 @@
+module Rigup
+	module Utils
+		module Install
+
+			def select_suffixed_file(aFile,aExtendedExtension=false)
+				ext = Buzztools::File.extension(aFile,aExtendedExtension)
+				no_ext = Buzztools::File.no_extension(aFile,aExtendedExtension)
+				dir = File.dirname(aFile)
+				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
+			# eg. create a public_override folder that duplicates the same structure as public,
+			# and contains the modified files. On deployment call
+			#		override_folder("#{@release_path}/public")		# equiv to override_folder("#{@release_path}/public", "#{@release_path}/public_override")
+			# and the files in public_override will be copied over public, then public_override removed
+			def override_folder(aFolder,aOverrideFolder=nil,aRemove=true)
+				aFolder = aFolder.desuffix('/')
+				aOverrideFolder ||= (aFolder+'_override')
+				run "#{context.config[:sudo]} cp -vrf #{aOverrideFolder}/* #{aFolder}/"
+				run "#{context.config[:sudo]} rm -rf #{aOverrideFolder}" if aRemove
+			end
+
+
+			# set standard permissions for web sites - readonly for apache user
+			def permissions_for_web(aPath,aUser=nil,aGroup=nil,aHideScm=nil)
+				aUser ||= @user
+				aGroup ||= @group
+
+				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)
+				case aHideScm
+					when :svn then run_for_all("chmod -R 700",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 "chmod -R g+w #{aPath.ensure_suffix('/')}"
+				run_for_all("chmod -R 700",aPath,:dirs,"*/.svn")
+			end
+
+			def internal_permissions(aPath,aKind)
+				case aKind
+					when 'rails' then
+						permissions_for_web(aPath,@user,@group,true)
+
+						run_for_all("chmod +x",File.join(aPath,'script'),:files)
+
+
+						uploads = shared_path+'/uploads'
+						make_public_cache_dir(uploads)
+						#if File.exists?(uploads)
+						#	permissions_for_web(uploads,@user,@group,true)
+						#	permissions_for_web_writable(uploads)
+						#end
+						#permissions_for_web_writable("#{aPath}/tmp")
+						make_public_cache_dir("#{aPath}/tmp")
+
+						run "#{context.config[:sudo]} chown #{@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')
+					when 'browsercms' then
+						internal_permissions(aPath,'rails')
+				end
+			end
+
+			def apply_permissions(aPath=nil,aKind=nil)
+				aPath ||= release_path
+				aKind ||= @kind || 'rails'
+				internal_permissions(aPath, aKind)
+			end
+
+			def ensure_link(aTo,aFrom,aUserGroup=nil,aSudo='')
+				raise "Must supply from" if !aFrom
+				cmd = []
+				cmd << "#{aSudo} rm -rf #{aFrom}"
+				cmd << "#{aSudo} ln -sf #{aTo} #{aFrom}"
+				cmd << "#{aSudo} chown -h #{aUserGroup} #{aFrom}" if aUserGroup
+				run(cmd.join(' && '),raise: false)
+			end
+
+			def make_public_cache_dir(aStartPath)
+				run "#{context.config[:sudo]} mkdir -p #{aStartPath}"
+				permissions_for_web(aStartPath)
+				permissions_for_web_writable(aStartPath)
+			end
+
+		end
+	end
+end

data/lib/rigup/utils/run.rb

@@ -0,0 +1,64 @@
+module Rigup
+	module Utils
+		module Run
+
+			def bash
+				@bash ||= ::Session::Bash.new
+			end
+
+			def pwd
+				bash.execute("pwd", stdout: nil).first.strip
+			end
+
+			def cd(aPath,&block)
+				if block_given?
+					begin
+				    before_path = pwd
+						cd(aPath)
+						yield aPath,before_path
+					rescue Exception => e
+						logger.info e.message
+					ensure
+						cd(before_path)
+					end
+				else
+					aPath = File.expand_path(aPath)
+					Dir.chdir(aPath)
+					bash.execute("cd \"#{aPath}\"")
+				end
+				aPath
+			end
+
+			def run(aCommand,aOptions=nil)
+				aOptions ||= {}
+				logger.debug aCommand
+				response,errout = bash.execute(aCommand,stdout: STDOUT)  #   ::POpen4::shell(aCommand,aDir || @context.pwd)
+				logger.debug errout if errout.to_nil
+				logger.debug response if response.to_nil
+				raise "Command Failed" unless bash.exit_status==0 or aOptions[:raise]==false
+				return response
+			end
+
+			def run_for_all(aCommand,aPath,aFilesOrDirs,aPattern=nil,aInvertPattern=false,aSudo=false)
+				#run "#{sudo} find . -wholename '*/.svn' -prune -o -type d -print0 |xargs -0 #{sudo} chmod 750"
+				#sudo find . -type f -exec echo {} \;
+				cmd = []
+				cmd << "sudo" if aSudo
+				cmd << "find #{aPath.ensure_suffix('/')}"
+				cmd << "-wholename '#{aPattern}'" if aPattern
+				cmd << "-prune -o" if aInvertPattern
+				cmd << case aFilesOrDirs.to_s[0,1]
+					when 'f' then '-type f'
+					when 'd' then '-type d'
+					else ''
+				end
+				cmd << "-exec"
+				cmd << aCommand
+				cmd << "'{}' \\;"
+				cmd = cmd.join(' ')
+				run cmd
+			end
+
+		end
+	end
+end

data/lib/rigup/version.rb

@@ -1,3 +1,3 @@
 module Rigup
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/rigup.rb

@@ -8,8 +8,9 @@ require 'session'
 require_relative "rigup/version"
 require_relative "rigup/config"
 require_relative "rigup/context"
-require_relative "rigup/runability"
-require_relative "rigup/install_utils"
+require_relative "rigup/utils/run"
+require_relative "rigup/utils/install"
 require_relative "rigup/git_repo"
 require_relative "rigup/cli"
+require_relative "rigup/base"
 require_relative "rigup/deploy_base"

data/rigup.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
 	s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
 	s.test_files    = s.files.grep(%r{^(test|spec|features)/})
 
-  s.add_dependency 'bundler', '~>1.5.3'
-  s.add_dependency 'thor', '~> 0.19.1'
+  s.add_dependency 'bundler'#, '~>1.5.3'
+  s.add_dependency 'thor'#, '~> 0.19.1'
 
 
   s.add_development_dependency 'rspec', '~>2.14.0'

data/rigup.iml

@@ -14,6 +14,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.5.3, RVM: ruby-2.0.0-p247) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="buzztools (v0.0.6, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="git (v1.2.6, RVM: ruby-2.0.0-p247) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.2.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rigup
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Gary McGhee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,14 +119,15 @@ files:
 - bin/rigup
 - example deploy.thor
 - Gemfile
+- lib/rigup/base.rb
 - lib/rigup/cli.rb
 - lib/rigup/config.rb
 - lib/rigup/context.rb
 - lib/rigup/deploy_base.rb
 - lib/rigup/git_repo.rb
-- lib/rigup/install_utils.rb
-- lib/rigup/runability.rb
 - lib/rigup/svn.rb
+- lib/rigup/utils/install.rb
+- lib/rigup/utils/run.rb
 - lib/rigup/version.rb
 - lib/rigup.rb
 - LICENSE

data/lib/rigup/install_utils.rb

@@ -1,93 +0,0 @@
-module Rigup
-	module InstallUtils
-
-		def select_suffixed_file(aFile,aExtendedExtension=false)
-			ext = Buzztools::File.extension(aFile,aExtendedExtension)
-			no_ext = Buzztools::File.no_extension(aFile,aExtendedExtension)
-			dir = File.dirname(aFile)
-			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
-		# eg. create a public_override folder that duplicates the same structure as public,
-		# and contains the modified files. On deployment call
-		#		override_folder("#{@release_path}/public")		# equiv to override_folder("#{@release_path}/public", "#{@release_path}/public_override")
-		# and the files in public_override will be copied over public, then public_override removed
-		def override_folder(aFolder,aOverrideFolder=nil,aRemove=true)
-			aFolder = aFolder.desuffix('/')
-			aOverrideFolder ||= (aFolder+'_override')
-			run "#{@context.config[:sudo]} cp -vrf #{aOverrideFolder}/* #{aFolder}/"
-			run "#{@context.config[:sudo]} rm -rf #{aOverrideFolder}" if aRemove
-		end
-
-
-		# set standard permissions for web sites - readonly for apache user
-		def permissions_for_web(aPath,aUser=nil,aGroup=nil,aHideScm=nil)
-			aUser ||= @user
-			aGroup ||= @group
-
-			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)
-			case aHideScm
-				when :svn then run_for_all("chmod -R 700",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 "chmod -R g+w #{aPath.ensure_suffix('/')}"
-			run_for_all("chmod -R 700",aPath,:dirs,"*/.svn")
-		end
-
-		def internal_permissions(aPath,aKind)
-			case aKind
-				when 'rails' then
-					permissions_for_web(aPath,@user,@group,true)
-
-					run_for_all("chmod +x",File.join(aPath,'script'),:files)
-
-
-					uploads = @shared_path+'/uploads'
-					make_public_cache_dir(uploads)
-					#if File.exists?(uploads)
-					#	permissions_for_web(uploads,@user,@group,true)
-					#	permissions_for_web_writable(uploads)
-					#end
-					#permissions_for_web_writable("#{aPath}/tmp")
-					make_public_cache_dir("#{aPath}/tmp")
-
-					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')
-				when 'browsercms' then
-					internal_permissions(aPath,'rails')
-			end
-		end
-
-		def apply_permissions(aPath=nil,aKind=nil)
-			aPath ||= @release_path
-			aKind ||= @kind || 'rails'
-			internal_permissions(aPath, aKind)
-		end
-
-		def ensure_link(aTo,aFrom,aUserGroup=nil,aSudo='')
-			raise "Must supply from" if !aFrom
-			cmd = []
-			cmd << "#{aSudo} rm -rf #{aFrom}"
-			cmd << "#{aSudo} ln -sf #{aTo} #{aFrom}"
-			cmd << "#{aSudo} chown -h #{aUserGroup} #{aFrom}" if aUserGroup
-			run(cmd.join(' && '),raise: false)
-		end
-
-		def make_public_cache_dir(aStartPath)
-			run "#{@context.config[:sudo]} mkdir -p #{aStartPath}"
-			permissions_for_web(aStartPath)
-			permissions_for_web_writable(aStartPath)
-		end
-
-	end
-end

data/lib/rigup/runability.rb

@@ -1,62 +0,0 @@
-module Rigup
-	module Runability
-
-		def bash
-			@bash ||= ::Session::Bash.new
-		end
-
-		def pwd
-			bash.execute("pwd", stdout: nil).first.strip
-		end
-
-		def cd(aPath,&block)
-			if block_given?
-				begin
-			 		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)
-				bash.execute("cd \"#{aPath}\"")
-			end
-			aPath
-		end
-
-		def run(aCommand,aOptions=nil)
-			aOptions ||= {}
-			@context.logger.debug aCommand
-			response,errout = bash.execute(aCommand,stdout: STDOUT)  #   ::POpen4::shell(aCommand,aDir || @context.pwd)
-			@context.logger.debug errout if errout.to_nil
-			@context.logger.debug response if response.to_nil
-			raise "Command Failed" unless bash.exit_status==0 or aOptions[:raise]==false
-			return response
-		end
-
-		def run_for_all(aCommand,aPath,aFilesOrDirs,aPattern=nil,aInvertPattern=false,aSudo=false)
-			#run "#{sudo} find . -wholename '*/.svn' -prune -o -type d -print0 |xargs -0 #{sudo} chmod 750"
-			#sudo find . -type f -exec echo {} \;
-			cmd = []
-			cmd << "sudo" if aSudo
-			cmd << "find #{aPath.ensure_suffix('/')}"
-			cmd << "-wholename '#{aPattern}'" if aPattern
-			cmd << "-prune -o" if aInvertPattern
-			cmd << case aFilesOrDirs.to_s[0,1]
-				when 'f' then '-type f'
-				when 'd' then '-type d'
-				else ''
-			end
-			cmd << "-exec"
-			cmd << aCommand
-			cmd << "'{}' \\;"
-			cmd = cmd.join(' ')
-			run cmd
-		end
-
-	end
-end