runeblog 0.0.77 → 0.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1569e4f78adc608707f4eb19abcb8fb93a02fbc
-  data.tar.gz: ea6dddca0418de9a86335ed056187e28951ae952
+  metadata.gz: 803f8e5ff082b0e23819eb091c649075abb4d059
+  data.tar.gz: 98b845e49a328067bb7add5080498c9308c3c26b
 SHA512:
-  metadata.gz: 8d97b86002bb3573ca90d4dad60606d0b274d27496e875e4fbefa9046a0265114c0d2434402467c7c3816dbda72955603b16d255acacdbc77a89b05f37d229c1
-  data.tar.gz: 1459f0d97b66954d116307bd7b9695f81107a8ecf378e593f18aae3edf9ca67145e83101495dac973a77f1df7afd220541b738df822ea74a0e7e328708bf91ff
+  metadata.gz: 3f08ef8743d3426f0659b57e4fb7f008a00d80c43dd03b5e1acd387316025f1f23d1fd471ad82343905164ff218a3e4df60c572bcf3b9249faf0b43d2ba01469
+  data.tar.gz: 111cde858002851bb9c1074b92ed85ac012e89b445199a18317cc8033da2520fb5cdd7be9dba060d887a3c4ffcb0500432eda0b7d616a9e4e67ea4ec5be711f8

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.77   2018-10-04
+RuneBlog v 0.0.78   2018-10-04

data/lib/deploy.rb

@@ -4,6 +4,9 @@ require 'runeblog'
 class RuneBlog::Deployment
   attr_reader :user, :server, :root, :path
 
+  BadRemoteLogin = Exception.new("Can't login remotely")
+  BadRemotePerms = Exception.new("Bad remote permissions")
+
   def initialize(user, server, root, path, protocol = "http")
     @blog = RuneBlog.blog
     @user, @server, @root, @path = 
@@ -17,9 +20,9 @@ class RuneBlog::Deployment
   def deploy(files)
     reset_output
     dir = "#@root/#@path"
-    result = system("ssh -c #@user@#@server mkdir #{dir}") 
+    result = system("ssh #@user@#@server -x mkdir #{dir}") 
     list = files.join(' ')
-    cmd = "scp -r #{list} root@#{server}:#{dir} >/dev/null 2>&1"
+    cmd = "scp -r #{list} #@user@##server:#{dir} >/dev/null 2>&1"
     output! "Deploying #{files.size} files...\n"
     result = system(cmd)
     raise "Problem occurred in deployment" unless result
@@ -28,6 +31,23 @@ class RuneBlog::Deployment
     output! "...finished.\n"
     @out
   end
+
+  def remote_login?
+    cmd = "ssh -o BatchMode=yes #@user@#@server -x date >/dev/null 2>&1"
+    result = system(cmd)
+    return nil unless result
+    true
+  end
+
+  def remote_permissions?
+    dir = "#@root/#@path"
+    temp = "#@path/__only_testing" 
+    try1 = system("ssh -o BatchMode=yes -o ConnectTimeout=2 #@user@#@server -x mkdir -p #{temp} >/dev/null 2>&1")
+    return nil unless try1
+    try2 = system("ssh -o BatchMode=yes -o ConnectTimeout=2 #@user@#@server -x rmdir #{temp} >/dev/null 2>&1")
+    return nil unless try2
+    true
+  end
 end
 
 

data/lib/repl.rb

@@ -19,8 +19,9 @@ module RuneBlog::REPL
   def cmd_browse
     reset_output
     check_empty(arg)
-    url = @blog.deployment_url
-    if url.nil?
+    url = @blog.view.deployer.url
+    # FIXME Bad logic here.
+    if url.nil?   
       output! "Deploy first."
       return @out
     end
@@ -172,13 +173,14 @@ module RuneBlog::REPL
   end
 
   def cmd_kill(arg)
-    reset_output
+    reset_output "\n"
     args = arg.split
     args.each do |x| 
       # FIXME
-      cmd_remove_post(x, false)
+      ret = cmd_remove_post(x.to_i, false)
+      output ret
     end
-    nil
+    @out
   rescue => err
     error(err)
     puts err.backtrace

data/lib/runeblog.rb

@@ -124,13 +124,6 @@ class RuneBlog
     end
   end
 
-  def deployment_url
-    return nil unless @deploy[@view]
-    lines = @deploy[@view]
-    user, server, sroot, spath = *@deploy[@view]
-    url = "http://#{server}/#{spath}"
-  end
-
   def view_files
     vdir = @blog.viewdir(@view)
     # meh
@@ -169,13 +162,13 @@ class RuneBlog
 
   def posts
     dir = self.view.dir
-    posts = Dir.entries(dir).grep(/^0.*/)
+    posts = Dir.entries(dir).grep(/^\d{4}/)
     posts
   end
 
   def drafts
     dir = "#@root/src"
-    drafts = Dir.entries(dir).grep(/^0.*.lt3/)
+    drafts = Dir.entries(dir).grep(/^\d{4}.*/)
   end
 
   def change_view(view)

data/lib/version.rb

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

data/test/general.rb

@@ -141,19 +141,74 @@ class TestREPL < Minitest::Test
   def test_012_create_remove_post!
     @blog.change_view("beta_view")
     assert @blog.view.to_s == "beta_view", "Expected beta_view"
-    before = @blog.posts.size 
+    nposts = @blog.posts.size 
+    ndrafts = @blog.drafts.size 
     meta = OpenStruct.new
     meta.title = "Uninteresting title"
     num = @blog.create_new_post(meta, true)
-    assert @blog.posts.size == before + 1, "Don't see new post"
+
+    assert @blog.posts.size == nposts + 1, "Don't see new post"
     @blog.remove_post(num)
-    @blog.delete_draft(num)  # Hmm
-    assert @blog.posts.size == before, "Failed to delete post"
+    assert @blog.posts.size == nposts, "Failed to delete post"
+
+    assert @blog.drafts.size == ndrafts + 1, "Don't see new draft"
+    @blog.delete_draft(num)
+    assert @blog.drafts.size == ndrafts, "Failed to delete draft"
+    @blog.change_view("alpha_view")
+  end
+
+  def test_013_slug_tests
+    hash = { "abcxyz"      => "abcxyz",      # 0-based
+             "abc'xyz"     => "abcxyz",
+             'abc"xyz'     => "abcxyz",
+             '7%sol'       => "7sol",
+             "only a test" => "only-a-test",
+             "abc  xyz"    => "abc--xyz",    # change this behavior?
+             "ABCxyZ"      => "abcxyz",
+           }
+    hash.each_pair.with_index do |keys, i|
+      real, fixed = *keys
+      result = @blog.make_slug(real)[1][5..-1]  # weird? returns [99, "0099-whatever"]
+      assert result == fixed, "Case #{i}: expected: #{fixed.inspect}, got #{result.inspect}"
+    end
+  end
+
+  def test_014_remove_nonexistent_post!
+    @blog.change_view("alpha_view")
+    out = cmd_remove_post(99)
+    assert out =~ /Post 99 not found/, "Expected error about nonexistent post, got: #{out}"
+  end
+
+  def test_015_kill_multiple_posts!
     @blog.change_view("alpha_view")
+    out = cmd_list_posts(nil)
+    before = out.split("\n").length 
+    out = cmd_kill("1  2 7")
+    out = cmd_list_posts(nil)
+    after = out.split("\n").length 
+    assert after == before - 3, "list_posts saw #{before} posts, now #{after} (not #{before-3})"
+    system("ruby test/make_blog.rb")   # This is hellish, I admit
   end
 
-  def test_013_kill_posts!
-    # Must think about this.
+  def test_016_can_deploy
+    dep = RuneBlog::Deployment.new("root", "rubyhacker.com", "/var/www", "whatever")
+    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
+    dep = RuneBlog::Deployment.new("bad_user", "rubyhacker.com", "/var/www", "whatever")
+    result = dep.remote_login?
+    assert result.nil?, "Expected to detect login error (bad user)"
+  end
+
+  def test_018_cannot_deploy_bad_server
+    dep = RuneBlog::Deployment.new("root", "nonexistent123.com", "/var/www", "whatever")
+    result = dep.remote_login?
+    assert result.nil?, "Expected to detect login error (bad server)"
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.77
+  version: 0.0.78
 platform: ruby
 authors:
 - Hal Fulton