runeblog 0.3.29 → 0.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f73831245e7f26410b588d25eb8eaf411f199c3b138c07cbbdc1cd6ab17a0c9a
-  data.tar.gz: 985cc0eb1bef7e7f7d782e7f2f15f06c110351acc828de6e188f256f88800808
+  metadata.gz: 2f1dd9b0013eda386f3152a196dcd6ee279274bdcfebca3fce17fd1a495fe93d
+  data.tar.gz: 9b1a091067233521f3a9216d84471ae31a0132b68ca22dca174555e824267c21
 SHA512:
-  metadata.gz: 5a3ff11e051b4b35d3016f3494e8f296373cc9463255fcc2803cd30a1429772dcf4e35e2de8c80218b6ba96eb7da4b2884ba9cf478eadb940b4cc16c3bd7b464
-  data.tar.gz: 46adb7c62bedf13f9ccc4a4dcd1526764b0a6d6f3d6638c1e06bad3a49d0957e0858f5d979ca8fb61ca0f08183e8e76d82a07b4a9ec547474ee36e1fa538e1bf
+  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
@@ -195,7 +204,6 @@ def create_new_repo?
   if ! RuneBlog.exist?
     exit unless yesno("No blog repo found. Create new one?")
     RuneBlog.create_new_blog_repo
-    puts "Sleeping..."; sleep 15
     puts fx("  Blog repo successfully created.", :bold)
     new_repo = true
   end
@@ -236,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}"
-    puts "Sleeping..."; sleep 10
   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/runeblog.rb

@@ -103,7 +103,6 @@ class RuneBlog
     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
@@ -139,31 +138,7 @@ class RuneBlog
     sleep 3
   end
 
-#   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
-#   rescue => err
-#     puts "ERROR - #{err.inspect}"
-#     # puts "Error - see stderr.out"
-#     puts err.inspect + "\n" + err&.backtrace
-#     sleep 3
-#   end
-
-  def initialize(root_rel)    ##### FIXME ??
+  def initialize(root_rel = ".blogs")    ##### FIXME ??
     # @blog = instance    # Duhhh
     @root = Dir.pwd/root_rel
     # _init_get_view    ##########??????

data/lib/runeblog_version.rb

@@ -1,7 +1,7 @@
 if !defined?(RuneBlog::Path)
 
 class RuneBlog
-  VERSION = "0.3.29"
+  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.29
+  version: 0.3.30
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext