regenerate 0.1.0 → 0.1.1

data/lib/regenerate/regenerate-utils.rb

@@ -12,6 +12,7 @@ module Regenerate
         puts "Renaming file #{outFile} to #{backupFileName} ..."
         File.rename(outFile, backupFileName)
       end
+      backupFileName
     end
     
     def ensureDirectoryExists(directoryName)

data/lib/regenerate/site-regenerator.rb

@@ -25,7 +25,10 @@ module Regenerate
     
     include Regenerate::Utils
     
+    attr_accessor :checkNoChanges
+    
     def initialize(baseDir, sourceSubDir, outputSubDir)
+      
       @baseDir = File.expand_path(baseDir)
       @sourceSubDir = sourceSubDir
       @outputSubDir = outputSubDir
@@ -33,6 +36,7 @@ module Regenerate
       @sourceTypeDirs = {:source => File.join(@baseDir, @sourceSubDir), 
         :output => File.join(@baseDir, @outputSubDir)}
       @oppositeSourceType = {:source => :output, :output => :source}
+      @checkNoChanges = false
       puts "SiteRegenerator, @baseDir = #{@baseDir.inspect}"
     end
     
@@ -60,7 +64,7 @@ module Regenerate
       extension = File.extname(srcFile).downcase
       puts "  extension = #{extension}"
       if REGENERATE_EXTENSIONS.include? extension
-        WebPage.new(srcFile).regenerateToOutputFile(outFile)
+        WebPage.new(srcFile).regenerateToOutputFile(outFile, checkNoChanges)
       else
         copySrcToOutputFile(srcFile, outFile)
       end

data/lib/regenerate/web-page.rb

@@ -171,7 +171,7 @@ module Regenerate
   class ParseException<Exception
   end
   
-  class ParsedRejennerCommentLine
+  class ParsedRegenerateCommentLine
     
     attr_reader :isInstanceVar, :hasCommentStart, :hasCommentEnd, :sectionStart, :sectionEnd
     attr_reader :isEmptySection, :line, :name, :value
@@ -229,6 +229,9 @@ module Regenerate
     
   end
   
+  class UnexpectedChangeError<Exception
+  end
+  
   class WebPage
     
     include Regenerate::Utils
@@ -356,8 +359,37 @@ module Regenerate
       end
     end
     
-    def writeRegeneratedFile(outFile)
-      makeBackupFile(outFile)
+    def diffReport(newString, oldString)
+      i = 0
+      minLength = [newString.length, oldString.length].min
+      while i<minLength and newString[i] == oldString[i] do
+        i += 1
+      end
+      diffPos = i
+      newStringEndPos = [diffPos+20,newString.length].min
+      oldStringEndPos = [diffPos+20, newString.length].min
+      startPos = [0, diffPos-10].max
+      "Different from position #{diffPos}: \n  #{newString[startPos...newStringEndPos].inspect}\n !=\n  #{oldString[startPos...newStringEndPos].inspect}"
+    end
+    
+    def checkOutputFileUnchanged(outFile, oldFile)
+      if File.exists? oldFile
+        oldFileContents = File.read(oldFile)
+        newFileContents = File.read(outFile)
+        if oldFileContents != newFileContents
+          newFileName = outFile + ".new"
+          File.rename(outFile, newFileName)
+          File.rename(oldFile, outFile)
+          raise UnexpectedChangeError.new("New file #{newFileName} is different from old file #{outFile}: #{diffReport(newFileContents,oldFileContents)}")
+        end
+      else
+        raise UnexpectedChangeError.new("Can't check #{outFile} against backup #{oldFile} " + 
+                                        "because backup file doesn't exist")
+      end
+    end
+    
+    def writeRegeneratedFile(outFile, checkNoChanges)
+      backupFileName = makeBackupFile(outFile)
       puts "Outputting regenerated page to #{outFile} ..."
       File.open(outFile, "w") do |f|
         for component in @components do
@@ -365,6 +397,9 @@ module Regenerate
         end
       end
       puts "Finished writing #{outFile}"
+      if checkNoChanges
+        checkOutputFileUnchanged(outFile, backupFileName)
+      end
     end
     
     def readFileLines
@@ -376,7 +411,7 @@ module Regenerate
         #puts "line #{lineNumber}: #{line}"
         commentLineMatch = COMMENT_LINE_REGEX.match(line)
         if commentLineMatch
-          parsedCommandLine = ParsedRejennerCommentLine.new(line, commentLineMatch)
+          parsedCommandLine = ParsedRegenerateCommentLine.new(line, commentLineMatch)
           #puts "parsedCommandLine = #{parsedCommandLine}"
           if parsedCommandLine.isRejennerCommentLine
             parsedCommandLine.checkIsValid
@@ -398,9 +433,9 @@ module Regenerate
       #display
     end
     
-    def regenerateToOutputFile(outFile)
+    def regenerateToOutputFile(outFile, checkNoChanges = false)
       executeRubyComponents
-      writeRegeneratedFile(outFile)
+      writeRegeneratedFile(outFile, checkNoChanges)
     end
     
     def executeRubyComponents
@@ -441,6 +476,13 @@ module Regenerate
       end
     end
     
+    def erbFromString(templateString)
+      @binding = binding
+      template = ERB.new(templateString, nil, nil)
+      template.result(@binding)
+    end
+      
+    
     def relative_path(path)
       File.expand_path(File.join(@baseDir, path.to_str))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regenerate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies: []
 description: Use to regenerate to write a web page with embedded instance variable
   definitions and embedded ruby code which executes to regenerate the same web page