runeblog 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8a23e918f61dd880293c774b4c2cf02f24e8e6d
-  data.tar.gz: 0ba2d8b67bc2417df7b11a5cf49bc3fe95cb89b5
+  metadata.gz: b5610e389e42975588026a817dbdccc04b202d9e
+  data.tar.gz: 0f52e5f757a729bb01625ea05d88c23df5d7208c
 SHA512:
-  metadata.gz: fbfc48c5affa14e9de261bc11e046bfc904e943fd99a83e0221470f3c194b9e0f74b93c4f5be227f127aed3e7b494cc06f68df9e3131617f52afdc7d239f22dd
-  data.tar.gz: 02ed71f16fe0f7a564a20d170e1c516033f17079550fbabf347ddb6e153524ee6a8f9c6cb048e03e1fa1db628465d326e7b51257d83204179d7a3110d4a2d206
+  metadata.gz: d88699dbf12f1cc9d5efd0ef87b5866bb2f94ba27b35abc1b266403bc72d6cfffd5afee808dea7beb9d1bc19a27ff88138264b17bb81abc44586f85d62054b39
+  data.tar.gz: 4ddad379e9c9eff2c0071aa1d6b8b14cef453c1d6c713abd056ce0ac2b87344543c9b11bc0950e3c871acaf22c0e6424e8ad909a48bc39a538f4c6cde96f1477

data/bin/blog

@@ -7,48 +7,48 @@ require 'runeblog'
 trap("INT") { }
 
 def execute_command
-  case @cmd
-    when "h", "help";         help
-    when "q", "quit";         exit
-    when "p", "post";         new_post
-    when "new post";          new_post  # same as above
-    when "list posts", "lsp"; list_posts
-    when "new view";          new_view(@arg)
-    when "lsv", "list views"; list_views
-    when "change view";       change_view(@arg)
-    when "import post";       import(@arg)
-    when "relink";            relink
-    when "rebuild";           rebuild
-    when "version";           puts RuneBlog::VERSION
+  case @meth
+    when :help, :quit, :new_post, :list_views, :relink, :rebuild, :version, 
+         :list_posts, :do_nothing
+      self.send(@meth)
     else
-      puts "\n  Huh? I don't know the command '#{@cmd}'"
+      self.send(@meth, @arg)
   end
-  puts
+  puts unless @meth == :do_nothing
 end
 
 def check(boolean, msg)
-  abort msg unless boolean
+  save = @cmd
+  @cmd = nil
+  raise msg unless boolean
+  @cmd = save
 end
 
 def expected(nw = 1) 
-  abort "Unexpected '#{@words[nw]}'" unless @words.size == nw
+  save = @cmd
+  @cmd = nil
+  raise "Unexpected '#{@words[nw]}'" unless @words.size == nw
+  @cmd = save
 end
 
 def need_arg(nw = 1)
-  abort "Unexpected '#{@words[nw+1]}'" if @words[nw+1]
-  abort "Need an arg here" unless @words[nw]
+  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
 
-#   when "lsv", "list views"; list_views
-#   when "list posts", "lsp"; list_posts
-#   when "new view";          new_view(@arg)
-#   when "new post";          new_post  # same as above
-#   when "change view";       change_view(@arg)
-#   when "import post";       import(@arg)
+def do_nothing
+end
 
 def parse_cmd
   @cmd = gets.chomp
+  if @cmd == ""
+    @meth = :do_nothing
+    return @cmd
+  end
   @arg = ""
   @words = @cmd.split
   case @words.first
@@ -88,6 +88,7 @@ def parse_cmd
           @meth = :list_posts
           expected(2)
         else 
+          @cmd = nil
           raise "Unknown #{@words[1]}"
       end
     when "new"
@@ -100,9 +101,11 @@ def parse_cmd
           @meth = :new_post
           expected(2)
         else
+          @cmd = nil
           raise "Unknown '#{@words[1]}'"
       end
     else 
+      @cmd = nil
       raise "Unknown '#{@words[0]}'"
   end
   @cmd
@@ -117,7 +120,9 @@ end
 
 def help
   puts <<-EOS
+
   Commands:
+
      h, help           This message
      q, quit           Exit the program
 
@@ -132,7 +137,6 @@ def help
 
      relink            Regenerate index for all views
      rebuild           Regenerate all posts and relink
-
   EOS
 end
 
@@ -144,9 +148,15 @@ STDOUT.sync = true
 
 if @cmd.nil?   # REPL
   read_config
+  puts
   loop do
     print red("blog> ")
-    @cmd = parse_cmd
+    begin
+      @cmd = parse_cmd
+    rescue => err
+      puts err
+      next 
+    end
     execute_command
   end
 else  # one command

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.15   2017-05-05 00:00:00 UTC
+RuneBlog v 0.0.16   2017-05-05 00:00:00 UTC

data/lib/runeblog.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
@@ -53,7 +53,7 @@ data
 
 require 'rubygems'
 require 'ostruct'
-# require 'livetext'
+require 'livetext'
 
 
 ### ask
@@ -64,6 +64,19 @@ def ask(prompt, meth = :to_s)
   STDIN.gets.chomp.send(meth)
 end
 
+### quit
+
+def quit
+  puts
+  exit
+end
+
+### version
+
+def version
+  puts "\n  " + RuneBlog::VERSION
+end
+
 ### new_blog!
 
 def new_blog!
@@ -81,7 +94,7 @@ end
 
 def next_sequence
   @config.sequence += 1
-  File.open("#{@config.root}/data/sequence", "w") {|f| f.puts @config.sequence }
+  File.open("#{@config.root}/sequence", "w") {|f| f.puts @config.sequence }
   @config.sequence
 end
 
@@ -149,8 +162,9 @@ end
 
 def process_post(file)
   lt ||= Livetext.new
-  puts "  Processing: #{file}"
-  lt.process_file(file)
+# puts "  Processing: #{Dir.pwd}/#{file}"
+  path = @config.root + "/src/#{file}"
+  lt.process_file(path)
   @meta = lt.main.instance_eval { @meta }
   @meta.slug = file.sub(/.lt3$/, "")
   @meta

metadata

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