dokkit 0.4.3 → 0.4.4

data/Manifest.txt

@@ -26,15 +26,6 @@ lib/dokkit/logging.rb
 lib/dokkit/logging/logger.rb
 lib/dokkit/logging/observers.rb
 lib/dokkit/logging/observers/console.rb
-lib/dokkit/models/simple/Rakefile
-lib/dokkit/models/simple/doc/configs/simple.yaml
-lib/dokkit/models/simple/doc/data/html/css/style.css
-lib/dokkit/models/simple/doc/data/latex/deplate.sty
-lib/dokkit/models/simple/doc/layouts/simple.html
-lib/dokkit/models/simple/doc/layouts/simple.latex
-lib/dokkit/models/simple/doc/layouts/simple.text
-lib/dokkit/models/simple/doc/pages/simple.deplate
-lib/dokkit/models/simple/setup/setup.rb
 lib/dokkit/resource.rb
 lib/dokkit/resource/data.rb
 lib/dokkit/resource/document.rb
@@ -46,6 +37,15 @@ lib/dokkit/resource/filenamehelper.rb
 lib/dokkit/tasklib.rb
 lib/dokkit/tasklib/clean.rb
 lib/dokkit/tasklib/render.rb
+lib/models/simple/Rakefile
+lib/models/simple/doc/configs/simple.yaml
+lib/models/simple/doc/data/html/css/style.css
+lib/models/simple/doc/data/latex/deplate.sty
+lib/models/simple/doc/layouts/simple.html
+lib/models/simple/doc/layouts/simple.latex
+lib/models/simple/doc/layouts/simple.text
+lib/models/simple/doc/pages/simple.deplate
+lib/models/simple/setup/setup.rb
 tasks/annotations.rake
 tasks/doc.rake
 tasks/gem.rake

data/Rakefile

@@ -18,7 +18,8 @@ PROJ.url = 'http://dokkit.rubyforge.org'
 PROJ.description = paragraphs_of('README.txt', 1).join("\n\n")
 PROJ.changes = paragraphs_of('History.txt', 0..1).join("\n\n")
 PROJ.rubyforge_name = 'dokkit'
-PROJ.dependencies = ['deplate', 'rake', 'maruku', 'haml']
+PROJ.dependencies = ['deplate', 'rake', 'maruku']
+PROJ.need_zip = true
 PROJ.spec_opts << ['--format', 'specdoc', '--color']
 PROJ.rdoc_exclude << "models/simple"
 # EOF

data/lib/dokkit/application.rb

@@ -13,6 +13,29 @@ require 'dokkit'
 module Dokkit
   class Application
 
+    class << self
+      
+      def get_modelname_from(path)
+        File.basename(path)
+      end
+      
+      def get_model_dir_from(array_of_path)
+        array_of_path.select { |path| path =~ /\.?dokkit-?/ }.collect { |path| File.join(path, 'models')}
+      end
+      
+      def get_models_from(array_of_path)
+        models = { }
+        get_model_dir_from(array_of_path).each do |model_path|
+          Dir.glob(File.join(model_path, '*')).each do |model_path|
+            name = get_modelname_from(model_path)
+            models[name] = model_path
+          end
+        end
+        models
+      end
+      
+    end
+    
     OPTIONS =  [
                 [ "--usage", "-u", GetoptLong::NO_ARGUMENT,
                   "Display usage information." ],
@@ -38,14 +61,15 @@ EOU
     def initialize(logger, configuration = { })
       @logger = logger
       @configuration = configuration
-      @dokkit_dir = configuration[:dokkit_dir] || dokkit_dir
       @user_dir = configuration[:user_dir] || relative_to_home('.dokkit')
       @model_dir = configuration[:model_dir] || 'models'
       @default_model = configuration[:default_model] || 'simple'
-      @models = { 'simple' => File.join(@dokkit_dir, 'dokkit/models/simple') } if @dokkit_dir
-      @models.merge!(fetch_models)
     end
 
+    def models
+      Application::get_models_from(Gem.latest_load_paths.push(@user_dir))
+    end
+    
     def run
       
       process_args
@@ -60,27 +84,16 @@ EOU
 
     private
 
-    def dokkit_dir
-      lib = nil
-      $:.each do |it|
-        if File.exists?(File.join(it, 'dokkit/models/'))
-          lib = it
-          break
-        end
-      end
-      lib
-    end
-
     def relative_to_home(path)
       File.join(((ENV['HOMEPATH'] if RUBY_PLATFORM =~ /win32/) || ENV['HOME']), path)
     end
 
     def create_environment(dest_dir)
       model = @model || @default_model
-      if @models.has_key?(model)
+      if models.has_key?(model)
         unless File.exists?(dest_dir)
           @logger.info("Creating documentation environment based on '#{model}' on directory '#{dest_dir}'.")
-          FileUtils.cp_r(@models[model], dest_dir)
+          FileUtils.cp_r(models[model], dest_dir)
         else
           @logger.error("Directory '#{dest_dir}' already exists.")
         end
@@ -133,26 +146,9 @@ EOU
         puts
       end
     end
-
-    def model_dir
-      File.join(@dokkit_dir, @model_dir)
-    end
-
-    def fetch_models
-      models = { }
-      if File.exists?(model_dir)
-        Dir.glob(File.join(model_dir, '*')) do |model|
-          modelname = model.sub(File.join(@dokkit_dir, @model_dir), '').sub('/', '')
-          models[modelname] = model
-        end
-      end
-      models
-    end
-
+    
     def list_models
-      @models.each_key do |model|
-        @logger.info("Found model '#{model}'.")
-      end
+      models.each_key { |model| @logger.info("Found model '#{model}'.") }
     end
 
   end

data/lib/dokkit/filters/haml.rb

@@ -6,7 +6,11 @@
 # (C)2006-2008 Andrea Fazzi <andrea.fazzi@alca.le.it> (and contributors). 
 #                                                                          
 
-require 'haml'
+begin
+  require 'haml'
+rescue LoadError
+  nil
+end
 
 module Dokkit
   module Filter

data/lib/dokkit/resource/document.rb

@@ -121,7 +121,11 @@ module Dokkit
       end
 
       def default_filter_chain_for(formatter, format)
-        @configuration[:default_filter_chain][formatter][format]
+        if @configuration[:default_filter_chain][formatter].has_key?(format)
+          @configuration[:default_filter_chain][formatter][format]
+        else
+          @logger.error("Output format '#{format}' is not available for '#{formatter}' formatter.")
+        end
       end
 
       def default_postfilter_chain_for(format)

data/lib/dokkit.rb

@@ -51,5 +51,5 @@ rescue LoadError
 end  
 
 module Dokkit
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dokkit
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Andrea Fazzi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-05 00:00:00 +00:00
+date: 2008-08-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,15 +39,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: haml
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: "== DESCRIPTION:  dokkit is a document generator. It was inspired by rote but now it is completely independent from it. dokkit uses filters like deplate and maruku to generate output in a large variety of formats (tex, html, docbook, plain text, ...)."
 email: andrea.fazzi@alca.le.it
 executables: 
@@ -87,15 +78,6 @@ files:
 - lib/dokkit/logging/logger.rb
 - lib/dokkit/logging/observers.rb
 - lib/dokkit/logging/observers/console.rb
-- lib/dokkit/models/simple/Rakefile
-- lib/dokkit/models/simple/doc/configs/simple.yaml
-- lib/dokkit/models/simple/doc/data/html/css/style.css
-- lib/dokkit/models/simple/doc/data/latex/deplate.sty
-- lib/dokkit/models/simple/doc/layouts/simple.html
-- lib/dokkit/models/simple/doc/layouts/simple.latex
-- lib/dokkit/models/simple/doc/layouts/simple.text
-- lib/dokkit/models/simple/doc/pages/simple.deplate
-- lib/dokkit/models/simple/setup/setup.rb
 - lib/dokkit/resource.rb
 - lib/dokkit/resource/data.rb
 - lib/dokkit/resource/document.rb
@@ -107,6 +89,15 @@ files:
 - lib/dokkit/tasklib.rb
 - lib/dokkit/tasklib/clean.rb
 - lib/dokkit/tasklib/render.rb
+- lib/models/simple/Rakefile
+- lib/models/simple/doc/configs/simple.yaml
+- lib/models/simple/doc/data/html/css/style.css
+- lib/models/simple/doc/data/latex/deplate.sty
+- lib/models/simple/doc/layouts/simple.html
+- lib/models/simple/doc/layouts/simple.latex
+- lib/models/simple/doc/layouts/simple.text
+- lib/models/simple/doc/pages/simple.deplate
+- lib/models/simple/setup/setup.rb
 - tasks/annotations.rake
 - tasks/doc.rake
 - tasks/gem.rake