runeblog 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e69d2af4ba58065485485a894e2247a2b94480
-  data.tar.gz: 0d125197fd42dc3183b023828908d3ff147d2170
+  metadata.gz: d8a23e918f61dd880293c774b4c2cf02f24e8e6d
+  data.tar.gz: 0ba2d8b67bc2417df7b11a5cf49bc3fe95cb89b5
 SHA512:
-  metadata.gz: f0d85a3bc232cd3bb3944bd60650b63cd4a588f7956add29ed8f2bbd1741d40ef252242e0103e1a7b156efee4b39d72bbd17927424730e8b30ca3e1124181e4b
-  data.tar.gz: d3ef5e6078ce545b6487219ee61b3ca56ffd1be7039e11b709ef9fe7060e740a7570124652ac4c6b30eb5e7c5d4a593e69e4f7953546ce2e30635bc07ac49c5b
+  metadata.gz: fbfc48c5affa14e9de261bc11e046bfc904e943fd99a83e0221470f3c194b9e0f74b93c4f5be227f127aed3e7b494cc06f68df9e3131617f52afdc7d239f22dd
+  data.tar.gz: 02ed71f16fe0f7a564a20d170e1c516033f17079550fbabf347ddb6e153524ee6a8f9c6cb048e03e1fa1db628465d326e7b51257d83204179d7a3110d4a2d206

data/bin/blog

@@ -4,6 +4,8 @@ $: << "./lib"
 
 require 'runeblog'
 
+trap("INT") { }
+
 def execute_command
   case @cmd
     when "h", "help";         help
@@ -24,6 +26,95 @@ def execute_command
   puts
 end
 
+def check(boolean, msg)
+  abort msg unless boolean
+end
+
+def expected(nw = 1) 
+  abort "Unexpected '#{@words[nw]}'" unless @words.size == nw
+end
+
+def need_arg(nw = 1)
+  abort "Unexpected '#{@words[nw+1]}'" if @words[nw+1]
+  abort "Need an arg here" unless @words[nw]
+  @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 parse_cmd
+  @cmd = gets.chomp
+  @arg = ""
+  @words = @cmd.split
+  case @words.first
+    when "h", "help"
+      @meth = :help
+      expected(1)
+    when "q", "quit"
+      @meth = :quit
+      expected(1)
+    when "p", "post"
+      @meth = :new_post
+      expected(1)
+    when "lsv"
+      @meth = :list_views
+      expected(1)
+    when "lsp"
+      @meth = :list_posts
+      expected(1)
+    when "relink"
+      @meth = :relink
+      expected(1)
+    when "rebuild"
+      @meth = :rebuild
+      expected(1)
+    when "version"
+      @meth = :version
+      expected(1)
+    when "cv"
+      @meth = :change_view
+      @arg = need_arg(1)
+    when "list"
+      case @words[1]
+        when "views"
+          @meth = :list_views
+          expected(2)
+        when "posts"
+          @meth = :list_posts
+          expected(2)
+        else 
+          raise "Unknown #{@words[1]}"
+      end
+    when "new"
+      case @words[1]
+        when "view"
+          @meth = :new_view
+          expected(2)
+          @arg = need_arg(2)
+        when "post"
+          @meth = :new_post
+          expected(2)
+        else
+          raise "Unknown '#{@words[1]}'"
+      end
+    else 
+      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:
@@ -49,17 +140,13 @@ end
 
 STDOUT.sync = true
 
-@cmd = ARGV[0..1].join(" ")
-@arg = ARGV[2]
+@cmd = get_argv
 
-if @cmd.empty?   # REPL
+if @cmd.nil?   # REPL
   read_config
   loop do
-    print "blog> "
-    @cmd = gets.chomp.gsub(/ +/, " ") rescue abort("\n")
-    words = @cmd.split
-    @cmd = words[0..1].join(" ")
-    @arg = words[2]
+    print red("blog> ")
+    @cmd = parse_cmd
     execute_command
   end
 else  # one command

data/data/VERSION

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

data/lib/runeblog.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
@@ -11,6 +11,23 @@ class RuneBlog
   PostTrailer = File.read(DefaultData + "/post_trailer.html") rescue "not found"
 end
 
+def clear
+  puts "\e[H\e[2J"  # clear screen
+end
+
+def red(text)
+  "\e[31m#{text}\e[0m"
+end
+
+def blue(text)
+  "\e[34m#{text}\e[0m"
+end
+
+def bold(str)
+  "\e[1m#{str}\e[22m"
+end
+
+
 # FIXME lots of structure changes
 
 require 'yaml'
@@ -255,14 +272,18 @@ end
 
 def list_views
   read_config unless @config
-  puts @config.views
+  puts
+  @config.views.each {|v| puts "  #{v}" }
 end
 
 ### change_view
 
 def change_view(arg = nil)
-  raise "view #{arg} does not exist" unless @config.views.include?(arg)
-  @view = arg
+  if @config.views.include?(arg)
+    @view = arg
+  else
+    puts "view #{arg.inspect} does not exist"
+  end
 end
 
 ### new_view
@@ -331,7 +352,6 @@ def list_posts
     else
       posts.each {|post| puts "  #{post}" }
     end
-    puts
   end
 rescue 
   puts "Oops? cwd = #{Dir.pwd}   dir = #{dir}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Hal Fulton
@@ -48,9 +48,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A command-line blogging system
 test_files: []
-has_rdoc: