regenerate 0.2.0 → 0.2.1

data/bin/regenerate

@@ -2,8 +2,11 @@
  
 require 'regenerate'
 
+STDOUT.sync = true
+STDERR.sync = true
+
 if ARGV.length == 1
-  Regenerate.regenerate(ARGV[0])
+  Regenerate.regeneratePath(ARGV[0])
 else
   raise Exception, "regenerate expects exactly one argument: #{ARGV.inspect}"
 end

data/lib/regenerate.rb

@@ -3,12 +3,3 @@
 
 require 'regenerate/web-page.rb'
 require 'regenerate/site-regenerator.rb'
-
-STDOUT.sync = true
-STDERR.sync = true
-
-#puts "ARGV = #{ARGV.inspect}"
-
-if ARGV.length >= 1
-  Regenerate.regeneratePath(ARGV[0])
-end

data/lib/regenerate/regenerate-utils.rb

@@ -7,11 +7,11 @@ module Regenerate
     def makeBackupFile(outFile)
       backupFileName = outFile+"~"
       if File.exists? backupFileName
-        puts "Deleting existing backup file #{backupFileName} ..."
+        #puts " deleting existing backup file #{backupFileName} ..."
         File.delete (backupFileName)
       end
       if File.exists? outFile
-        puts "Renaming file #{outFile} to #{backupFileName} ..."
+        #puts " renaming file #{outFile} to #{backupFileName} ..."
         File.rename(outFile, backupFileName)
       end
       backupFileName

data/lib/regenerate/site-regenerator.rb

@@ -48,7 +48,7 @@ module Regenerate
         :output => File.join(@baseDir, @outputSubDir)}
       @oppositeSourceType = {:source => :output, :output => :source}
       @checkNoChanges = false
-      puts "SiteRegenerator, @baseDir = #{@baseDir.inspect}"
+      puts "SiteRegenerator initialized, @baseDir = #{@baseDir.inspect}"
     end
     
     # files & directories starting with "_" are not output files (they are other helper files)
@@ -72,13 +72,13 @@ module Regenerate
     # Generate an output file from a source file
     # (pathComponents represent the path from the root source directory to the actual file)
     def regenerateFileFromSource(srcFile, pathComponents)
-      puts "regenerateFileFromSource, srcFile = #{srcFile}, pathComponents = #{pathComponents.inspect}"
+      #puts "regenerateFileFromSource, srcFile = #{srcFile}, pathComponents = #{pathComponents.inspect}"
       subPath = pathComponents.join("/")
       outFile = File.join(@sourceTypeDirs[:output], subPath)
-      puts "  outFile = #{outFile}"
+      #puts "  outFile = #{outFile}"
       ensureDirectoryExists(File.dirname(outFile))
       extension = File.extname(srcFile).downcase
-      puts "  extension = #{extension}"
+      #puts "  extension = #{extension}"
       if REGENERATE_EXTENSIONS.include? extension
         WebPage.new(srcFile).regenerateToOutputFile(outFile, checkNoChanges)
       else
@@ -88,13 +88,13 @@ module Regenerate
     
     # Generate a source file from an output file (if that can be done)
     def regenerateSourceFromOutput(outFile, pathComponents)
-      puts "regenerateSourceFromOutput, outFile = #{outFile}, pathComponents = #{pathComponents.inspect}"
+      #puts "regenerateSourceFromOutput, outFile = #{outFile}, pathComponents = #{pathComponents.inspect}"
       subPath = pathComponents.join("/")
       srcFile = File.join(@sourceTypeDirs[:source], subPath)
-      puts "  srcFile = #{srcFile}"
+      #puts "  srcFile = #{srcFile}"
       ensureDirectoryExists(File.dirname(srcFile))
       extension = File.extname(outFile).downcase
-      puts "  extension = #{extension}"
+      #puts "  extension = #{extension}"
       if REGENERATE_EXTENSIONS.include? extension
         raise "Regeneration from output not yet implemented."
       else
@@ -104,9 +104,9 @@ module Regenerate
     
     # Regenerate (or generate) a file, either from source file or from output file
     def regenerateFile(srcFile, pathComponents, sourceType)
-      puts "regenerateFile, srcFile = #{srcFile}, sourceType = #{sourceType.inspect}"
+      #puts "regenerateFile, srcFile = #{srcFile}, sourceType = #{sourceType.inspect}"
       outFile = File.join(@sourceTypeDirs[@oppositeSourceType[sourceType]], File.join(pathComponents))
-      puts " outFile = #{outFile}"
+      #puts " outFile = #{outFile}"
       outFileDir = File.dirname(outFile)
       if !File.exists?(outFileDir)
         if sourceType == :output
@@ -124,9 +124,9 @@ module Regenerate
     # Regenerate (or generated) specified sub-directory or file in sub-directory
     # of source or output root directory (according to sourceType)
     def regenerateSubPath(pathComponents, sourceType)
-      puts "regenerateSubPath, pathComponents = #{pathComponents.inspect}, sourceType = #{sourceType.inspect}"
+      #puts "regenerateSubPath, pathComponents = #{pathComponents.inspect}, sourceType = #{sourceType.inspect}"
       srcPath = File.join(@sourceTypeDirs[sourceType], File.join(pathComponents))
-      puts " srcPath = #{srcPath}"
+      #puts " srcPath = #{srcPath}"
       if File.directory? (srcPath)
         for entry in Dir.entries(srcPath) do
           if ![".", ".."].include? entry
@@ -144,9 +144,9 @@ module Regenerate
     # the source or output root directory).
     def regeneratePath(path)
       path = File.expand_path(path)
-      puts "SiteRegenerator.regeneratePath, path = #{path}"
+      #puts "SiteRegenerator.regeneratePath, path = #{path}"
       relativePath = Pathname.new(path).relative_path_from(Pathname.new(@baseDir))
-      puts " relativePath = #{relativePath}"
+      #puts " relativePath = #{relativePath}"
       relativePathComponents = relativePath.to_s.split("/")
       puts " relativePathComponents = #{relativePathComponents.inspect}"
       subDir = relativePathComponents[0]
@@ -165,10 +165,12 @@ module Regenerate
   
   # Searching upwards from the current directory, find a file ".regenerate.rb" in the root directory of the project
   def self.findRegenerateScript(path, fileName)
+    puts "Find regenerate script ..."
     for dir in PathAndParents.new(path) do
       scriptFileName = File.join(dir, fileName)
       puts " looking for #{scriptFileName} ..."
       if File.exists?(scriptFileName)
+        puts " FOUND #{scriptFileName}"
         return scriptFileName
       end
     end

data/lib/regenerate/web-page.rb

@@ -368,7 +368,7 @@ module Regenerate
     
     # Set the value of an instance variable of the page object
     def setPageObjectInstanceVar(varName, value)
-      puts " setPageObjectInstanceVar, #{varName} = #{value.inspect}"
+      #puts " setPageObjectInstanceVar, #{varName} = #{value.inspect}"
       @pageObject.instance_variable_set(varName, value)
     end
     
@@ -508,13 +508,12 @@ module Regenerate
     # there are no differences between the new output and the existing output.
     def writeRegeneratedFile(outFile, checkNoChanges)
       backupFileName = makeBackupFile(outFile)
-      puts "Outputting regenerated page to #{outFile} ..."
       File.open(outFile, "w") do |f|
         for component in @components do
           f.write(component.output)
         end
       end
-      puts "Finished writing #{outFile}"
+      puts " wrote regenerated page to #{outFile}"
       if checkNoChanges
         checkAndEnsureOutputFileUnchanged(outFile, backupFileName)
       end
@@ -522,7 +521,7 @@ module Regenerate
     
     # Read in and parse lines from source file
     def readFileLines
-      puts "Opening #{@fileName} ..."
+      puts "Reading source file #{@fileName} ..."
       lineNumber = 0
       File.open(@fileName).each_line do |line|
         line.chomp!
@@ -563,12 +562,12 @@ module Regenerate
     # Execute the Ruby components which consist of Ruby code to be evaluated in the context of the page object
     def executeRubyComponents
       fileDir = File.dirname(@fileName)
-      puts "Executing ruby components in directory #{fileDir} ..."
+      #puts "Executing ruby components in directory #{fileDir} ..."
       Dir.chdir(fileDir) do
         for rubyComponent in @rubyComponents
           rubyCode = rubyComponent.text
-          puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-          puts "Executing ruby (line #{rubyComponent.lineNumber}) #{rubyCode.inspect} ..."
+          #puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+          #puts "Executing ruby (line #{rubyComponent.lineNumber}) #{rubyCode.inspect} ..."
           @pageObject.instance_eval(rubyCode, @fileName, rubyComponent.lineNumber)
           #puts "Finished executing ruby at line #{rubyComponent.lineNumber}"
         end
@@ -635,7 +634,7 @@ module Regenerate
         properties[property] = value
       end
       propertiesFileName = relative_path(self.class.propertiesFileName(@baseFileName))
-      puts "Saving properties #{properties.inspect} to #{propertiesFileName}"
+      #puts "Saving properties #{properties.inspect} to #{propertiesFileName}"
       ensureDirectoryExists(File.dirname(propertiesFileName))
       File.open(propertiesFileName,"w") do |f|
         f.write(JSON.pretty_generate(properties))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regenerate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: