razor 0.5 → 0.5.1

data/README.md

@@ -0,0 +1,3 @@
+== Razor
+
+See https://github.com/aumgn/razor_sample_blog for an example.

data/lib/razor.rb

@@ -29,7 +29,7 @@ module Razor
 		require 'rack'
 		port = (port and port.to_i or 3300)
 		on_request = lambda do |env|
-			page = Razor.http_request src, env['PATH_INFO']
+			page = http_request src, env['PATH_INFO']
 			if page
 				[
 					200,

data/lib/razor/rake/git_generate.rb

@@ -0,0 +1,117 @@
+require 'rake'
+require 'rake/tasklib'
+require 'tmpdir'
+
+require 'razor'
+
+module Razor
+	
+	module Rake
+		
+		module Git
+			
+			class BranchError < RuntimeError
+				
+				def initialize(branch)
+					super("Must be on #{branch}")
+				end
+				
+			end
+			
+			class CleanBranchError < RuntimeError
+				
+				def initialize
+					super("Current branch must be clean.")
+				end
+				
+			end
+			
+			class Generate < ::Rake::TaskLib
+				
+				attr_accessor :template_branch
+				attr_accessor :site_branch
+				attr_accessor :url_base
+				
+				def initialize(name='git:generate')
+					@name = name
+					@template_branch = 'master'
+					@site_branch = 'site'
+					@url_base = ''
+					yield self if block_given?
+					define_task
+				end
+				
+				def define_task
+					task(@name, [:message]) { |t, args|
+						hl = HighLine.new
+						ensure_on_branch template_branch
+						ensure_branch_is_clean # needed ?
+						# .gitinore workaround
+						#TODO: Solve this problem
+						gitignore = File.read '.gitignore' rescue ''
+						Dir.mktmpdir { |tmp|
+							Razor.generate(generate_options, '.', tmp)
+							checkout site_branch do
+								sh 'git rm -r .'
+								sh "cp -r #{tmp}/* ."
+								# .gitignore workaround
+								File.open('.gitignore', 'w') {|f| f << gitignore }
+								sh 'git add .'
+								msg = args.message
+								if msg.nil? or msg.empty?
+									sh 'git commit'
+								else
+									sh "git commit -m #{msg}"
+								end
+							end
+						}
+					}
+				end
+				
+				def current_branch
+					`git status` =~ /^# On branch (.+)/
+					return $1
+				end
+				
+				def checkout(branch)
+					if block_given?
+						old = current_branch
+						begin
+							`git checkout #{branch}`
+							yield
+						ensure
+							`git checkout #{old}`
+						end
+					else
+						`git checkout #{branch}`
+					end
+				end
+				
+				def ensure_on_branch(branch)
+					current_branch == branch and return
+					ensure_branch_is_clean
+					checkout branch
+				rescue CleanBranchError
+					raise BranchError.new(branch)
+				end
+
+				def ensure_branch_is_clean
+					clean = (`git status` =~ /nothing to commit \(working directory clean\)\n$/ )
+					p clean
+					clean and return
+					raise CleanBranchError
+				end
+				
+				def generate_options
+					{
+						:url_base => @url_base
+					}
+				end
+				
+			end
+			
+		end
+		
+	end
+	
+end

data/lib/razor/renderer.rb

@@ -47,7 +47,6 @@ module Razor
 				begin
 					str = File.open(filepath, 'rb') { |f| f.read }
 				rescue
-					puts $!
 					str = nil
 				end
 				ext = File.extname filename

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Razor
-	Version = '0.5'
+	Version = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razor
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-10 00:00:00.000000000 +01:00
+date: 2011-03-11 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &24114740 !ruby/object:Gem::Requirement
+  requirement: &21799560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24114740
+  version_requirements: *21799560
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &24114220 !ruby/object:Gem::Requirement
+  requirement: &21799040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24114220
+  version_requirements: *21799040
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &24113740 !ruby/object:Gem::Requirement
+  requirement: &21798560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24113740
+  version_requirements: *21798560
 description: ! '''Razor is a static website generator. Describe layouts and pages
   in ruby. Write them with html and Mustache.
 
@@ -58,7 +58,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README
+- README.md
 - LICENSE
 - lib/razor.rb
 - lib/razor/generable.rb
@@ -67,10 +67,11 @@ files:
 - lib/razor/template.rb
 - lib/razor/rake/ftp.rb
 - lib/razor/rake/ftp_push.rb
+- lib/razor/rake/git_generate.rb
 - lib/version.rb
 - bin/razor
 has_rdoc: true
-homepage: https://github.com/aumgn/razor
+homepage: https://aumgn.fr/razor
 licenses:
 - MIT License. See LICENSE file.
 post_install_message: