runeblog 0.2.51 → 0.2.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 600dac0389d976fd41b8c3a5f4f63e4896a1b3f330525faa6b703dfb38e0b825
-  data.tar.gz: 52472d46f783f209ad13e95f8e230c89173780a98867389a075833fb3cb1edd9
+  metadata.gz: fab29a6bc9b27d8b8390c07288d63a8d27c4131a47ddcecf5291e92a7877d1fa
+  data.tar.gz: 7a782cc946f7d541491755d6c592defaf58df51772b2815801fbc2a27af303d9
 SHA512:
-  metadata.gz: 9a650511f857069328ec4295e4ab1c70add5730118b68c16d45113844215f8db540bad78580225228b24ae4b26022abda6ab1e5af487edc231360d1a1c50fbda
-  data.tar.gz: 641d6ae9269a77d36929f36810ff779736cee66e81e0bb27660f8e7832f2f6ecce57977362a2128585789365d503a4f79b03580674293bf7a8575facadc296ac
+  metadata.gz: 56a454e863d21a642101e99de411f22cb2471b60d7f1575d1e6905d50273f3bbdf4ec1ac3a08bae55c5c41137588e0d4f12d388532cc61a369be232d5a2f226f
+  data.tar.gz: 8a4598adc7ac76950e588890db7fbb62d7f024934df04f0c9aed44098296a7b6de5b1fe6f4de82289516eaba010d64554c46df4a711b272c87c9ed6d7ac55d78

data/lib/helpers-repl.rb

@@ -32,6 +32,8 @@ module RuneBlog::REPL
      "config"            => :cmd_config,
      "manage $widget"    => :cmd_manage,
 
+     "legacy"            => :cmd_legacy,
+
      "list posts"        => :cmd_list_posts,
      "lsp"               => :cmd_list_posts,
 
@@ -187,25 +189,6 @@ module RuneBlog::REPL
     slug[0..3] + slug[4..-1]
   end
 
-  def import(arg = nil)
-    raise "Not implemented at present..."
-    arg = nil if arg == ""
-    arg ||= ask("Filename: ")  # check validity later
-    name = arg
-    grep = `grep ^.title #{name}`
-    @title = grep.sub(/^.title /, "")
-    @slug = @blog.make_slug(@title) # import (not impl)
-    @fname = @slug + ".lt3"
-    result = system!("cp #{name} #@root/drafts/#@fname")
-    raise CantCopy(name, "#@root/drafts/#@fname") unless result
-
-    edit_initial_post(@fname)
-    process_post(@fname)
-    link_post_all_views(@meta)
-  rescue => err
-    error(err)
-  end
-
   def tags_for_view(vname = @blog.view)
     Dir.chdir(vname) do
       fname = "tagpool"

data/lib/repl.rb

@@ -287,6 +287,10 @@ puts "Got to #{__method__}"
   def cmd_new_post(arg, testing = false)
     reset_output
     check_empty(arg)
+    if @blog.views.empty?
+      puts "\n  Create a view before creating the first post!\n "
+      return
+    end
     title = ask("\nTitle: ")
     puts
     @blog.create_new_post(title)
@@ -448,54 +452,92 @@ puts "Got to #{__method__}"
     @out
   end
 
+  def cmd_legacy(arg = nil)
+#   dir = ask("Dir = ")
+    dir = "sources/computing"
+    puts "Importing from: #{dir}"
+    files = Dir[dir/"**"]
+    files.each do |fname|
+      name = fname
+      cmd = "grep ^.title #{name}"
+      grep = `#{cmd}`   # find .title
+      @title = grep.sub(/^.title /, "")
+      num = `grep ^.post #{name}`.sub(/^.post /, "").to_i
+      seq = @blog.get_sequence
+      tnum = File.basename(fname).to_i
+
+      raise "num != seq + 1" if num != seq + 1
+      raise "num != tnum" if num != tnum
+      seq = @blog.next_sequence
+      raise "num != seq" if num != seq
+
+      label = '%04d' % num
+      slug0 = @title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
+      @slug = "#{label}-#{slug0}"
+      @fname = @slug + ".lt3"
+      cmd = "cp #{name} #{@blog.root}/drafts/#@fname"
+      result = system!(cmd)
+      raise CantCopy(name, "#{@blog.root}/drafts/#@fname") unless result
+puts(`ls -l #{@blog.root}/drafts`)
+puts "@fname = #@fname"
+puts "Pause..."
+gets
+      @meta = @blog.process_post(@fname)
+      puts
+      sleep 2
+    end
+  rescue => err
+    error(err)
+  end
+
+  Help = <<-EOS
+
+  {Basics:}                                         {Views:}
+  -------------------------------------------       -------------------------------------------
+  {h, help}           This message                  {change view VIEW}  Change current view
+  {q, quit}           Exit the program              {cv VIEW}           Change current view
+  {v, version}        Print version information     {new view}          Create a new view
+                                                    {list views}        List all views available
+                                                    {lsv}               Same as: list views
+                   
+  {Posts:}                                          {Advanced:}
+  -------------------------------------------       -------------------------------------------
+  {p, post}           Create a new post             {config}            Edit various system files
+  {new post}          Same as p, post               {customize}         (BUGGY) Change set of tags, extra views
+  {lsp, list posts}   List posts in current view    {preview}           Look at current (local) view in browser
+  {lsd, list drafts}  List all drafts (all views)   {browse}            Look at current (published) view in browser
+  {delete ID [ID...]} Remove multiple posts         {rebuild}           Regenerate all posts and relink
+  {undelete ID}       Undelete a post               {publish}           Publish (current view)
+  {edit ID}           Edit a post                   {ssh}               Login to remote server
+  {import ASSETS}     Import assets (images, etc.)  {manage WIDGET}     Manage content/layout of a widget
+  EOS
+
   def cmd_help(arg, testing = false)
     reset_output 
     check_empty(arg)
-    msg = <<-EOS
-
-       Commands:
-  
-       h, help           This message
-       q, quit           Exit the program
-       v, version        Print version information
-  
-       change view VIEW  Change current view
-       cv VIEW           Change current view
-
-       new view          Create a new view
-
-       list views        List all views available
-       lsv               Same as: list views
-
-       config            Edit various system files
-*      customize         (BUGGY) Change set of tags, extra views
-  
-       p, post           Create a new post
-       new post          Same as post (create a post)
-
-*      import ASSETS     Import assets (images, etc.)
-
-       lsp, list posts   List posts in current view
-
-       lsd, list drafts  List all posts regardless of view
-  
-       delete ID [ID...] Remove multiple posts
-       undelete ID       Undelete a post
-       edit ID           Edit a post
-  
-       preview           Look at current (local) view in browser
-       browse            Look at current (published) view in browser
-       rebuild           Regenerate all posts and relink
-       publish           Publish (current view)
-       ssh               Login to remote server
-    EOS
+    msg = Help
     output msg
     msg.each_line do |line|
-      next if testing
-      line.chomp!
-      s1, s2 = line[0..22], line[23..-1]
-      print fx(s1, :bold)
-      puts s2
+      e = line.each_char
+      first = true
+      loop do
+        s1 = ""
+        c = e.next
+        if c == "{"
+          s2 = first ? "" : "  "
+          first = false
+          loop do 
+            c = e.next
+            break if c == "}"
+            s2 << c
+          end
+          print fx(s2, :bold)
+          s2 = ""
+        else
+          s1 << c
+        end
+        print s1
+      end
     end
     puts unless testing
     @out

data/lib/runeblog.rb

@@ -117,11 +117,14 @@ class RuneBlog
     Dir.chdir(dir) do
       views = _retrieve_metadata(:views)
       views.each do |v| 
-        unless @blog.view?(v)
-          puts "Warning: '#{v}' is not a view"
+puts "VIEW = #{v}   dir = #{dir}"
+        unless self.view?(v)
+          puts "#{fx("Warning:", :red)} #{fx(v, :bold)} is not a view"
           next
         end
-        system!("cp *html #@root/views/#{v}/remote")
+puts "pwd = #{Dir.pwd}"
+puts "cp *html #@root/views/#{v}/remote"
+        system!("cp *html #@root/views/#{v}/remote", show: true)
       end
     end
   rescue => err
@@ -154,12 +157,16 @@ class RuneBlog
   end
 
   def process_post(sourcefile)
-    log!(enter: __method__, args: [dir], level: 2)
+    log!(enter: __method__, args: [sourcefile], level: 2)
     nslug = sourcefile.sub(/.lt3/, "")
     dir = @root/:posts/nslug
-    create_dir(dir)
+# puts "sourcefile = #{sourcefile}"
+puts "-- dir = #{dir}\n   pwd = #{Dir.pwd}\n   @root = #@root"
+gets
+    create_dirs(dir)
     # FIXME dependencies?
-    xlate cwd: dir, src: sourcefile  # , debug: true
+    xlate cwd: dir, src: @root/:drafts/sourcefile, debug: true
+# puts `ls -l #{dir}`
     _deploy_local(dir)
   rescue => err
     _tmp_error(err)
@@ -398,12 +405,15 @@ class RuneBlog
     _tmp_error(err)
   end
 
+  def import_legacy_post(file, oldfile, testing = false)
+  end
+
   def edit_initial_post(file, testing = false)
     log!(enter: __method__, args: [file, testing], level: 3)
-    debug "=== edit_initial_post #{file.inspect}  => #{sourcefile}"
-    result = system!("#@editor #{sourcefile} +8") unless testing
-    raise EditorProblem(sourcefile) unless result
-    process_post(sourcefile)
+    debug "=== edit_initial_post #{file.inspect}  => #{file}"
+    result = system!("#@editor #{file} +8") unless testing
+    raise EditorProblem(file) unless result
+    process_post(file)
     nil
   rescue => err
     error(err)

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.51"
+  VERSION = "0.2.52"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/xlate.rb

@@ -17,10 +17,10 @@ def stale?(src, dst, deps, force = false)
 end
 
 def xlate(cwd: Dir.pwd, src:, 
-          dst: (strip = true; src.sub(/.lt3$/,"")), 
+          dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
           deps: [], copy: nil, debug: false, force: false)
   src += LEXT unless src.end_with?(LEXT)
-  dst += ".html" unless dst.end_with?(".html") || strip
+  dst += ".html" unless (dst.end_with?(".html"))   # || strip)
   indent = " "*12
   Dir.chdir(cwd) do
     if debug
@@ -30,6 +30,7 @@ def xlate(cwd: Dir.pwd, src:,
       STDERR.puts "#{indent}      copy: #{copy}" if copy
     end
     stale = stale?(src, dst, deps, force)
+# puts "stale? src = #{src}\n       dst = #{dst}\n       #{stale}"
     if stale
       rc = system("livetext #{src} >#{dst}")
       STDERR.puts "...completed (shell returned #{rc})" if debug

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.51
+  version: 0.2.52
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext