runeblog 0.0.65 → 0.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 337899305625d6e47d1651fc7f5c74cbe01d9dac
-  data.tar.gz: c115cf315621933d753bfdb663e7030506354df5
+  metadata.gz: adf4312a5e7a32552ee91aa3915429723f9ffbd6
+  data.tar.gz: 157c726b6db5384507a8813df016f25f729d4574
 SHA512:
-  metadata.gz: f653637ca0fbbc59f34faf72b263546befc886a3bb10ec3569de9c4209bee45a30c7e267af30f297d5701b76e201955d48827cb87258e9695cd91012ddb348d2
-  data.tar.gz: f56f552eb2475dd785d00b3ec2cb16b3bfa166a5bdc46adfcbbd3d19e908d8412d6db09a5a8322b6062c3519409c79f52e3f8801fee1236072dc0cddafa9abde
+  metadata.gz: 3eaf87eec7fd56c1efc5fd586f0fd154667c353b63890e9807500bd992cd138c9a55b3d1d5ae8b5659fc2de018a48adf0cbaef3371476881afbb4fbfe6f7c453
+  data.tar.gz: 58d33fe4ad47f8b0aaaa3e657b8a6a01755b6612dd8c65679cddf6cf61e58650d59ff0d2bb1a2ec321858fb0d12347d117632a2a5fb4b2d985dd11d3438685df

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.65   2018-09-27
+RuneBlog v 0.0.66   2018-09-28

data/lib/repl.rb

@@ -34,7 +34,7 @@ module RuneBlog::REPL
   def cmd_preview(arg)
     reset_output
     check_empty(arg)
-    local = @blog.viewdir(@blog.view) + "/index.html"
+    local = @blog.view.index
     result = system("open #{local}")
     raise CantOpen, local unless result
   rescue => err
@@ -42,6 +42,36 @@ module RuneBlog::REPL
   end
 
   def cmd_deploy(arg)  # FIXME non-string return expected in caller?
+    reset_output
+    check_empty(arg)
+    @blog.view.deploy
+    user, server, sroot, spath = *@deploy[@blog.view]
+    if files.empty?    # FIXME  baloney
+      output! "No files to deploy"
+      return @out
+    end
+
+    output "Files:"
+    files.each {|f| output "    #{f}\n" }
+    output_newline
+    dir = "#{sroot}/#{spath}"
+    # FIXME - may or may not already exist
+    result = system("ssh root@#{server} mkdir #{dir}") 
+    # ^ needs -c?? 
+
+    cmd = "scp -r #{files.join(' ')} 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("#{vdir}/last_deployed", files)
+    output! "...finished.\n"
+    @out
+  rescue => err
+    error(err)
+  end
+
+  def old_cmd_deploy(arg)  # FIXME non-string return expected in caller?
     # TBD clunky FIXME 
     reset_output
     check_empty(arg)
@@ -110,19 +140,15 @@ module RuneBlog::REPL
       output "#{@blog.view}"
       return @out
     else
-      list = @blog.views.grep /^#{arg}/
-      if list.size == 1
-        @blog.view = list.first
-        output! "View: #{@blog.view}\n" if arg != @blog.view
-      else
-        output! "view #{arg.inspect} does not exist\n"
+      if @blog.view?(arg)
+        @blog.view = arg
+        output! "View: #{@blog.view}\n"
       end
     end
     @out
   rescue => err
     error(err)
   end
-
   def cmd_new_view(arg)
     reset_output
     @blog.create_view(arg)
@@ -219,7 +245,7 @@ module RuneBlog::REPL
     check_empty(arg)
     reset_output
     posts = @blog.posts  # current view
-    output @blog.view + ":\n"
+    output @blog.view.name + ":\n"
     if posts.empty?
       output! "No posts\n"
     else

data/lib/runeblog.rb

@@ -20,7 +20,11 @@ def error(err)  # FIXME - this is duplicated
 end
 
 class RuneBlog
-  VERSION = "0.0.65"
+  VERSION = "0.0.66"
+
+  class << self
+    attr_accessor :blog
+  end
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data/views/_default"
@@ -34,7 +38,7 @@ class RuneBlog
   PostTemplate = File.read(PostTemplatePath) rescue "not found"
 
   attr_reader :root, :views, :sequence
-  attr_accessor :view  # FIXME
+  attr_accessor :view  # overridden
 
   def self.create_new_blog
     #-- what if data already exists?
@@ -48,22 +52,51 @@ class RuneBlog
     File.open("data/VERSION", "a") {|f| f.puts "\nBlog created: " + Time.now.to_s }
   end
 
+  def get_config(file)
+    lines = File.readlines(file).map(&:chomp)
+    root, view_name = *lines
+  end
+
   def initialize(cfg_file = ".blog")   # assumes existing blog
-    # What views are there? Deployment, etc.
-    # Crude - FIXME later
+    # Crude - FIXME later - What views are there? Deployment, etc.
+    self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
+    @root, view_name = get_config(cfg_file)
+    @views = subdirs("#@root/views/").sort.map {|name| RuneBlog::View.new(name) }
+    @view = str2view(view_name)
+    @sequence = get_sequence
+  end
 
-    lines = File.readlines(cfg_file).map {|x| x.chomp }
-    @root = lines[0]
-    @view = lines[1]
-    dirs = subdirs("#@root/views/")
-    @root = root
-    @views = dirs
-    @sequence = File.read(root + "/sequence").to_i
+  def view?(name)
+    views.any? {|x| x.name == name }
+  end
+
+  def view
+    @view
+  end
+
+  def str2view(str)
+    @views.find {|x| x.name == str }
+  end
+
+  def view=(arg)
+    case arg
+      when RuneBlog::View
+        @view = arg
+      when String
+        new_view = str2view(arg)
+        raise "Can't find view #{arg}" if new_view.nil?
+        @view = new_view
+      else 
+        raise "#{arg.inspect} was not a View or a String"
+    end
+  end
+
+  def get_sequence
+    File.read(root + "/sequence").to_i
   end
 
   def next_sequence
-    @sequence += 1
-    File.open("#@root/sequence", "w") {|f| f.puts @sequence }
+    File.write("#@root/sequence", @sequence += 1)
     @sequence
   end
 
@@ -76,7 +109,8 @@ class RuneBlog
   end
 
   def create_view(arg)
-    raise "view #{arg} already exists" if self.views.include?(arg)
+    names = self.views.map(&:to_s)
+    raise "view #{arg} already exists" if names.include?(arg)
 
     dir = @root + "/views/" + arg + "/"
     create_dir(dir + 'custom')
@@ -87,13 +121,13 @@ class RuneBlog
     File.write(dir + "custom/blog_trailer.html", RuneBlog::BlogTrailer)
     File.write(dir + "custom/post_template.html", RuneBlog::PostTemplate)
     File.write(dir + "last_deployed", "Initial creation")
-    self.views << arg
+    @views << RuneBlog::View.new(arg)
   end
 
   def delete_view(name, force = false)
     if force
       system("rm -rf #@root/views/#{name}") 
-      @views -= [name]
+      @views -= [str2view(name)]
     end
   end
 
@@ -109,6 +143,7 @@ class RuneBlog
     # meh
     files = ["#{vdir}/index.html"]
     files += Dir.entries(vdir).grep(/^\d\d\d\d/).map {|x| "#{vdir}/#{x}" }
+    # Huh? 
     files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_deployed") }
   end
 
@@ -120,7 +155,7 @@ class RuneBlog
   end
 
   def create_new_post(title, testing = false)
-    post = RuneBlog::Post.new(title, @view)
+    post = RuneBlog::Post.new(title, @view.to_s)
     post.edit unless testing
     post.publish
     post.num
@@ -137,8 +172,9 @@ class RuneBlog
   end
 
   def posts
-    dir = self.viewdir(@view)
+    dir = self.view.dir
     posts = Dir.entries(dir).grep(/^0.*/)
+    posts
   end
 
   def drafts
@@ -147,7 +183,7 @@ class RuneBlog
   end
 
   def change_view(view)
-    @view = view   # error checking?
+    self.view = view   # error checking?
   end
 
   def process_post(file)
@@ -202,7 +238,7 @@ class RuneBlog
     posts.map! {|post| YAML.load(File.read("#{vdir}/#{post}/metadata.yaml")) }
     File.open("#{vdir}/index.html", "w") do |f|
       f.puts @bloghead
-      posts.each {|post| f.puts posting(view, post) }
+      posts.each {|post| f.puts index_entry(view, post) }
       f.puts @blogtail
     end
   rescue => err
@@ -213,7 +249,7 @@ class RuneBlog
     self.views.each {|view| generate_index(view) }
   end
 
-  def posting(view, meta)
+  def index_entry(view, meta)
     # FIXME clean up and generalize
     ref = "#{view}/#{meta.slug}/index.html"
     <<-HTML
@@ -226,8 +262,6 @@ class RuneBlog
       <br><br>
       <hr>
     HTML
-    text = File.read(self.viewdir(view) + "custom/post_template.html")
-    interpolate(text)
   end
 
   def rebuild_post(file)
@@ -273,12 +307,90 @@ end
 
 #######
 
-class RuneBlog::Post
+class RuneBlog::Deployment
+  attr_reader :user, :server, :root, :path
 
-  class << self
-    attr_accessor :blog
+  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
+    # How read deployment info??
+  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
+end
+
+#######
+
+
+class RuneBlog::Post
+
   attr_reader :id, :title, :date, :views, :num, :slug
 
   def self.files(num, root)
@@ -287,20 +399,19 @@ class RuneBlog::Post
     result
   end
   
-  def initialize(title, view)
-    raise "Post.blog is not set!" if RuneBlog::Post.blog.nil?
-    @blog = RuneBlog::Post.blog
+  def initialize(title, view_name)
+    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
+    @blog = RuneBlog.blog
     @title = title
-    @view = view
+    @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}
+      .views #@view
  
       .teaser
       Teaser goes here.
@@ -325,8 +436,9 @@ class RuneBlog::Post
     @meta = livetext.process_file(@draft, binding)
     raise "process_file returned nil" if @meta.nil?
 
-    @meta.views.each do |view|   # Create dir using slug (index.html, metadata?)
-      vdir = @blog.viewdir(view)
+    @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

data/test/repl.rb

@@ -9,7 +9,6 @@ class TestREPL < Minitest::Test
 
   def setup
     @blog = RuneBlog.new
-    RuneBlog::Post.blog = @blog
   end
 
   def test_001_cmd_help
@@ -101,28 +100,31 @@ class TestREPL < Minitest::Test
   end
 
   def test_008_current_view
-    assert @blog.view == "view1", "Current view seems wrong (#{@blog.view}, not view1)"
+    assert @blog.view.to_s == "view1", "Current view seems wrong (#{@blog.view}, not view1)"
   end
 
   def test_009_change_view
     assert @blog.change_view("view2")
-    assert @blog.view == "view2", "Current view seems wrong (#{@blog.view}, not view2)"
+    assert @blog.view.to_s == "view2", "Current view seems wrong (#{@blog.view}, not view2)"
   end
 
   def test_010_accessors
-    assert @blog.views.sort == ["view1", "view2"]
+    sorted_views = @blog.views.map(&:to_s).sort
+    assert sorted_views == ["view1", "view2"], "Got: #{sorted_views.inspect}"
   end
 
   def test_011_create_delete_view
     @blog.create_view("anotherview")
-    assert @blog.views.sort == ["anotherview", "view1", "view2"], "After create: #{@blog.views.sort.inspect}"
+    sorted_views = @blog.views.map(&:to_s).sort
+    assert sorted_views == ["anotherview", "view1", "view2"], "After create: #{sorted_views.inspect}"
     @blog.delete_view("anotherview", true)
-    assert @blog.views.sort == ["view1", "view2"], "After delete: #{@blog.views.sort.inspect}"
+    sorted_views = @blog.views.map(&:to_s).sort 
+    assert sorted_views == ["view1", "view2"], "After delete: #{sorted_views.inspect}"
   end
 
   def test_012_create_remove_post   # FIXME - several problems here
     @blog.change_view("view2")
-    assert @blog.view == "view2"
+    assert @blog.view.to_s == "view2", "Expected view2"
     before = @blog.posts.size 
     num = @blog.create_new_post("Uninteresting title", true)
     assert @blog.posts.size == before + 1, "Don't see new post"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.65
+  version: 0.0.66
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext