Skip to content
Browse files

Code cleanup. Reorganized GEM structure.

  • Loading branch information...
1 parent 3ba7527 commit df58408bc72212ce4d3e8ac349533e7f6e8f65e3 @weppos committed
Showing with 39 additions and 12 deletions.
  1. +2 −1 CHANGELOG.rdoc
  2. +24 −0 LICENSE.rdoc
  3. +9 −7 Rakefile
  4. +1 −1 test/{unit → }/apache_log_regex_test.rb
  5. +3 −2 test/test_all.rb
  6. +0 −1 test/{helper.rb → test_helper.rb}
View
3 CHANGELOG.rdoc
@@ -1,5 +1,6 @@
= Changelog
-== development
+
+== master
* Initial public release.
View
24 LICENSE.rdoc
@@ -1 +1,25 @@
= License
+
+(The MIT License)
+
+Copyright (c) 2008-2009 Simone Carletti <weppos@weppos.net>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
View
16 Rakefile
@@ -1,18 +1,20 @@
require 'rubygems'
+require 'rake'
+
+gem 'echoe', '>= 3.1'
require 'echoe'
$LOAD_PATH.unshift(File.dirname(__FILE__) + "/lib")
require 'apache_log_regex'
-
+
# Common package properties
-PKG_NAME = ENV['PKG_NAME'] || ApacheLogRegex::GEM
+PKG_NAME = ENV['PKG_NAME'] || ApacheLogRegex::GEM
PKG_VERSION = ENV['PKG_VERSION'] || ApacheLogRegex::VERSION
PKG_SUMMARY = "Ruby parser for Apache log files based on regular expressions."
-PKG_FILES = FileList.new("{lib,test}/**/*.rb") do |fl|
- fl.exclude 'TODO'
- fl.include %w(README.rdoc CHANGELOG.rdoc LICENSE.rdoc)
- fl.include %w(Rakefile setup.rb)
+PKG_FILES = FileList.new("{lib,test}/**/*.rb") do |files|
+ files.include %w(README.rdoc CHANGELOG.rdoc LICENSE.rdoc)
+ files.include %w(Rakefile setup.rb)
end
RUBYFORGE_PROJECT = 'apachelogregex'
@@ -38,7 +40,7 @@ Echoe.new(PKG_NAME, PKG_VERSION) do |p|
p.rdoc_pattern = /^(lib|CHANGELOG.rdoc|README.rdoc)/
p.development_dependencies = ["rake >=0.8",
- "echoe >=3"]
+ "echoe >=3.1"]
end
View
2 test/unit/apache_log_regex_test.rb → test/apache_log_regex_test.rb
@@ -13,7 +13,7 @@
#++
-require File.dirname(__FILE__) + '/../helper'
+require 'test_helper'
class ApacheLogRegexTest < Test::Unit::TestCase
View
5 test/test_all.rb
@@ -13,5 +13,6 @@
#++
-require File.dirname(__FILE__) + '/helper'
-Dir.glob(File.dirname(__FILE__) + '/unit/**/*_test.rb').sort.each { |unit| require unit }
+require 'test_helper'
+
+Dir.glob(File.dirname(__FILE__) + '/**/*_test.rb').sort.each { |unit| require unit }
View
1 test/helper.rb → test/test_helper.rb
@@ -13,7 +13,6 @@
#++
-# prepend lib folder
$:.unshift(File.dirname(__FILE__) + '/../lib')
require 'rubygems'

0 comments on commit df58408

Please sign in to comment.
Something went wrong with that request. Please try again.