runeblog 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5610e389e42975588026a817dbdccc04b202d9e
-  data.tar.gz: 0f52e5f757a729bb01625ea05d88c23df5d7208c
+  metadata.gz: daf51824d3995af799d0e01ce97f9f83726f539b
+  data.tar.gz: a0bd0c5e7087b80a27f308d318343a8d174e2a8d
 SHA512:
-  metadata.gz: d88699dbf12f1cc9d5efd0ef87b5866bb2f94ba27b35abc1b266403bc72d6cfffd5afee808dea7beb9d1bc19a27ff88138264b17bb81abc44586f85d62054b39
-  data.tar.gz: 4ddad379e9c9eff2c0071aa1d6b8b14cef453c1d6c713abd056ce0ac2b87344543c9b11bc0950e3c871acaf22c0e6424e8ad909a48bc39a538f4c6cde96f1477
+  metadata.gz: ff8bb51ac1286a1a6d12501730024d47ac041ee078322d9c64c1f157688d66c7260b935982012c8d20dfac52eaae4febbc25fc1547f9416a3ac2c955e8795907
+  data.tar.gz: 6cf7e3c4eee1ada91f26439c470bb407f5d324399df5f827fe7fbefeb1b6e432563bb4bb43208b7c405815aa54a465910f3c6ef48342eb27a3664815fb182c36

data/bin/blog

@@ -9,21 +9,14 @@ trap("INT") { }
 def execute_command
   case @meth
     when :help, :quit, :new_post, :list_views, :relink, :rebuild, :version, 
-         :list_posts, :do_nothing
+         :list_posts, :list_drafts, :do_nothing
       self.send(@meth)
-    else
+    when Object
       self.send(@meth, @arg)
   end
   puts unless @meth == :do_nothing
 end
 
-def check(boolean, msg)
-  save = @cmd
-  @cmd = nil
-  raise msg unless boolean
-  @cmd = save
-end
-
 def expected(nw = 1) 
   save = @cmd
   @cmd = nil
@@ -67,6 +60,9 @@ def parse_cmd
     when "lsp"
       @meth = :list_posts
       expected(1)
+    when "lsd"
+      @meth = :list_drafts
+      expected(1)
     when "relink"
       @meth = :relink
       expected(1)
@@ -77,7 +73,12 @@ def parse_cmd
       @meth = :version
       expected(1)
     when "cv"
+      raise "Too many arguments" if @words.size > 2
       @meth = :change_view
+      @arg = @words[1]
+    when "rm"
+      raise "Too many arguments" if @words.size > 2
+      @meth = :remove_post
       @arg = need_arg(1)
     when "list"
       case @words[1]
@@ -87,6 +88,9 @@ def parse_cmd
         when "posts"
           @meth = :list_posts
           expected(2)
+        when "drafts"
+          @meth = :list_drafts
+         expected(2)
         else 
           @cmd = nil
           raise "Unknown #{@words[1]}"
@@ -104,6 +108,15 @@ def parse_cmd
           @cmd = nil
           raise "Unknown '#{@words[1]}'"
       end
+    when "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
     else 
       @cmd = nil
       raise "Unknown '#{@words[0]}'"
@@ -134,6 +147,8 @@ def help
      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                Remove a post
 
      relink            Regenerate index for all views
      rebuild           Regenerate all posts and relink

data/data/VERSION

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

data/lib/runeblog.rb

@@ -1,6 +1,9 @@
+require 'find'
+require 'yaml'
+
 
 class RuneBlog
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
@@ -30,8 +33,6 @@ end
 
 # FIXME lots of structure changes
 
-require 'yaml'
-
 =begin
 
 Post
@@ -81,7 +82,7 @@ end
 
 def new_blog!
   unless File.exist?(".blog")
-    yn = ask("No .blog found. Create new blog?")
+    yn = ask(red("  No .blog found. Create new blog?"))
     if yn.upcase == "Y"
       #-- what if data already exists?
       system("cp -r #{RuneBlog::DefaultData} .")
@@ -270,7 +271,7 @@ end
 ### publish?
 
 def publish?
-  yn = ask("Publish? y/n ")
+  yn = ask(red("  Publish? y/n "))
   yn.upcase == "Y"
 end
 
@@ -293,7 +294,9 @@ end
 ### change_view
 
 def change_view(arg = nil)
-  if @config.views.include?(arg)
+  if arg.nil?
+    puts "\n  #@view"
+  elsif @config.views.include?(arg)
     @view = arg
   else
     puts "view #{arg.inspect} does not exist"
@@ -307,6 +310,7 @@ def new_view(arg = nil)
   read_config unless @config
   arg ||= ask("New view: ")  # check validity later
   raise "view #{arg} already exists" if @config.views.include?(arg)
+
   dir = @config.root + "/views/" + arg
   cmd = "mkdir -p #{dir}/custom"
   system(cmd)
@@ -354,6 +358,34 @@ def new_post
   end
 end
 
+### remove_post
+
+#-- FIXME affects linking, building, deployment...
+
+def remove_post(arg)
+  id = Integer(arg) rescue raise("'#{arg}' is not an integer")
+  tag = "#{'%04d' % id}-"
+  files = Find.find("#{@config.root}").to_a
+  files = files.grep(/#{tag}/)
+  if files.empty?
+    puts "\n No such post found"
+    return
+  end
+  puts
+  files.each {|f| puts "  #{f}" }
+  yn = ask red("\n  Delete all these? ")
+  if yn.downcase == "y"
+    #-- maybe implement trash later?
+    system("rm -rf #{files.join(' ')}")
+    puts red("\n  Deleted")
+  else
+    puts red("\n  No action taken")
+  end
+rescue => err
+  puts err
+  puts
+end
+
 ### list_posts
 
 def list_posts
@@ -372,4 +404,23 @@ rescue
   exit
 end
 
+### list_drafts
+
+def list_drafts
+  dir = "#{@config.root}/src"
+  Dir.chdir(dir) do
+    posts = Dir.entries(".").grep(/^0.*.lt3/)
+    puts
+    if posts.empty?
+      puts "No posts"
+    else
+      posts.each {|post| puts "  #{post.sub(/.lt3$/, "")}" }
+    end
+  end
+rescue 
+  puts "Oops? cwd = #{Dir.pwd}   dir = #{dir}"
+  exit
+end
+
+
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies: []
 description: A blog system based on Ruby and Livetext
 email: rubyhacker@gmail.com