runeblog 0.2.33 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c75004d0736a0ca8b5f5b966ef4d0d3fc7933bea56aea2e88e3d4394b2d4b8e2
-  data.tar.gz: 35dbe2cb026e4f00113557725d2e7ab9dea3b368815963dd01ebf2ef4bd09e03
+  metadata.gz: 31cb042c2e6bebe0faa230063ffafe7ee7c43a8a0cf0011d9600657a0caa3f04
+  data.tar.gz: cc1c14af581ec7b3817b4e73556778bd4a483fc676be5f7a051df250bfb17be4
 SHA512:
-  metadata.gz: 2691134fb525279a2a89a5b45c2e802106ec6c43418ff3985d5c99c3b9d068a4128c37be251de9e46e34670b4a7096418663cb14f40731158b0f863f8e320b83
-  data.tar.gz: e08bc25caf4db3ba85785fe59bd3d715dd8f7fcc002268e5784fa20e9cf695c7353a73b8f1ec988be0ef5368db4c4a3db3ae4bbb732cf7c762dcb310963da6c3
+  metadata.gz: c6be26fb941033a3d737a17825ef64b5f3fbb188d227b4f5f6f22eff1e5a98cfc35857218f75ed5b0e6377cfd99c6df79f20853b3c602195c58a54e4aca681fe
+  data.tar.gz: 981e83cbaeeb52325c3c60f134b5e8d637907729e2ad8b8119fe2460599c9cf9668c762b8d24110c44c98fc78074c49c89d3bec3e8d3770f370f685810cc8f89

data/bin/blog

@@ -24,7 +24,7 @@ TEXT
 end
 
 def mainloop
-  print fx("blog> ", Red, :bold)
+  print fx("#{@blog.view}> ", Red, :bold)
   cmd = STDSCR.gets(history: @cmdhist, tab: @tabcom)
   cmd_quit(nil) if cmd.nil?   # ^D
   cmd.chomp!

data/lib/helpers-repl.rb

@@ -18,7 +18,6 @@ module RuneBlog::REPL
 
      "new view $name"    => :cmd_new_view,
 
-#    "customize"         => :cmd_customize,
      "tags"              => :cmd_tags,
      "import"            => :cmd_import,
 
@@ -41,11 +40,9 @@ module RuneBlog::REPL
      "list assets"       => :cmd_list_assets,
      "lsa"               => :cmd_list_assets,
 
-     "rm $postid"        => :cmd_remove_post,
+     "delete >postid"        => :cmd_remove_post,
      "undel $postid"     => :cmd_undelete_post,
 
-     "kill >postid"      => :cmd_kill, 
-
      "edit $postid"      => :cmd_edit_post,
      "ed $postid"        => :cmd_edit_post,
      "e $postid"         => :cmd_edit_post,
@@ -54,8 +51,6 @@ module RuneBlog::REPL
 
      "browse"            => :cmd_browse,
 
-     "relink"            => :cmd_relink,
-
      "rebuild"           => :cmd_rebuild,
 
      "publish"           => :cmd_publish,
@@ -108,6 +103,7 @@ module RuneBlog::REPL
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
+puts "choose: #{[meth, params].inspect}"
     [meth, params]
   end
 

data/lib/repl.rb

@@ -131,23 +131,7 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     puts unless testing
-    files = @blog.find_draft_slugs
-    if files.empty? 
-      msg = "No files changed"
-      output! msg
-      puts "\n  #{msg}\n " unless testing
-      return @out
-    end
-    files.each {|file| @blog.rebuild_post(file) }
-    @blog.dirty_views.each {|view| generate_index(view) }  # All views for now?
-    File.write("#{@blog.root}/drafts/last_rebuild", Time.now)
-    @out
-  end
-
-  def cmd_relink(arg, testing = false)
-    reset_output
-    check_empty(arg)
-    @blog.relink
+    @blog.generate_view(@blog.view)
     @out
   end
 
@@ -195,12 +179,19 @@ module RuneBlog::REPL
     puts err.backtrace.join("\n")
   end
 
-  def cmd_kill(arg, testing = false)
+  def _remove_post(arg, testing=false)
+    id = get_integer(arg)
+    result = @blog.remove_post(id)
+    puts "Post #{id} not found" if result.nil?
+  end
+
+  def cmd_remove_post(arg, testing = false)
+puts "arg = #{arg.inspect} is a #{arg.class}"
     reset_output
     args = arg.split
     args.each do |x| 
       # FIXME
-      ret = cmd_remove_post(x.to_i, false)
+      ret = _remove_post(x.to_i, false)
       puts ret
       output ret
     end
@@ -209,16 +200,6 @@ module RuneBlog::REPL
 
   #-- FIXME affects linking, building, publishing...
 
-  def cmd_remove_post(arg, testing = false)
-    reset_output
-    id = get_integer(arg)
-    result = @blog.remove_post(id)
-    output! "Post #{id} not found" if result.nil?
-    @out
-  end
-
-  #-- FIXME affects linking, building, publishing...
-
   def cmd_edit_post(arg, testing = false)
     reset_output
     id = get_integer(arg)
@@ -357,26 +338,24 @@ module RuneBlog::REPL
        list views        List all views available
        lsv               Same as: list views
 
-       config            Edit the publish file or the templates
-       customize         (BUGGY) Change set of tags, extra views
+*      config            Edit the publish file or the templates
+*      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.)
+*      import ASSETS     Import assets (images, etc.)
 
        lsp, list posts   List posts in current view
 
        lsd, list drafts  List all posts regardless of view
   
-       rm ID             Remove a post
-       kill ID ID ID...  Remove multiple posts
+       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
-       relink            Regenerate index for all views
        rebuild           Regenerate all posts and relink
        publish           Publish (current view)
        ssh               Login to remote server

data/lib/runeblog.rb

@@ -296,6 +296,7 @@ class RuneBlog
     log!(enter: __method__, args: [slug])
     id = slug.to_i
     text = nil
+    @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
     xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , debug: true
     @_post_entry ||= File.read("/tmp/post_entry.html")
@@ -397,12 +398,17 @@ class RuneBlog
     log!(enter: __method__, args: [view])
     generate_index(view)   # recent posts (recent.html)
     vdir = @root/:views/view
+    @theme = @root/:views/view/:themes/:standard
     xlate cwd: vdir/"themes/standard/etc",
           src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
     xlate cwd: vdir/"themes/standard",
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
-
+  rescue => err
+    puts err
+    puts err.backtrace.join("\n")
+    print "Pause... "
+    gets
   end
 
   def _get_views(draft)
@@ -494,11 +500,6 @@ class RuneBlog
     end
   end
 
-  def relink   # FIXME no longer used?
-    log!(enter: __method__)
-    self.views.each {|view| generate_index(view) }
-  end
-
   def index_entry(view, meta)
     log!(enter: __method__, args: [view, meta])
     debug "=== index_entry #{view.to_s.inspect}  #{meta.num} #{meta.title.inspect}"
@@ -538,6 +539,7 @@ class RuneBlog
   def remove_post(num)
     log!(enter: __method__, args: [num])
     raise ArgumentError unless num.is_a?(Integer)
+    # FIXME update original draft .views
     tag = prefix(num)
     files = Find.find(self.view.dir).to_a
     list = files.select {|x| File.directory?(x) and x =~ /#{tag}/ }

data/lib/runeblog_version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.34
 platform: ruby
 authors:
 - Hal Fulton