@@ -315,31 +315,28 @@ private save_name = Cabar::Plugin.default_name = name # Observe when plugins are installed. - main.plugin_manager.add_observer(self, :plugin_installed, :plugin_installed!) + plugin_manager.add_observer(self, :plugin_installed, :plugin_installed!) plugin.each do | file | next unless file file = Cabar.path_expand(file, directory) - _logger.debug do - " loading plugin #{file.inspect}" - end - - require file - - _logger.debug do - " loading plugin #{file.inspect}: DONE" - end + plugin_manager.load_plugin! file end ensure Cabar::Plugin.default_name = save_name - main.plugin_manager.delete_observer(self, :plugin_installed) + plugin_manager.delete_observer(self, :plugin_installed) end end end + def plugin_manager + main.plugin_manager + end + + # Observer callback for newly installed plugins. def plugin_installed! plugin_manager, plugin _logger.debug do lib/ruby/cabar/loader.rb @@ -64,7 +64,8 @@ module Cabar @commands = [ ] super - @file = $1 if /^(.*):\d+:in / === @file + @file = $1 if /^(.*):\d+/ === @file + # $stderr.puts "Plugin file #{@file.inspect}" @name ||= @@default_name raise ArgumentError, "Component in #{@file} does not have a name" unless @name @@ -141,6 +142,7 @@ module Cabar def initialize *args @plugins = [ ] @plugin_by_name = { } + @plugin_by_file = { } super end @@ -151,7 +153,24 @@ module Cabar end + def load_plugin! file + file += ".rb" unless /\.rb$/ === file + file = File.expand_path(file) + return :already if @plugin_by_file[file] + + @plugin_by_file[file] = [ ] + _logger.info { "plugin: loading plugin #{file.inspect}" } + require file + _logger.info { "plugin: loading plugin #{file.inspect}: DONE" } + self + end + + def register_plugin! plugin + unless @plugin_by_file[plugin.file] + raise Error, "Plugin not loaded via Plugin::Manager#load_plugin!" + end + # Overlay configuration options. config_opts = main.configuration.config['plugin'] config_opts &&= config_opts[plugin.name] @@ -186,6 +205,7 @@ module Cabar plugin.manager = self @plugins << plugin @plugin_by_name[name] = plugin + @plugin_by_file[plugin.file] << plugin notify_observers(:plugin_installed, plugin) @@ -210,6 +230,7 @@ module Cabar # The default documentation. attr_accessor :default_doc + def initialize *args, &blk @target = nil @target_stack = [ ] @@ -224,6 +245,18 @@ module Cabar @_logger ||= @plugin._logger end + + + # Returns the Plugin Manager. + def manager + @plugin.manager + end + + + # Returns the current Main objects. + def main + Cabar::Main.current + end # Define :documentation for the next item. lib/ruby/cabar/plugin.rb @@ -13,13 +13,12 @@ DOC $:.map { | dir | Dir["#{dir}/cabar/plugin/*.rb"] }. flatten. reject { | fn | fn == __FILE__ }. - map { | fn | %r{/(cabar/plugin/[a-z0-9_-]+)\.rb$}i =~ fn ? $1 : nil }. compact. sort. uniq. each do | n | # $stderr.puts "loading #{n}" - require n + manager.load_plugin! n end doc "Internals and introspection." lib/ruby/cabar/plugin/cabar.rb @@ -86,33 +86,61 @@ module Cabar def match_output generated, expected + + if Array === expected and (Regexp === expected[0] or String === expected[0]) + g = generated + expected.each do | e | + case e + when String + e.split("\n").each do | e | + e_rx = match_output_rx(e, :eol) + unless e_rx === g + $stderr.puts "expected:\n#{e}\n----" + case e + when /^([a-z0-9_]+=)/i + g_rx = /^(#{$1}.*)^/ + # $stderr.puts "g_rx = #{g_rx.inspect}" + + $stderr.puts "generated:\n#{g_rx === g ? $1 : generated}\n----" + else + $stderr.puts "generated:\n#{generated}\n----" + end + end + g.should match(e_rx) + end + when Regexp + g.should match(e) + end + end + else # require 'rubygems' # gem 'diff-lcs' # require 'diff-lcs' - e = match_output_rx expected - g = generated - g = g.gsub(/(:|")test\/ruby:/) { $1 } - - unless e === g - e = expected.split("\n") - g = generated.split("\n") - e.zip(g) do | (el, gl) | - el_rx = match_output_rx el, :eol - unless el_rx === gl - $stderr.puts "- #{el_rx.inspect}" - $stderr.puts "+ #{gl.inspect}" + e = match_output_rx expected + g = generated + g = g.gsub(/(:|")test\/ruby:/) { $1 } + + unless e === g + e = expected.split("\n") + g = generated.split("\n") + e.zip(g) do | (el, gl) | + el_rx = match_output_rx el, :eol + unless el_rx === gl + $stderr.puts "- #{el_rx.inspect}" + $stderr.puts "+ #{gl.inspect}" + end end end + + g.should match(e) end - - g.should match(e) - rescue Exception => err $stderr.puts "generated:\n#{generated}\n----" raise err.class.new(err.message + "\n#{err.backtrace * "\n"}") end + def match_output_rx expected, eol = false e = expected.gsub('<<CABAR_BASE_DIR>>', Cabar::CABAR_BASE_DIR) e = Regexp.escape(e) lib/ruby/cabar/test/main_helper.rb @@ -6,9 +6,10 @@ describe 'cbr env' do it 'cbr env # no args' do example_main(:args => 'env', - :match_stdout => <<'EOF') + :match_stdout => [ +<<"EOF" CABAR_TOP_LEVEL_COMPONENTS="boc"; export CABAR_TOP_LEVEL_COMPONENTS; -CABAR_REQUIRED_COMPONENTS="boc todo c1 boc_customer gems c3 c2 boc_locale boc_config rubygems cabar ruby"; export CABAR_REQUIRED_COMPONENTS; +CABAR_REQUIRED_COMPONENTS="boc todo c1 boc_customer gems c3 c2 boc_locale boc_config rubygems cabar ruby derby cabar_core"; export CABAR_REQUIRED_COMPONENTS; CABAR_boc_NAME="boc"; export CABAR_boc_NAME; CABAR_boc_VERSION="1.1"; export CABAR_boc_VERSION; CABAR_boc_DIRECTORY="<<CABAR_BASE_DIR>>/example/repo/dev/boc"; export CABAR_boc_DIRECTORY; @@ -81,7 +82,7 @@ CABAR_ruby_NAME="ruby"; export CABAR_ruby_NAME; CABAR_ruby_VERSION="<<ANY>>"; export CABAR_ruby_VERSION; CABAR_ruby_DIRECTORY="<<CABAR_BASE_DIR>>/comp/ruby/std"; export CABAR_ruby_DIRECTORY; CABAR_ruby_BASE_DIRECTORY="/usr"; export CABAR_ruby_BASE_DIRECTORY; -CABAR_ruby_RUBYLIB="<<CABAR_BASE_DIR>>/lib/ruby:<<ANY>>:."; export CABAR_ruby_RUBYLIB; +CABAR_ruby_RUBYLIB="<<ANY>><<CABAR_BASE_DIR>>/lib/ruby:<<ANY>>:."; export CABAR_ruby_RUBYLIB; CABAR_ruby_PATH="/usr/bin"; export CABAR_ruby_PATH; CABAR_ENV_PERL5LIB="<<ANY>>"; export CABAR_ENV_PERL5LIB; PERL5LIB="<<ANY>>"; export PERL5LIB; @@ -93,10 +94,11 @@ CABAR_ENV_BOC_LOCALE_PATH="<<CABAR_BASE_DIR>>/example/repo/prod/boc_customer/1.2 BOC_LOCALE_PATH="<<CABAR_BASE_DIR>>/example/repo/prod/boc_customer/1.2/locale"; export BOC_LOCALE_PATH; CABAR_ENV_INCLUDE_PATH="<<CABAR_BASE_DIR>>/example/repo/prod/c3/include"; export CABAR_ENV_INCLUDE_PATH; INCLUDE_PATH="<<CABAR_BASE_DIR>>/example/repo/prod/c3/include"; export INCLUDE_PATH; -CABAR_ENV_RUBYLIB="<<CABAR_BASE_DIR>>/example/repo/dev/c1/lib/ruby:<<CABAR_BASE_DIR>>/example/repo/prod/boc_customer/1.2/lib:<<CABAR_BASE_DIR>>/example/repo/dev/c2/1.2/lib/ruby:<<CABAR_BASE_DIR>>/example/repo/prod/boc_locale/1.1/lib:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/lib:test/ruby:<<CABAR_BASE_DIR>>/example:<<CABAR_BASE_DIR>>/lib/ruby:<<ANY>>:."; export CABAR_ENV_RUBYLIB; -RUBYLIB="<<CABAR_BASE_DIR>>/example/repo/dev/c1/lib/ruby:<<CABAR_BASE_DIR>>/example/repo/prod/boc_customer/1.2/lib:<<CABAR_BASE_DIR>>/example/repo/dev/c2/1.2/lib/ruby:<<CABAR_BASE_DIR>>/example/repo/prod/boc_locale/1.1/lib:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/lib:test/ruby:<<CABAR_BASE_DIR>>/example:<<CABAR_BASE_DIR>>/lib/ruby:<<ANY>>:."; export RUBYLIB; -CABAR_ENV_CABAR_RAKE_FILE="<<CABAR_BASE_DIR>>/example/repo/dev/boc/Rakefile!boc:<<CABAR_BASE_DIR>>/example/repo/dev/c1/Rakefile!c1:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/Rakefile!boc_config:<<CABAR_BASE_DIR>>/Rakefile!cabar"; export CABAR_ENV_CABAR_RAKE_FILE; -CABAR_RAKE_FILE="<<CABAR_BASE_DIR>>/example/repo/dev/boc/Rakefile!boc:<<CABAR_BASE_DIR>>/example/repo/dev/c1/Rakefile!c1:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/Rakefile!boc_config:<<CABAR_BASE_DIR>>/Rakefile!cabar"; export CABAR_RAKE_FILE; +CABAR_ENV_RUBYLIB="<<ANY>>:."; export CABAR_ENV_RUBYLIB; +RUBYLIB="test/ruby:<<CABAR_BASE_DIR>>/example/repo/dev/c1/lib/ruby:<<CABAR_BASE_DIR>>/example/repo/prod/boc_customer/1.2/lib:<<CABAR_BASE_DIR>>/example/repo/dev/c2/1.2/lib/ruby:<<CABAR_BASE_DIR>>/example/repo/prod/boc_locale/1.1/lib:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/lib:<<CABAR_BASE_DIR>>/comp/derby/1.0/lib/ruby:<<CABAR_BASE_DIR>>/comp/cabar_core/lib/ruby:<<CABAR_BASE_DIR>>/example:<<CABAR_BASE_DIR>>/lib/ruby:<<ANY>>:."; export RUBYLIB; +RUBYLIB="test/ruby:<<CABAR_BASE_DIR>>/example/repo/dev/c1/lib/ruby:<<CABAR_BASE_DIR>>/example/repo/prod/boc_customer/1.2/lib:<<CABAR_BASE_DIR>>/example/repo/dev/c2/1.2/lib/ruby:<<CABAR_BASE_DIR>>/example/repo/prod/boc_locale/1.1/lib:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/lib:<<CABAR_BASE_DIR>>/comp/derby/1.0/lib/ruby:<<CABAR_BASE_DIR>>/comp/cabar_core/lib/ruby:<<CABAR_BASE_DIR>>/example:<<CABAR_BASE_DIR>>/lib/ruby:<<ANY>>:."; export RUBYLIB; +CABAR_ENV_CABAR_RAKE_FILE="<<CABAR_BASE_DIR>>/example/repo/dev/boc/Rakefile!boc:<<CABAR_BASE_DIR>>/example/repo/dev/c1/Rakefile!c1:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/Rakefile!boc_config:<<CABAR_BASE_DIR>>/Rakefile!cabar:<<CABAR_BASE_DIR>>/comp/derby/1.0/Rakefile!derby:<<CABAR_BASE_DIR>>/example/repo/dev/boc/Rakefile!boc!:<<CABAR_BASE_DIR>>/example/repo/dev/c1/Rakefile!c1!:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/Rakefile!boc_config!:<<CABAR_BASE_DIR>>/Rakefile!cabar!:<<CABAR_BASE_DIR>>/comp/derby/1.0/Rakefile!derby!:<<CABAR_BASE_DIR>>/example/repo/dev/boc/Rakefile!boc!!:<<CABAR_BASE_DIR>>/example/repo/dev/c1/Rakefile!c1!!:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/Rakefile!boc_config!!:<<CABAR_BASE_DIR>>/Rakefile!cabar!!:<<CABAR_BASE_DIR>>/comp/derby/1.0/Rakefile!derby!!"; export CABAR_ENV_CABAR_RAKE_FILE; +CABAR_RAKE_FILE="<<CABAR_BASE_DIR>>/example/repo/dev/boc/Rakefile!boc:<<CABAR_BASE_DIR>>/example/repo/dev/c1/Rakefile!c1:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/Rakefile!boc_config:<<CABAR_BASE_DIR>>/Rakefile!cabar:<<CABAR_BASE_DIR>>/comp/derby/1.0/Rakefile!derby:<<CABAR_BASE_DIR>>/example/repo/dev/boc/Rakefile!boc!:<<CABAR_BASE_DIR>>/example/repo/dev/c1/Rakefile!c1!:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/Rakefile!boc_config!:<<CABAR_BASE_DIR>>/Rakefile!cabar!:<<CABAR_BASE_DIR>>/comp/derby/1.0/Rakefile!derby!:<<CABAR_BASE_DIR>>/example/repo/dev/boc/Rakefile!boc!!:<<CABAR_BASE_DIR>>/example/repo/dev/c1/Rakefile!c1!!:<<CABAR_BASE_DIR>>/example/repo/prod/boc_config/1.0/Rakefile!boc_config!!:<<CABAR_BASE_DIR>>/Rakefile!cabar!!:<<CABAR_BASE_DIR>>/comp/derby/1.0/Rakefile!derby!!"; export CABAR_RAKE_FILE; CABAR_ENV_PATH="<<CABAR_BASE_DIR>>/example/repo/dev/boc/bin:<<CABAR_BASE_DIR>>/example/repo/dev/c1/bin:<<CABAR_BASE_DIR>>/example/repo/prod/c3/bin:<<CABAR_BASE_DIR>>/example/repo/dev/c2/1.2/bin:<<CABAR_BASE_DIR>>/bin:<<ANY>>"; export CABAR_ENV_PATH; PATH="<<CABAR_BASE_DIR>>/example/repo/dev/boc/bin:<<CABAR_BASE_DIR>>/example/repo/dev/c1/bin:<<CABAR_BASE_DIR>>/example/repo/prod/c3/bin:<<CABAR_BASE_DIR>>/example/repo/dev/c2/1.2/bin:<<CABAR_BASE_DIR>>/bin:<<ANY>>"; export PATH; CABAR_ENV_GEM_PATH="<<CABAR_BASE_DIR>>/example/repo/plat/gems/1.0/gems-<<ANY>>"; export CABAR_ENV_GEM_PATH; @@ -108,6 +110,8 @@ TEST2="test2"; export TEST2; unset CABAR_ENV_TEST3; unset TEST3; EOF +] +) end test/ruby/cabar/env.spec b7067d25fb8f7b84d9993ff05d689cf16187bcb4 Kurt Stephens kstephens ks.github@kurtstephens.com http://github.com/kstephens/cabar/commit/163c85450faa16e6abec24df49c64931dcb44fb1 163c85450faa16e6abec24df49c64931dcb44fb1 2009-06-30T10:37:21-07:00 2009-06-30T10:37:21-07:00 Use Plugin::Manager#load_plugin!; Fixed env.spec. 2f58a5cecd844af6a39ac563df32efcda3a459d5 Kurt Stephens kstephens ks.github@kurtstephens.com