pbsimply 3.4.2 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5f5d9b6fc087e4096b312c9fd859f85d5e4435c8e6671af35570cc126b93d3
-  data.tar.gz: d58e752fc487f64383c731075363535c14ed329a2c3cb43107059cfdb8707837
+  metadata.gz: 1e6667388a878546c3fb8b5c5880661c66012a3ad65f4ce834fba8da89d470dc
+  data.tar.gz: 14b13fbe88d551bffb92d5a2c61f8e6a1378a437baa2a805a170e152314f37c5
 SHA512:
-  metadata.gz: 2dc1d4ea9145abefc6834e43fb8360bc6e01026ad1ea2f3a51dd461ea7656fb6d6284dcd564e62063cafc6f2cd6cd15d3b7630aa905cf2d1b57fd03c7f46e640
-  data.tar.gz: 31c080d6f466a753f2ba834306f1a4fcb14420c37a9b54257672ae9717fa044d081f785ebe5152c4dbb29dad90c9aca42abbd7193d61c6009ee2d1c5fcafb88e
+  metadata.gz: d650ffb297c0bd3ce21e05fc0edbb8d67f01c24af295b4a2ca387ccfacecefd81649469e7ddd1600958ed0943ba2f4bf46839fb6fbd0ed0c5d7e4c8efeede449
+  data.tar.gz: 5d35227c8476719684bc8c0abf04bf49ba4c34cbf065b487230750aeea5a1d0582b187299603ccdaf93d0047017b8a9b276bd6d8a49fa04c17ad577d173da1db

data/bin/pbsimply

@@ -25,6 +25,12 @@ end
 # Alias for compatibility.
 PureBuilder = pbs_class
 
-pbs = pbs_class.new(config)
-pbs.treat_cmdline
-pbs.main
+begin
+  pbs = pbs_class.new(config)
+  pbs.treat_cmdline
+
+  pbs.main
+rescue PBSimply::CommandLineError => e
+  $stderr.puts e.to_s
+  exit 1
+end

data/lib/pbsimply/docengine/pandoc.rb

@@ -85,7 +85,6 @@ class PBSimply
       end
 
       def target_file_extensions
-        p [".md", ".rst"] + @pandoc_input_extmap.keys
         [".md", ".rst"] + @pandoc_input_extmap.keys
       end
     end

data/lib/pbsimply/document.rb

@@ -0,0 +1,112 @@
+require 'pbsimply/frontmatter'
+
+class PBSimply
+  class Document
+    include Frontmatter
+
+    def initialize(pbs, filename)
+      @config = pbs.config
+      @dir = pbs.dir
+      @filename = filename
+      @ext = File.extname filename
+      @orig_filepath = File.join(pbs.dir, filename)
+      @now = pbs.now
+      @accs_processing = pbs.accs_processing
+      @outfile = pbs.outfile
+      frontmatter, @pos = read_frontmatter(pbs.dir, filename)
+      @frontmatter = pbs.frontmatter.merge frontmatter
+      @modified = true
+      @proc_doc_path = nil
+    end
+
+    attr_reader :frontmatter, :filename, :pos, :ext, :proc_doc_path, :orig_filepath
+    attr_accessor :orig_frontmatter, :now
+
+    def add_meta(additional_meta)
+      frontmatter.merge!(additional_meta)
+    end
+
+    def read_document(workdir: "")
+      File.open(File.join(@dir, @filename)) do |f|
+        f.seek(@pos)
+        doc_content = f.read
+        if @config["unicode_normalize"] && !@frontmatter["skip_normalize"]
+          doc_content.unicode_normalize!(@config["unicode_normalize"].to_sym)
+        end
+        File.open(File.join(workdir, "current_document#{@ext}"), "w") do |fo|
+          fo.write doc_content
+        end
+      end
+
+      @proc_doc_path = File.join(workdir, "current_document#{@ext}")
+    end
+
+    def draft?
+      frontmatter["draft"]
+    end
+
+    def to_a
+      [@dir, @filename, @frontmatter]
+    end
+
+    # Check is the article modified? (or force update?)
+    def modified?
+      index = @orig_frontmatter ||= {}
+
+      case @config["detect_modification"]
+      when "changes"
+        # Use "changes"
+        @modified = false if @frontmatter["changes"] == index["changes"]
+      when "mtimesize"
+        # Use mtime and file size.
+        @modified = false if @frontmatter["_mtime"] <= (index["_last_proced"] || 0) && @frontmatter["_size"] == index["_size"]
+      else
+        # Default method, use mtime.
+        @modified = false if @frontmatter["_mtime"] <= (index["_last_proced"] || 0)
+      end
+
+      if @modified
+        $stderr.puts "#{@filename} last modified at #{@frontmatter["_mtime"]}, last processed at #{index["_last_proced"] || 0}"
+      else
+        $stderr.puts "#{@filename} is not modified."
+      end
+
+      set_timestamp
+
+      if @frontmatter["skip_update"]
+        # Document specific skip update
+        @modified = false
+      elsif index["_modified"]
+        @modified = true
+      else
+        @modified
+      end
+    end
+
+    def mark_meta_modified
+      # Frontmatter used as a reference for metadata update detection.
+      # Keys that are always updated during processing should be removed.
+      ex_keys = ["_last_proced", "last_update"] + (@config["compr_ex_keys"] || [])
+      @orig_frontmatter ||= {}
+      compr_frontmatter = @orig_frontmatter.except(*ex_keys) # Hash#except from Ruby 2.0
+
+      if compr_frontmatter == frontmatter
+        @modified = false
+      else
+        @frontmatter["_modified"] = true
+        @frontmatter.merge!(@orig_frontmatter.slice(*ex_keys))
+      end
+    end
+
+    def effective_forntmatter
+      @modified ? @frontmatter : @orig_frontmatter
+    end
+
+    private
+
+    def set_timestamp
+      @frontmatter["_last_proced"] = @now.to_i
+      @frontmatter["last_update"] = @now.strftime("%Y-%m-%d %H:%M:%S")
+    end
+  end
+end

data/lib/pbsimply/frontmatter.rb

@@ -211,6 +211,8 @@ module PBSimply::Frontmatter
     return frontmatter, pos
   end
 
+  private
+
   def outext frontmatter
     return frontmatter["force_ext"] if frontmatter["force_ext"]
 

data/lib/pbsimply/hooks.rb

@@ -107,11 +107,5 @@ class PBSimply::Hooks
     end
   end
 
-  attr :pre
-  attr :process
-  attr :delete
-  attr :post
-  attr :accs
-
-  attr :config
+  attr_reader :pre, :process, :delete, :post, :accs, :config
 end

data/lib/pbsimply/prayer.rb

@@ -78,13 +78,13 @@ module PBSimply::Prayer
             begin
               @article_order = @indexes.to_a.sort_by {|i| i[1]["date"]}
             rescue
-              abort "*** Automatic Blessing Method Error: Maybe some article have no date."
+              abort "*** Automatic Blessing Method Error: Maybe some article has no date."
             end
           when "timestamp"
             begin
               @article_order = @indexes.to_a.sort_by {|i| i[1]["timestamp"]}
             rescue
-              abort "*** Automatic Blessing Method Error: Maybe some article have no timetsamp."
+              abort "*** Automatic Blessing Method Error: Maybe some article has no timetsamp."
             end
           when "lexical"
             @article_order = @indexes.to_a.sort_by {|i| i[1]["_filename"]}

data/lib/pbsimply.rb

@@ -16,16 +16,19 @@ require 'pbsimply/docengine/base'
 require 'pbsimply/prayer'
 require 'pbsimply/plugger'
 require 'pbsimply/hooks'
-require 'pbsimply/frontmatter'
 require 'pbsimply/accs'
 require 'pbsimply/config-checker.rb'
+require 'pbsimply/document'
 
 class PBSimply
   include Prayer
   include Plugger
-  include Frontmatter
   include ACCS
 
+  # Custom exception
+  class CommandLineError < StandardError
+  end
+
   # Use Oj as JSON library for frontmatter passing if possible.
   begin
     require 'oj'
@@ -119,16 +122,22 @@ class PBSimply
 
     @refresh = false # Force generate all documents.
     @skip_index = false # Don't register to index.
+    @preflight = false # Don't generate output document.
     @outfile = nil # Fixed output filename
     @add_meta = nil
     @accs = nil
     @accs_index = {}
     @now = Time.now
     @hooks = PBSimply::Hooks.new(self, @config)
+    @dir = nil
+    @frontmatter = {}
+    @accs_processing = false
 
     @debug = (ENV["DEBUG"] == "yes")
   end
 
+  attr_reader :config, :dir, :frontmatter, :now, :accs_processing, :outfile
+
   # Process command-line
   def treat_cmdline(dir=nil)
     # Options definition.
@@ -137,8 +146,10 @@ class PBSimply
     opts.on("-X", "--ignore-ext") { @ignore_ext = true }
     opts.on("-I", "--skip-index") { @skip_index = true }
     opts.on("-A", "--skip-accs") { @skip_accs = true }
+    opts.on("-p", "--preflight") { @preflight = true }
     opts.on("-o FILE", "--output") {|v| @outfile = v }
     opts.on("-m FILE", "--additional-metafile") {|v| @add_meta = Psych.unsafe_load(File.read(v))}
+    opts.on("-a", "--only-accs") { @accs_only = true }
     opts.parse!(ARGV)
 
     if File.exist?(".pbsimply-bless.rb")
@@ -171,7 +182,7 @@ class PBSimply
     @docobject
   end
 
-  attr :indexes
+  attr_reader :indexes
 
   ###############################################
   #            PROCESSING FUNCTIONS             #
@@ -182,7 +193,7 @@ class PBSimply
   def proc_dir
     draft_articles = []
     target_docs = []
-    @indexes_orig = {}
+    effective_docs = []
     $stderr.puts "in #{@dir}..."
 
     $stderr.puts "Checking Frontmatter..."
@@ -202,11 +213,9 @@ class PBSimply
       end
 
       $stderr.puts "Checking frontmatter in #{filename}"
-      frontmatter, pos = read_frontmatter(@dir, filename)
-      frontmatter = @frontmatter.merge frontmatter
-      frontmatter.merge!(@add_meta) if @add_meta
+      doc = Document.new(self, filename)
 
-      if frontmatter["draft"]
+      if doc.draft?
         draft_articles.push({
           article_filename: filename,
           filename: filename,
@@ -215,32 +224,26 @@ class PBSimply
         next
       end
 
-      @indexes_orig[filename] = @indexes[filename]
-      @indexes[filename] = frontmatter
+      doc.orig_frontmatter = @indexes[filename]
+      @indexes[filename] = doc.frontmatter
 
       # Push to target documents without checking modification.
-      target_docs.push([filename, frontmatter, pos])
+      target_docs.push(doc)
+
+      # Push to all effective documents.
+      effective_docs.push(doc)
     end
     ENV.delete("pbsimply_currentdoc")
     ENV.delete("pbsimply_filename")
 
     delete_turn_draft draft_articles
 
-    # #proc_docs destructs target_docs
-    processed_docs = proc_docs target_docs.dup
+    proc_docs target_docs
 
     delete_missing
     
-    # Restore skipped doc's frontmatter
-    orig_filelist = Set.new(target_docs.map {|i| i[0]})
-    proc_filelist = Set.new(processed_docs.map {|i| i[0]})
-    recov_filelist = orig_filelist - proc_filelist
-    recov_filelist.each do |filename|
-      @indexes[filename] = @indexes_orig[filename]
-    end
-
     # Save index.
-    @db.dump(@indexes) unless @skip_index
+    save_index(effective_docs) unless @skip_index
 
     # ACCS processing
     if @accs && !target_docs.empty?
@@ -250,37 +253,41 @@ class PBSimply
 
   def proc_docs target_docs
     # Exclude unchanged documents.
-    if @indexes && @indexes_orig
+    unless @singlemode
       $stderr.puts "Checking modification..."
-      target_docs.delete_if {|filename, frontmatter, pos| !check_modify(filename, frontmatter)}
+      if !@preflight
+        target_docs.delete_if do |doc|
+          next false if @refresh # Force refresh mode
+          !doc.modified?
+        end
+        # target_docs.delete_if {|filename, frontmatter, pos| !check_modify(filename, frontmatter)}
+      end
     end
 
     # Modify frontmatter `BLESSING'
-    target_docs.each do |filename, frontmatter, pos|
-      $stderr.puts "Blessing #{filename}..."
-      bless frontmatter
+    target_docs.each do |doc|
+      $stderr.puts "Blessing #{doc.filename}..."
+      bless doc.frontmatter
+    end
+
+    if !@singlemode && @preflight
+      $stderr.puts "Checking metadata modification..."
+      target_docs.each {|doc| doc.mark_meta_modified }
+      return # Resign processing document in preflight mode.
     end
 
     # Ready.
     $stderr.puts "Okay, Now ready. Process documents..."
 
     # Proccess documents
-    target_docs.each do |filename, frontmatter, pos|
-      ext = File.extname filename
-      ENV["pbsimply_currentdoc"] = File.join(@workdir, "current_document#{ext}")
-      ENV["pbsimply_filename"] = filename
-      @index = frontmatter
-      File.open(File.join(@dir, filename)) do |f|
-        f.seek(pos)
-        doc_content = f.read
-        if @config["unicode_normalize"] && !frontmatter["skip_normalize"]
-          doc_content.unicode_normalize!(@config["unicode_normalize"].to_sym)
-        end
-        File.open(File.join(@workdir, "current_document#{ext}"), "w") {|fo| fo.write doc_content }
-      end
-
-      $stderr.puts "Processing #{filename}"
-      generate(@dir, filename, frontmatter)
+    target_docs.each do |doc|
+      ENV["pbsimply_currentdoc"] = File.join(@workdir, "current_document#{doc.ext}")
+      ENV["pbsimply_filename"] = doc.filename
+      @index = doc.frontmatter
+      doc.read_document(workdir: @workdir)
+
+      $stderr.puts "Processing #{doc.filename}"
+      generate(doc)
     end
 
     # Call post plugins
@@ -337,11 +344,20 @@ class PBSimply
       ENV["pbsimply_frontmatter"] = @workfile_frontmatter
       @workfile_pandoc_defaultfiles ||= File.join(@workdir, "pbsimply-defaultfiles.yaml")
       # If target file is regular file, run as single mode.
-      @singlemode = true if File.file?(@dir)
+      @singlemode = File.file?(@dir)
+
+      if @accs_only && !@accs_processing
+        accs_only_mode_check
 
-      # Check single file mode.
-      if @singlemode
+        # Process ACCS without regular generating document
+        setup_config(@dir)
+        load_index
+
+        process_accs
+      elsif @singlemode # Check single file mode.
         # Single file mode
+        return if @preflight
+
         if @dir =~ %r:(.*)/([^/]+):
           dir = $1
           filename = $2
@@ -354,14 +370,13 @@ class PBSimply
 
         load_index
 
-        frontmatter, pos = read_frontmatter(dir, filename)
-        frontmatter = @frontmatter.merge frontmatter
-        @index = frontmatter
+        doc = Document.new(self, filename)
+        @index = doc.frontmatter
 
-        proc_docs([[filename, frontmatter, pos]])
+        proc_docs([doc])
 
         if File.exist?(File.join(@dir, ".accs.yaml")) && !@accs_processing && !@skip_accs
-          single_accs filename, frontmatter
+          single_accs doc.filename, doc.frontmatter
         end
       else
         # Normal (directory) mode.
@@ -379,13 +394,14 @@ class PBSimply
     @workfile_pandoc_defaultfiles = nil
   end
 
-  def generate(dir, filename, frontmatter)
+  def generate(doc)
+    dir, filename, frontmatter = *doc.to_a
     print_fileproc_msg(filename) # at sub-class
 
     # Preparing and pre script.
-    orig_filepath = [dir, filename].join("/")
-    ext = File.extname(filename)
-    procdoc = File.join(@workdir, "current_document#{ext}")
+    orig_filepath = doc.orig_filepath
+    ext = doc.ext
+    procdoc = doc.proc_doc_path
 
     pre_plugins(procdoc, frontmatter)
     @hooks.pre.run({procdoc: procdoc, frontmatter: frontmatter})
@@ -454,41 +470,20 @@ class PBSimply
     end
   end
 
-  # Check is the article modified? (or force update?)
-  def check_modify(filename, frontmatter)
-    modify = true
-    index = @indexes_orig[filename]&.dup || {}
-
-    case @config["detect_modification"]
-    when "changes"
-      # Use "changes"
-      modify = false if frontmatter["changes"] == index["changes"]
-    when "mtimesize"
-      # Use mtime and file size.
-      modify = false if frontmatter["_mtime"] <= (index["_last_proced"] || 0) && frontmatter["_size"] == index["_size"]
-    else
-      # Default method, use mtime.
-      modify = false if frontmatter["_mtime"] <= (index["_last_proced"] || 0)
+  def accs_only_mode_check
+    unless File.exist?(File.join(@dir, ".accs.yaml"))
+      raise CommandLineError.new "ACCS-only processing mode can only be performed on the ACCS directory."
     end
-
-
-    if modify
-      $stderr.puts "#{filename} last modified at #{frontmatter["_mtime"]}, last processed at #{@indexes_orig[filename]&.[]("_last_proced") || 0}"
-    else
-      $stderr.puts "#{filename} is not modified."
+    unless File.directory?(@dir)
+      raise CommandLineError.new "ACCS-only processing needs ACCS directory as an argument."
     end
+  end
 
-    frontmatter["_last_proced"] = @now.to_i
-    frontmatter["last_update"] = @now.strftime("%Y-%m-%d %H:%M:%S")
-
-    if frontmatter["skip_update"]
-      # Document specific skip update
-      false
-    elsif @refresh
-      # Refresh (force update) mode.
-      true
-    else
-      modify
+  def save_index(effective_docs)
+    new_indexes = {}
+    effective_docs.each do |doc|
+      new_indexes[doc.filename] = doc.effective_forntmatter
     end
+    @db.dump(new_indexes)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pbsimply
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.1
 platform: ruby
 authors:
 - Masaki Haruka
@@ -36,6 +36,7 @@ files:
 - lib/pbsimply/docengine/misc.rb
 - lib/pbsimply/docengine/pandoc.rb
 - lib/pbsimply/docengine/rdoc.rb
+- lib/pbsimply/document.rb
 - lib/pbsimply/frontmatter.rb
 - lib/pbsimply/hooks.rb
 - lib/pbsimply/plugger.rb