kitabu 1.0.0.rc4 → 1.0.0

data/Gemfile.lock

@@ -1,17 +1,15 @@
 PATH
   remote: .
   specs:
-    kitabu (1.0.0.rc4)
+    kitabu (1.0.0)
       RedCloth
       activesupport
       coderay
       eeepub-with-cover-support
       i18n
       nokogiri
-      notifier
       rdiscount
       thor
-      watchr
 
 GEM
   remote: http://rubygems.org/
@@ -21,13 +19,13 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     awesome_print (1.0.2)
-    builder (3.0.0)
+    builder (3.1.3)
     coderay (1.0.7)
     diff-lcs (1.1.3)
     eeepub-with-cover-support (0.8.7)
       builder
       rubyzip
-    i18n (0.6.0)
+    i18n (0.6.1)
     method_source (0.8)
     multi_json (1.3.6)
     nokogiri (1.5.5)
@@ -36,6 +34,8 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    pry-nav (0.2.2)
+      pry (~> 0.9.10)
     rake (0.9.2.2)
     rdiscount (1.6.8)
     rspec (2.11.0)
@@ -51,7 +51,6 @@ GEM
     test_notifier (1.0.0)
       notifier
     thor (0.16.0)
-    watchr (0.7)
 
 PLATFORMS
   ruby
@@ -60,6 +59,7 @@ DEPENDENCIES
   awesome_print
   kitabu!
   pry
+  pry-nav
   rake
   rspec
   test_notifier

data/README.rdoc

@@ -15,7 +15,7 @@ While Prince is too expensive (495USD for a single user license), the free versi
 To install Kitabu, you’ll need a working Ruby 1.9+ installation.
 If you’re cool with it, just run the following command to install it.
 
-  gem install kitabu --pre
+  gem install kitabu
 
 After installing Kitabu, run the following command to check your external
 dependencies.

data/kitabu.gemspec

@@ -26,13 +26,12 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n"
   s.add_dependency "thor"
   s.add_dependency "eeepub-with-cover-support"
-  s.add_dependency "watchr"
-  s.add_dependency "notifier"
   s.add_dependency "coderay"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "test_notifier"
   s.add_development_dependency "rake"
   s.add_development_dependency "pry"
+  s.add_development_dependency "pry-nav"
   s.add_development_dependency "awesome_print"
 end

data/lib/kitabu.rb

@@ -10,9 +10,10 @@ require "optparse"
 require "ostruct"
 require "RedCloth"
 require "tempfile"
+require "pathname"
 require "thor"
 require "thor/group"
-require "watchr"
+require "listen"
 require "yaml"
 require "cgi"
 

data/lib/kitabu/cli.rb

@@ -26,7 +26,6 @@ module Kitabu
 
     desc "export [OPTIONS]", "Export e-book"
     method_option :only, :type => :string, :desc => "Can be one of: #{FORMATS.join(", ")}"
-    method_option :auto, :type => :boolean, :desc => "Watch changes and automatically export files"
     method_option :open, :type => :boolean, :desc => "Automatically open PDF (Mac OS X only)"
 
     def export

data/lib/kitabu/exporter.rb

@@ -2,13 +2,7 @@ module Kitabu
   class Exporter
     def self.run(root_dir, options)
       exporter = new(root_dir, options)
-
-      if options[:auto]
-        exporter.export!
-        exporter.auto! if options[:auto]
-      else
-        exporter.export!
-      end
+      exporter.export!
     end
 
     attr_accessor :root_dir
@@ -64,17 +58,5 @@ module Kitabu
     def config
       Kitabu.config(root_dir)
     end
-
-    def auto!
-      script = Watchr::Script.new
-
-      script.watch(%r[(code|config|images|templates|text)/.*]) do |match|
-        ui.say "* #{match[0]}... ", :yellow, false
-        export!
-      end
-
-      contrl = Watchr::Controller.new(script, Watchr.handler.new)
-      contrl.run
-    end
   end
 end

data/lib/kitabu/generator.rb

@@ -59,6 +59,10 @@ module Kitabu
       create_file "code/.gitkeep"
     end
 
+    def copy_guardfile
+      copy_file "Guardfile", "Guardfile"
+    end
+
     private
     # Retrieve user's name using finger.
     # Defaults to <tt>John Doe</tt>.

data/lib/kitabu/parser/html.rb

@@ -123,18 +123,18 @@ module Kitabu
           index = self.class.footnote_index
           actual_index = fn["id"].gsub(/[^\d]/, "")
 
-          fn.set_attribute("id", "fn#{index}")
+          fn.set_attribute("id", "_fn#{index}")
 
           html.css("a[href='#fn#{actual_index}']").each do |link|
-            link.set_attribute("href", "#fn#{index}")
+            link.set_attribute("href", "#_fn#{index}")
           end
 
           html.css("a[href='#fnr#{actual_index}']").each do |link|
-            link.set_attribute("href", "#fnr#{index}")
+            link.set_attribute("href", "#_fnr#{index}")
           end
 
           html.css("[id=fnr#{actual_index}]").each do |tag|
-            tag.set_attribute("id", "fnr#{index}")
+            tag.set_attribute("id", "_fnr#{index}")
           end
 
           self.class.footnote_index += 1

data/lib/kitabu/parser/pdf.rb

@@ -16,7 +16,7 @@ module Kitabu
           element.delete("xml:lang")
         end
 
-        html.css("p.footnote[id^='fn']").each do |fn|
+        html.css("p.footnote[id^='_fn']").each do |fn|
           fn.node_name = "span"
           fn.set_attribute("class", "fn")
 

data/lib/kitabu/version.rb

@@ -3,6 +3,6 @@ module Kitabu
     MAJOR = 1
     MINOR = 0
     PATCH = 0
-    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc4"
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/support/shared.rb

@@ -33,6 +33,10 @@ shared_examples_for "e-book" do
     mybook.join("text/01_Welcome.md")
   end
 
+  it "copies Guardfile" do
+    mybook.join("Guardfile")
+  end
+
   it "copies html template files" do
     mybook.join("templates/html/user.css").should be_file
     mybook.join("templates/html/layout.css").should be_file

data/templates/Guardfile

@@ -0,0 +1,8 @@
+notification :off
+interactor :off
+
+guard :shell do
+  watch %r[^(?!output)] do |m|
+    `kitabu export`
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kitabu
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,23 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: watchr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: notifier
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,14 +140,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -172,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: test_notifier
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test_notifier
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -220,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -359,6 +343,7 @@ files:
 - spec/support/mybook/text/TOC.textile
 - spec/support/mybook/text/_00_Introduction.markdown
 - spec/support/shared.rb
+- templates/Guardfile
 - templates/config.erb
 - templates/cover.erb
 - templates/cover.png
@@ -387,9 +372,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23