runeblog 0.0.95 → 0.0.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d4d9b1bcaafabe52df6f052937384b9ca18994
-  data.tar.gz: 321bdd0774b16023c07aa178c186c979fe4e3189
+  metadata.gz: 6f6d3746b90f11a932bc05711f21f789809cca00
+  data.tar.gz: 48b95ce73c73cf0acce1a61377e1a0044ff75fd9
 SHA512:
-  metadata.gz: 3f5b753295af284c6c58cae4a9835ccb4ec4533994a39ba5bddac3059de9fac885059d601216ec3472f61f70444fd7f2435d39b57a30b4749e83948b7b6497a5
-  data.tar.gz: 87fa60d1c80194b23e5ee31fadea623455ec477ccb25e09e51994bbe4f9b92a0e51e4ae5f83dcec641d027744959a683452581cc65dfca237107a46c2b73e0e5
+  metadata.gz: 5a349ab1b13babe5d238d43787b1342d72aae3eb4c924b536f99525f4f6db4874d550a9678a16a031b11a6a268a2313ebf15f1072980d9ae49dc10464e00e5d1
+  data.tar.gz: 00c2de00d08e210e21acc2c82fa000e23f7e8fcc97d9383664b5354bac001e1401b5aa65df1de4e3fcffe84a1bb1ee652194af13fd57e0d99803390cc3a37b95

data/lib/global.rb

@@ -10,7 +10,7 @@ class RuneBlog
   class View
   end
 
-  class Deployment
+  class Publishing
   end
 
   class Post

data/lib/helpers-repl.rb

@@ -50,7 +50,7 @@ module RuneBlog::REPL
 
      "rebuild"           => :cmd_rebuild,
 
-     "deploy"            => :cmd_deploy,
+     "publish"           => :cmd_publish,
 
      "q"                 => :cmd_quit,
      "quit"              => :cmd_quit
@@ -193,14 +193,14 @@ module RuneBlog::REPL
 
     edit_initial_post(@fname)
     process_post(@fname)
-    publish_post(@meta) # if publish?
+    link_post_all_views(@meta)
   rescue => err
     error(err)
   end
 
-  def ask_deployment_info   # returns Deployment object
+  def ask_publishing_info   # returns Publishing object
     # user, server, root, path, protocol = "http"
-    puts "Please enter deployment data for view #{@blog.view}..."
+    puts "Please enter publishing data for view #{@blog.view}..."
     user = ask("User: ")
     root = ask("Doc root: ")
     server = ask("Server: ")
@@ -208,7 +208,7 @@ module RuneBlog::REPL
     proto = ask("Protocol (ENTER for http): ")
     [user, root, server, path, proto].each {|x| x.chomp! }
     proto = "http" if proto.empty?
-    RuneBlog::Deployment.new(user, server, root, path, proto)
+    RuneBlog::Publishing.new(user, server, root, path, proto)
   end
 
   ### find_asset

data/lib/post.rb

@@ -54,7 +54,7 @@ class RuneBlog::Post
     error(err)
   end 
 
-  def publish
+  def build
     livetext = Livetext.new(STDOUT)
     @meta = livetext.process_file(@draft, binding)
     raise LivetextError(@draft) if @meta.nil?

data/lib/{deploy.rb → publish.rb}

@@ -1,7 +1,7 @@
 require 'helpers-blog'
 require 'runeblog'
 
-class RuneBlog::Deployment
+class RuneBlog::Publishing
   attr_reader :user, :server, :docroot, :path
 
   BadRemoteLogin = Exception.new("Can't login remotely")
@@ -29,17 +29,17 @@ class RuneBlog::Deployment
     url = "#{protocol}://#{@server}/#{@path}"
   end
  
-  def deploy(files)
+  def publish(files)
     reset_output
     dir = "#@docroot/#@path"
     result = system("ssh #@user@#@server -x mkdir #{dir}") 
     list = files.join(' ')
     cmd = "scp -r #{list} #@user@##server:#{dir} >/dev/null 2>&1"
-    output! "Deploying #{files.size} files...\n"
+    output! "Publishing #{files.size} files...\n"
     result = system(cmd)
-    raise DeploymentError unless result
+    raise PublishError unless result
 
-    dump(files, "#{@blog.view.dir}/last_deployed")
+    dump(files, "#{@blog.view.dir}/last_published")
     output! "...finished.\n"
     @out
   end

data/lib/repl.rb

@@ -2,7 +2,7 @@ require 'runeblog'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
 
-make_exception(:DeploymentError, "Error during deployment")
+make_exception(:PublishError, "Error during publishing")
 make_exception(:EditorProblem,   "Could not edit $1")
 
 module RuneBlog::REPL
@@ -23,10 +23,10 @@ module RuneBlog::REPL
   def cmd_browse
     reset_output
     check_empty(arg)
-    url = @blog.view.deployer.url
+    url = @blog.view.publisher.url
     # FIXME Bad logic here.
     if url.nil?   
-      output! "Deploy first."
+      output! "Publish first."
       return @out
     end
     result = system("open '#{url}'")
@@ -42,13 +42,13 @@ module RuneBlog::REPL
     raise CantOpen(local) unless result
   end
 
-  def cmd_deploy(arg)  # FIXME non-string return expected in caller?
+  def cmd_publish(arg)  # FIXME non-string return expected in caller?
     reset_output
     check_empty(arg)
-    @blog.view.deploy
-    user, server, sroot, spath = *@deploy[@blog.view]
+    @blog.view.publish
+    user, server, sroot, spath = *@publish[@blog.view]
     if files.empty?    # FIXME  baloney
-      output! "No files to deploy"
+      output! "No files to publish"
       return @out
     end
 
@@ -61,11 +61,11 @@ module RuneBlog::REPL
     # ^ needs -c?? 
 
     cmd = "scp -r #{files.join(' ')} root@#{server}:#{dir} >/dev/null 2>&1"
-    output! "Deploying #{files.size} files...\n"
+    output! "Publishing #{files.size} files...\n"
     result = system(cmd)
-    raise DeploymentError unless result
+    raise PublishError unless result
 
-    dump(files, "#{vdir}/last_deployed")
+    dump(files, "#{vdir}/last_published")
     output! "...finished.\n"
     @out
   end
@@ -114,9 +114,9 @@ module RuneBlog::REPL
   def cmd_new_view(arg)
     reset_output
     @blog.create_view(arg)
-    resp = yesno("Add deployment info now? ")
-    @blog.view.deployer = ask_deployment_info
-    write_config(@blog.view.deployer,  @blog.view.dir + "/deploy")  # change this?
+    resp = yesno("Add publishing info now? ")
+    @blog.view.publisher = ask_publishing_info
+    write_config(@blog.view.publisher,  @blog.view.dir + "/publish")  # change this?
     nil
   end
 
@@ -141,7 +141,7 @@ module RuneBlog::REPL
     @out
   end
 
-  #-- FIXME affects linking, building, deployment...
+  #-- FIXME affects linking, building, publishing...
 
   def cmd_remove_post(arg, safe=true)
     # FIXME - 'safe' is no longer a thing
@@ -155,7 +155,7 @@ module RuneBlog::REPL
     @out
   end
 
-  #-- FIXME affects linking, building, deployment...
+  #-- FIXME affects linking, building, publishing...
 
   def cmd_edit_post(arg)
     reset_output
@@ -242,10 +242,10 @@ module RuneBlog::REPL
        #{red('edit ID          ')} Edit a post
   
        #{red('preview          ')} Look at current (local) view in browser
-       #{red('browse           ')} Look at current (deployed) view in browser
+       #{red('browse           ')} Look at current (published) view in browser
        #{red('relink           ')} Regenerate index for all views
        #{red('rebuild          ')} Regenerate all posts and relink
-       #{red('deploy           ')} Deploy (current view)
+       #{red('publish          ')} Publish (current view)
     EOS
     @out
   end

data/lib/runeblog.rb

@@ -4,7 +4,7 @@ require 'global'
 require 'helpers-blog'
 require 'default'
 require 'view'
-require 'deploy'
+require 'publish'
 require 'post'
 require 'version'
 
@@ -57,7 +57,7 @@ class RuneBlog
 
   def initialize   # assumes existing blog
     # Crude - FIXME later - 
-    # What views are there? Deployment, etc.
+    # What views are there? Publishing, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     @root, @view_name, @editor = 
       read_config(ConfigFile, :root, :current_view, :editor)
@@ -85,12 +85,12 @@ class RuneBlog
     case arg
       when RuneBlog::View
         @view = arg
-        @view.deployer = read_config(@view.dir + "/deploy")
+        @view.publisher = read_config(@view.dir + "/publish")
       when String
         new_view = str2view(arg)
         raise NoSuchView(arg) if new_view.nil?
         @view = new_view
-        @view.deployer = read_config(@view.dir + "/deploy")
+        @view.publisher = read_config(@view.dir + "/publish")
       else 
         raise CantAssignView(arg.class.to_s)
     end
@@ -130,11 +130,11 @@ class RuneBlog
     create_dir('custom')
     create_dir('assets')
     # FIXME dump method??
-    dump("", "deploy")
+    dump("", "publish")
     dump(x::BlogHeader, "custom/blog_header.html")
     dump(x::BlogTrailer, "custom/blog_trailer.html")
     dump(x::PostTemplate, "custom/post_template.html")
-    dump("Initial creation", "last_deployed")
+    dump("Initial creation", "last_published")
     Dir.chdir(up)
     @views << RuneBlog::View.new(arg)
   end
@@ -152,7 +152,7 @@ class RuneBlog
     files = ["#{vdir}/index.html"]
     files += posts.map {|x| "#{vdir}/#{x}" }
     # Huh? 
-    files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_deployed") }
+    files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_published") }
   end
 
   def files_by_id(id)   # FIXME get rid of this later
@@ -169,7 +169,7 @@ class RuneBlog
     meta.body ||= "Remainder of post goes here."
     post = RuneBlog::Post.new(meta, @view.to_s)
     post.edit unless testing
-    post.publish
+    post.build
     post.num
   rescue => err
     puts err # error(err)
@@ -219,7 +219,7 @@ class RuneBlog
     error(err)
   end
 
-  def publish_post(meta)
+  def link_post_all_views(meta)
     meta.views.each {|view| link_post_view(view) }
 #   assets = find_all_assets(@meta.assets, views)
     nil
@@ -230,7 +230,7 @@ class RuneBlog
   def link_post_view(view)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     # Create dir using slug (index.html, metadata?)
-    vdir = self.viewdir(view)
+    vdir = self.viewdir(view) # FIXME
     dir = vdir + @meta.slug + "/"
     create_dir(dir + "assets") 
     Dir.chdir(dir) do
@@ -307,7 +307,7 @@ class RuneBlog
   def rebuild_post(file)
     raise ArgumentError unless file.is_a?(String)
     @meta = process_post(file)
-    publish_post(@meta)       # FIXME ??
+    link_post_all_views(@meta)       # FIXME ??
   rescue => err
     error(err)
   end

data/lib/version.rb

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

data/lib/view.rb

@@ -3,7 +3,7 @@ require 'runeblog'
 
 class RuneBlog::View
   attr_reader :name, :state
-  attr_accessor :deployer
+  attr_accessor :publisher
 
   include RuneBlog::Helpers
 
@@ -11,8 +11,8 @@ class RuneBlog::View
     raise NoBlogAccessor if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
     @name = name
-    dep_file = @blog.root + "/views/#@name/deploy"
-    @deployer = read_config(dep_file)
+    dep_file = @blog.root + "/views/#@name/publish"
+    @publisher = read_config(dep_file)
   end
 
   def dir
@@ -36,19 +36,19 @@ class RuneBlog::View
     files
   end
 
-  def deploy
-    # ?? @blog.view.deployment.deploy
+  def publish
+    # ?? @blog.view.publisher.publish
     # output "Files:"
     # files.each {|f| output "    #{f}\n" }
     output_newline
     list = files(true)
-    @deployer.deploy(list)
+    @publisher.publish(list)
   rescue => err
     error(err)
   end
 
   def recent?(file)
-    File.mtime(file) < File.mtime("#{dir()}/last_deployed")
+    File.mtime(file) < File.mtime("#{dir()}/last_published")
   end
 
 end

data/test/general.rb

@@ -98,7 +98,7 @@ class TestREPL < Minitest::Test
       "browse"            => [:cmd_browse, nil],
       "relink"            => [:cmd_relink, nil],
       "rebuild"           => [:cmd_rebuild, nil],
-      "deploy"            => [:cmd_deploy, nil],
+      "publish"           => [:cmd_publish, nil],
       "q"                 => [:cmd_quit, nil],
       "quit"              => [:cmd_quit, nil]
       # Later: too many/few params
@@ -193,33 +193,33 @@ class TestREPL < Minitest::Test
     @blog.undelete_post(7)
   end
 
-if File.exist?("testing.deploy")
+if File.exist?("testing.publish")
 
-  def test_016_can_deploy
+  def test_016_can_publish
     x = OpenStruct.new
     x.user, x.server, x.docroot, x.docroot, x.path, x.proto = 
       "root", "rubyhacker.com", "/var/www", "whatever", "http"
-    dep = RuneBlog::Deployment.new(x)
+    dep = RuneBlog::Publishing.new(x)
     result = dep.remote_login?
     assert result == true, "Valid login doesn't work"
     result = dep.remote_permissions?
     assert result == true, "Valid mkdir doesn't work"
   end
 
-  def test_017_cannot_deploy_wrong_user
+  def test_017_cannot_publish_wrong_user
     x = OpenStruct.new
     x.user, x.server, x.docroot, x.docroot, x.path, x.proto = 
       "bad_user", "rubyhacker.com", "/var/www", "whatever", "http"
-    dep = RuneBlog::Deployment.new(x)
+    dep = RuneBlog::Publishing.new(x)
     result = dep.remote_login?
     assert result.nil?, "Expected to detect login error (bad user)"
   end
 
-  def test_018_cannot_deploy_bad_server
+  def test_018_cannot_publish_bad_server
     x = OpenStruct.new
     x.user, x.server, x.docroot, x.docroot, x.path, x.proto = 
       "root", "nonexistent123.com", "/var/www", "whatever", "http"
-    dep = RuneBlog::Deployment.new(x)
+    dep = RuneBlog::Publishing.new(x)
     result = dep.remote_login?
     assert result.nil?, "Expected to detect login error (bad server)"
   end
@@ -261,7 +261,7 @@ end  # conditional tests
   end
 
   # later tests...
-  # new view asks for deployment info and writes it
+  # new view asks for publishing info and writes it
   #   (how to mimic user input? test some other way?)
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.95
+  version: 0.0.96
 platform: ruby
 authors:
 - Hal Fulton
@@ -42,11 +42,11 @@ files:
 - "./runeblog.gemspec"
 - bin/blog
 - lib/default.rb
-- lib/deploy.rb
 - lib/global.rb
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
 - lib/post.rb
+- lib/publish.rb
 - lib/repl.rb
 - lib/runeblog.rb
 - lib/version.rb