fnando-kitabu 0.2.1 → 0.3.0

data/README.markdown

@@ -85,6 +85,13 @@ to use a sequential numbering as the name. Here's a sample:
 		- 03\_Windows\_instructions.markdown
 		- 04\_Ubuntu\_Linux\_instructions.markdown
 
+If you prefer, you can add a chapter per file:
+
+- text
+	- 01\_Introduction.markdown
+	- 02\_What\_is\_Ruby\_on\_Rails.markdown
+	- 03\_Installing\_Ruby\_on\_Rails.markdown
+
 Note that you can use Textile or Markdown at the same time. Just use the 
 `.markdown` or `.textile` file extension.
 

data/Rakefile

@@ -1,10 +1,10 @@
 require 'rake'
 
-PKG_FILES = %w( Rakefile kitabu.gemspec History.txt License.txt README.markdown TODO.txt ) + Dir["{app_generators,bin,lib,themes}/**/*"]
+PKG_FILES = %w(Rakefile kitabu.gemspec README.markdown) + Dir["{bin,lib,templates}/**/*"]
 
 spec = Gem::Specification.new do |s|
   s.name = "kitabu"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
   s.summary = "A framework for creating e-books from Markdown/Textile text markup using Ruby."
   s.authors = ["Nando Vieira"]
   s.email = ["fnando.vieira@gmail.com"]
@@ -16,10 +16,11 @@ spec = Gem::Specification.new do |s|
 	s.executables = "kitabu"
 	
 	# Dependencies
-  s.add_dependency "rubigen"
   s.add_dependency "discount"
   s.add_dependency "hpricot"
   s.add_dependency "unicode"
+  s.add_dependency "main"
+  
   # Requirements
   s.requirements << "Install the Oniguruma RE library and ultraviolet gem to get Syntax Highlighting (only for TextMate users)"
 end
@@ -27,42 +28,61 @@ end
 namespace :gem do
   # Thanks to the Merb project for this code.
   desc "Update Github Gemspec"
-    task :update_gemspec do
-      skip_fields = %w(new_platform original_platform specification_version loaded required_ruby_version rubygems_version platform )
+  task :update_gemspec do
+    skip_fields = %w(new_platform original_platform specification_version loaded required_ruby_version rubygems_version platform )
+    
+    result = "# WARNING : RAKE AUTO-GENERATED FILE. DO NOT MANUALLY EDIT!\n"
+    result << "# RUN : 'rake gem:update_gemspec'\n\n"
+    result << "Gem::Specification.new do |s|\n"
+    
+    spec.instance_variables.each do |ivar|
+      value = spec.instance_variable_get(ivar)
+      name  = ivar.split("@").last
+      next if name == "date"
       
-      result = "# WARNING : RAKE AUTO-GENERATED FILE. DO NOT MANUALLY EDIT!\n"
-      result << "# RUN : 'rake gem:update_gemspec'\n\n"
-      result << "Gem::Specification.new do |s|\n"
+      if name == 'version'
+        base_file = File.join(File.dirname(__FILE__), 'lib/kitabu/base.rb')
+        contents = File.read(base_file)
+        contents.gsub!(/VERSION = "[\d\.]+"/sim, %(VERSION = "#{value}"))
+        File.open(base_file, 'w+') do |f|
+          f << contents
+        end
+      end
       
-      spec.instance_variables.each do |ivar|
-        value = spec.instance_variable_get(ivar)
-        name  = ivar.split("@").last
-        value = Time.now if name == "date"
-        
-        next if skip_fields.include?(name) || value.nil? || value == "" || (value.respond_to?(:empty?) && value.empty?)
-        if name == "dependencies"
-          value.each do |d|
-            dep, *ver = d.to_s.split(" ")
-            result <<  "  s.add_dependency #{dep.inspect}, #{ver.join(" ").inspect.gsub(/[()]/, "").gsub(", runtime", "")}\n"
-          end
+      next if skip_fields.include?(name) || value.nil? || value == "" || (value.respond_to?(:empty?) && value.empty?)
+      if name == "dependencies"
+        value.each do |d|
+          dep, *ver = d.to_s.split(" ")
+          result <<  "  s.add_dependency #{dep.inspect}, #{ver.join(" ").inspect.gsub(/[()]/, "").gsub(", runtime", "")}\n"
+        end
+      else
+        case value
+        when Array
+          value =  name != "files" ? value.inspect : value.inspect.split(",").join(",\n")
+        when FalseClass
+        when TrueClass
+        when Fixnum
+        when String
+          value = value.inspect
         else
-          case value
-          when Array
-            value =  name != "files" ? value.inspect : value.inspect.split(",").join(",\n")
-          when FalseClass
-          when TrueClass
-          when Fixnum
-          when String
-            value = value.inspect
-          else
-            value = value.to_s.inspect
-          end
-          result << "  s.#{name} = #{value}\n"
+          value = value.to_s.inspect
         end
+        result << "  s.#{name} = #{value}\n"
       end
-      
-      result << "end"
-      File.open(File.join(File.dirname(__FILE__), "#{spec.name}.gemspec"), "w"){|f| f << result}
     end
-
+    
+    result << "end"
+    File.open(File.join(File.dirname(__FILE__), "#{spec.name}.gemspec"), "w"){|f| f << result}
+  end
+  
+  desc "Build gem"
+  task :build => :update_gemspec do
+    system "rm *.gem"
+    system "gem build #{spec.instance_variable_get('@name')}.gemspec"
+  end
+  
+  desc "Install gem"
+  task :install => :build do
+    system "sudo gem install #{spec.instance_variable_get('@name')}"
+  end
 end

data/bin/kitabu

@@ -1,17 +1,46 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'rubigen'
+require 'kitabu'
+require 'kitabu/templates'
+require 'main'
 
-if %w(-v --version).include? ARGV.first
-  require 'kitabu/version'
-  puts "#{File.basename($0)} #{Kitabu::VERSION::STRING}"
-  exit(0)
-end
-
-require 'rubigen/scripts/generate'
-source = RubiGen::PathSource.new(:application, 
-  File.join(File.dirname(__FILE__), "../app_generators"))
-RubiGen::Base.reset_sources
-RubiGen::Base.append_sources source
-RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'kitabu')
+Main {
+  description <<-TXT
+    The 'kitabu' command creates a new book with a default
+    directory structure at the path you specify.
+    
+    VERSION: #{Kitabu::VERSION}
+    
+    USAGE: kitabu path [parameters]
+  TXT
+  
+  argument(:path) {
+    description "The output path."
+    required
+    validate {|path| !File.exists?(path) }
+    attr
+  }
+  
+  option(:l, :layout){
+    description "Specify which layout to use.  Available: #{Kitabu::Base.layouts.join(', ')}"
+    cast :string
+    defaults "boom"
+    argument :optional
+    validate {|layout| Kitabu::Base.layout?(layout) }
+    attr
+  }
+  
+  option(:t, :theme){
+    description "Specify which syntax highlight theme to use. Available: #{Kitabu::Base.themes.join(', ')}"
+    cast :string
+    defaults "eiffel"
+    argument :optional
+    validate {|theme| Kitabu::Base.theme?(theme) }
+    attr
+  }
+  
+  def run
+    Kitabu::Templates.process!(:layout => layout, :theme => theme, :path => path)
+  end
+}

data/kitabu.gemspec

@@ -2,78 +2,51 @@
 # RUN : 'rake gem:update_gemspec'
 
 Gem::Specification.new do |s|
-  s.date = "Sun Aug 24 17:34:59 -0300 2008"
-  s.executables = ["kitabu"]
   s.authors = ["Nando Vieira"]
+  s.require_paths = ["lib"]
   s.required_rubygems_version = ">= 0"
-  s.version = "0.2.1"
+  s.has_rdoc = false
   s.files = ["Rakefile",
  "kitabu.gemspec",
- "History.txt",
- "License.txt",
  "README.markdown",
- "TODO.txt",
- "app_generators/kitabu",
- "app_generators/kitabu/kitabu_generator.rb",
- "app_generators/kitabu/templates",
- "app_generators/kitabu/templates/config.yml",
- "app_generators/kitabu/templates/css",
- "app_generators/kitabu/templates/css/active4d.css",
- "app_generators/kitabu/templates/css/blackboard.css",
- "app_generators/kitabu/templates/css/dawn.css",
- "app_generators/kitabu/templates/css/eiffel.css",
- "app_generators/kitabu/templates/css/idle.css",
- "app_generators/kitabu/templates/css/iplastic.css",
- "app_generators/kitabu/templates/css/lazy.css",
- "app_generators/kitabu/templates/css/mac_classic.css",
- "app_generators/kitabu/templates/css/slush_poppies.css",
- "app_generators/kitabu/templates/css/sunburst.css",
- "app_generators/kitabu/templates/layouts",
- "app_generators/kitabu/templates/layouts/boom",
- "app_generators/kitabu/templates/layouts/boom/layout.css",
- "app_generators/kitabu/templates/layouts/boom/layout.html",
- "app_generators/kitabu/templates/Rakefile",
- "app_generators/kitabu/templates/user.css",
- "app_generators/kitabu/USAGE",
  "bin/kitabu",
  "lib/kitabu",
  "lib/kitabu/base.rb",
  "lib/kitabu/blackcloth.rb",
  "lib/kitabu/redcloth.rb",
  "lib/kitabu/tasks.rb",
+ "lib/kitabu/templates.rb",
  "lib/kitabu.rb",
- "themes/active4d.css",
- "themes/all_hallows_eve.css",
- "themes/amy.css",
- "themes/blackboard.css",
- "themes/brilliance_black.css",
- "themes/brilliance_dull.css",
- "themes/cobalt.css",
- "themes/dawn.css",
- "themes/eiffel.css",
- "themes/espresso_libre.css",
- "themes/idle.css",
- "themes/iplastic.css",
- "themes/lazy.css",
- "themes/mac_classic.css",
- "themes/magicwb_amiga.css",
- "themes/pastels_on_dark.css",
- "themes/slush_poppies.css",
- "themes/spacecadet.css",
- "themes/sunburst.css",
- "themes/twilight.css",
- "themes/zenburnesque.css"]
-  s.has_rdoc = false
-  s.requirements = ["Install the Oniguruma RE library and ultraviolet gem to get Syntax Highlighting (only for TextMate users)"]
+ "templates/config.yml",
+ "templates/layouts",
+ "templates/layouts/boom",
+ "templates/layouts/boom/layout.css",
+ "templates/layouts/boom/layout.html",
+ "templates/Rakefile",
+ "templates/syntax.css",
+ "templates/themes",
+ "templates/themes/active4d.css",
+ "templates/themes/blackboard.css",
+ "templates/themes/dawn.css",
+ "templates/themes/eiffel.css",
+ "templates/themes/idle.css",
+ "templates/themes/iplastic.css",
+ "templates/themes/lazy.css",
+ "templates/themes/mac_classic.css",
+ "templates/themes/slush_poppies.css",
+ "templates/themes/sunburst.css",
+ "templates/user.css"]
   s.email = ["fnando.vieira@gmail.com"]
-  s.name = "kitabu"
-  s.bindir = "bin"
+  s.version = "0.3.0"
   s.homepage = "http://github.com/fnando/kitabu"
+  s.requirements = ["Install the Oniguruma RE library and ultraviolet gem to get Syntax Highlighting (only for TextMate users)"]
+  s.name = "kitabu"
   s.summary = "A framework for creating e-books from Markdown/Textile text markup using Ruby."
+  s.executables = ["kitabu"]
   s.description = "A framework for creating e-books from Markdown/Textile text markup using Ruby. Using the Prince PDF generator, you'll be able to get high quality PDFs. Mac users that have Textmate installed can have source code highlighted with his favorite theme."
-  s.add_dependency "rubigen", ">= 0"
   s.add_dependency "discount", ">= 0"
   s.add_dependency "hpricot", ">= 0"
   s.add_dependency "unicode", ">= 0"
-  s.require_paths = ["lib"]
+  s.add_dependency "main", ">= 0"
+  s.bindir = "bin"
 end

data/lib/kitabu/base.rb

@@ -1,4 +1,6 @@
 module Kitabu
+  VERSION = "0.3.0"
+  
   module Markup
     def self.content_for(options)
       source_file = File.join(KITABU_ROOT, 'code', options[:source_file].to_s)
@@ -52,7 +54,11 @@ module Kitabu
       # get syntax
       syntax = Kitabu::Base.default_syntax unless Kitabu::Base.syntax?(syntax)
       
-      Uv.parse(code, "xhtml", syntax, false, theme)
+      code = Uv.parse(code, "xhtml", syntax, false, theme)
+      code.gsub!(/<pre class="(.*?)"/sim, %(<pre class="\\1 #{syntax}"))
+      code.gsub!(/<pre>/sim, %(<pre class="#{syntax} #{theme}"))
+      
+      code
     end
   end
   
@@ -129,28 +135,39 @@ module Kitabu
     end
     
     def self.generate_html
-      # all parsed markdown file holder
+      # parsed file holder
       contents = ""
       
+      entries = Dir.entries(text_dir).sort.reject do |entry| 
+        %w(. .. .svn .git).include?(entry) || (File.file?(entry) && entry !~ /\.(markdown|textile)$/)
+      end
+      
+      raise "No markup files found! Stopping PDF generation" if entries.empty?
+      
       # first, get all chapters; then, get all parsed markdown
       # files from this chapter and group them into a <div class="chapter"> tag
-      Dir.entries(text_dir).sort.each do |dirname|
-        # ignore files and some directories
-        next if %w(. .. .svn .git).include?(dirname) || File.file?(text_dir + "/#{dirname}")
-        
+      entries.each do |entry|
         # gets all parsed markdown files to wrap in a 
         # chapter element
         chapter = ""
         
-        # merge all markdown and textile files into a single list
-        markup_files = Dir["#{text_dir}/#{dirname}/**/*.markdown"] + Dir["#{text_dir}/#{dirname}/**/*.textile"]
+        # entry can be a file outside chapter folder
+        file = "#{text_dir}/#{entry}"
+        
+        if File.file?(file)
+          markup_files = [file]
+        else
+          # merge all markdown and textile files into a single list
+          markup_files =  Dir["#{text_dir}/#{entry}/**/*.markdown"] + 
+                          Dir["#{text_dir}/#{entry}/**/*.textile"]
+        end
         
         # no files, so skip it!
         next if markup_files.empty?
         
         markup_files.sort.each do |markup_file|
           # get the file contents
-          markup_contents = File.new(markup_file).read
+          markup_contents = File.read(markup_file)
           
           # instantiate a markup object
           begin
@@ -205,9 +222,9 @@ module Kitabu
                     :block_name => block_name,
                     :source_file => source_file
                   })
-                  
-                  Kitabu::Markup.syntax(code, syntax)
                 end
+                
+                Kitabu::Markup.syntax(code, syntax)
               end
             end
           end
@@ -217,7 +234,10 @@ module Kitabu
         
         contents << '<div class="chapter">%s</div>' % chapter
       end
-
+      
+      # create output directory if is missing
+      FileUtils.mkdir(File.dirname(html_path)) unless File.exists?(File.dirname(html_path))
+      
       # save html file
       File.open(html_path, 'w+') do |f|
         f << Kitabu::Base.parse_layout(contents)
@@ -236,6 +256,10 @@ module Kitabu
       syntaxes.include?(syntax_name)
     end
     
+    def self.layout?(layout_name)
+      layouts.include?(layout_name)
+    end
+    
     def self.default_theme
       DEFAULT_THEME
     end
@@ -254,14 +278,14 @@ module Kitabu
     
     def self.layouts
       @layouts ||= begin
-        dir = File.join(GEM_ROOT, "app_generators/kitabu/templates/layouts/")
+        dir = File.join(GEM_ROOT, "templates/layouts")
         Dir.entries(dir).reject{|p| p =~ /^\.+$/ }.sort
       end
     end
     
     def self.themes
       @themes ||= begin
-        filter = File.join(GEM_ROOT, "app_generators/kitabu/templates/css/*.css")
+        filter = File.join(GEM_ROOT, "templates/themes/*.css")
         Dir[filter].collect{|path| File.basename(path).gsub(/\.css$/, '') }.sort
       end
     end

data/lib/kitabu/blackcloth.rb

@@ -6,7 +6,7 @@ class BlackCloth < RedCloth
     %\{       # opening
     (.*?)     # footnote
     \}#       # closing
-  /x
+  /xms
   
   # Usage: Writing some text with a footnote %{this is a footnote}
   def inline_textile_fn(text)
@@ -57,15 +57,6 @@ class BlackCloth < RedCloth
     # get line interval
     m, from_line, to_line = *attrs.match(/class=".*? ([0-9]+),([0-9]+)"/)
     
-    # code = Kitabu::Markup.syntax({
-    #   :code => content,
-    #   :syntax => syntax,
-    #   :source_file => source_file,
-    #   :block_name => block_name,
-    #   :from_line => from_line,
-    #   :to_line => to_line
-    # })
-    
     content = Kitabu::Markup.content_for({
       :code => content,
       :syntax => syntax,

data/lib/kitabu/templates.rb

@@ -0,0 +1,49 @@
+module Kitabu
+  module Templates
+    TEMPLATES_ROOT = File.join(Kitabu::Base::GEM_ROOT, 'templates')
+    DIRECTORIES = %w(text templates output)
+    
+    def self.process!(options)
+      directories!(options)
+      bundle_css!(options)
+      files!(options)
+      config!(options)
+    end
+    
+    def self.directories!(options)
+      FileUtils.mkdir(options[:path])
+      
+      DIRECTORIES.each do |d|
+        FileUtils.mkdir File.join(options[:path], d)
+      end
+    end
+    
+    def self.files!(options)
+      copy_file "Rakefile", "#{options[:path]}/Rakefile"
+      copy_file "layouts/#{options[:layout]}/layout.css", "#{options[:path]}/templates/layout.css"
+      copy_file "layouts/#{options[:layout]}/layout.html", "#{options[:path]}/templates/layout.html"
+      copy_file "user.css", "#{options[:path]}/templates/user.css"
+    end
+    
+    def self.config!(options)
+      template = File.new(File.join(TEMPLATES_ROOT, 'config.yml')).read
+      env = OpenStruct.new(options)
+      contents = ERB.new(template).result env.instance_eval{binding}
+
+      File.open(File.join(options[:path], 'config.yml'), 'w+') << contents
+    end
+    
+    def self.bundle_css!(options)
+      contents = Dir["#{TEMPLATES_ROOT}/themes/*.css"].collect do |file|
+        File.read(file)
+      end
+
+      File.open("#{options[:path]}/templates/syntax.css", "w+") << contents.join("\n\n")
+    end
+    
+    private
+      def self.copy_file(from, to)
+        FileUtils.cp File.join(TEMPLATES_ROOT, from), to
+      end
+  end
+end

data/lib/kitabu.rb

@@ -1,18 +1,15 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'rubygems'
+require 'yaml'
+require 'erb'
+require 'ostruct'
+require 'rexml/streamlistener'
+require 'rexml/document'
+require 'hpricot'
 
-require "rubygems"
-require "yaml"
-require "erb"
-require "ostruct"
-require "rexml/streamlistener"
-require "rexml/document"
-require "hpricot"
-
-require "kitabu/base"
+require 'kitabu/base'
 
 begin
-  require "ruby-debug"
+  require 'ruby-debug'
 rescue LoadError => e
   nil
 end

data/{app_generators/kitabu/templates → templates}/layouts/boom/layout.html

@@ -7,27 +7,27 @@
 	<link rel="stylesheet" type="text/css" href="../templates/syntax.css"/>
 	<link rel="stylesheet" type="text/css" href="../templates/user.css"/>
 	
-	<meta name="author" content="<%%= authors.join(', ') %>" />
-	<meta name="subject" content="<%%= subject %>" />
-	<meta name="keywords" content="<%%= keywords %>" />
+	<meta name="author" content="<%= authors.join(', ') %>" />
+	<meta name="subject" content="<%= subject %>" />
+	<meta name="keywords" content="<%= keywords %>" />
 </head>
 <body>
 	<div class="frontcover"></div>
 	<div class="halftitlepage">
-		<h1 class="no-toc"><%%= title %></h1>
+		<h1 class="no-toc"><%= title %></h1>
 	</div>
 
 	<div class="titlepage">
-		<h1 class="no-toc"><%%= title %></h1>
-		<p class="no-toc"><%%= authors.join('<br/>') %></p>
+		<h1 class="no-toc"><%= title %></h1>
+		<p class="no-toc"><%= authors.join('<br/>') %></p>
 	</div>
 	
 	<div class="imprint">
-		<p><%%= copyright %></p>
+		<p><%= copyright %></p>
 	</div>
 	
 	<div class="chapters">
-		<%%= contents %>
+		<%= contents %>
 	</div>
 
 	<div class="white_page"></div>