runeblog 0.0.43 → 0.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3fbf51af336c1442a5aa62e13df695d2c2cd318
-  data.tar.gz: 4fa03ce9ff83cc6144cc580f346733b5b8d34916
+  metadata.gz: f1e459ba25edc955fe31efb2e59f314c3049347c
+  data.tar.gz: 5eb31fa2ca94d0caa3980fb846a90ba8bad6ecbf
 SHA512:
-  metadata.gz: 30001b22c7851778c22b3cb7be20c5af16563e89408308f42d6813dfd70d8ddd3c384dc2a7d35feac71aa6bae8631cf938051b3f11254a28d3fe119134e2514f
-  data.tar.gz: 902447ebf5221a2130df2a1f504ab07bc086aee612af57479183e04042f963a8ef1edf9b5a041f5ae8d69b7eefd0bccc1bca24e9b9ef1effd5756dbbb32aa909
+  metadata.gz: ea2bf26873cceedfc76cf85f8ac8721b8140877aa33781f8b2b9ecfcd5e4f81505528a4e2cf32cfc2cc63abde263778842bf692092de56aff79352018e8fcd42
+  data.tar.gz: e2c050a292b68017a1ec0bbd5bbb97bae042ca7bc9f2c414e9b608b89d24f52e5e4c089d3ab6ab0635eee228ae10df7cc804a2de1d809a528d2469a60541d128

data/bin/blog

@@ -3,212 +3,47 @@
 $: << "./lib"
 
 require 'repl'
+require 'blogcmds'
 
 trap("INT") { }
 
 include RuneBlog::REPL
 
-def execute_command
-  case @meth
-    when :help, :quit, :new_post, :list_views, :relink, :rebuild, :version, 
-         :list_posts, :list_drafts, :do_nothing, :deploy, :open_remote, :open_local
-      self.send(@meth)
-    when Object
-      self.send(@meth, @arg)
-  end
-  puts unless @meth == :do_nothing
-end
-
-def expected(nw = 1) 
-  save = @cmd
-  @cmd = nil
-  raise "Unexpected '#{@words[nw]}'" unless @words.size == nw
-  @cmd = save
-end
-
-def need_arg(nw = 1)
-  save = @cmd
-  @cmd = nil
-  raise "Unexpected '#{@words[nw+1]}'" if @words[nw+1]
-  raise "Need an arg here" unless @words[nw]
-  @cmd = save
-  @words[nw]
-end
-
-def do_nothing
-end
-
-def expect_w(meth)
-  @meth = meth
-  expected(1)
-end
-
-def expect_w_arg(meth, optional = false)
-  raise "Too many arguments" if @words.size > 2
-  @meth = meth
-  @arg = optional ? @words[1] : need_arg(1)
-end
-
-def handle_open
-  case @words.size
-    when 1
-      @meth = :open_local
-    when 2
-      if @words[1] == "remote"
-        @meth = :open_remote
-      else
-        raise "Don't know '#{@words[1]}'"
-      end
-    else
-      raise "Don't understand '#{@words.join(' ')}'"
-  end
-end
-
-def handle_list
-  case @words[1]
-    when "views"
-      @meth = :list_views
-      expected(2)
-    when "posts"
-      @meth = :list_posts
-      expected(2)
-    when "drafts"
-      @meth = :list_drafts
-     expected(2)
-    else 
-      @cmd = nil
-      raise "Unknown #{@words[1]}"
-  end
-end
-
-def handle_new
-  case @words[1]
-    when "view"
-      @meth = :new_view
-      expected(2)
-      @arg = need_arg(2)
-    when "post"
-      @meth = :new_post
-      expected(2)
-    else
-      @cmd = nil
-      raise "Unknown '#{@words[1]}'"
-  end
-end
-
-def handle_change
-  case @words[2]
-    when "view"
-      raise "Too many arguments" if @words.size > 3
-      @meth = :change_view
-      @arg = need_arg(2)
-    else
-      raise "Unknown '#{@words[1]}'"
-  end
-end
-
-def handle_multi_rm
-  raise "Need at least one arg" unless @words.size >= 2
-  @arg = @words[1..-1].join(" ")
-  @meth = :remove_multiple_posts
-end
-
-def parse_cmd(str)
-  @cmd = str
-  @arg = ""
-  if @cmd == ""
-    @meth = :do_nothing
-    return @cmd
-  end
-
-  @words = @cmd.split
-  case @words.first
-    when "h", "help";  expect_w(:help)
-    when "q", "quit";  expect_w(:quit)
-    when "p", "post";  expect_w(:new_post)
-    when "lsv";        expect_w(:list_views)
-    when "lsp";        expect_w(:list_posts)
-    when "lsd";        expect_w(:list_drafts)
-    when "relink";     expect_w(:relink)
-    when "rebuild";    expect_w(:rebuild)
-    when "deploy";     expect_w(:deploy)
-    when "version";    expect_w(:version)
-    when "cv";         expect_w_arg(:change_view, true)
-    when "rm";         expect_w_arg(:remove_post)
-    when "kill";       handle_multi_rm
-    when "e", "edit";  expect_w_arg(:edit_post)
-    when "open";       handle_open
-    when "list";       handle_list
-    when "new";        handle_new
-    when "change";     handle_change
-    else 
-      @cmd = nil
-      raise "Unknown '#{@words[0]}'"
-  end
-  @cmd
-end
-
 def get_argv
   return nil if ARGV.size == 0
-  @cmd = ARGV[0..1].join(" ")
-  @arg = ARGV[2]
-  @cmd
-end
-
-def help
-  puts <<-EOS
-
-  Commands:
-
-     h, help           This message
-     q, quit           Exit the program
-
-     change view VIEW  Change current view
-     new view          Create a new view
-     list views        List all views available
-     lsv               Same as: list views
-
-     p, post           Create a new post
-     new post          Same as post (create a post)
-     lsp, list posts   List posts in current view
-     lsd, list drafts  List all posts regardless of view
-
-     rm ID             Remove a post
-     edit ID           Edit a post
-
-     open              Look at current (local) view in browser
-     open remote       Look at current (deployed) view in browser
-     relink            Regenerate index for all views
-     rebuild           Regenerate all posts and relink
-     deploy            Deploy (current view)
-  EOS
+  cmd = ARGV[0..1].join(" ")
+  arg = ARGV[2]
+  [cmd, arg]
 end
 
 ###########
 
 STDOUT.sync = true
 
-@cmd = get_argv
+cmd, arg = get_argv
 
 read_config
 
 puts red("\n  RuneBlog v #{RuneBlog::VERSION}")
 
-if @cmd.nil?   # REPL
+if cmd.nil?   # REPL
   puts
   loop do
     print red("blog> ")
     begin
-      parse_cmd(gets.chomp)
+      cmd = gets.chomp
+      meth, params = Command.choose_method(cmd)
     rescue => err
       puts err
       next 
     end
-    execute_command
+    send(meth, params)
   end
 else  # one command
+  raise "Not working right now"
   file = File.open("/dev/tty")
   STDIN.reopen(file)    # avoid ARGF dumbness
+  meth, params = Command.choose_method(cmd)
   parse_cmd(ARGV.join(" "))
   execute_command
 end

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.43   2018-07-31
+RuneBlog v 0.0.45   2018-08-27

data/lib/blogcmds.rb

@@ -0,0 +1,95 @@
+# help
+# list views
+# new view $viewname
+
+class Command 
+  Patterns = 
+    {"help"              => :cmd_help, 
+     "h"                 => :cmd_help,
+
+     "list views"        => :cmd_list_views, 
+     "lsv"               => :cmd_list_views, 
+
+     "new view $name"    => :cmd_new_view,
+
+     "new post"          => :cmd_new_post,
+     "p"                 => :cmd_new_post,
+     "post"              => :cmd_new_post,
+
+     "change view $name" => :cmd_change_views,
+     "cv $name"          => :cmd_change_views,
+
+     "list posts"        => :cmd_list_posts,
+     "lsp"               => :cmd_list_posts,
+
+     "list drafts"       => :cmd_list_drafts,
+     "lsd"               => :cmd_list_drafts,
+
+     "rm $postid"        => :cmd_remove_post,
+
+     "edit $postid"      => :cmd_edit_post,
+     "ed $postid"        => :cmd_edit_post,
+     "e $postid"         => :cmd_edit_post,
+
+     "preview"           => :cmd_preview,
+
+     "pre"               => :cmd_preview,
+
+     "browse"            => :cmd_browse,
+
+     "relink"            => :cmd_relink,
+
+     "rebuild"           => :cmd_rebuild,
+
+     "deploy"            => :cmd_deploy,
+
+     "q"                 => :cmd_quit,
+     "quit"              => :cmd_quit
+   }
+  
+  Regexes = {}
+  Patterns.each_pair do |pat, meth|
+    rx = "^" + pat
+    rx.gsub!(/ /, " +")
+    rx.gsub!(/\$(\w+) */) { " *(?<#{$1}>\\w+)" }
+    rx << "$"
+    rx = Regexp.new(rx)
+    Regexes[rx] = meth
+  end
+  
+  def self.choose_method(cmd)
+    found = nil
+    params = []
+    Regexes.each_pair do |rx, meth|
+      m = cmd.match(rx)
+      result = m ? m.to_a : nil
+      next unless result
+      found = meth
+      params = m[1..-1]
+    end
+    meth = found || :cmd_INVALID
+    params = cmd if meth == :cmd_INVALID
+    [meth, params]
+  end
+end
+
+# test_cmds = [
+#              "fake cmd foo bar",
+#              "help", 
+#              "h",
+#              "list views", 
+#              "lsv",
+#              "new view foo",
+#              "not valid",
+#              "help invalid",
+#              "new view",
+#              "new view too many args"]
+# 
+# loop do 
+#   print "\nCmd = "
+#   cmd = gets.chomp.strip
+#   meth, params = Command.choose_method(cmd)
+#   puts "  Calling: #{meth}(#{params.inspect})"
+# end
+
+

data/lib/repl.rb

@@ -48,20 +48,23 @@ module RuneBlog::REPL
 
   ### quit
 
-  def quit
+  def cmd_quit(arg)
+    raise "Glitch: Got an argument" if arg != []
     puts
     exit
   end
 
   ### version
 
-  def version
+  def cmd_version(arg)
+    raise "Glitch: Got an argument" if arg != []
     puts "\n  " + RuneBlog::VERSION
   end
 
   ### new_blog!
 
-  def new_blog!
+  def cmd_new_blog!(arg)
+    raise "Glitch: Got an argument" if arg != []
     unless File.exist?(".blog")
       yn = ask(red("  No .blog found. Create new blog? "))
       if yn.upcase == "Y"
@@ -137,9 +140,10 @@ Remainder of post goes here.
     error(err, __LINE__, __FILE__)
   end
 
-  ### open_remote
+  ### browse
 
-  def open_remote
+  def cmd_browse
+    raise "Glitch: Got an argument" if arg != []
     @deploy ||= {}
     return puts red("\n  Deploy first.") unless @deploy[@view]
 
@@ -160,8 +164,9 @@ Remainder of post goes here.
     error(err, __LINE__, __FILE__)
   end
 
-  def deploy
+  def cmd_deploy(arg)
     # TBD clunky FIXME 
+    raise "Glitch: Got an argument" if arg != []
     @deploy ||= {}
     deployment = @config.viewdir(@view) + "deploy"
     raise "File '#{deployment}' not found" unless File.exist?(deployment)
@@ -348,7 +353,8 @@ Remainder of post goes here.
 
   ### rebuild
 
-  def rebuild
+  def cmd_rebuild(arg)
+    raise "Glitch: Got an argument" if arg != []
     puts
     files = Dir.entries("#@root/src/").grep /\d\d\d\d.*.lt3$/
     files.map! {|f| File.basename(f) }
@@ -360,7 +366,8 @@ Remainder of post goes here.
 
   ### relink
 
-  def relink
+  def cmd_relink(arg)
+    raise "Glitch: Got an argument" if arg != []
     @config.views.each {|view| generate_index(view) }
   rescue => err
     error(err, __LINE__, __FILE__)
@@ -375,8 +382,9 @@ Remainder of post goes here.
 
   ### list_views
 
-  def list_views
+  def cmd_list_views(arg)
     abort "Config file not read"  unless @config
+    raise "Glitch: Got an argument" if arg != []
     puts
     @config.views.each {|v| puts "  #{v}" }
   rescue => err
@@ -385,10 +393,11 @@ Remainder of post goes here.
 
   ### change_view
 
-  def change_view(arg = nil)
-    if arg.nil?
+  def cmd_change_view(arg)
+    if arg.empty?
       puts "\n  #@view"
     else
+      arg = arg.first
       list = @config.views.grep /^#{arg}/
       if list.size == 1
         @view = @config.view = list.first
@@ -403,8 +412,8 @@ Remainder of post goes here.
 
   ### new_view
 
-  def new_view(arg = nil)
-    arg = nil if arg == ""
+  def cmd_new_view(arg)
+    arg = arg.first
     read_config unless @config
     arg ||= ask("New view: ")  # check validity later
     raise "view #{arg} already exists" if @config.views.include?(arg)
@@ -413,6 +422,7 @@ Remainder of post goes here.
     create_dir(dir + 'custom')
     create_dir(dir + 'assets')
 
+    # Something more like this?  RuneBlog.new_view(arg)
     File.write(dir + "custom/blog_header.html",  RuneBlog::BlogHeader)
     File.write(dir + "custom/blog_trailer.html", RuneBlog::BlogTrailer)
     File.write(dir + "last_deployed", "Initial creation")
@@ -444,7 +454,8 @@ Remainder of post goes here.
 
   ### new_post
 
-  def new_post
+  def cmd_new_post(arg)
+    raise "Glitch: Got an argument" if arg != []
     read_config unless @config
     @title = ask("Title: ")
     @today = Time.now.strftime("%Y%m%d")
@@ -470,7 +481,8 @@ Remainder of post goes here.
 
   #-- FIXME affects linking, building, deployment...
 
-  def remove_post(arg, safe=true)
+  def cmd_remove_post(arg, safe=true)
+    arg = arg.first
     id = Integer(arg) rescue raise("'#{arg}' is not an integer")
     tag = "#{'%04d' % id}-"
     files = Find.find(@root).to_a
@@ -505,7 +517,8 @@ Remainder of post goes here.
 
   #-- FIXME affects linking, building, deployment...
 
-  def edit_post(arg)
+  def cmd_edit_post(arg)
+    arg = arg.first
     id = Integer(arg) rescue raise("'#{arg}' is not an integer")
     tag = "#{'%04d' % id}-"
     files = Find.find(@root+"/src").to_a
@@ -527,7 +540,8 @@ Remainder of post goes here.
 
   ### list_posts
 
-  def list_posts
+  def cmd_list_posts(arg)
+    raise "Glitch: Got an argument" if arg != []
     dir = @config.viewdir(@view)
     Dir.chdir(dir) do
       posts = Dir.entries(".").grep(/^0.*/)
@@ -546,7 +560,8 @@ Remainder of post goes here.
 
   ### list_drafts
 
-  def list_drafts
+  def cmd_list_drafts(arg)
+    raise "Glitch: Got an argument" if arg != []
     dir = "#@root/src"
     Dir.chdir(dir) do
       posts = Dir.entries(".").grep(/^0.*.lt3/)
@@ -563,4 +578,39 @@ Remainder of post goes here.
     exit
   end
 
+  def cmd_INVALID(arg)
+    puts "\n  Command '#{red(arg)}' not understood.\n "
+  end
+
+  def cmd_help(arg)
+    raise "Glitch: Got an argument" if arg != []
+    puts <<-EOS
+  
+    Commands:
+  
+       h, help           This message
+       q, quit           Exit the program
+  
+       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
+  
+       p, post           Create a new post
+       new post          Same as post (create a post)
+       lsp, list posts   List posts in current view
+       lsd, list drafts  List all posts regardless of view
+  
+       rm ID             Remove a post
+       edit ID           Edit a post
+  
+       preview           Look at current (local) view in browser
+       browse            Look at current (deployed) view in browser
+       relink            Regenerate index for all views
+       rebuild           Regenerate all posts and relink
+       deploy            Deploy (current view)
+    EOS
+  end
+
 end

data/lib/runeblog.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'livetext'
 
 class RuneBlog
-  VERSION = "0.0.43"
+  VERSION = "0.0.45"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.45
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -46,6 +46,7 @@ files:
 - data/views/_default/custom/blog_trailer.html
 - data/views/_default/custom/post_template.html
 - data/views/_default/last_deployed
+- lib/blogcmds.rb
 - lib/repl.rb
 - lib/runeblog.rb
 - runeblog.gemspec