trivial 0.0.3 → 0.0.4

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('trivial', '0.0.3') do |p|
+Echoe.new('trivial', '0.0.4') do |p|
 	p.summary = "Ultra-lightweight website framework for PHP"
 	p.description = <<-EOT
 		For those who are using PHP to build their sites and want a very simple framework

data/bin/trivialize

@@ -19,7 +19,11 @@ end
 	[ [File.dirname(__FILE__), '..', 'content', 'index.html'], [ARGV[0], 'content', 'index.html'] ],
 	[ [File.dirname(__FILE__), '..', 'styles', 'application.css'], [ARGV[0], 'styles', 'application.css'] ]
 ].each do |src, dest|
-	FileUtils.cp(File.join(*src), File.join(*dest))
+	if !File.exists? File.join(*dest)
+		FileUtils.cp(File.join(*src), File.join(*dest))
+	else
+		puts "Won't overwrite existing #{File.join(*dest)}!"
+	end
 end
 
 puts "Done! Make sure you can use .htaccess files in your Webserver setup."

data/dist/htaccess.dist

@@ -5,5 +5,4 @@ RewriteRule ^$ lib/trivial.php [L]
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !.*\.inc$
-RewriteRule /(.*) lib/trivial.php [L]
-
+RewriteRule (.*) lib/trivial.php [L]

data/lib/trivial.php

@@ -38,12 +38,12 @@ $trim = str_replace(realpath($_SERVER['DOCUMENT_ROOT']), '', realpath($root_dir)
 $requested = preg_replace('#/$#', '/index.html', $_SERVER['REDIRECT_URL']);
 $requested = preg_replace("#${trim}/(.*)\.[^\.]+\$#", '\1', $requested);
 
-function styles($additional = array()) {
-	return head_component($additional, 'styles/%s.css',	'<link rel="stylesheet" href="styles/%s.css" type="text/css" />');
+function styles() {
+	return head_component(func_get_args(), 'styles/%s.css',	'<link rel="stylesheet" href="styles/%s.css" type="text/css" />');
 }
 
-function scripts($additional = array()) {
-	return head_component($additional, 'scripts/%s.js',	'<script type="text/javascript" src="scripts/%s.js"></script>');
+function scripts() {
+	return head_component(func_get_args(), 'scripts/%s.js',	'<script type="text/javascript" src="scripts/%s.js"></script>');
 }
 
 function head_component($additional, $search, $format) {

data/trivial.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trivial}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Bintz"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - John Bintz