runeblog 0.0.67 → 0.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 312d4bc3515cf60d3bf2ae0f1531297e7929e44d
-  data.tar.gz: 94d91c4536bff9751544d93cd5b0a3e0292de8ce
+  metadata.gz: 3dc3e2a34a12ed3f1e937d24cc1b8fa96a723bf2
+  data.tar.gz: 1dc3be8dce26862daf1a8e56c8e9ddbf30a55577
 SHA512:
-  metadata.gz: 50df528cc615999d15e5e1875ac754c4443ce53ea8271a2eb8b834a3a50f796d3be7d485f0388462a41149c126424e2ac80da73104ab5939d2ad0213d7770dfb
-  data.tar.gz: 501a13eb07d84d70f85dd73dfe399d9a55d8de8369b5030d99545fe605fb68a7c5c4461c2f06154e3ba2b71093d036b66f9051ff70d26a4fe934545a580f3222
+  metadata.gz: e05a643f97da28a3866c4fef0c979f74287893c7f6c6be5a0accbbf10cec9a7a2a584386672141a5cc45494810af317e4087164a77bca7d67eb39af1850ec4fb
+  data.tar.gz: ad207fc6af4e429e12a6917ff55fe1d73eacf4384f8bc5ce7af6c275582b5f057e49388f56fa3055400ffb341bae689a6c5c2734723ac4f1061fc1f1fba645d5

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.67   2018-09-29
+RuneBlog v 0.0.69   2018-09-29

data/lib/deploy.rb

@@ -0,0 +1,33 @@
+require 'helpers-blog'
+require 'runeblog'
+
+class RuneBlog::Deployment
+  attr_reader :user, :server, :root, :path
+
+  def initialize(user, server, root, path, protocol = "http")
+    @blog = RuneBlog.blog
+    @user, @server, @root, @path = 
+      user, server, root, path
+  end
+
+  def url
+    url = "#{protocol}://#{@server}/#{@path}"
+  end
+ 
+  def deploy(files)
+    reset_output
+    dir = "#@root/#@path"
+    result = system("ssh -c #@user@#@server mkdir #{dir}") 
+    list = files.join(' ')
+    cmd = "scp -r #{list} root@#{server}:#{dir} >/dev/null 2>&1"
+    output! "Deploying #{files.size} files...\n"
+    result = system(cmd)
+    raise "Problem occurred in deployment" unless result
+
+    File.write("#{@blog.view.dir}/last_deployed", files)
+    output! "...finished.\n"
+    @out
+  end
+end
+
+

data/lib/helpers-blog.rb

@@ -0,0 +1,17 @@
+def create_dir(dir)   # FIXME move later
+  cmd = "mkdir -p #{dir} >/dev/null 2>&1"
+  result = system(cmd) 
+  raise "Can't create #{dir}" unless result
+end
+
+def interpolate(str)
+  wrap = "<<-EOS\n#{str}\nEOS"
+  eval wrap
+end
+
+def error(err)  # FIXME - this is duplicated
+  str = "\n  Error: #{err}"
+  puts str
+  puts err.backtrace  # [0]
+end
+

data/lib/hmm

@@ -0,0 +1,102 @@
+helpers-repl.rb
+67:  def self.choose_method(cmd)
+84:  def error(err)
+90:  def ask(prompt, meth = :to_s)
+96:  def yesno(prompt, meth = :to_s)
+102:  def reset_output(initial = "")
+107:  def flush_output(initial = "")
+113:  def output(str)  # \n and indent
+118:  def outstr(str)  # \n and indent
+123:  def output!(str)  # red, \n and indent
+128:  def output_newline(n = 1)
+137:  def check_empty(arg)
+141:  def get_integer(arg)
+147:  def check_file_exists(file)
+151:  def error_cant_delete(files)
+160:  def clear
+164:  def red(text)
+168:  def blue(text)
+172:  def bold(str)
+176:  def colored_slug(slug)
+180:  def import(arg = nil)
+200:  def ask_deployment_info   # returns Deployment object
+215:#   def find_asset(asset)    # , views)
+241:#   def find_all_assets(list, views)
+
+repl.rb
+7:  def cmd_quit(arg)
+12:  def cmd_version(arg)
+19:  def cmd_browse
+34:  def cmd_preview(arg)
+44:  def cmd_deploy(arg)  # FIXME non-string return expected in caller?
+74:  def old_cmd_deploy(arg)  # FIXME non-string return expected in caller?
+104:  def cmd_rebuild(arg)
+115:  def cmd_relink(arg)
+124:  def cmd_list_views(arg)
+136:  def cmd_change_view(arg)
+153:  def cmd_new_view(arg)
+163:  def cmd_new_post(arg)
+173:  def cmd_kill(arg)
+185:  def cmd_remove_post(arg, safe=true)
+226:  def cmd_edit_post(arg)
+247:  def cmd_list_posts(arg)
+262:  def cmd_list_drafts(arg)
+280:  def cmd_INVALID(arg)
+285:  def cmd_help(arg)
+
+runeblog.rb
+5:def create_dir(dir)   # FIXME move later
+11:def interpolate(str)
+16:def error(err)  # FIXME - this is duplicated
+43:  def self.create_new_blog
+55:  def get_config(file)
+60:  def initialize(cfg_file = ".blog")   # assumes existing blog
+69:  def view?(name)
+73:  def view(name = nil)
+77:  def str2view(str)
+81:  def view=(arg)
+94:  def get_sequence
+98:  def next_sequence
+103:  def viewdir(v)
+107:  def self.exist?
+111:  def create_view(arg)
+127:  def delete_view(name, force = false)
+134:  def deployment_url
+141:  def view_files
+150:  def files_by_id(id)
+157:  def create_new_post(title, testing = false)
+166:  def edit_initial_post(file)
+174:  def posts
+180:  def drafts
+185:  def change_view(view)
+189:  def process_post(file)
+203:  def publish_post(meta)
+211:  def link_post_view(view)
+225:  def generate_index(view)
+248:  def relink
+252:  def index_entry(view, meta)
+267:  def rebuild_post(file)
+274:  def remove_post(num)
+281:  def post_exists?(num)
+286:  def make_slug(title, postnum = nil)
+293:  def subdirs(dir)
+299:  def find_src_slugs
+313:  def initialize(user, server, root, path, protocol = "http")
+319:  def url
+323:  def deploy(files)
+345:  def initialize(name)
+352:  def dir
+356:  def index
+360:  def to_s
+364:  def files(recent = false)
+373:  def deploy
+384:  def recent?(file)
+388:  def read_config
+395:  def write_config
+408:  def self.files(num, root)
+414:  def initialize(title, view_name)
+438:  def edit
+446:  def publish
+469:  def create_post_subtree(vdir)
+477:  def make_slug(postnum = nil)
+484:  def tag(num)

data/lib/post.rb

@@ -0,0 +1,87 @@
+require 'helpers-blog'
+require 'runeblog'
+
+class RuneBlog::Post
+
+  attr_reader :id, :title, :date, :views, :num, :slug
+
+  def self.files(num, root)
+    files = Find.find(root).to_a
+    result = files.grep(/#{tag(num)}-/)
+    result
+  end
+  
+  def initialize(title, view_name)
+    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
+    @blog = RuneBlog.blog
+    @title = title
+    @view = @blog.str2view(view_name)
+    @num, @slug = make_slug
+    date = Time.now.strftime("%Y-%m-%d")
+    template = <<-EOS.gsub(/^ */, "")
+      .mixin liveblog
+ 
+      .title #{title}
+      .pubdate #{date}
+      .views #@view
+ 
+      .teaser
+      Teaser goes here.
+      .end
+      Remainder of post goes here.
+    EOS
+ 
+    @draft = "#{@blog.root}/src/#@slug.lt3"
+    File.write(@draft, template)
+  end
+
+  def edit
+    result = system("vi #@draft +8")
+    raise "Problem editing #@draft" unless result
+    nil
+  rescue => err
+    error(err)
+  end 
+
+  def publish
+    livetext = Livetext.new(STDOUT)
+    @meta = livetext.process_file(@draft, binding)
+    raise "process_file returned nil" if @meta.nil?
+
+    @meta.views.each do |view_name|   # Create dir using slug (index.html, metadata?)
+      view = @blog.str2view(view_name)
+      vdir = view.dir
+      dir = vdir + @slug + "/"
+      Dir.mkdir(dir)
+      Dir.chdir(dir) do
+        create_post_subtree(vdir)
+        @blog.generate_index(view)
+      end
+    end
+  rescue => err
+    p err
+    err.backtrace.each {|x| puts x }
+    # error(err)
+  end
+
+  private
+
+  def create_post_subtree(vdir)
+    create_dir("assets") 
+    File.write("metadata.yaml", @meta.to_yaml)
+    template = File.read(vdir + "/custom/post_template.html")
+    text = interpolate(template)
+    File.write("index.html", text)
+  end
+
+  def make_slug(postnum = nil)
+    postnum ||= @blog.next_sequence
+    num = tag(postnum)   # FIXME can do better
+    slug = @title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
+    [postnum, "#{num}-#{slug}"]
+  end
+
+  def tag(num)
+    "#{'%04d' % num}"
+  end
+end

data/lib/runeblog.rb

@@ -1,32 +1,21 @@
 require 'find'
 require 'yaml'
 require 'livetext'
+require 'skeleton'
+require 'view'
+require 'deploy'
+require 'post'
+require 'helpers-blog'
+require 'version'
 
-def create_dir(dir)   # FIXME move later
-  cmd = "mkdir -p #{dir} >/dev/null 2>&1"
-  result = system(cmd) 
-  raise "Can't create #{dir}" unless result
-end
-
-def interpolate(str)
-  wrap = "<<-EOS\n#{str}\nEOS"
-  eval wrap
-end
-
-def error(err)  # FIXME - this is duplicated
-  str = "\n  Error: #{err}"
-  puts str
-  puts err.backtrace  # [0]
-end
+###
 
 class RuneBlog
-  VERSION = "0.0.67"
 
   class << self
     attr_accessor :blog
   end
 
-  Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data/views/_default"
 
   BlogHeaderPath   = DefaultData + "/custom/blog_header.html"
@@ -305,183 +294,3 @@ class RuneBlog
 
 end
 
-#######
-
-class RuneBlog::Deployment
-  attr_reader :user, :server, :root, :path
-
-  def initialize(user, server, root, path, protocol = "http")
-    @blog = RuneBlog.blog
-    @user, @server, @root, @path = 
-      user, server, root, path
-  end
-
-  def url
-    url = "#{protocol}://#{@server}/#{@path}"
-  end
- 
-  def deploy(files)
-    reset_output
-    dir = "#@root/#@path"
-    result = system("ssh -c #@user@#@server mkdir #{dir}") 
-    list = files.join(' ')
-    cmd = "scp -r #{list} root@#{server}:#{dir} >/dev/null 2>&1"
-    output! "Deploying #{files.size} files...\n"
-    result = system(cmd)
-    raise "Problem occurred in deployment" unless result
-
-    File.write("#{@blog.view.dir}/last_deployed", files)
-    output! "...finished.\n"
-    @out
-  end
-end
-
-#######
-
-class RuneBlog::View
-  attr_reader :name, :state
-  attr_accessor :deploy
-
-  def initialize(name)
-    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
-    @blog = RuneBlog.blog
-    @name = name
-    @deploy = read_config
-  end
-
-  def dir
-    @blog.root + "/views/#@name/"
-  end
-
-  def index
-    dir + "index.html"
-  end
-
-  def to_s
-    @name
-  end
-
-  def files(recent = false)
-    vdir = dir()
-    files = [index()]
-    others = Dir.entries(vdir).grep(/^\d\d\d\d/)
-    files += others.map {|x| "#{vdir}/#{x}" }
-    files.reject! {|f| recent?(f) } if recent
-    files
-  end
-
-  def deploy
-    # ?? @blog.view.deployment.deploy
-    # output "Files:"
-    # files.each {|f| output "    #{f}\n" }
-    output_newline
-    list = files(true)
-    @deployer.deploy(list)
-  rescue => err
-    error(err)
-  end
-
-  def recent?(file)
-    File.mtime(file) < File.mtime("#{dir()}/last_deployed")
-  end
-
-  def read_config
-    file = self.dir + "/deploy"
-    lines = File.readlines(file).map(&:chomp)
-    user, server, root, path, proto = *lines
-    @deploy = RuneBlog::Deployment.new(user, server, root, path, proto)
-  end
-
-  def write_config
-    file = @blog.view.dir + "/deploy"
-    File.open(file) {|f| f.puts [@user, @server, @root, @path, @proto] }
-  end
-end
-
-#######
-
-
-class RuneBlog::Post
-
-  attr_reader :id, :title, :date, :views, :num, :slug
-
-  def self.files(num, root)
-    files = Find.find(root).to_a
-    result = files.grep(/#{tag(num)}-/)
-    result
-  end
-  
-  def initialize(title, view_name)
-    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
-    @blog = RuneBlog.blog
-    @title = title
-    @view = @blog.str2view(view_name)
-    @num, @slug = make_slug
-    date = Time.now.strftime("%Y-%m-%d")
-    template = <<-EOS.gsub(/^ */, "")
-      .mixin liveblog
- 
-      .title #{title}
-      .pubdate #{date}
-      .views #@view
- 
-      .teaser
-      Teaser goes here.
-      .end
-      Remainder of post goes here.
-    EOS
- 
-    @draft = "#{@blog.root}/src/#@slug.lt3"
-    File.write(@draft, template)
-  end
-
-  def edit
-    result = system("vi #@draft +8")
-    raise "Problem editing #@draft" unless result
-    nil
-  rescue => err
-    error(err)
-  end 
-
-  def publish
-    livetext = Livetext.new(STDOUT)
-    @meta = livetext.process_file(@draft, binding)
-    raise "process_file returned nil" if @meta.nil?
-
-    @meta.views.each do |view_name|   # Create dir using slug (index.html, metadata?)
-      view = @blog.str2view(view_name)
-      vdir = view.dir
-      dir = vdir + @slug + "/"
-      Dir.mkdir(dir)
-      Dir.chdir(dir) do
-        create_post_subtree(vdir)
-        @blog.generate_index(view)
-      end
-    end
-  rescue => err
-    p err
-    err.backtrace.each {|x| puts x }
-    # error(err)
-  end
-
-  private
-
-  def create_post_subtree(vdir)
-    create_dir("assets") 
-    File.write("metadata.yaml", @meta.to_yaml)
-    template = File.read(vdir + "/custom/post_template.html")
-    text = interpolate(template)
-    File.write("index.html", text)
-  end
-
-  def make_slug(postnum = nil)
-    postnum ||= @blog.next_sequence
-    num = tag(postnum)   # FIXME can do better
-    slug = @title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
-    [postnum, "#{num}-#{slug}"]
-  end
-
-  def tag(num)
-    "#{'%04d' % num}"
-  end
-end

data/lib/skeleton.rb

@@ -0,0 +1,13 @@
+# skeleton
+
+class RuneBlog
+  class View
+  end
+
+  class Deployment
+  end
+
+  class Post
+  end
+end
+

data/lib/version.rb

@@ -0,0 +1,6 @@
+
+class RuneBlog
+  VERSION = "0.0.69"
+
+  Path  = File.expand_path(File.join(File.dirname(__FILE__)))
+end

data/lib/view.rb

@@ -0,0 +1,63 @@
+require 'helpers-blog'
+require 'runeblog'
+
+class RuneBlog::View
+  attr_reader :name, :state
+  attr_accessor :deploy
+
+  def initialize(name)
+    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
+    @blog = RuneBlog.blog
+    @name = name
+    @deploy = read_config
+  end
+
+  def dir
+    @blog.root + "/views/#@name/"
+  end
+
+  def index
+    dir + "index.html"
+  end
+
+  def to_s
+    @name
+  end
+
+  def files(recent = false)
+    vdir = dir()
+    files = [index()]
+    others = Dir.entries(vdir).grep(/^\d\d\d\d/)
+    files += others.map {|x| "#{vdir}/#{x}" }
+    files.reject! {|f| recent?(f) } if recent
+    files
+  end
+
+  def deploy
+    # ?? @blog.view.deployment.deploy
+    # output "Files:"
+    # files.each {|f| output "    #{f}\n" }
+    output_newline
+    list = files(true)
+    @deployer.deploy(list)
+  rescue => err
+    error(err)
+  end
+
+  def recent?(file)
+    File.mtime(file) < File.mtime("#{dir()}/last_deployed")
+  end
+
+  def read_config
+    file = self.dir + "/deploy"
+    lines = File.readlines(file).map(&:chomp)
+    user, server, root, path, proto = *lines
+    @deploy = RuneBlog::Deployment.new(user, server, root, path, proto)
+  end
+
+  def write_config
+    file = @blog.view.dir + "/deploy"
+    File.open(file) {|f| f.puts [@user, @server, @root, @path, @proto] }
+  end
+end
+

data/runeblog.gemspec

@@ -2,7 +2,7 @@ require 'date'
 require 'find'
 
 $: << "."
-require "lib/runeblog"
+require "lib/version"
 
 Gem::Specification.new do |s|
   system("rm -f *.gem")
@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
   test = Find.find("test").to_a
 
   s.files       =  main + misc + test
+STDERR.puts "Files are:"
+s.files.each {|fn| STDERR.puts "  " + fn }
+STDERR.puts
   s.homepage    = 'https://github.com/Hal9000/runeblog'
   s.license     = "Ruby's license"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.67
+  version: 0.0.69
 platform: ruby
 authors:
 - Hal Fulton
@@ -47,9 +47,16 @@ files:
 - data/views/_default/custom/post_template.html
 - data/views/_default/deploy
 - data/views/_default/last_deployed
+- lib/deploy.rb
+- lib/helpers-blog.rb
 - lib/helpers-repl.rb
+- lib/hmm
+- lib/post.rb
 - lib/repl.rb
 - lib/runeblog.rb
+- lib/skeleton.rb
+- lib/version.rb
+- lib/view.rb
 - runeblog.gemspec
 - test/repl.rb
 homepage: https://github.com/Hal9000/runeblog
@@ -72,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A command-line blogging system