glyph 0.3.0 → 0.4.0

data/tasks/load.rake

@@ -1,9 +1,29 @@
 #!/usr/bin/env ruby
 
 namespace :load do
+	include Glyph::Utils
 
 	desc "Load all files"
-	task :all => [:config, :snippets, :macros] do
+	task :all => [:config, :tasks, :commands, :snippets, :macros] do
+	end
+
+	desc "Load tasks"
+	task :tasks do
+		unless Glyph.lite? then
+			load_files_from_dir(Glyph::PROJECT/'lib/tasks', '.rake') do |f, contents|
+				load f
+			end	
+		end
+	end
+
+	desc "Load commands"
+	task :commands do
+		unless Glyph.lite? then
+			include GLI if (Glyph::PROJECT/'lib/commands').exist?
+			load_files_from_dir(Glyph::PROJECT/'lib/commands', '.rb') do |f, contents|
+				require f
+			end
+		end
 	end
 
 	desc "Load snippets"
@@ -20,18 +40,28 @@ namespace :load do
 	task :macros do
 		raise RuntimeError, "The current directory is not a valid Glyph project" unless Glyph.project? || Glyph.lite?
 		load_macros_from_dir = lambda do |dir|
-			if dir.exist? then
-				dir.children.each do |c|
-					Glyph.instance_eval file_load(c) unless c.directory?
-				end
+			load_files_from_dir(dir, ".rb") do |file, contents|
+				Glyph.instance_eval contents
 			end
 		end
-		case  Glyph['language.set']
+		load_layouts_from_dir = lambda do |dir|
+			load_files_from_dir(dir, ".glyph") do |file, contents|
+				Glyph.rewrite "layout:#{file.basename(file.extname)}".to_sym, contents
+			end
+		end
+		case  Glyph['options.macro_set']
 		when 'glyph' then
 			Glyph.instance_eval file_load(Glyph::HOME/'macros/core.rb')
 			Glyph.instance_eval file_load(Glyph::HOME/'macros/filters.rb')
 			Glyph.instance_eval file_load(Glyph::HOME/'macros/xml.rb')
-			load_macros_from_dir.call Glyph::HOME/"macros"/Glyph["filters.target"].to_s
+			macro_dirs = Glyph["output.#{Glyph['document.output']}.macro_dirs"]
+			layout_dirs = Glyph["output.#{Glyph['document.output']}.layout_dirs"] || []
+			unless macro_dirs.blank?
+				macro_dirs.each {|d| load_macros_from_dir.call Glyph::HOME/"macros/#{d}" }
+			else
+				warning "No #{Glyph['document.output']} macros defined"
+			end
+			layout_dirs.each {|d| load_layouts_from_dir.call Glyph::HOME/"layouts/#{d}" }
 		when 'xml' then
 			Glyph.instance_eval file_load(Glyph::HOME/'macros/core.rb') 
 			Glyph.instance_eval file_load(Glyph::HOME/'macros/filters.rb') 
@@ -45,6 +75,8 @@ namespace :load do
 		# load project macros
 		unless Glyph.lite? then
 			load_macros_from_dir.call Glyph::PROJECT/"lib/macros"
+			load_macros_from_dir.call Glyph::PROJECT/"lib/macros/#{Glyph['document.output']}"
+			load_layouts_from_dir.call Glyph::PROJECT/'lib/layouts' if Glyph.multiple_output_files?
 		end
 	end
 

data/tasks/project.rake

@@ -1,26 +1,27 @@
 #!/usr/bin/env ruby
 
 namespace :project do
+	include Glyph::Utils
 
 	desc "Create a new Glyph project"
 	task :create, [:dir] do |t, args|
 		dir = Pathname.new args[:dir]
 		raise ArgumentError, "Directory #{dir} does not exist." unless dir.exist?
-		raise ArgumentError, "Directory #{dir} is not empty." unless dir.children.blank?
+		raise ArgumentError, "Directory #{dir} is not empty." unless dir.children.select{|f| !f.basename.to_s.match(/^(\..+|Gemfile[.\w]*|Rakefile)$/)}.blank?
 		# Create subdirectories
-		subdirs = ['lib/tasks', 'lib/macros', 'lib/macros/html', 'lib', 'text', 'output', 'images', 'styles']
+		subdirs = ['lib/macros', 'lib/tasks', 'lib/layouts', 'lib/tasks', 'lib/commands', 'text', 'output', 'images', 'styles']
 		subdirs.each {|d| (dir/d).mkpath }
 		# Create snippets
 		yaml_dump Glyph::PROJECT/'snippets.yml', {:test => "This is a \nTest snippet"}
 		# Create files
 		file_copy Glyph::HOME/'document.glyph', Glyph::PROJECT/'document.glyph'
 		config = yaml_load Glyph::HOME/'config.yml'
-	 	config[:document][:filename] = dir.basename.to_s
-	 	config[:document][:title] = dir.basename.to_s
+		config[:document][:filename] = dir.basename.to_s
+		config[:document][:title] = dir.basename.to_s
 		config[:document][:author] = ENV['USER'] || ENV['USERNAME'] 	
-		config.delete(:system)
+		config.each_pair { |k, v| config.delete(k) unless k == :document }
 		yaml_dump Glyph::PROJECT/'config.yml', config
-		Glyph.info "Project '#{dir.basename}' created successfully."
+		info "Project '#{dir.basename}' created successfully."
 	end
 
 	desc "Add a new text file to the project"
@@ -31,5 +32,6 @@ namespace :project do
 		raise ArgumentError, "File '#{args[:file]}' already exists." if file.exist?
 		File.new(file.to_s, "w").close
 	end
-
 end
+
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glyph
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Fabio Cevasco
@@ -14,44 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 +02:00
+date: 2010-09-03 00:00:00 +02:00
 default_executable: glyph
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gli
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
-        - 0
-        - 3
         - 1
-        version: 0.3.1
+        - 1
+        - 1
+        version: 1.1.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: extlib
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 37
         segments: 
         - 0
         - 9
-        - 12
-        version: 0.9.12
+        - 15
+        version: 0.9.15
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
@@ -63,37 +70,43 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
-        - 1
-        - 11
-        version: 1.1.11
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 1
-        - 5
-        - 4
-        version: 1.5.4
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -105,9 +118,11 @@ dependencies:
   name: directory_watcher
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 3
@@ -119,23 +134,27 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 3
         - 0
-        - 6
-        version: 3.0.6
+        - 15
+        version: 3.0.15
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 4
         - 2
@@ -147,9 +166,11 @@ dependencies:
   name: bluecloth
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 2
         - 0
@@ -161,9 +182,11 @@ dependencies:
   name: coderay
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 0
         - 9
@@ -181,6 +204,7 @@ extra_rdoc_files:
 - LICENSE.textile
 - README.textile
 files: 
+- .gitignore
 - AUTHORS.textile
 - CHANGELOG.textile
 - LICENSE.textile
@@ -191,33 +215,40 @@ files:
 - bin/glyph
 - book/config.yml
 - book/document.glyph
-- book/images/document_generation.png
-- book/images/glyph.png
-- book/images/glyph.svg
+- book/images/glyph/commands_tasks.png
+- book/images/glyph/document_generation.png
+- book/images/glyph/glyph.eps
+- book/images/glyph/glyph.png
+- book/images/glyph/glyph.svg
+- book/lib/commands/commands.rb
+- book/lib/layouts/bookindex.glyph
+- book/lib/layouts/bookpage.glyph
+- book/lib/layouts/project.glyph
 - book/lib/macros/reference.rb
-- book/output/html/glyph.html
-- book/output/html/images/document_generation.png
-- book/output/html/images/glyph.png
-- book/output/html/images/glyph.svg
-- book/output/pdf/glyph.pdf
+- book/lib/tasks/tasks.rake
 - book/resources/document_generation.txt
-- book/script/authors
-- book/script/changelog
-- book/script/license
-- book/script/readme
 - book/snippets.yml
-- book/text/acknowledgement.glyph
+- book/text/acknowledgements.glyph
 - book/text/changelog.glyph
 - book/text/compiling/compiling.glyph
 - book/text/compiling/lite_mode.glyph
 - book/text/compiling/programmatic_usage.glyph
+- book/text/config/document.glyph
+- book/text/config/filters.glyph
+- book/text/config/options.glyph
+- book/text/config/output.glyph
 - book/text/extending/bookmarks_headers.glyph
+- book/text/extending/command.glyph
+- book/text/extending/commands_tasks.glyph
 - book/text/extending/further_reading.glyph
 - book/text/extending/internals.glyph
 - book/text/extending/interpreting.glyph
+- book/text/extending/layouts.glyph
 - book/text/extending/macro_def.glyph
+- book/text/extending/output_format.glyph
 - book/text/extending/params_attrs.glyph
 - book/text/extending/placeholders.glyph
+- book/text/extending/task.glyph
 - book/text/extending/validators.glyph
 - book/text/getting_started/configuration.glyph
 - book/text/getting_started/create_project.glyph
@@ -230,10 +261,15 @@ files:
 - book/text/macros/macros_inline.glyph
 - book/text/macros/macros_structure.glyph
 - book/text/ref_commands.glyph
-- book/text/ref_config.glyph
-- book/text/ref_macros.glyph
+- book/text/stats/bookmarks.glyph
+- book/text/stats/links.glyph
+- book/text/stats/macros.glyph
+- book/text/stats/snippets.glyph
+- book/text/stats/stats.glyph
+- book/text/text_editing/attribute_intro.glyph
 - book/text/text_editing/code.glyph
 - book/text/text_editing/conditionals.glyph
+- book/text/text_editing/esc_quot.glyph
 - book/text/text_editing/evaluation.glyph
 - book/text/text_editing/glyph_files.glyph
 - book/text/text_editing/images.glyph
@@ -241,41 +277,71 @@ files:
 - book/text/text_editing/links.glyph
 - book/text/text_editing/macro_intro.glyph
 - book/text/text_editing/raw_html.glyph
+- book/text/text_editing/section_aliases.glyph
 - book/text/text_editing/sections.glyph
 - book/text/text_editing/stylesheets.glyph
+- book/text/text_editing/topics.glyph
+- book/text/text_editing/xml_fallback.glyph
 - book/text/troubleshooting/errors_command.glyph
 - book/text/troubleshooting/errors_generic.glyph
-- book/text/troubleshooting/errors_intro.glyph
 - book/text/troubleshooting/errors_macro.glyph
 - book/text/troubleshooting/errors_parser.glyph
 - config.yml
 - document.glyph
 - glyph.gemspec
+- layouts/web/index.glyph
+- layouts/web/topic.glyph
+- layouts/web5/index.glyph
+- layouts/web5/topic.glyph
 - lib/glyph.rb
+- lib/glyph/analyzer.rb
+- lib/glyph/bookmark.rb
 - lib/glyph/commands.rb
+- lib/glyph/commands/add.rb
+- lib/glyph/commands/compile.rb
+- lib/glyph/commands/config.rb
+- lib/glyph/commands/init.rb
+- lib/glyph/commands/outline.rb
+- lib/glyph/commands/stats.rb
+- lib/glyph/commands/todo.rb
 - lib/glyph/config.rb
 - lib/glyph/document.rb
 - lib/glyph/interpreter.rb
 - lib/glyph/macro.rb
+- lib/glyph/macro_helpers.rb
 - lib/glyph/macro_validators.rb
 - lib/glyph/node.rb
 - lib/glyph/parser.rb
+- lib/glyph/reporter.rb
 - lib/glyph/syntax_node.rb
 - lib/glyph/system_extensions.rb
+- lib/glyph/utils.rb
 - macros/core.rb
 - macros/filters.rb
 - macros/html/block.rb
 - macros/html/inline.rb
 - macros/html/structure.rb
+- macros/html5/block.rb
+- macros/html5/inline.rb
+- macros/html5/structure.rb
 - macros/xml.rb
 - spec/files/article.glyph
 - spec/files/container.textile
+- spec/files/custom_command.rb
+- spec/files/custom_tasks.rake
 - spec/files/document.glyph
+- spec/files/document_for_stats.glyph
 - spec/files/document_with_toc.glyph
 - spec/files/included.textile
 - spec/files/ligature.jpg
 - spec/files/markdown.markdown
+- spec/files/references.glyph
 - spec/files/test.sass
+- spec/files/web1.glyph
+- spec/files/web2.glyph
+- spec/files/web_doc.glyph
+- spec/lib/analyzer_spec.rb
+- spec/lib/bookmark_spec.rb
 - spec/lib/commands_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/document_spec.rb
@@ -285,11 +351,15 @@ files:
 - spec/lib/macro_validators_spec.rb
 - spec/lib/node_spec.rb
 - spec/lib/parser_spec.rb
+- spec/lib/reporter_spec.rb
 - spec/lib/syntax_node_spec.rb
 - spec/macros/core_spec.rb
 - spec/macros/filters_spec.rb
+- spec/macros/html5_spec.rb
 - spec/macros/macros_spec.rb
 - spec/macros/textile_spec.rb
+- spec/macros/web5_spec.rb
+- spec/macros/web_spec.rb
 - spec/macros/xml_spec.rb
 - spec/spec_helper.rb
 - spec/tasks/generate_spec.rb
@@ -332,35 +402,44 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Glyph -- A Ruby-powered Document Authoring Framework
 test_files: 
 - spec/macros/core_spec.rb
+- spec/macros/web_spec.rb
+- spec/macros/html5_spec.rb
 - spec/macros/filters_spec.rb
+- spec/macros/web5_spec.rb
 - spec/macros/textile_spec.rb
 - spec/macros/xml_spec.rb
 - spec/macros/macros_spec.rb
 - spec/lib/interpreter_spec.rb
+- spec/lib/analyzer_spec.rb
 - spec/lib/commands_spec.rb
 - spec/lib/node_spec.rb
+- spec/lib/bookmark_spec.rb
 - spec/lib/macro_spec.rb
 - spec/lib/macro_validators_spec.rb
 - spec/lib/config_spec.rb
@@ -368,7 +447,9 @@ test_files:
 - spec/lib/parser_spec.rb
 - spec/lib/syntax_node_spec.rb
 - spec/lib/document_spec.rb
+- spec/lib/reporter_spec.rb
 - spec/tasks/load_spec.rb
 - spec/tasks/generate_spec.rb
 - spec/tasks/project_spec.rb
+- spec/files/custom_command.rb
 - spec/spec_helper.rb