@@ -4,6 +4,27 @@ require 'rubygems' require 'yaml' require 'pp' +require 'optparse' + +options = {} +OptionParser.new do |opts| + opts.banner = "Usage: example.rb [options]" + + opts.on("-g [NAME]", "--ginger [NAME]", "Ginger gem name") do |name| + options[:ginger] = name + end + + opts.on("-n [NAME]", "--notamock [NAME]", "Not A Mock gem name") do |name| + options[:notamock] = name + end + + opts.on("-s [NAME]", "--sphinx [NAME]", "Sphinx daemon name") do |name| + options[:sphinx] = name + end +end.parse! + +OPTIONS = options + module ContributeHelper; end class Contribute @@ -14,7 +35,8 @@ class Contribute Dependencies::Sphinx, Dependencies::Mysql, Dependencies::AR, - Dependencies::Ginger + Dependencies::Ginger, + Dependencies::NotAMock ] end @@ -159,6 +181,8 @@ EO_CREATE_DATABASE_FAILED begin ActiveRecord::Base.connection.create_database('thinking_sphinx') colour_puts "<green>successful</green>" + puts + return true rescue ActiveRecord::StatementInvalid if $!.message[/database exists/] colour_puts "<green>successful</green> (database already existed)" @@ -166,11 +190,10 @@ EO_CREATE_DATABASE_FAILED return true else colour_puts "<red>failed</red>" + colour_puts CREATE_DATABASE_FAILED end end - colour_puts CREATE_DATABASE_FAILED - false end @@ -272,6 +295,11 @@ module ContributeHelper puts + if !all_found + print "You may wish to try setting additional options. Use ./contribute.rb -h for details" + puts + end + all_found end @@ -315,18 +343,23 @@ module Dependencies end class Ginger < ContributeHelper::Gem - name 'ginger' + name(OPTIONS.has_key?(:ginger) ? OPTIONS[:ginger] : 'ginger') + end + + class NotAMock < ContributeHelper::Gem + name(OPTIONS.has_key?(:notamock) ? OPTIONS[:notamock] : 'not_a_mock') end class Sphinx < ContributeHelper::Dependency name 'sphinx' def check - output = `which searchd` + app_name = OPTIONS.has_key?(:sphinx) ? OPTIONS[:sphinx] : 'searchd' + output = `which #{app_name}` @location = output.chomp if $? == 0 $? == 0 end end end -Contribute.new.show \ No newline at end of file +Contribute.new.show contribute.rb 80e59b2d9e371ff959b212a168b2d1349aa57df7 Tom Simnett tom@initforthe.com http://github.com/freelancing-god/thinking-sphinx/commit/cde7e4966213ec30eac3422504e76b3ea7a2bb27 cde7e4966213ec30eac3422504e76b3ea7a2bb27 2009-06-15T20:20:14-07:00 2009-06-15T06:03:14-07:00 Update of contribute.rb to allow different gem names and fixed up database connection tests 307ddb857a5fc08fdbf2917882ff592a857456a9 Pat Allan pat@freelancing-gods.com