wcc 1.1.0 → 1.2.0

data/assets/filter.d/{only_changes_of.rb → changes_of.rb}

@@ -1,15 +1,15 @@
 
-WCC::Filters.add 'only_changes_of' do |data,args|
+WCC::Filters.add 'changes_of' do |data,args|
 	case args['t'] || args['type']
-	when 'lines',nil
+	when 'line','lines',nil
 		cmp_val = data.diff.nlinesc
-	when 'chars'
+	when 'char','chars'
 		cmp_val = data.diff.ncharsc
 	when 'ins','insertions'
 		cmp_val = data.diff.ninsertions
 	when 'del','deletions'
 		cmp_val = data.diff.ndeletions
-	when 'hunks'
+	when 'hunk','hunks'
 		cmp_val = data.diff.nhunks
 	end
 	next (cmp_val >= args['at_least']) if args.key?('at_least')

data/assets/filter.d/rel_changes_of.rb

@@ -0,0 +1,21 @@
+
+# NOTE: the percentage may easily go above 100% when there are more
+#       changes than the whole site has lines.
+
+WCC::Filters.add 'rel_changes_of' do |data,args|
+	case args['percent_of']
+	when 'all_lines',nil
+		percent = data.diff.nlinesc.to_f / data.site.content.count("\n").+(1).to_f * 100
+#	when 'all_chars','all_characters'
+#		percent = ...
+#	when 'nonblank_lines'
+#		percent = ...
+	end
+	next (percent >= args['at_least']) if args.key?('at_least')
+	next (percent >  args['more_than']) if args.key?('more_than')
+	next (percent <= args['at_most']) if args.key?('at_most')
+	next (percent <  args['fewer_then']) if args.key?('fewer_than')
+	next (percent == args['exactly']) if args.key?('exactly')
+	next (percent != args['not_quite']) if args.key('not_quite')
+	true
+end

data/lib/wcc/mail.rb

@@ -41,9 +41,9 @@ module WCC
 	# does plain SMTP to host:port using [Net::SMTP].
 	class SmtpMailer
 		def initialize(host, port)
-			WCC.logger.info "Send mail via SMTP to #{@host}:#{@port}"
 			@host = host
 			@port = port
+			WCC.logger.info "Send mail via SMTP to #{@host}:#{@port}"
 		end
 		
 		# Sends a mail built up from some [ERB] templates to the

data/lib/wcc.rb

@@ -45,7 +45,7 @@ end
 
 module WCC
 
-	VERSION = "1.1.0"
+	VERSION = "1.2.0"
 
 	DIFF_TIME_FMT = '%Y-%m-%d %H:%M:%S %Z'
 	
@@ -105,7 +105,6 @@ module WCC
 				opts.on('-f', '--from MAIL', 'Set From: mail address') do |m| self[:from_mail] = m end
 				opts.on('--host HOST', 'Set SMTP host') do |h| self[:host] = h end
 				opts.on('--port PORT', 'Set SMTP port') do |p| self[:port] = p end
-				#opts.on('--init', '--initialize')
 				opts.on('--show-config', 'Show config after loading config file (debug purposes)') do self[:show_config] = true end
 				opts.on('-h', '-?', '--help', 'Display this screen') do
 					puts opts
@@ -171,19 +170,6 @@ module WCC
 				exit 0
 			end
 			
-			# create cache dir for hash and diff files
-			Dir.mkdir(self[:cache_dir]) unless File.directory?(self[:cache_dir])
-			
-			if(self[:clean])
-				WCC.logger.warn "Cleanup hash and diff files"
-				Dir.foreach(self[:cache_dir]) do |f|
-					File.delete(self.file(f)) if f =~ /^.*\.(md5|site)$/
-				end
-			end
-			
-			# read filter.d
-			Dir[File.join(self[:filter_dir], '*.rb')].each { |file| require file }
-			
 			# attach --no-mails filter
 			WCC::Filters.add '--no-mails' do |data|
 				!self[:nomails]
@@ -367,6 +353,40 @@ module WCC
 			# first use of Conf initializes it
 			WCC.logger = Logger.new(STDOUT)
 			
+			# make sure logger is correctly configured
+			Conf.instance
+			
+			# create cache dir for hash and diff files
+			Dir.mkdir(Conf[:cache_dir]) unless File.directory?(Conf[:cache_dir])
+			
+			if(Conf[:clean])
+				WCC.logger.warn "Cleanup hash and diff files"
+				Dir.foreach(Conf[:cache_dir]) do |f|
+					File.delete(Conf.file(f)) if f =~ /^.*\.(md5|site)$/
+				end
+			end
+			
+			# read filter.d
+			Dir[File.join(Conf[:filter_dir], '*.rb')].each { |file| require file }
+			
+			# timestamps
+			cache_file = Conf.file('cache.yml')
+			if File.exists?(cache_file)
+				WCC.logger.debug "Load timestamps from '#{cache_file}'"
+
+				# may be *false* if file is empty
+				yaml = YAML.load_file(cache_file)
+
+				if not yaml
+					WCC.logger.info "No timestamps loaded"
+				else
+					@@timestamps = yaml['timestamps']
+				end
+			else
+				@@timestamps = {}
+			end
+			
+			# templates
 			@@mail_plain = load_template('mail.alt.erb')
 			@@mail_bodies = {
 				:plain => load_template('mail-body.plain.erb'),
@@ -374,12 +394,23 @@ module WCC
 			}
 			
 			Conf.sites.each do |site|
+				ts_old = get_timestamp(site)
+				ts_new = Time.now.to_i
+				if (ts_new-ts_old) < site.check_interval*60
+					ts_diff = (ts_new-ts_old)/60
+					WCC.logger.info "Skipping check for #{site.uri.host.to_s} due to check #{ts_diff} minute#{ts_diff == 1 ? '' : 's'} ago."
+					next
+				end
 				if checkForUpdate(site)
 					WCC.logger.warn "#{site.uri.host.to_s} has an update!"
 				else
 					WCC.logger.info "#{site.uri.host.to_s} is unchanged"
 				end
+				update_timestamp(site, ts_new)
 			end
+			
+			# save timestamps
+			File.open(cache_file, 'w+') do |f| YAML.dump({"timestamps" => @@timestamps}, f) end
 		end
 		
 		private
@@ -390,5 +421,13 @@ module WCC
 			# <> omit newline for lines starting with <% and ending in %>
 			ERB.new(t, 0, "<>")
 		end
+		
+		def self.get_timestamp(site)
+			@@timestamps[site.uri.to_s] || 0
+		end
+		
+		def self.update_timestamp(site, t)
+			@@timestamps[site.uri.to_s] = t
+		end
 	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wcc
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Christian Nicolai
@@ -59,7 +59,8 @@ extra_rdoc_files:
 files: 
 - assets/conf.yml
 - assets/filter.d/arg-test.rb
-- assets/filter.d/only_changes_of.rb
+- assets/filter.d/changes_of.rb
+- assets/filter.d/rel_changes_of.rb
 - assets/filter.d/test.rb
 - assets/template.d/mail.alt.erb
 - assets/template.d/mail-body.html.erb