@@ -1,10 +1,18 @@ -RSTACK_ROOT = File.expand_path(File.dirname(__FILE__) + "/..") -RSTACK_VENDOR = File.join RSTACK_ROOT, "vendor" +module RStack + def self.root + File.expand_path File.join(File.dirname(__FILE__), '..') + end + + def self.vendor + File.join root, 'vendor' + end +end -Dir[RSTACK_ROOT + "/vendor/**"].each do |dir| +Dir[RStack.vendor + "/**"].each do |dir| $:.unshift File.directory?(lib = "#{dir}/lib") ? lib : dir end +require 'rubygems' require 'active_support' require 'rubygems' require 'rake/gempackagetask' @@ -15,8 +23,7 @@ require 'rstack/pathize' require 'rstack/configuration' require 'rstack/generator' - -Dir[RSTACK_ROOT + "/lib/rstack/tasks/*.rb"].each {|f| require f } +Dir[RStack.root + "/lib/rstack/tasks/*.rb"].each {|f| require f } lib/rstack.rb @@ -16,7 +16,7 @@ module RStack @main_path = Pathname.new path_without_last end - @templates_path = Pathname.new(RSTACK_ROOT) + 'templates' + @templates_path = Pathname.new(RStack.root) + 'templates' @active_support_path = Pathname.new(File.dirname(__FILE__) + '/vendor/activesupport') end lib/rstack/generator.rb @@ -7,7 +7,7 @@ module RStack rdoc.rdoc_dir = configuration.outpath + '/doc' rdoc.title = "#{configuration.gem_name} -- #{configuration.version}" rdoc.main = 'README.txt' - rdoc.template = RSTACK_VENDOR + "/allison-2.0.2/lib/allison" + rdoc.template = RStack.vendor + "/allison-2.0.2/lib/allison" rdoc.options << '--line-numbers' << '--inline-source' end end lib/rstack/tasks/doc.rb @@ -15,10 +15,11 @@ module RStack s.add_dependency "rstack", ">= #{RStack::Version::STRING}" end - s.add_dependency 'rake', '>= 0.8.1' - s.add_dependency 'rcov', '>= 0.8.0' - s.add_dependency 'diff-lcs', '>= 1.1.2' - s.add_dependency 'rspec', '>= 1.1.3' + s.add_dependency 'rake', '>= 0.8.1' + s.add_dependency 'rcov', '>= 0.8.0' + s.add_dependency 'diff-lcs', '>= 1.1.2' + s.add_dependency 'rspec', '>= 1.1.3' + s.add_dependency 'activesupport', '>= 2.0.2' configuration.dependencies.each do |dependency, version| s.add_dependency dependency, version lib/rstack/tasks/gem.rb @@ -101,7 +101,7 @@ describe RStack::Generator, "#templates_path" do end it "should start with RSTACK_ROOT" do - @generator.templates_path.to_s.starts_with?(RSTACK_ROOT).should be_true + @generator.templates_path.to_s.starts_with?(RStack.root).should be_true end it "should exist" do spec/generator_spec.rb lib/rstack/pathize.rb vendor/activesupport-2.0.1/CHANGELOG vendor/activesupport-2.0.1/README vendor/activesupport-2.0.1/lib/active_support.rb vendor/activesupport-2.0.1/lib/active_support/basic_object.rb vendor/activesupport-2.0.1/lib/active_support/buffered_logger.rb vendor/activesupport-2.0.1/lib/active_support/clean_logger.rb vendor/activesupport-2.0.1/lib/active_support/core_ext.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/array.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/array/access.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/array/conversions.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/array/extract_options.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/array/grouping.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/array/random_access.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/bigdecimal.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/bigdecimal/conversions.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/blank.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/cgi.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/class.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/class/attribute_accessors.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/class/delegating_attributes.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/class/inheritable_attributes.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/class/removal.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/date.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/date/behavior.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/date/calculations.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/date/conversions.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/date_time.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/date_time/calculations.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/date_time/conversions.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/duplicable.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/enumerable.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/exception.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/file.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/float.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/float/rounding.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/hash.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/hash/conversions.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/hash/diff.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/hash/except.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/hash/indifferent_access.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/hash/keys.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/hash/reverse_merge.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/hash/slice.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/integer.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/integer/even_odd.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/integer/inflections.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/kernel.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/kernel/agnostics.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/kernel/daemonizing.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/kernel/debugger.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/kernel/reporting.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/kernel/requires.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/load_error.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/logger.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module/aliasing.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module/attr_accessor_with_default.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module/attr_internal.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module/attribute_accessors.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module/delegation.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module/inclusion.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module/introspection.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/module/loading.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/name_error.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/numeric.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/numeric/bytes.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/numeric/time.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/object.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/object/extending.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/object/instance_variables.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/object/misc.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/pathname.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/pathname/clean_within.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/proc.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/range.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/range/blockless_step.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/range/conversions.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/range/include_range.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/range/overlaps.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/string.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/string/access.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/string/conversions.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/string/inflections.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/string/iterators.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/string/starts_ends_with.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/string/unicode.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/string/xchar.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/symbol.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/test.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/test/unit/assertions.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/time.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/time/behavior.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/time/calculations.rb vendor/activesupport-2.0.1/lib/active_support/core_ext/time/conversions.rb vendor/activesupport-2.0.1/lib/active_support/dependencies.rb vendor/activesupport-2.0.1/lib/active_support/deprecation.rb vendor/activesupport-2.0.1/lib/active_support/duration.rb vendor/activesupport-2.0.1/lib/active_support/inflections.rb vendor/activesupport-2.0.1/lib/active_support/inflector.rb vendor/activesupport-2.0.1/lib/active_support/json.rb vendor/activesupport-2.0.1/lib/active_support/json/decoding.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/date.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/date_time.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/enumerable.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/false_class.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/hash.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/nil_class.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/numeric.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/object.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/regexp.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/string.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/symbol.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/time.rb vendor/activesupport-2.0.1/lib/active_support/json/encoders/true_class.rb vendor/activesupport-2.0.1/lib/active_support/json/encoding.rb vendor/activesupport-2.0.1/lib/active_support/json/variable.rb vendor/activesupport-2.0.1/lib/active_support/multibyte.rb vendor/activesupport-2.0.1/lib/active_support/multibyte/chars.rb vendor/activesupport-2.0.1/lib/active_support/multibyte/generators/generate_tables.rb vendor/activesupport-2.0.1/lib/active_support/multibyte/handlers/passthru_handler.rb vendor/activesupport-2.0.1/lib/active_support/multibyte/handlers/utf8_handler.rb vendor/activesupport-2.0.1/lib/active_support/multibyte/handlers/utf8_handler_proc.rb vendor/activesupport-2.0.1/lib/active_support/option_merger.rb vendor/activesupport-2.0.1/lib/active_support/ordered_options.rb vendor/activesupport-2.0.1/lib/active_support/test_case.rb vendor/activesupport-2.0.1/lib/active_support/testing.rb vendor/activesupport-2.0.1/lib/active_support/testing/default.rb vendor/activesupport-2.0.1/lib/active_support/values/time_zone.rb vendor/activesupport-2.0.1/lib/active_support/values/unicode_tables.dat vendor/activesupport-2.0.1/lib/active_support/vendor.rb vendor/activesupport-2.0.1/lib/active_support/vendor/builder-2.1.2/blankslate.rb vendor/activesupport-2.0.1/lib/active_support/vendor/builder-2.1.2/builder.rb vendor/activesupport-2.0.1/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb vendor/activesupport-2.0.1/lib/active_support/vendor/builder-2.1.2/builder/css.rb vendor/activesupport-2.0.1/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb vendor/activesupport-2.0.1/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb vendor/activesupport-2.0.1/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb vendor/activesupport-2.0.1/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb vendor/activesupport-2.0.1/lib/active_support/vendor/xml-simple-1.0.11/xmlsimple.rb vendor/activesupport-2.0.1/lib/active_support/version.rb vendor/activesupport-2.0.1/lib/active_support/whiny_nil.rb vendor/activesupport-2.0.1/lib/activesupport.rb 35b4855e2ca845762c5e5f6c5887fe10e970fc4e Jeremy Burks jeremy.burks@gmail.com http://github.com/jrun/rstack/commit/6c7c81bf3ea672f669f9e2d7238fb826d23ef133 6c7c81bf3ea672f669f9e2d7238fb826d23ef133 2008-04-05T08:46:41-07:00 2008-04-05T08:46:41-07:00 * removed activesupport from vendor and added it as a dependency * be like all the cool kids and use RStack.root instead of RSTACK_ROOT 3c6044499347f0d38fd3b4902dfdc690d8a1cf61 Jeremy Burks jeremy.burks@gmail.com