runeblog 0.3.28 → 0.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f9a3b31f1adc96704b1781f04e2eb4227ca341ebc3f118a0ead49c3be65859
-  data.tar.gz: 573d4f8ba2778d476b9b327e1c994863745f1d643f6b633cc771d3d4b2872af6
+  metadata.gz: 2f1dd9b0013eda386f3152a196dcd6ee279274bdcfebca3fce17fd1a495fe93d
+  data.tar.gz: 9b1a091067233521f3a9216d84471ae31a0132b68ca22dca174555e824267c21
 SHA512:
-  metadata.gz: acaaf9714332878e5f60b26576c86286672f221717b8c66901749cf9e9e4a257baee45ec5a2fe42d1eea3c64746cd959d10bbba1b08828cb15075ca9af85ae40
-  data.tar.gz: 43b9c4d21d1c5d82f6c7e1b1ce291f304e1dd52f12b46b36200f4aebe2db127603b15ab1dcaca43cc8ea607a515263019abf20c4b88d8e0da620a41187639a9a
+  metadata.gz: ac2b3d8dd3d7f378658d138db56695e5749b0022ef19197bb6d863c077b469972e3d6a6b6adb27f20dc91e1a6a656320d8c15b657da9015935a5bd371d5a4b4e
+  data.tar.gz: ffd02d0666582b4d2a31dcc552872fc5e257e30b26054e06ebf337aca2ceac9540ff0b1506cdf272b0cdee7fa7f6b70b4c7bddc578460472684039bac5dbb05c

data/bin/blog

@@ -11,6 +11,8 @@ require 'repl'
 
 include RuneBlog::REPL
 
+include ErrorChecks
+
 def yesno(question, noskip=false)
   puts fx("\n  #{question}", :bold)
   puts unless noskip
@@ -46,18 +48,25 @@ end
 
 def get_global
   view_name = ask!("      Filename: ")
+  # FIXME test below doesn't work?
+  FilenameHasBlank(view_name) if view_name.include?(" ")
+
   @blog.create_view(view_name)   # call change_view??
   if yesno("Faster view setup? (no: edit global.lt3)")
     title     = ask!("      View title: ")
     subtitle  = ask!("      Subtitle  : ")
     domain    = ask!("      Domain    : ")
     modify_view_global(view_name)
-    modify_view_settings(name: view_name, title: title, subtitle: subtitle,
+    modify_view_settings(name: view_name, title: title, subtitle: subtitle, 
                          domain: domain)
   else
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(VIEW_.*\|SITE.*\)"'
     edit_file(@blog.view.dir/"themes/standard/global.lt3", vim: vim_params)
   end
+rescue => err
+  puts err
+  puts "Retrying..."
+  retry
 end
 
 def get_started
@@ -204,6 +213,7 @@ def create_new_repo?
 rescue => err
   STDERR.puts "Error - #{err.to_s}"
   STDERR.puts err.backtrace if err.respond_to?(:backtrace)
+  puts "Sleeping..."; sleep 10
 end
 
 def print_intro
@@ -234,12 +244,13 @@ reopen_stderr
 
 check_ruby_version
 handle_cmdline unless ARGV.empty?
+
 set_fgbg
 print_intro
-# STDERR.puts "cp 6 - pause"; gets
 create_new_repo?
-# STDERR.puts "cp 7 - pause"; gets
+
 cmd_history_etc
-# STDERR.puts "cp 8 - pause"; gets
+
 loop { mainloop }
+
 exit_repl

data/lib/exceptions.rb

@@ -34,4 +34,5 @@ make_exception(:CantFindWidgetDir,     "Can't find widget dir '%1'")
 make_exception(:PublishError,          "Error during publishing")
 make_exception(:NoNumericPrefix,       "No numeric prefix on slug '%1'")
 make_exception(:NoExtensionExpected,   "No file extension expected on '%1'")
+make_exception(:FilenameHasBlank,      "File '%1' contains a blank space.")
 

data/lib/lowlevel.rb

@@ -4,15 +4,6 @@
     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"
-    File.open(out, "w") do |f|
-      f.puts err.to_s + "\n--------"
-      f.puts err.backtrace.join("\n")
-    end
-    puts "Error: See #{out}"
-    # sleep 3
   end
 
   def dump(obj, name)
@@ -25,7 +16,6 @@
 
   def system!(os_cmd, show: false)
     log!(enter: __method__, args: [os_cmd], level: 2)
-caller.each {|x| print ":::  "; p x }
     STDERR.puts os_cmd if show
     rc = system(os_cmd)
     STDERR.puts "  rc = #{rc.inspect}" if show

data/lib/menus.rb

@@ -105,7 +105,7 @@ Menu.top_config = {
     "Generator for a post"                => proc { edit_post_generate },
     "   HEAD info for post"               => proc { edit_post_head },
     "   Content for post"                 => proc { edit_post_index },
-    "Variables (general)"                 => proc { edit_view_global },
+    "Variables (general!)"                 => proc { edit_view_global },
     "   View-specific"                    => proc { edit_settings_view },
     "   Recent posts"                     => proc { edit_settings_recent },
     "   Publishing"                       => proc { edit_settings_publish },

data/lib/repl.rb

@@ -11,8 +11,10 @@ Signal.trap("INT") { puts "Don't  :)" }
 module RuneBlog::REPL
   def edit_file(file, vim: "")
     ed = @blog.editor
+STDERR.puts ">>> edit_file: ed = #{ed.inspect}"
     params = vim if ed =~ /vim$/
     result = system!("#{@blog.editor} #{file} #{params}")
+STDERR.puts ">>> edit_file: after system call"
     raise EditorProblem(file) unless result
     cmd_clear
   end
@@ -38,7 +40,7 @@ module RuneBlog::REPL
   end
 
   def cmd_config
-    hash = {"Variables (general)"                 => "global.lt3",
+    hash = {"Variables (General)"                 => "global.lt3",
             "   View-specific"                    => "../settings/view.txt",
             "   Recent posts"                     => "../../settings/recent.txt",
             "   Publishing"                       => "../../settings/publish.txt",
@@ -60,6 +62,7 @@ module RuneBlog::REPL
            }
 
     dir = @blog.view.dir/"themes/standard/"
+STDERR.puts ">>> cmd_config: dir = #{dir.inspect}"
     num, target = STDSCR.menu(title: "Edit file:", items: hash)
     edit_file(dir/target)
   end

data/lib/runeblog.rb

@@ -96,14 +96,13 @@ class RuneBlog
 
   def self.create_new_blog_repo(root_rel = ".blogs")
     log!(enter: __method__, args: [root_rel])
-    check_error(BlogRepoAlreadyExists) { Dir.exist?(repo_root) }
+    check_error(BlogRepoAlreadyExists) { Dir.exist?(root_rel) }
     check_nonempty_string(root_rel)
     repo_root = Dir.pwd/root_rel
 
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
       create_dirs(:data, :config, :widgets, :drafts, :views, :posts)  # ?? widgets?
-      # FIXME
       get_all_widgets("widgets")
       new_sequence
     end
@@ -131,21 +130,7 @@ class RuneBlog
 
   def self.read(root_rel = ".blogs")   # always assumes existing blog
     log!(enter: "RuneBlog.read", args: [root_rel])
-    instance = RuneBlog.allocate
-    instance.instance_eval do
-      @blog = instance    # Duhhh
-      @root = Dir.pwd/root_rel
-      # _init_get_view    ##########??????
-      # self.class.blog = self   # Weird, like singleton. Dumbass circular dependency?
-      RuneBlog.blog = instance
-      dirs = subdirs("#@root/views/").sort
-      @views = dirs.map {|name| RuneBlog::View.new(name) }
-      @curr = str2view(File.read(@root/"data/VIEW").chomp)
-      @view = @curr
-      # ...was init_get_view
-      @sequence, @post_views, @post_tags = get_sequence, [], []
-    end
-    return instance
+    RuneBlog.new(root_rel)
   rescue => err
     puts "ERROR - #{err.inspect}"
     # puts "Error - see stderr.out"
@@ -153,7 +138,20 @@ class RuneBlog
     sleep 3
   end
 
-  def initialize    ##### FIXME ??
+  def initialize(root_rel = ".blogs")    ##### FIXME ??
+    # @blog = instance    # Duhhh
+    @root = Dir.pwd/root_rel
+    # _init_get_view    ##########??????
+    # self.class.blog = self   # Weird, like singleton. Dumbass circular dependency?
+    RuneBlog.blog = self
+    dirs = subdirs("#@root/views/").sort
+    @views = dirs.map {|name| RuneBlog::View.new(name) }
+    @curr = str2view(File.read(@root/"data/VIEW").chomp)
+    @view = @curr
+    # ...was init_get_view
+    @sequence, @post_views, @post_tags = get_sequence, [], []
+    get_repo_config
+    read_features
   end
 
   def complete_file(name, vars, hash)

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -1,8 +1,8 @@
 require 'logging'
 
 class RuneBlog::View
-  attr_reader :name, :state, :globals
-  attr_accessor :publisher
+  attr_reader :name, :state
+  attr_accessor :publisher, :globals
 
   include RuneBlog::Helpers
 
@@ -33,14 +33,25 @@ class RuneBlog::View
 
   def get_globals(force = false)
     return if @globals && !force
+
     # gfile = @blog.root/"views/#@name/themes/standard/global.lt3"
     gfile = @blog.root/"views/#@name/data/global.lt3"
     return unless File.exist?(gfile)  # Hackish!! how is View.new called from create_view??
 
     live = Livetext.customize(call: ".nopara")
+puts "get_globals - 1 - transforming #{gfile}"
+    # FIXME - error here somehow:
+    # get_globals - 1 - transforming /private/tmp/.blogs/views/foobar/data/global.lt3
+    # >> variables: pre="view"  file="../settings/view.txt" pwd=/private/tmp
+    # No such dir "../settings" (file ../settings/view.txt)
+    # No such dir "../settings" (file ../settings/view.txt)
+    # get_globals - 2
     live.xform_file(gfile)
+puts "get_globals - 2"
     live.setvar("ViewDir", @blog.root/:views/@name)
+puts "get_globals - 3"
     live.setvar("View",    @name)
+puts "get_globals - 4"
     @globals = live.vars
 #   dump_globals_stderr
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.28
+  version: 0.3.30
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext