jekylltask 1.0.2 → 1.1.0

data/jekylltask.gemspec

@@ -15,7 +15,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'jekylltask'
-  spec.version        = '1.0.2'
+  spec.version        = '1.1.0'
   spec.author         = 'Jekyll Rake Task'
   spec.email          = "antoine@lunar-ocean.com"
   spec.homepage       = "http://www.github.com/atoulme/jekylltask"
@@ -25,8 +25,13 @@ A Rake task to run jekyll over your textile files.
   TEXT
 
   spec.files          = Dir['lib/**/*', '*.{gemspec}', 'LICENSE', 'README.rdoc']
+
+  # Rakefile needs to create spec for both platforms (ruby and java), using the
+  # $platform global variable.  In all other cases, we figure it out from RUBY_PLATFORM.
+  spec.platform       = $platform || RUBY_PLATFORM[/java/] || 'ruby'
                         
   # Tested against these dependencies.
   spec.add_dependency 'rake',                 '>= 0.8.7'
-  spec.add_dependency 'jekyll',               '>= 0.6.2'
+  spec.add_dependency 'jekyll',               '>= 0.6.2' unless spec.platform.to_s == 'java'
+  spec.add_dependency 'realityforge-jekyll',  '>= 0.7.1' if spec.platform.to_s == 'java'
 end

data/lib/jekylltask.rb

@@ -14,60 +14,83 @@
 # the License.
 
 require 'rake/tasklib'
-require 'jekyll'
 
+module Kernel
+  def suppress_warnings
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+end
+
+suppress_warnings { require 'liquid' }
+require 'jekyll'
 
 class JekyllTask < Rake::TaskLib
-  def initialize(name=:jekyll)  # :yield: self
+  def initialize(name) # :yield: self
     @name = name
-    @source = name
-    @target = name
+    @source = nil
+    @target = nil
+    @auto = false
+    @description = nil
     yield self if block_given?
-    task name, :auto, :needs=>[@source] do |task, args|
-      generate args.auto
-    end
-    if @source != @target
-      file @target=>FileList["#{@source}/**/*"] do
-        generate
-      end
-      task 'clobber' do
-        rm_rf @target
-      end
-    end
+    raise "User must specify source directory" unless self.source
+    raise "User must specify target directory" unless self.target
+    generate
   end
 
+  attr_reader :name
   attr_accessor :source
   attr_accessor :target
+  attr_accessor :auto
+  attr_accessor :description
 
-  def generate(auto = false)
-    options = { 'source'=>source, 'destination'=>target }
-    options = Jekyll.configuration(options)
-    site = Jekyll::Site.new(options)
+  private
 
-    if auto
-      require 'directory_watcher'
-      puts "Auto generating: just edit a page and save, watch the console to see when we're done regenerating pages"
-      dw = DirectoryWatcher.new(source)
-      dw.interval = 1
-      dw.glob = Dir.chdir(source) do
-        dirs = Dir['*'].select { |x| File.directory?(x) }
-        dirs -= [target]
-        dirs = dirs.map { |x| "#{x}/**/*" }
-        dirs += ['*']
+  def generate
+    desc self.description if self.description
+    if self.auto
+      task self.name do
+        require 'directory_watcher'
+        puts "Auto generating: just edit a page and save, watch the console to see when we're done regenerating pages"
+        dw = DirectoryWatcher.new(source)
+        dw.interval = 1
+        dw.glob = Dir.chdir(source) do
+          dirs = Dir['*'].select { |x| File.directory?(x) }
+          dirs -= [target]
+          dirs = dirs.map { |x| "#{x}/**/*" }
+          dirs += ['*']
+        end
+        dw.start
+        site = init_jekyll
+        dw.add_observer do |*args|
+          t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{t}] regeneration: #{args.size} files changed"
+          site.process
+          puts "Done"
+        end
+        loop { sleep 1 }
       end
-      dw.start
-      dw.add_observer do |*args|
-        t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{t}] regeneration: #{args.size} files changed"
+    else
+      task self.name => self.target
+      file self.target => FileList["#{self.source}/**/*"] do
+        puts "Generating documentation in #{target}"
+        site = init_jekyll
         site.process
-        puts "Done"
+        touch target
       end
-      loop { sleep 1 }
-    else
-      puts "Generating documentation in #{target}"
-      site.process
-      touch target
     end
+    task 'clobber' do
+      rm_rf self.target
+    end
+  end
+
+  def init_jekyll
+    options = {'source' => self.source, 'destination' => self.target}
+    options = Jekyll.configuration(options)
+    Jekyll::Site.new(options)
   end
 end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: jekylltask
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jekyll Rake Task
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 -07:00
-default_executable: 
+date: 2011-07-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -26,11 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
         version: 0.8.7
   type: :runtime
   version_requirements: *id001
@@ -42,11 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 6
-        - 2
         version: 0.6.2
   type: :runtime
   version_requirements: *id002
@@ -65,7 +49,6 @@ files:
 - jekylltask.gemspec
 - LICENSE
 - README.rdoc
-has_rdoc: true
 homepage: http://www.github.com/atoulme/jekylltask
 licenses: []
 
@@ -79,23 +62,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A Rake task to run jekyll