mkblog 0.0.5 → 0.0.6

data/bin/mkblog

@@ -11,7 +11,9 @@ include FileUtils
 
 def main()
     options = {
-        "debug" => false
+        "debug" => false,
+        "username" => "",
+        "email" => ""
     }
     option_parser = OptionParser.new do |opts|
         executable_name = File.basename($PROGRAM_NAME)
@@ -21,7 +23,12 @@ def main()
         opts.on("-d","--debug","debug") do 
             options["debug"] = true
         end
-
+        opts.on("-u","--username name","your name in blog, like \"Larry Cai\"") do | name|
+            options["username"] = name
+        end
+        opts.on("-e","--email email","email could be contacted in blog") do |name|
+            options["email"] = name
+        end
         opts.on("-g","--generate project","generate blog under project.github.com") do |name|
             unless name =~ /^[a-zA-Z0-9]+$/
                 raise ArgumentError,"name should be [a-zA-Z0-9]"
@@ -39,7 +46,7 @@ def main()
     puts options.inspect if options["debug"]
     
     case options["command"] 
-    when "generate" then generate_project(options["account"],options["debug"])
+    when "generate" then generate_project(options["account"],options["username"],options["email"],options["debug"])
     when "show" then showhelp() 
     else puts "--help for help"
     end    
@@ -74,9 +81,12 @@ def guess()
     return username,email
 end
 # http://stackoverflow.com/questions/5074327/most-appropriate-way-to-generate-directory-of-files-from-directory-of-template-f
-def generate_project(account,debug)
+def generate_project(account,username,email,debug)
     destination = account + ".github.com"
-    username,email = guess()
+    #puts username, email
+    gitusername,gitemail = guess() 
+    username = gitusername if username.empty?
+    email = gitemail if email.empty?
     source = File.dirname(__FILE__)+"/../templates"
     #puts "generate project \"#{destination}\" from source \"#{source}\""
     FileUtils.rmtree(destination)

data/lib/mkblog_version.rb

@@ -1,3 +1,3 @@
 module MkBlog
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/templates/_posts/2012-03-16-setup-blog-in-5minutes.mkd.erb

@@ -20,7 +20,7 @@ title: 5分钟快速架设个人博客
     index.html
     _layout/master.html
     _layout/post.html
-
+    
 现在就可以把东西放到Github上了。在<http://github.com/<%= account %>>建一个`<%= account %>.github.com`，然后上传。
 
 再在你的项目中按照[github:pages](http://pages.github.com/)配好。
@@ -29,6 +29,9 @@ title: 5分钟快速架设个人博客
 
 忘了说怎么写博客了，把文件放在 `_posts`即可。
 
+## 其他 ##
+[feedburner](http://feedburner.google.com)和[disqus](http://disqus.com)的账号自己搞定吧
+
 # 相关阅读 #
  1. 蒋鑫的《Github权威指南》<http://www.worldhello.net/gotgithub/03-project-hosting/050-homepage.html>
  2. 展新的 “搭建 Jekyll 博客的一些小技巧” <http://www.pizn.me/2012/03/01/some-tips-for-jekyll-blog.html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkblog
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &24945000 !ruby/object:Gem::Requirement
+  requirement: &23250336 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.6
   type: :development
   prerelease: false
-  version_requirements: *24945000
+  version_requirements: *23250336
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &24944760 !ruby/object:Gem::Requirement
+  requirement: &23249988 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24944760
+  version_requirements: *23249988
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &24944472 !ruby/object:Gem::Requirement
+  requirement: &23249688 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24944472
+  version_requirements: *23249688
 description: ! 'generate jekyll based blog '
 email:
 - larry.caiyu@gmail.com