hx 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/hx/commandline.rb

@@ -30,14 +30,19 @@ require 'tempfile'
 module Hx
 module Commandline
 
-DEFAULT_CONFIG_FILENAME = "hx-config.yaml"
+DEFAULT_CONFIG_FILENAME = "config.hx"
 
 def self.main(*args)
   options = OpenStruct.new
   options.config_file = nil
 
   OptionParser.new do |opts|
-    opts.banner = "Usage: hx [--config CONFIG_FILE]"
+    opts.banner = <<EOS
+Usage: hx [--config CONFIG_FILE] [upgen]
+       hx [--config CONFIG_FILE] regen
+       hx [--config CONFIG_FILE] post[up] SOURCE:PATH
+       hx [--config CONFIG_FILE] edit[up] SOURCE:PATH
+EOS
 
     opts.on("-c", "--config CONFIG_FILE",
             "Use CONFIG_FILE instead of searching for " +
@@ -110,27 +115,32 @@ def self.do_gen(site, update_only)
   end
 end
 
+def self.cmd_editup(site, pathspec)
+  cmd_edit(site, pathspec)
+  cmd_upgen(site)
+end
+
+def self.cmd_postup(site, pathspec)
+  cmd_post(site, pathspec)
+  cmd_upgen(site)
+end
+
 def self.cmd_edit(site, pathspec)
-  do_edit(site, pathspec, false)
+  do_edit(site, pathspec, nil)
 end
 
-def self.cmd_create(site, pathspec)
-  do_edit(site, pathspec, true)
+def self.cmd_post(site, pathspec)
+  prototype = {
+    'title' => Hx.make_default_title(site.options, path),
+    'author' => Hx.get_default_author(site.options),
+    'content' => ""
+  }
+  do_edit(site, pathspec, prototype)
 end
 
-def self.do_edit(site, pathspec, create)
+def self.do_edit(site, pathspec, prototype)
   source_name, path = pathspec.split(':', 2)
-  path, source_name = source_name, path unless source_name
-
-  if create
-    prototype = {
-      'title' => Hx.make_default_title(site.options, path),
-      'author' => Hx.get_default_author(site.options),
-      'content' => ""
-    }
-  else
-    prototype = nil
-  end
+  raise "Invalid entry specification #{pathspec}" unless path
 
   if source_name
     source = site.sources[source_name]
@@ -163,9 +173,7 @@ def self.do_edit(site, pathspec, create)
           $stderr.print "Edit failed; retry? [Yn] "
           $stderr.flush
           response = $stdin.gets.strip
-          unless response =~ /^y/i
-            raise e
-          end
+          raise unless response =~ /^y/i
         end
       end
     ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - MenTaLguY