runeblog 0.1.68 → 0.1.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2582c242a2e3130d14dad7b484d96b7703258fbdd0d59212b993df72c3c55c
-  data.tar.gz: 0fcac65738ecc1dec58168ddf348292cc091d4408bf8a6590e2a76c984c4bef9
+  metadata.gz: 01a59a40806ea47e4c1050698e94fe48047c853357b2dd8dcc7519973d7969ed
+  data.tar.gz: f63c02e9da788ef463339a9cf9f0e0a3502975e7a1eaedd3bda935f53f9ab2fd
 SHA512:
-  metadata.gz: a519a50fb120971d3fb2115b43d1857657f63fc8617894d3589c810ecb0a9b6c9d838e91fb09d09724669d518672fef9b27964d57b34b368cdbd0cabe4a83cc3
-  data.tar.gz: 44be5e4a8c726655c634817f171fc73a759ac8bf0dc5aaf95d452a6df7efc9c9868635cd137ef66551182b76e5363f9bcd13388b2cacf0adbc514aef4479b0f5
+  metadata.gz: 71bf1ca60168bcb5297271eacd173f3f70e1447ac575c0d3e034ae0a3884024fdca117c4780cc401f48a5c73095864b15616253c1d8d4b0453aeac4a2d8a9875
+  data.tar.gz: 2034c163ca26b8215d9f9e5fa9debf3024924fdc506791868615ff791446ccb10fbbfb48b264ad277c4b2f3d6ed0116c30dd32a5dd84191e093592ee5d9ca1a4

data/bin/blog

@@ -49,12 +49,12 @@ home = ENV['HOME']
 RubyText.start(:_echo, :keypad, scroll: true, log: "binblog.txt", fg: @fg, bg: @bg)
 
 if ! RuneBlog.exist?
-  print fx("\n  No blog found. Create new one? (y/n): ", :bold)
+  print fx("\n  No blog repo found. Create new one? (y/n): ", :bold)
   response = gets.chomp
   if response.downcase == "y"
-    print fx("\n Enter blog name: ", :bold)
-    blog_name = gets.chomp
-    RuneBlog.create_new_blog(blog_name)
+    print fx("\n Enter default view name: ", :bold)
+    view_name = gets.chomp
+    RuneBlog.create_new_blog_repo(view_name)
     get_started
   else
     exit

data/lib/runeblog.rb

@@ -67,11 +67,11 @@ class RuneBlog
 				index.lt3
 =end
 
-  def self.create_new_blog_repo(repo_filename, dir = ".blogs/data")
+  def self.create_new_blog_repo(first_view, dir = ".blogs/data")
     raise ArgumentError unless dir.is_a?(String) && ! dir.empty?
     root_dir = Dir.pwd + "/" + dir
     raise BlogRepoAlreadyExists if Dir.exist?(root_dir)
-    new_dotfile(root: root_dir, current_view: repo_filename)
+    new_dotfile(root: root_dir, current_view: first_view)
     create_dir(dir)
 # New code goes here! 
     Dir.chdir(dir) do
@@ -82,8 +82,7 @@ class RuneBlog
       new_sequence
     end
     blog = self.new
-STDERR.puts :cp021
-    blog.create_view(repo_filename)
+    blog.create_view(first_view)
   rescue => err
     puts "Can't create blog repo: '#{dir}' - #{err}"
     puts err.backtrace.join("\n")
@@ -154,60 +153,30 @@ STDERR.puts :cp021
   end
 
   def create_view(arg)
-STDERR.puts :cp029
     debug "=== create_view #{arg.inspect}"
-STDERR.puts :cp029a
     raise ArgumentError unless arg.is_a?(String) && ! arg.empty?
 
-STDERR.puts :cp029b
     names = self.views.map(&:to_s)
-STDERR.puts :cp029c
     raise ViewAlreadyExists(arg) if names.include?(arg)
 
-STDERR.puts :cp029d
     dir = "#@root/views/#{arg}/"
-STDERR.puts :cp029e
     raise DirAlreadyExists(dir) if Dir.exist?(dir)
-STDERR.puts :cp029f
     create_dir(dir)
-STDERR.puts :cp029g
     up = Dir.pwd
-STDERR.puts :cp029h
     Dir.chdir(dir)
-STDERR.puts :cp029i
     x = RuneBlog::Default
-STDERR.puts :cp029j
     create_dir('themes')
-STDERR.puts :cp029k
     create_dir("local")
-STDERR.puts :cp029l
     create_dir("generated")
-STDERR.puts :cp029m
-## new code...
+
     Dir.chdir("themes")  { system("tar zxvf #{GemData}/standard.tgz 2>/dev/null") }
-STDERR.puts :cp029n
     create_dir('assets')
-STDERR.puts :cp029o
-## add default stuff to assets?
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
-#?  dump("", "tagpool")
     view = RuneBlog::View.new(arg)
     self.view = view
-# Rewrite this! think: livetext themes/standard/generate.lt3
-#  (output goes elsewhere)
-    # This is just all wrong now?
-STDERR.puts :cp029p
-    live = Livetext.new(nil)
-STDERR.puts :cp029q
-    Livetext.parameters = [RuneBlog.blog, 0, live]
-STDERR.puts :cp029r
-    meta = live.transform(x::BlogTemplate)
-STDERR.puts :cp029s
-    dump(meta, "themes/standard/blogview.lt3")
-STDERR.puts :cp029t
+    system("livetext themes/standard/generate.lt3 >generated/blog/index.html 2>generated/blog/index.err")
     dump("Initial creation", "last_published")
-STDERR.puts :cp029u
     Dir.chdir(up)
     @views << view
     @views

data/lib/runeblog_version.rb

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

data/runeblog.gemspec

@@ -20,12 +20,13 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.84'
+  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.85'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
 
   # Files...
-  main = Find.find("bin").to_a + 
-         Find.find("lib").to_a
+  main = Find.find("bin").to_a  + 
+         Find.find("lib").to_a  +
+         Find.find("data").to_a
 
   misc = %w[./README.lt3 ./README.md ./runeblog.gemspec]
   test = Find.find("test").to_a

data/test/general_test.rb

@@ -257,7 +257,7 @@ end  # conditional tests
 
   def xtest_019_exception_existing_blog
 #   puts __method__
-    assert_raises(BlogAlreadyExists) { RuneBlog.create_new_blog }
+    assert_raises(BlogAlreadyExists) { RuneBlog.create_new_blog_repo }
   end
 
   def xtest_020_exception_missing_blog_accessor

data/test/make_blog.rb

@@ -32,13 +32,9 @@ end
 STDERR.puts :cp01
 
 system("rm -rf .blogs")
-STDERR.puts :cp02
 RuneBlog.create_new_blog_repo('test_view', ".blogs/data")
-STDERR.puts :cp03
 x = RuneBlog.new
-STDERR.puts :cp04
 x.create_view("alpha_view")
-STDERR.puts :cp05
 
 # Hack:
 if File.exist?("publish")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.68
+  version: 0.1.69
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.84
+        version: 0.8.85
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.84
+        version: 0.8.85
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +61,7 @@ files:
 - "./README.md"
 - "./runeblog.gemspec"
 - bin/blog
+- data/standard.tgz
 - lib/default.rb
 - lib/global.rb
 - lib/helpers-blog.rb