docwu 0.0.6 → 0.0.7

data/lib/docwu/post.rb

@@ -105,7 +105,7 @@ module Docwu
     end
 
     def title
-      self.page_data['title'] || self.url
+      self.page_data['title'] || self.name
     end
 
     # 渲染

data/lib/docwu/utils.rb

@@ -2,6 +2,12 @@
 module Docwu
   class Utils
     class << self
+      def cp_r src, dest
+        if File.exists?(src)
+          FileUtils.cp_r(src, dest)
+        end
+      end
+
       def hash_deep_merge(hash, other_hash)
         hash.merge(other_hash) do |key, oldval, newval|
           oldval = oldval.to_hash if oldval.respond_to?(:to_hash)

data/lib/docwu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Docwu
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/docwu/worker.rb

@@ -3,31 +3,6 @@ require 'date'
 module Docwu
   class Worker
 
-    # - folder1
-    #   - assets:
-    #     + javascripts
-    #     + images
-    #     + files
-    #   - doc:
-    #     + 市场相关
-    #     = 个人相关
-    #       + happy
-    #       + john
-    #       - xiaozhang
-    #         + learning
-    #     + 基本文档
-    # - folder2
-    #   - layouts:
-    #     - application.mustache
-    #   - doc:
-    #     + 基础资料
-    # - assets:
-    #   + javascripts
-    #   + images
-    # - layouts:
-    #   - application.mustache
-    #
-
     attr_reader :layouts, :data, :deploy_path, :folders, :topics
 
     def initialize
@@ -96,9 +71,12 @@ module Docwu
     def generate
       # 删除要输出的路径
       FileUtils.rm_rf(self.deploy_path)
+      FileUtils.mkdir_p(self.deploy_path)
+
+      ::Docwu::Utils.cp_r("#{plain_path('/assets/')}", "#{self.deploy_path}")
 
-      # 复制 assets 文件进去
-      FileUtils.cp_r("#{plain_path('/assets')}", "#{self.deploy_path}/")
+      # 复制静态文件里去
+      ::Docwu::Utils.cp_r("#{plain_path('/static/')}", "#{self.deploy_path}")
 
       self.folders.each do |folder|
         folder.generate

data/lib/docwu.rb

@@ -25,23 +25,52 @@ module Docwu
 
     _command = args.shift
 
-    _useful_cmds = ['g', 'generate', 's', 'server', '-h', '--help']
+    _useful_cmds = ['g', 'generate', 's', 'server', '-h', '--help', 'new']
 
     unless _useful_cmds.include?(_command)
-      raise "command #{_command} is not available, not in (#{_useful_cmds.join('|')})"
+      puts "command #{_command} is not available, not in (#{_useful_cmds.join('|')})"
+      exit
+    end
+
+
+    if ['new'].include?(_command)
+      _project_name = args.shift
+
+      if _project_name.nil?
+        puts 'error: You need input a project name! '
+        exit
+      end
+
+      _new_dest = "#{workspace}/#{_project_name}"
+
+      _template_src = "#{File.dirname(__FILE__)}/template_files"
+
+      if File.exists?(_new_dest) && File.directory?(_new_dest)
+        puts "error: #{_new_dest} already exists! Please check !"
+      else
+        FileUtils.cp_r("#{_template_src}", "#{_new_dest}")
+
+        system "cd #{_new_dest} && bundle install && bundle exec docwu generate"
+        puts "cd #{_new_dest} && bundle install && bundle exec docwu generate"
+
+        puts "[#{_new_dest}] already success created!"
+      end
+
+      exit
     end
 
     _default_params = {
       '-p'        => [5656],
       '-a'        => ['0.0.0.0'],
-      '-c'        => ["#{workspace}/config.yml"],
-      'DOCWU_ENV' => ['development'],
-      '-d'        => [(args.delete('-d') == '-d')]
+      '-c'        => ["#{workspace}/config.yml"]
     }
 
     if ['--help', '-h'].include?(_command)
       puts "docwu:"
 
+      puts "   * docwu new [project_name]  ; eg.: docwu new project"
+      puts ""
+      puts "   * docwu g, docwu generate, docwu s, docwu server"
       _default_params.each do |_cmd, _cfg|
         puts "    #{_cmd}, #{_cfg[1]} (default: #{_cfg[0]})"
       end

data/lib/template_files/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gem 'docwu', '0.0.7'

data/lib/template_files/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    coderay (1.0.9)
+    daemons (1.1.9)
+    docwu (0.0.7)
+      coderay
+      mustache_render
+      nokogiri
+      redcarpet
+      thin
+    eventmachine (1.0.3)
+    mini_portile (0.5.1)
+    mustache_render (0.0.25)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    rack (1.5.2)
+    redcarpet (3.0.0)
+    thin (1.5.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  docwu (= 0.0.7)

data/lib/template_files/README.md

@@ -0,0 +1,3 @@
+# 团800 Wiki 系统
+
+

data/lib/template_files/_deploy/assets/images/shared/folder/README.txt

@@ -0,0 +1 @@
+http://sc.chinaz.com/tubiao/121008316061.htm

data/lib/template_files/_deploy/assets/stylesheets/application.css

@@ -0,0 +1,215 @@
+body {
+  padding: 0;
+  margin: 0;
+  color: #503E2C;
+  font-family: "Oxygen",Arial,"Hiragino Sans GB","Microsoft YaHei","STHeiti","WenQuanYi Micro Hei",SimSun,sans-serif;
+  font-size: 14px;
+  letter-spacing: 1px;
+  word-wrap: break-word;
+}
+
+a:hover {
+  color: red !important;
+}
+
+a {
+  color: #A68800;
+}
+
+a.button {
+  background-color: #AAB5B5;
+  border-radius: 10px;
+  -moz-border-radius: 10px;
+  color: white;
+  display: inline-block;
+  margin: 0 5px 5px 0;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+
+img {
+  border: none;
+}
+
+.wrapper {
+  width: 1024px;
+  margin: 0 auto;
+}
+
+.clearfix:after {
+    clear: both;
+    content: ".";
+    display: block;
+    height: 0;
+    visibility: hidden;
+}
+
+pre {
+  padding: 10px;
+  font-size: 12px;
+  background-color: #F8F8F8;
+  border: 1px solid #DDDDDD;
+  border-radius: 3px 3px 3px 3px;
+  overflow: auto;
+}
+
+#header {
+  background: none repeat scroll 0 0 #007E8C;
+  padding: 10px;
+}
+
+#header .nav a {
+  color: #fff;
+  padding: 0 10px 0 0;
+}
+
+#container {
+  padding: 5px;
+}
+
+#container .path {
+  margin: 10px 0;
+  padding: 5px;
+  height: 24px;
+  line-height: 24px;
+  overflow: hidden;
+  text-indent: 12px;
+  color: #666;
+  border: 1px solid #ccc;
+}
+
+#container .path a {
+  color: #666;
+}
+
+#container .posterity .folders li.post {
+  padding: 5px;
+}
+
+#container .posterity .folders li.post .introduction {
+  font-size: 80%;
+}
+
+#container .posterity .folders li.post a.read-link {
+  font-size: 80%;
+  color: #503E2C;
+}
+
+#container .content {
+  padding: 10px;
+}
+
+#container .information {
+  padding: 0;
+  margin: 0 0 10px;
+}
+
+#container .information .bar .high {
+  color: red;
+}
+
+#footer {
+  font-size: 12px;
+  text-align: center;
+  color: #999999;
+}
+
+#footer .wrapper {
+  border-top: 1px solid #DBDBDB;
+  margin: 8px auto auto;
+  padding-bottom: 10px;
+  padding-top: 10px;
+  width: 800px;
+}
+
+.dl-catalogs {
+  padding: 0;
+  margin:  0;
+}
+
+.dl-catalogs dd {
+  margin: 0;
+  line-height: 1.8;
+  display: none;
+  white-space:nowrap;
+  overflow: hidden;
+  font-size: 12px;
+}
+.dl-catalogs dd a {
+  color: #503E2C;
+}
+
+.dl-catalogs dd.catalog-link-h1 {
+  display: block;
+  padding-left: 10px;
+  background: url("/assets/images/shared/icons/li-1.gif") no-repeat scroll 3px 8px transparent
+}
+
+.dl-catalogs dd.catalog-link-h2 {
+  display: block;
+  padding-left: 20px;
+  background: url("/assets/images/shared/icons/li-2.gif") no-repeat scroll 13px 8px transparent
+}
+
+.dl-catalogs dd.catalog-link-h3 {
+  display: block;
+  padding-left: 30px;
+  background: url("/assets/images/shared/icons/li-3.gif") no-repeat scroll 23px 8px transparent
+}
+
+.dl-catalogs dd.catalog-link-h4 {
+
+}
+
+.dl-catalogs dd.catalog-link-h5 {
+
+}
+
+.dl-catalogs dd.catalog-link-h6 {
+
+}
+
+#container .posterity .folders .folder {
+  background-color: #EEEEEE;
+  clear: both;
+  padding: 18px 20px;
+  margin: 10px;
+}
+
+#container .posterity .folders .folder .self .info {
+  font-size: 12px;
+  float: right;
+}
+
+#container .posterity .folders .folder h3 {
+  margin: 0;
+  padding: 5px 0 10px;
+}
+
+#container .posterity .folders .folder .children {
+  float: right;
+  width: 835px;
+}
+
+
+#container .posterity .folders .folder .sub-folders a {
+  margin: 5px;
+}
+
+#container .posterity .folders .folder img.icon {
+  height: 128px;
+}
+
+#container .posterity .folders .folder img.sub-icon {
+  height: 32px;
+  width: 32px;
+}
+
+#container .posterity .folders .folder ul.posts {
+  padding-left: 15px;
+}
+
+#container .posterity .folders .folder ul.posts li {
+  line-height: 1.5;
+}
+

data/lib/template_files/_deploy/assets/stylesheets/document_folder.css

@@ -0,0 +1,12 @@
+#container .information {
+  text-align: left;
+}
+
+#container .information h1 {
+  margin: 5px 0;
+}
+
+#container .information .bar {
+  padding: 5px;
+}
+

data/lib/template_files/_deploy/assets/stylesheets/document_post.css

@@ -0,0 +1,103 @@
+
+#container .information {
+  text-align: center;
+  color: #666;
+}
+
+#container .information .bar {
+  padding: 5px;
+}
+
+#container .information .bar-tags {
+}
+
+#container .outline {
+  background: none repeat scroll 0 0 #F5FCEE;
+  border: 1px solid #DCDDDD;
+  color: #706A6A;
+  font-size: 13px;
+  line-height: 24px;
+  margin: 8px auto 0;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+#container .container-block {
+  background: none repeat scroll 0 0 #EEEEEE;
+}
+
+#container .content {
+  margin: 0;
+  border-radius: 3px 3px 3px 3px;
+  padding: 3px;
+}
+
+#container .content .content-inner {
+  background-color: #FFFFFF;
+  border: 1px solid #CACACA;
+  padding: 10px;
+}
+
+#container .content .content-inner > p {
+  text-indent: 2em;
+}
+
+.content-workmark > *:first-child {
+    margin-top: 0 !important;
+}
+
+.content-workmark h1, 
+.content-workmark h2, 
+.content-workmark h3, 
+.content-workmark h4, 
+.content-workmark h5, 
+.content-workmark h6
+{
+    cursor: text;
+    font-weight: bold;
+    line-height: 1.7;
+    margin: 1em 0 15px;
+    padding: 0;
+    position: relative;
+}
+
+.content-workmark h1 {
+  border-bottom: 2px solid #DDDDDD;
+  font-size: 2.5em;
+}
+
+.content-workmark h2 {
+  border-bottom: 1px solid #EEEEEE;
+  font-size: 1.6em;
+  margin-left: 5px;
+}
+
+.content-workmark h3 {
+  margin-left: 8px;
+}
+
+.content-workmark h4 {
+  margin-left: 10px;
+}
+
+.content-workmark h5 {
+  margin-left: 12px;
+}
+
+.content-workmark h6 {
+  margin-left: 14px;
+}
+
+#container .container-main {
+  float: left;
+  line-height: 1.5;
+  margin: 0 auto;
+  padding: 5px;
+  width: 795px;
+}
+
+#container .container-side {
+  float: right;
+  padding: 10px 8px 0 0;
+  width: 210px;
+}

data/lib/template_files/_deploy/assets/stylesheets/index.css

@@ -0,0 +1,12 @@
+#container .information {
+  text-align: left;
+}
+
+#container .information h1 {
+  margin: 5px 0;
+}
+
+#container .information .bar {
+  padding: 5px;
+}
+

data/lib/template_files/_deploy/document/help/README.html

@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <title>
+      《团800 Wiki 系统, 基本使用文档》 - 帮助  - 团800 Wiki大全
+    </title>
+    <script type='text/javascript' src='/assets/javascripts/application.js'></script>
+    <script type='text/javascript' src='/assets/javascripts/document_post.js'></script>
+    <link href="/assets/stylesheets/application.css" media="all" rel="stylesheet" />
+    <link href="/assets/stylesheets/document_post.css" media="all" rel="stylesheet" />
+  </head>
+<body>
+<div id='header' class='clearfix'>
+  <div class='nav wrapper'>
+    <a href='/index.html'>首页</a>
+
+    <a href='/document/projects/tuan800/index.html' title='团800'>团800</a>
+    <a href='/document/projects/zhe800/index.html' title='折800'>折800</a>
+    <a href='/document/projects/hui800/index.html' title='惠800'>惠800</a>
+    <a href='/document/projects/passport800/index.html' title='团800通行证'>团800通行证</a>
+    <a href='/document/learning/index.html' title='学习教程'>学习教程</a>
+    <a href='/document/juices/index.html' title='每日果汁'>每日果汁</a>
+    <a href='/document/help/index.html' title='帮助'>帮助</a>
+  </div>
+</div>
+
+<div id='container' class='wrapper clearfix'>
+  <div class='path'>
+    <a href='/index.html'>首页</a>
+
+    &gt;
+    <a href='/document/help/index.html' title='帮助'>帮助</a>
+  </div>
+
+  <div class='information'>
+    <h1>团800 Wiki 系统, 基本使用文档</h1>
+
+    <div class='bar'>
+      时间: 2013-08-30 19:41
+
+      <span class='bar-authors'>
+        作者:
+        <a href='javascript:;'>王进忠</a>
+      </span>
+
+    </div>
+
+
+
+  </div>
+
+  <div class='container-block clearfix'>
+    <!-- container-main begin -->
+    <div class='container-main clearfix'>
+
+      <div class='content'>
+        <div class='content-inner content-workmark'>
+          <h1>
+<a name="markup-h1-1"></a>团800 Wiki 系统</h1>
+
+<h2>
+<a name="markup-h2-2"></a>基本命令</h2>
+
+<ol>
+<li><p>更新代码</p></li>
+<li>
+<p>安装GEMS:</p>
+
+<p>bundle install</p>
+</li>
+<li><p>开发环境开启服务器</p></li>
+</ol>
+<ul>
+<li>bundle exec docwu s          # 默认开启， <a href="http://127.0.0.1:5656">http://127.0.0.1:5656</a>
+</li>
+<li>bundle exec docwu s -p 3300  # 以3300端口开启服务器， <a href="http://127.0.0.1:3300">http://127.0.0.1:3300</a>
+</li>
+</ul>
+<ol>
+<li>当文档修改了，需要使用如下命令进行重新生成</li>
+</ol>
+<ul>
+<li>bundle exec docwu g</li>
+</ul>
+<h2>
+<a name="markup-h2-3"></a>TODO LISTS</h2>
+
+<ul>
+<li>当本地文档修改后，需要自动重建</li>
+</ul>
+<h2>
+<a name="markup-h2-4"></a>Deploy 生产环境部署</h2>
+
+<ul>
+<li><p>可以使用 nginx, apache 等web server启动，<br>
+注意将项目root指向 -&gt; ruby_wiki/_deploy  # ！！！！</p></li>
+<li><p>可以使用crontab进行项目自动部署</p></li>
+</ul>
+        </div>
+      </div>
+
+    </div> <!-- container-main end -->
+
+    <div class='container-side clearfix'>
+      <h3>文档目录大纲</h3>
+      <dl class='dl-catalogs'>
+        <dd class='catalog-link-h1'><a href='#markup-h1-1' title='团800 Wiki 系统'>团800 Wiki 系统</a></dd>
+        <dd class='catalog-link-h2'><a href='#markup-h2-2' title='基本命令'>基本命令</a></dd>
+        <dd class='catalog-link-h2'><a href='#markup-h2-3' title='TODO LISTS'>TODO LISTS</a></dd>
+        <dd class='catalog-link-h2'><a href='#markup-h2-4' title='Deploy 生产环境部署'>Deploy 生产环境部署</a></dd>
+      </dl>
+    </div>
+  </div>
+
+</div>
+<div id='footer'>
+  <div class='wrapper'>
+    <p>&copy; 2011-2013 团800文档</p>
+    <p>滴水石穿，点点积累</p>
+  </div>
+</div>
+</body>
+</html>