runeblog 0.3.23 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c5908c63aea98d2cc29ab782e11b83361d3d866bda7d0c902afb1cfdc70226
-  data.tar.gz: 7740ee4f471a6addeaea6a48394e02aa53ae30be129b9761d1b1b9eb316de7a3
+  metadata.gz: fcf07214d034b5091d1b1b0910aee40fe46b8c735c33451fd364eaf57621084f
+  data.tar.gz: 7b6bab92b5a4a1835de24650c721f62aac77d0a36405877871b5db98198ba976
 SHA512:
-  metadata.gz: 9421dacd34f38911af55054966a341563a70f791bc5fc080f949ad9f1724ae32b15b8163b30985546e3666a127ab87b3a33b731a31a21bf546c832011d006245
-  data.tar.gz: c1571f0a8f8109bc9ce3603142bb8f4b02117606aada8f8931eb9ec6e694ffe094ca2218ce618f37011ceea2da5291edfa8e83f9d7fa64e743bb8dd0483a31f1
+  metadata.gz: 14d8f4233ae7a9e8aaa91f9f9c9bb725d821f852ccfcaee2a493074743ed8ac3d830e334dda9b1367bea2951e04b5ddb78987a9f11130adaadb0af26a0ea39d1
+  data.tar.gz: 3c2904ff1064fb28dd1885f2e58f640287a9c8e3527d379eb573e2a950753bdbe01d0b206e5060d7bbbd0d28880c92c43435721b0693c27658cc08862abc02ad

data/bin/blog

@@ -107,7 +107,11 @@ def mainloop
     puts "Don't understand '#{cmd.inspect}'\n "
   end
 rescue => err
-  puts err.to_s
+  log!(str: err.to_s)
+  log!(str: err.backtrace.join("\n")) if err.respond_to?(:backtrace)
+  puts "Current dir = #{Dir.pwd}"
+  puts err
+  puts err.backtrace.join("\n")
   puts "Pausing..."; gets
 end
 
@@ -197,7 +201,7 @@ def create_new_repo?
   get_started if new_repo
 rescue => err
   STDERR.puts "Error - #{err.to_s}"
-  STDERR.puts err.backtrace
+  STDERR.puts err.backtrace if err.respond_to?(:backtrace)
 end
 
 def print_intro

data/empty_view/themes/standard/etc/blog.css.lt3

@@ -3,8 +3,6 @@
 . Most of the global CSS goes here                  
 . --------------------------------------------------
 
-.say Inside $File in $FileDir: view/dir = $View $ViewDir
-
 .include $ViewDir/data/global.lt3
 
 body { font-family: $font.family }

data/lib/lowlevel.rb

@@ -3,6 +3,7 @@
     STDERR.puts err
     STDERR.puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
     log!(str: "#{err} - see also stderr.out")
+    log!(str: err.backtrace.join("\n")) if err.respond_to?(:backtrace)
     return
 
     out = "/tmp/blog#{rand(100)}.txt"
@@ -114,7 +115,7 @@
     puts err.backtrace.join("\n")
   end
 
-  def find_item(list)
+  def find_item(list, &block)
     log!(enter: __method__, args: [list], level: 2)
     list2 = list.select(&block)
     exactly_one(list2, list.join("/"))
@@ -129,7 +130,7 @@
     [n, item]
   end
 
-  def exactly_one(list, tag = nil)
+  def exactly_one(list, tag = nil, &block)
     log!(enter: __method__, args: [list], level: 2)
     list2 = list.select(&block)
     raise "List: Zero instances #{"- #{tag}" if tag}" if list.empty?

data/lib/processing.rb

@@ -32,9 +32,8 @@ def preprocess(cwd: Dir.pwd, src:,
     dst += ".html" unless dst.end_with?(".html")
   end
   sp = " "*12
-# STDERR.puts "=== ls -l #{cwd} = "
-# STDERR.puts `ls -l #{cwd}`
-# STDERR.puts "=== going into #{cwd}"
+
+
 
   Dir.chdir(cwd) do
     if debug
@@ -45,23 +44,25 @@ def preprocess(cwd: Dir.pwd, src:,
       STDERR.puts "#{sp}      from: #{caller[0]}"
       STDERR.puts "#{sp}      copy: #{copy}" if copy
       STDERR.puts "#{sp}      vars: #{vars.inspect}" unless vars == {}
+      STDERR.flush
     end
     stale = stale?(src, dst, deps, force)
+    STDERR.puts <<~EOF if debug
+      STALE = #{stale}
+      cwd = #{cwd.inspect}
+      src = #{src.inspect}
+      dst = #{dst.inspect}
+      strip = #{strip.inspect}
+      deps = #{deps.inspect}
+      copy = #{copy.inspect}
+      debug = #{debug.inspect}
+      force = #{force.inspect}
+      mix = #{mix.inspect}
+      call = #{call.inspect}
+      vars = #{vars.inspect}
+    EOF
     if stale
       live = Livetext.customize(mix: "liveblog", call: call, vars: vars)
-      STDERR.puts <<~EOF
-        cwd = #{cwd.inspect}
-        src = #{src.inspect}
-        dst = #{dst.inspect}
-        strip = #{strip.inspect}
-        deps = #{deps.inspect}
-        copy = #{copy.inspect}
-        debug = #{debug.inspect}
-        force = #{force.inspect}
-        mix = #{mix.inspect}
-        call = #{call.inspect}
-        vars = #{vars.inspect}
-      EOF
       log!(str: "Calling xform_file... src = #{src} pwd = #{Dir.pwd}")
       out = live.xform_file(src)
       File.write(dst, out)
@@ -69,6 +70,12 @@ def preprocess(cwd: Dir.pwd, src:,
     end
     puts "#{sp} -- ^ Already up to date!" if debug && ! stale
   end
+rescue => err
+  msg = err.to_s
+  msg << err.backtrace.join("\n") if err.respond_to?(:backtrace)
+  STDERR.puts msg
+  STDERR.flush
+  log!(str: msg) 
 end
 
 def get_live_vars(src)

data/lib/repl.rb

@@ -176,7 +176,10 @@ module RuneBlog::REPL
     result = system!("open #{local}")
     raise CantOpen(local) unless result
   rescue => err
-    _tmp_error(err)
+    msg = err.to_s
+    msg << "\n" << err.backtrace.join("\n") if err.respond_to?(:backtrace)
+    puts msg
+    log!(str: msg) 
   end
 
   def cmd_publish
@@ -415,6 +418,7 @@ log! str:  "cv Setting to #{name.inspect}"
         base = draft.sub(/.lt3$/, "")
         dir = @blog.root/:posts/base
         meta = nil 
+puts "Trying chdir into #{dir}..."
         Dir.chdir(dir) { meta = @blog.read_metadata }
         num, title = meta.num, meta.title
         num = '%4d' % num.to_s

data/lib/runeblog.rb

@@ -150,7 +150,7 @@ class RuneBlog
   rescue => err
     puts "Error - see stdout.txt"
     STDERR.puts err.inspect
-    STDERR.puts err.backtrace
+    STDERR.puts err&.backtrace
     sleep 3
   end
 
@@ -690,39 +690,31 @@ log! str:  "=== cwh cp 6"
     @theme = @root/:views/view_name/:themes/:standard
     pmeta  = @root/:views/view_name/:posts/nslug
 
-log! str:  "=== hpost cp 1"
 
     create_dirs(pdraft)                                # Step 1...
-log! str:  "=== hpost cp 2"
+    @view.globals ||= {}
+args = {cwd: pdraft, src: draft, debug: true, dst: "guts.html", 
+        mix: "liveblog", vars: @view.globals}
     preprocess cwd: pdraft, src: draft,                # FIXME dependencies?
-               dst: "guts.html", mix: "liveblog", vars: (@view.globals || {})
-log! str:  "=== hpost cp 3"
+               debug: true,
+               dst: "guts.html", mix: "liveblog", vars: @view.globals
     hash = _post_metadata(draft, pdraft)
-log! str:  "=== hpost cp 4"
     hash[:CurrentPost] = pmeta
     vposts = @root/:views/view_name/:posts             # Step 2...
-# 5.times { STDERR.puts }
-# STDERR.puts "-- hpost:"
-# hash.each_pair {|k,v| STDERR.puts "    #{k}:    #{v}" if k.is_a? Symbol }
-# 5.times { STDERR.puts }
     copy!(pdraft, vposts)    # ??
     copy(pdraft/"guts.html", vposts/nslug)             # Step 3...
                                                        # Step 4...
-    # preprocess cwd: @theme/:post, src: "generate.lt3", 
-log! str:  "=== hpost cp 5"
-# @view.dump_globals_stderr
     preprocess cwd: pmeta, src: "../../themes/standard/post/generate.lt3", 
                force: true, vars: hash, debug: true,
                dst: remote/ahtml, call: ".nopara"
-log! str:  "=== hpost cp 6"
     FileUtils.rm_f(remote/"published")
-log! str:  "=== hpost cp 7"
     timelog("Generated", remote/"history")
     copy_widget_html(view_name)
-log! str:  "=== hpost cp 8"
   rescue => err
-log! str:  "=== hpost cp 9"
-    _tmp_error(err)
+    puts "Error - see stdout.txt"
+    STDERR.puts err.inspect
+    STDERR.puts err&.backtrace
+    # _tmp_error(err)
     # puts err.backtrace.join("\n")
   end
 
@@ -734,11 +726,10 @@ log! str:  "=== hpost cp 9"
 
   def generate_post(draft, force = false)
     log!(enter: __method__, args: [draft], level: 1)
-log! str:  "=== gpost cp 1"
     views = _get_views(draft)
-log! str:  "=== gpost cp 2"
-    views.each {|view| _handle_post(draft, view) }
-log! str:  "=== gpost cp 3"
+    views.each do |view| 
+      _handle_post(draft, view)
+    end
     # For current view: 
     slug = File.basename(draft).sub(/.lt3$/, "")
     postdir = self.view.dir/"remote/post/"/slug

data/lib/runeblog_version.rb

@@ -1,7 +1,7 @@
 if !defined?(RuneBlog::Path)
 
 class RuneBlog
-  VERSION = "0.3.23"
+  VERSION = "0.3.24"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/runeblog.gemspec

@@ -8,6 +8,7 @@ require "runeblog_version"
 Gem.post_install do |spec|
   Dir.chdir(RuneBlog::Path)
   system("livetext -i liveblog.rb")
+  system("livetext -i code_rouge.rb")
 end
 
 spec = Gem::Specification.new do |s|
@@ -20,8 +21,9 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.9', '>= 0.9.09'
-  s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.23'
+  s.add_runtime_dependency 'livetext', '~> 0.9',  '>= 0.9.09'
+  s.add_runtime_dependency 'rubytext', '~> 0.1',  '>= 0.1.23'
+  s.add_runtime_dependency 'rouge',    '~> 3.25', '>= 3.25.0'
 
   s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.3.24
 platform: ruby
 authors:
 - Hal Fulton
@@ -50,6 +50,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.23
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.25'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement