cg 0.0.6 → 0.0.7

data/README.mkd

@@ -36,37 +36,60 @@ cg is A Ruby based HTML "contents generator".
 
         $ cg scratch cg.example.com
 
-2. All Rebuild
+2. Convert
+
+        $ cd cg.example.com/markdown/
+        $ cg convert index.mkd
+
+    e.g.
+
+        $ cg convert cg.example.com/markdown/index.mkd
+        => cg.example.com/index.html
+
+        $ cg convert cg.example.com/markdown/foo+index.mkd
+        => cg.example.com/foo/index.html
+
+        $ cg convert cg.example.com/markdown/foo-bar+hello.mkd
+        => cg.example.com/foo/bar/hello.html
+
+3. All Rebuild
 
         $ cd cg.example.com
         $ cg rebuild
 
-3. All Rebuild and Packing
+4. All Rebuild and Packing
 
         $ cd cg.example.com
         $ cg rebuild packing
         $ tar zxvf public.tar.gz -C /var/www/html/
 
-3. Convert
-
-        $ cd cg.example.com/markdown/
-        $ cg convert markdown_file
-
-4. Server
+5. Server
 
         $ cg server
 
     Access to [http://localhost:9292](http://localhost:9292)
 
+        $ cg server -h host -p 8080
+
+    Access to http://host:8080
+
+    Want to run cg server as a daemon? use `nohup`.
+
+        $ nohup cg server -h host -p 8080 > &
+
 
 ### Tips
 
-1. After save hook for Vim
+1. Template customize
+
+        $ vi templates/html.erb
+
+2. After save hook for Vim
 
         $ vi .vimrc
 >      autocmd BufWritePost *.mkd :silent !cg convert % > /dev/null
 
-2. After save hook for Emacs
+3. After save hook for Emacs
 
 
 ### Note on Patches/Pull Requests

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = 'cg'
-    gem.summary = 'HTML5 Contents Generator'
+    gem.summary = 'HTML Contents Generator'
     gem.description = 'cg is A Ruby based contents generator' 
     gem.email = "tomohiro.t+github@gmail.com"
     gem.homepage = 'http://rubygems.org/gems/cg'

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/bin/cg

@@ -3,6 +3,12 @@
 CG_ROOT = File.expand_path('..', File.dirname(__FILE__))
 $: << CG_ROOT
 
-require 'lib/contents_generator'
+Version = open(CG_ROOT + '/VERSION').read
+
+if ARGV.include? '--version'
+  puts "#{File.basename(__FILE__)} #{Version}"
+  exit
+end
 
+require 'lib/contents_generator'
 ContentsGenerator.boot

data/cg.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cg}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomohiro, TAIRA"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-06-04}
   s.default_executable = %q{cg}
   s.description = %q{cg is A Ruby based contents generator}
   s.email = %q{tomohiro.t+github@gmail.com}
@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
      "skel/styles/iphone.css",
      "skel/styles/reset-min.css",
      "skel/templates/.htaccess",
-     "skel/templates/disqus.rb",
-     "skel/templates/html.rb",
+     "skel/templates/disqus.erb",
+     "skel/templates/html.erb",
      "spec/cg_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{HTML5 Contents Generator}
+  s.summary = %q{HTML Contents Generator}
   s.test_files = [
     "spec/cg_spec.rb",
      "spec/spec_helper.rb"

data/lib/cg/convert.rb

@@ -50,7 +50,7 @@ module CG
       [dir_path, html_name]
     end
 
-    def load_template(template_name = 'html.rb')
+    def load_template(template_name = 'html.erb')
       Tilt::ErubisTemplate.new { File.read("#{@templates_dir}/#{template_name}") }
     end
 
@@ -74,11 +74,11 @@ module CG
     end
 
     def comment_rendering
-      return unless File.exist? "#{@templates_dir}/disqus.rb"
+      return unless File.exist? "#{@templates_dir}/disqus.erb"
 
       @disqus_subdomain = @domain.gsub('.', '-')
 
-      comment = Tilt::ErubisTemplate.new { File.read("#{@templates_dir}/disqus.rb") }
+      comment = Tilt::ErubisTemplate.new { File.read("#{@templates_dir}/disqus.erb") }
       comment.render(self)
     end
 

data/lib/cg/server.rb

@@ -19,6 +19,15 @@ module CG
 end
 
 if __FILE__ == $0
-  puts "[#{Time.now.strftime('%Y-%m-%d %H:%m')}] cg server start. http://localhost:9292"
-  Rack::Handler::default.run CG::Server.new, :Port => 9292
+  require 'optparse'
+  host = 'localhost'
+  port = 9292
+  ARGV.options do |o|
+    o.on('-p', '--port PORT_NUMBER', " (default: #{port})") { |v| port = v }
+    o.on('-h', '--host HOST', " (default: #{host})") { |v| host = v }
+    o.parse!
+  end
+
+  puts "[#{Time.now.strftime('%Y-%m-%d %H:%m')}] cg server start. http://#{host}:#{port}"
+  Rack::Handler::default.run CG::Server.new, :Port => port, :Host => host
 end

data/skel/templates/{html.rb → html.erb}

@@ -34,7 +34,7 @@
 
         <footer>
             <p>Copyright &#169; <%= Date.today.year %> <a href="http://tomohiro.github.com">Tomohiro</a> All rights reserved.</p>
-            <p>Powerd by <a href="http://rubygems.org/gems/cg" title="cg - A Ruby based contents generator">cg - A Ruby based contents generator</a></p>
+            <p>Powered by <a href="http://rubygems.org/gems/cg" title="cg - A Ruby based contents generator">cg - A Ruby based contents generator</a></p>
         </footer>
     </body>
 </html>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Tomohiro, TAIRA
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +09:00
+date: 2010-06-04 00:00:00 +09:00
 default_executable: cg
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,8 +137,8 @@ files:
 - skel/styles/iphone.css
 - skel/styles/reset-min.css
 - skel/templates/.htaccess
-- skel/templates/disqus.rb
-- skel/templates/html.rb
+- skel/templates/disqus.erb
+- skel/templates/html.erb
 - spec/cg_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -172,7 +172,7 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: HTML5 Contents Generator
+summary: HTML Contents Generator
 test_files: 
 - spec/cg_spec.rb
 - spec/spec_helper.rb