templates/boot.erb templates/connections.yml.erb templates/debug_handler.erb templates/hello_world.erb templates/rakefile.erb templates/settings.yml.erb templates/setup.erb templates/test_helper.erb @@ -1,30 +1,61 @@ +require 'rubygems' +require 'rake' require 'rake/testtask' +require 'rake/gempackagetask' +require File.join(File.dirname(__FILE__), "lib", "marvin") -begin - require 'jeweler' - Jeweler::Tasks.new do |s| - s.name = "marvin" - s.summary = "Ruby IRC Library / Framework" - s.email = "sutto@sutto.net" - s.homepage = "http://blog.ninjahideout.com/" - s.description = "Marvin is a Ruby IRC library / framework for ultimate awesomeness and with an evented design." - s.authors = ["Darcy Laycock"] - # Non-standard files to be included. - extras = ["config/setup.rb", "config/boot.rb", "config/settings.yml.sample", "config/connections.yml.sample"] - s.files = FileList["[A-Z]*.*", "{bin,generators,lib,test,spec,script,handlers}/**/*"] + extras - s.executables = "marvin" - # Our dependencies - s.add_dependency "Sutto-perennial" - s.add_dependency "eventmachine", ">= 0.12.0" - end -rescue LoadError - puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" +spec = Gem::Specification.new do |s| + s.name = 'marvin' + s.email = 'sutto@sutto.net' + s.homepage = 'http://sutto.net/' + s.authors = ["Darcy Laycock"] + s.version = Marvin.version(ENV['RELEASE'].blank?) + s.summary = "Evented IRC Library of Doom" + s.files = FileList["{bin,lib,templates,test,handlers}/**/*"].to_a + s.platform = Gem::Platform::RUBY + s.add_dependency "Sutto-perennial", ">= 0.2.4.6" + s.add_dependency "eventmachine-eventmachine", ">= 0.12.9" + s.add_dependency "json" +end + +task :default => "test:units" + +namespace :test do + desc "Runs the unit tests for perennial" + Rake::TestTask.new("units") do |t| + t.pattern = 'test/*_test.rb' + t.libs << 'test' + t.verbose = true + end +end + + +Rake::GemPackageTask.new(spec) do |pkg| + pkg.need_zip = true + pkg.need_tar = true end -task :default => "test" +task :gemspec do + File.open("marvin.gemspec", "w+") { |f| f.puts spec.to_ruby } +end + +def gemi(name, version) + command = "gem install #{name} --version '#{version}' --source http://gems.github.com" + puts ">> #{command}" + system "#{command} 1> /dev/null 2> /dev/null" +end -Rake::TestTask.new do |t| - t.libs << "test" - t.test_files = FileList['test/*_test.rb'] - t.verbose = true +task :install_dependencies do + spec.dependencies.each do |dependency| + gemi dependency.name, dependency.requirement_list.first + end +end + +task :tag do + if `git rev-parse HEAD` != `git rev-parse origin/master` + puts "You have uncommited changes. Please commit / stash them and rerun" + end + command = "git tag -a v#{Marvin.version(ENV['RELEASE'].blank?)}" + puts command + end \ No newline at end of file Rakefile @@ -1,160 +1,33 @@ #!/usr/bin/env ruby require 'rubygems' -require 'fileutils' -require "thor" +require File.join(File.dirname(__FILE__), "..", "lib", "marvin") -class Marvin < Thor +Marvin::Application.processing(ARGV) do |a| - GEM_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) + a.banner = "Marvin v#{Marvin::VERSION} - An IRC Library for Ruby" - attr_accessor :dest + a.generator! - # Map default help tasks. - map ["-h", "-?", "--help", "-D"] => :help + a.option :development, "Runs the app in development mode (handler reloading)", :shortcut => "D" + a.controller! :client, "Starts the actual Marvin client instance" + a.controller! :console, "Opens a friendly IRB prompt with Marvin pre-loaded" + a.controller! :distributed_client, "Starts a distributed client instance" - desc "create [PATH]", "creates a new marvin app at the given path" - method_options :verbose => :boolean - def create(path) - @dest = File.expand_path(path) - @verbose = options[:verbose] - if File.directory?(@dest) - STDOUT.puts "The given directory, \"#{path}\", already exists." - exit! 1 - else - say "Creating Marvin app" - say " => Making directories" - mkdir @dest - mkdir source(@dest, "script") - mkdir source(@dest, "config") - mkdir source(@dest, "handlers") - mkdir_p source(@dest, "tmp/pids") - mkdir source(@dest, "log") - mkdir source(@dest, "lib") - say " => Copying files..." - copy "config/setup.rb" - copy "config/boot.rb" - copy "config/connections.yml.sample", "config/connections.yml" - copy "config/settings.yml.sample", "config/settings.yml" - copy "handlers/hello_world.rb" - copy "handlers/debug_handler.rb" - %w(client console distributed_client ring_server status).each do |c| - copy "script/#{c}" - FileUtils.chmod 0755, source(@dest, "script/#{c}") - end - say "Done!" - end - end - - map "cl" => :client, "st" => :status, "rs" => :ring_server, - "dc" => :distributed_client, "co" => :console - - desc "start [PATH]", "starts client at the given path" - method_options :verbose => :boolean, :daemon => :boolean, :level => :optional, :kill => :boolean - def start(path = ".") - @dest = File.expand_path(path) - start_script(:client) - end - - desc "status [PATH]", "shows status of marvin app at a given location" - def status(path = ".") - @dest = File.expand_path(path) - start_script(:status) - end - - desc "client [PATH]", "starts a client instance from the given location" - method_options :verbose => :boolean, :daemon => :boolean, :level => :optional, :kill => :boolean - def client(path = ".") - @dest = File.expand_path(path) - start_script(:client) - end - - desc "ring_server [PATH]", "starts a ring server from the given location" - method_options :verbose => :boolean, :daemon => :boolean, :level => :optional, :kill => :boolean - def ring_server(path = ".") - @dest = File.expand_path(path) - start_script(:ring_server) - end - - desc "distributed_client [PATH]", "starts a distributed client from the given location" - method_options :verbose => :boolean, :daemon => :boolean, :level => :optional, - :kill => :boolean, :nodes => :numeric - def distributed_client(path = ".") - @dest = File.expand_path(path) - start_script(:distributed_client) - end - - desc "console [PATH]", "starts a marvin console from the given location" - def console(path = ".") - @dest = File.expand_path(path) - start_script(:console) - end - - private - - def source(*args) - File.expand_path(File.join(*args)) - end - - def copy(from, to = from) - s, d = source(GEM_ROOT, from), source(@dest, to) - say " --> cp #{s.gsub(" ", "\\ ")} #{d.gsub(" ", "\\ ")}" if @verbose - FileUtils.cp_r(s, d) - end - - def mkdir(path) - say " --> mkdir #{path.gsub(" ", "\\ ")}" if @verbose - FileUtils.mkdir path - end - - def mkdir_p(path) - say " --> mkdir #{path.gsub(" ", "\\ ")}" if @verbose - FileUtils.mkdir_p path - end - - def say(text) - STDOUT.puts text - end - - def marvin_repo?(path, type = client) - File.directory?(source(path, "script")) && File.exist?(source(path, "script/#{type}")) - end - - def start_script(name) - if marvin_repo?(@dest, name) - extra_args = [] - extra_args << "-k" if options[:kill] - extra_args << "-v" if options[:verbose] - extra_args << "-d" if options[:daemon] - extra_args << "--level=#{options[:level]}" if options[:level] - if options[:daemon] && options[:nodes] - nodes = options[:nodes] - else - nodes = 1 - end - Dir.chdir(@dest) do - # Lets you start a number of different processes. - # uses system if there are more than 1 nodes, exec - # otherwise. - if nodes > 1 - nodes.times { system("script/#{name}", *extra_args) } - else - exec("script/#{name}", *extra_args) - end - end - else - STDOUT.puts "Woop! #{@dest.gsub(" ", "\\ ")} isn't a marvin app." + a.option :force, "force the creation of the application" + a.add "create PATH", "Creates a marvin application at the given location" do |path, options| + path = File.expand_path(path) + if File.exists?(path) && !options[:force] + die! "The path you tried to use, #{path}, already exists. Please try another or use the --force option" end + setup_generator(path) + folders 'tmp', 'config', 'lib', 'handlers', 'test' + template 'boot.erb', 'config/boot.rb' + template 'setup.erb', 'config/setup.rb' + template 'settings.yml.erb', 'config/settings.yml' + template 'connections.yml.erb', 'config/connections.yml' + template 'debug_handler.erb', 'handlers/debug_handler.rb' + template 'hello_world.erb', 'handlers/hello_world.rb' + template 'rakefile.erb', 'Rakefile' end end - -STDOUT.puts "Marvin - IRC Library / Framework for Ruby" - -# Check if we have arguments, we run the normal -# thor task otherwise we just print the help -# message. -if ARGV.empty? - Marvin.new.help -else - Marvin.start -end \ No newline at end of file bin/marvin @@ -4,15 +4,12 @@ # any connections are created Marvin::Loader.before_run do - # Want a non-default namespace? Choose something simple - # Marvin::Settings.distributed_namespace = :some_namespace - # E.G. # MyHandler.register! (Marvin::Base subclass) or # Marvin::Settings.client.register_handler my_handler (a handler instance) # Register based on some setting you've added. e.g.: - # LoggingHandler.register! if Marvin::Settings.use_logging + # LoggingHandler.register! if Marvin::Settings.use_logging? # Conditional registration - load the distributed dispatcher # if an actual client, otherwise use the normal handlers. @@ -21,18 +18,14 @@ Marvin::Loader.before_run do # HelloWorld.register! # DebugHandler.register! # else + # Marvin::Distributed::Handler.register! + # else # end - if Marvin::Loader.distributed_client? - KeikiThwopper.register! - end - - Marvin::Distributed::Handler.register! - - # And any other code here that will be run before the client + # And any other code here that will be run before the client, e.g: - HelloWorld.register! - DebugHandler.register! + # HelloWorld.register! + # DebugHandler.register! end \ No newline at end of file config/setup.rb @@ -5,7 +5,7 @@ require 'perennial' module Marvin include Perennial - VERSION = "0.5.0" + VERSION = [0, 8, 0, 0] # Misc. #autoload :Util, 'marvin/util' @@ -45,6 +45,10 @@ module Marvin end + def self.version(include_minor = false) + VERSION[0, (include_minor ? 4 : 3)].join(".") + end + has_library :util, :abstract_client, :abstract_parser, :irc, :exception_tracker extends_library :settings lib/marvin.rb VERSION.yml bin/marvin_new 03c8c67bf3966a765126fb197268ce417e49549b Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/315900f9d6accc371e53200b82c6a6d65e81a001 315900f9d6accc371e53200b82c6a6d65e81a001 2009-09-15T20:29:37-07:00 2009-09-15T20:29:37-07:00 Refactor - remove jeweler, add new binary 90cffb948b9ed283757b97b9e4c343243f88ebcd Darcy Laycock sutto@sutto.net