@@ -24,6 +24,6 @@ Dir['tasks/*.rb'].each {|r| require r} ############################################################################## -# ADD YOUR CUSTOM TASKS IN /lib/tasks -# NAME YOUR RAKE FILES file_name.rake +# ADD YOUR CUSTOM TASKS IN ./tasks +# NAME YOUR RAKE FILES file_name.rb ############################################################################## Rakefile @@ -1,5 +1,11 @@ #! /usr/bin/env ruby -require 'warningshot/suite' + +#pre scan ARGV for pload oload +if ARGV.grep(/(o|p)load/i).empty? + require 'warningshot/suite' +else + require 'warningshot' +end # Create a config hash config = WarningShot::Config.parse_args bin/warningshot @@ -15,16 +15,16 @@ class WarningShot::GemResolver # Default version to install DEFAULT_VERSION = ">=0.0.0".freeze - cli("--gempath=PATH", String, "Alternate gem path ':' separated to check. First in path is where gems will be installed") do |val| - options[:gem_path] = val + cli("--gempath=PATH", String, "Alternate gem path ':' separated to check. First in path is where gems will be installed") do |gpath| + options[:gem_path] = gpath end - cli("-m","--resolver-gems=GEMS", String,"Names of gems containing add'l resolvers (':' seperated)") do |config| - options[:resolver_gems] = config.split(':') + cli("-m","--resolver-gems=GEMS", String,"Names of gems containing add'l resolvers (':' seperated)") do |resolver_gems| + options[:resolver_gems] = resolver_gems.split(':') end - cli("--minigems",String,"Not supported yet.") do |val| - options[:minigems] = val + cli("--minigems",String,"Not supported yet.") do |minigems| + options[:minigems] = minigems end GemResource = Struct.new(:name,:version,:source) do lib/resolvers/gem_resolver.rb @@ -1,15 +1,14 @@ class WarningShot::ManualResolver include WarningShot::Resolver order 10000 - #disable! - branch :manual description 'A glorified todo list of things that need to be resolved manually' - cli("--notes", "List all the notes in the manual branch") do |val| - options[:notes] = val - puts "HERE ARE THE NOTES" + WarningShot::Resolver.descendants.each{|d| d.disable!} + self.enable! + + WarningShot.after {WarningShot::ManualResolver.notes} end #Encapsulated in a struct so Resolver doesn't freak out when we instance_eval #met & #resolved @@ -22,4 +21,10 @@ class WarningShot::ManualResolver register :test do |dep| logger.info " ~ #{dep.msg}" end + + class << self + def notes + puts "TODO Output notes here..." + end + end end \ No newline at end of file lib/resolvers/manual_resolver.rb @@ -139,17 +139,14 @@ module WarningShot WarningShot::Config::PARSER.on("-p", "--[no-]prettycolors", "Colorize output") do |colorize| @@cli_options[:colorize] = colorize end - # NOTE stubs for taking WarningShot.only_load && WarningShot.priority_load from command line, ran into a catch22 - # with this so its removed for now. Cory ODaniel (11/8/2008) - # - #WarningShot::Config::PARSER.on("--oload=LIST", String, "Only load specified resolvers (Command seperated)") do |oload| - # @@cli_options[:oload] = oload.split(',') - # WarningShot.only_load *@@cli_options[:oload] - #end - #WarningShot::Config::PARSER.on("--pload=LIST", String, "Load specified resolvers only, setting sequential priority (Command seperated)") do |pload| - # @@cli_options[:pload] = pload.split(',') - # WarningShot.only_load *@@cli_options[:pload] - #end + WarningShot::Config::PARSER.on("--oload=LIST", String, "Only load specified resolvers (Command seperated)") do |oload| + @@cli_options[:oload] = oload.split(',') + WarningShot.only_load *@@cli_options[:oload] + end + WarningShot::Config::PARSER.on("--pload=LIST", String, "Load specified resolvers only, setting sequential priority (Command seperated)") do |pload| + @@cli_options[:pload] = pload.split(',') + WarningShot.only_load *@@cli_options[:pload] + end WarningShot::Config::PARSER.on_tail("--version", "Show version"){ WarningShot::Config::PARSER.parse!(argv) conf = WarningShot::Config.create(@@cli_options) lib/warningshot/config.rb @@ -69,7 +69,7 @@ module WarningShot # @api private def run @logger.info "WarningShot v. #{WarningShot::VERSION}" - @logger.info "Environment: #{self.environment}; Application: #{WarningShot.framework}" + @logger.info "Environment: #{self.environment}; Application: #{WarningShot.application_type}" @logger.info "On host: #{WarningShot.hostname}" WarningShot::Resolver.descendants.each do |klass| lib/warningshot/dependency_resolver.rb @@ -3,8 +3,9 @@ require File.dirname(__FILE__) / 'resolver' require File.dirname(__FILE__) / 'dependency_resolver' module WarningShot - BeforeCallbacks= [] - AfterCallbacks = [] + BeforeCallbacks = [] + AfterCallbacks = [] + ApplicationTypes = {} # Relative paths from WarningShot.root PATHS = { @@ -16,6 +17,10 @@ module WarningShot RecipeExt = "*.{yml,yaml}".freeze class << self + def register_application_type(type,&block) + ApplicationTypes[type] = block + end + def root File.expand_path(File.dirname(__FILE__)) / ".." / ".." end @@ -51,19 +56,19 @@ module WarningShot end end - # the application/framework warningshot is running in + # the application type warningshot is running in # uses constants to determine + # Additional application types can be registered with + # WarningShot.register_application_type # - # @return [String] Name of framework/application + # @return [Symbol] Name of framework/application type # @api public - def framework - if defined?(RAILS_ROOT) - return "RAILS" - elsif defined?(Merb) - return "MERB" - else - return "CONSOLE" - end + def application_type + ApplicationTypes.each do |type,block| + @@application_type = type if block.call + end if (@@application_type ||=nil).nil? + + @@application_type end # register a callback to be run before starting @@ -173,3 +178,7 @@ module WarningShot end end end + +WarningShot.register_application_type(:merb){ !!defined?(Merb) } +WarningShot.register_application_type(:rails){ !!defined?(RAILS_ROOT) } +WarningShot.register_application_type(:console){true} lib/warningshot/warning_shot.rb @@ -85,7 +85,14 @@ describe WarningShot::GemResolver do pending end - it 'should install gems in --gempath when specified and resolving' do + it 'should install gems in first gempath when --gempath is specified and resolving' do + #config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) + + #resolver = WarningShot::GemResolver.new(config,{:name => "ws-dummy"}) + #resolver.test! + #Dir['./test/output/gems/*ws-dummy*'].length.should be(0) + #resolver.resolve! + #Dir['./test/output/gems/*ws-dummy*'].length.should be(1) pending end end \ No newline at end of file test/spec/unit/resolvers/gem_resolver_spec.rb bc1055388ed9c66105f43a94c172ce0e2908ba26 Cory ODaniel github@coryodaniel.com http://github.com/coryodaniel/warningshot/commit/fe22e8eed015995a2b492a81556ec4e798e74810 fe22e8eed015995a2b492a81556ec4e798e74810 2008-11-20T13:18:46-08:00 2008-11-20T13:18:46-08:00 Ability to register application types so warningshot's resolvers can do conditional resolutions based on the application type ie, merb, rails, console, etc. WarningShot.register_application_type(<symbol>,<block>) 5d7846adfa870264e5a35fa05c1e64c78bca536d Cory ODaniel github@coryodaniel.com