Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
upgrade to Inochi 6.0.1
  • Loading branch information
sunaku committed Apr 22, 2011
1 parent 56a4a48 commit e1af4c3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 42 deletions.
1 change: 1 addition & 0 deletions BEYOND
Expand Up @@ -6,6 +6,7 @@ irb(1), wmiir(1), wmii(1)
=== References

[horizontal]
[[[Bundler]]]:: http://gembundler.com
[[[Inochi]]]:: <%= Inochi::WEBSITE %>
[[[libixp]]]:: http://libs.suckless.org/libixp
[[[p9p]]]:: http://cm.bell-labs.com/magic/man2html/5/intro
Expand Down
4 changes: 4 additions & 0 deletions Gemfile
@@ -0,0 +1,4 @@
source :rubygems

gem 'inochi', '>= 6.0.1', '< 7'
gem 'detest', '>= 3.1.0', '< 4' # for unit testing
8 changes: 4 additions & 4 deletions HACKING
Expand Up @@ -2,10 +2,10 @@

=== Prerequisites

Install Ruby libraries necessary for development:
Install Ruby libraries necessary for development using <<Bundler>>:

------------------------------------------------------------------------------
gem install rumai --development
bundle install
------------------------------------------------------------------------------

=== Infrastructure
Expand Down Expand Up @@ -71,7 +71,7 @@ set -x RUBYOPT -rubygems # fish
=== Running tests

Simply execute the included test runner, which sets up Ruby's `$LOAD_PATH` for
testing, loads the `test/helper.rb` file, and then evaluates all
testing, loads the included `test/test_helper.rb` file, and then evaluates all
`test/**/*_test.rb` files:

------------------------------------------------------------------------------
Expand All @@ -80,7 +80,7 @@ ruby test/runner

Its exit status will indicate whether all tests have passed. It may also
print additional pass/fail information depending on the testing library used
in the `test/helper.rb` file.
in the `test/test_helper.rb` file.

=== Contributing

Expand Down
39 changes: 2 additions & 37 deletions lib/rumai/inochi.rb
Expand Up @@ -42,7 +42,7 @@ def self.inspect
#
# @example
#
# RUNTIME = {
# GEMDEPS = {
# # this project needs exactly version 1.2.3 of the "an_example" gem
# 'an_example' => [ '1.2.3' ],
#
Expand All @@ -54,41 +54,6 @@ def self.inspect
# 'yet_another_example' => [],
# }
#
RUNTIME = {}

##
# RubyGems required by this project during development.
#
# @example
#
# DEVTIME = {
# # this project needs exactly version 1.2.3 of the "an_example" gem
# 'an_example' => [ '1.2.3' ],
#
# # this project needs at least version 1.2 (but not
# # version 1.2.4 or newer) of the "another_example" gem
# 'another_example' => [ '>= 1.2' , '< 1.2.4' ],
#
# # this project needs any version of the "yet_another_example" gem
# "yet_another_example" => [],
# }
#
DEVTIME = {
'inochi' => [ '>= 5.0.2', '< 6' ],
'detest' => [ '>= 3.1.0', '< 4' ], # for unit testing
}

# establish gem version dependencies
if respond_to? :gem, true
[RUNTIME, DEVTIME].each do |deps|
deps.each do |gem_name, gem_version|
begin
gem gem_name, *Array(gem_version)
rescue LoadError => error
warn "#{self.inspect}: #{error}"
end
end
end
end
GEMDEPS = {}

end
2 changes: 1 addition & 1 deletion test/runner
Expand Up @@ -24,7 +24,7 @@ lib_dir = File.expand_path('../../lib', __FILE__)
test_dir = File.expand_path('..', __FILE__)
$LOAD_PATH.unshift lib_dir, test_dir

load File.join(test_dir, 'helper.rb')
require 'test_helper'

ARGV << "#{test_dir}/**/*_test.rb" if ARGV.empty?
ARGV.each {|glob| Dir[glob].each {|test| load test } }
File renamed without changes.

0 comments on commit e1af4c3

Please sign in to comment.