RubyGems - gitdoc - Versions diffs - 4.3.0 → 4.4.0 - Mend

gitdoc 4.3.0 → 4.4.0

Files changed (8) hide show

data/TODO.md CHANGED Viewed

@@ -1,3 +1,11 @@
+# drop a .powrc file
+that sets requiring rubygems
+# make build dir
+gitdoc init should create the build dir with the rackup file
 # config.ru for build
 custom 404

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 4.3.0
1	+ 4.4.0

data/bin/gitdoc CHANGED Viewed

@@ -13,13 +13,14 @@ if File.exists? 'config.ru'
 end
 config = <<-END
+require 'bundler/setup' if $LOAD_PATH.grep(/gitdoc$/).empty?
 require 'gitdoc'
 GitDoc!
 END
 rakefile = <<-END
-require 'bundler/setup' unless $LOAD_PATH.last =~ /gitdoc$/
+require 'bundler/setup' if $LOAD_PATH.grep(/gitdoc$/).empty?
 require 'gitdoc/tasks'
 END
@@ -28,6 +29,10 @@ source :rubygems
 gem 'gitdoc', '#{version}'
 END
+powrc = <<-END
+export RUBYOPT="rubygems"
+END
 index = <<-END
 Welcome to GitDoc
 END
@@ -35,5 +40,6 @@ END
 File.open('config.ru','w') { |f| f.write config }
 File.open('Rakefile','w') { |f| f.write rakefile }
 File.open('Gemfile','w') { |f| f.write gemfile }
+File.open('.powrc','w') { |f| f.write powrc }
-system 'bundle install'
+system 'bundle install'

data/gitdoc.rb CHANGED Viewed

@@ -175,8 +175,82 @@ stylus.render str, {paths: ['#{File.dirname file}']}, (err,css) -> sys.puts css
 end
-# If the path doesn't have a file extension and a matching GitDoc document
-# exists then it is compiled and rendered
+# Compiles stylus to css
+module Stylus
+  extend self
+  # TODO: line number matching, raise errors through the stack
+  def compile source, file
+    # Requires node and the coffee and stylus npm packages installed
+    stylus_compiler = <<-COFFEE
+sys = require 'sys' ; stylus = require 'stylus'
+str = """\n#{source}\n"""
+stylus.render str, {paths: ['#{File.dirname file}']}, (err,css) -> sys.puts css
+COFFEE
+    `coffee --eval #{Shellwords.escape stylus_compiler}`.rstrip
+  end
+end
+# TODO: remove the CoffeeScript dependency and just use this
+module GitDoc::CoffeeScript
+  extend self
+  # TODO: line number matching, raise errors through the stack
+  def compile source, file = nil
+    `coffee --print --eval #{Shellwords.escape source}`.rstrip
+  end
+end
+# Compiles an extended coffeescript format into html
+module CoffeePage
+  extend self
+  def compile source, file
+    source = extract_requires source
+    source = extract_stylus source, file
+   ['<html>',
+    '<head>',
+    requires,
+    stylus,
+    '</head>',
+    '<body>',
+    '<script>',
+    GitDoc::CoffeeScript.compile(source),
+    '</script>',
+    '</body>'].flatten.join "\n"
+  end
+  def extract_requires source
+    @requires = []
+    source.gsub(/^\#\#\#[ ]*~[ ]*require[ ]*\n(.+?)\#\#\#\n?$/m) do
+      $1.split("\n").map(&:strip).each do |path|
+        @requires << path unless path.empty?
+      end
+      ''
+    end
+  end
+  def extract_stylus source, file
+    @stylus = []
+    source.gsub(/^\#\#\#[ ]*~[ ]*stylus[ ]*\n(.+?)\#\#\#\n?$/m) do
+      @stylus << Stylus.compile($1, file)
+      ''
+    end
+  end
+  def requires
+    @requires.map do |path|
+      "<script src='#{path}'></script>"
+    end.join "\n"
+  end
+  def stylus
+    ['<style>',@stylus.join("\n"),'</style>'].join("\n") unless @stylus.empty?
+  end
+end
+# Renders an extended markdown page wrapped in the GitDoc html
 get '*' do |name|
   name += 'index' if name =~ /\/$/
   file = settings.dir + name + '.md'
@@ -185,14 +259,21 @@ get '*' do |name|
   haml :doc
 end
-# If the path doesn't have a file extension or the extension is .html and a
-# matching html file exists then process it with the extended html compiler
+# Renders and extended html page without any additional wrapping
 get %r{(.*?)(\.html)?$} do |name,extension|
   file = settings.dir + name + (extension || '.html')
   pass unless File.exist? file
   html file
 end
+# Renders a .cspage as html
+get '*' do |name|
+  file = settings.dir + name + '.cspage'
+  pass unless File.exist? file
+  content_type :html
+  CoffeePage.compile File.read(file), file
+end
 # GitDoc document styles
 get '/gitdoc.css' do
   content_type :css

data/gitdoc/tasks.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 task :dev do
-  unless $LOAD_PATH.last =~ /gitdoc$/
+  unless $LOAD_PATH.grep /gitdoc$/
     abort "Run rake with the path to GitDocs's source to use dev mode\n"+
           "Eg. rake -I ~/Projects/gitdoc dev"
   end

data/pkg/gitdoc-4.3.0.gem CHANGED Viewed

Binary file

data/pkg/gitdoc-4.4.0.gem ADDED Viewed

Binary file

metadata CHANGED Viewed

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitdoc
 version: !ruby/object:Gem::Version
-  hash: 51
-  prerelease:
-  segments:
-  - 4
-  - 3
-  - 0
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Myles Byrne
@@ -15,87 +9,59 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-05-01 00:00:00 Z
+date: 2011-06-01 00:00:00 -05:00
+default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 19
-        segments:
-        - 1
-        - 5
-        - 8
         version: 1.5.8
-  type: :runtime
-  version_requirements: *id001
+    version:
 - !ruby/object:Gem::Dependency
   name: haml
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 53
-        segments:
-        - 3
-        - 0
-        - 25
         version: 3.0.25
-  type: :runtime
-  version_requirements: *id002
+    version:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 15
-        segments:
-        - 1
-        - 0
         version: "1.0"
-  type: :runtime
-  version_requirements: *id003
+    version:
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 9
-        segments:
-        - 2
-        - 1
-        - 1
         version: 2.1.1
-  type: :runtime
-  version_requirements: *id004
+    version:
 - !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 11
-        segments:
-        - 1
-        - 4
-        - 6
         version: 1.4.6
-  type: :runtime
-  version_requirements: *id005
+    version:
 description:
 email: myles@myles.id.au
 executables: []
@@ -117,11 +83,13 @@ files:
 - pkg/gitdoc-4.1.0.gem
 - pkg/gitdoc-4.2.0.gem
 - pkg/gitdoc-4.3.0.gem
+- pkg/gitdoc-4.4.0.gem
 - Rakefile
 - README.md
 - reset.sass
 - TODO.md
 - VERSION
+has_rdoc: true
 homepage: http://github.com/quackingduck/gitdoc
 licenses: []
@@ -131,27 +99,21 @@ rdoc_options: []
 require_paths:
 - .
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
       version: "0"
+  version:
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
       version: "0"
+  version:
 requirements: []
 rubyforge_project:
-rubygems_version: 1.7.2
+rubygems_version: 1.3.5
 signing_key:
 specification_version: 3
 summary: A light-weight web app for serving up a folder of markdown files