@@ -1,88 +1,62 @@ require 'rubygems' require 'rake' -require 'rake/testtask' -require 'rake/gempackagetask' - -require File.join(File.dirname(__FILE__), "lib", "marvin") -CURRENT_VERSION = Marvin.version(ENV['RELEASE'].blank?) - -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 = CURRENT_VERSION - s.summary = "Evented IRC Library for Ruby, built on EventMachine and Perennial." - s.description = File.read("DESCRIPTION") - s.files = FileList["{bin,lib,templates,test,handlers}/**/*"].to_a - s.platform = Gem::Platform::RUBY - s.executables = FileList["bin/*"].map { |f| File.basename(f) } - s.add_dependency "perennial", ">= 1.0.0.0" - s.add_dependency "eventmachine", ">= 0.12.8" - 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 :gemspec do - File.open("#{spec.name}.gemspec", "w+") { |f| f.puts spec.to_ruby } -end - -def gemi(name, version) - command = "gem install #{name} --version '#{version}' #{"--source http://gems.github.com" if name.include?("-")}".strip - puts ">> #{command}" - system "#{command} 1> /dev/null 2> /dev/null" -end -task :install_dependencies do - spec.dependencies.each do |dependency| - gemi dependency.name, dependency.requirement_list.first +MARVIN_MAIN_FILE = File.join(File.dirname(__FILE__), "lib", "marvin.rb") +require MARVIN_MAIN_FILE + +begin + require 'jeweler' + require 'perennial/jeweler_ext' + Jeweler.versioning_via MARVIN_MAIN_FILE, Marvin::VERSION + Jeweler::Tasks.new do |gem| + gem.name = "marvin" + gem.summary = "Evented IRC Library for Ruby, built on EventMachine and Perennial." + gem.description = File.read("DESCRIPTION") + gem.email = 'sutto@sutto.net' + gem.homepage = 'http://sutto.net/' + gem.authors = ["Darcy Laycock"] + gem.files = FileList["{bin,lib,templates,test,handlers}/**/*"].to_a + gem.platform = Gem::Platform::RUBY + gem.add_dependency "perennial", ">= 1.0.1" + gem.add_dependency "eventmachine", ">= 0.12.8" + gem.add_dependency "json" + gem.add_development_dependency "thoughtbot-shoulda" + gem.add_development_dependency "yard" end + Jeweler::GemcutterTasks.new +rescue LoadError => e + puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler" end -task :check_dirty do - if `git status`.include? 'added to commit' - puts "You have uncommited changes. Please commit them first" - exit! +require 'rake/testtask' +Rake::TestTask.new(:test) do |test| + test.libs << 'lib' << 'test' + test.pattern = 'test/**/*_test.rb' + test.verbose = true +end + +begin + require 'rcov/rcovtask' + Rcov::RcovTask.new do |test| + test.libs << 'test' + test.pattern = 'test/**/*_test.rb' + test.verbose = true + end +rescue LoadError + task :rcov do + abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov" end end -task :tag => :check_dirty do - command = "git tag -a v#{CURRENT_VERSION} -m 'Code checkpoint for v#{CURRENT_VERSION}'" - puts ">> #{command}" - system command -end - -task :commit_gemspec => [:check_dirty, :gemspec] do - command = "git commit -am 'Generate gemspec for v#{CURRENT_VERSION}'" - puts ">> #{command}" - system command -end +task :test => :check_dependencies -task :release => [:commit_gemspec, :tag] do - puts ">> git push" - system "git push 1> /dev/null 2> /dev/null" - system "git push --tags 1> /dev/null 2> /dev/null" - Rake::Task["gemcutter"].invoke - puts "New version released." -end +task :default => :test -task :gemcutter => [:check_dirty, :gemspec] do - puts ">> pushing to gemcutter" - gem_name = "#{spec.name}-#{CURRENT_VERSION}.gem" - system "gem build #{spec.name}.gemspec && gem push #{gem_name} && rm #{gem_name}" +begin + require 'yard' + YARD::Rake::YardocTask.new +rescue LoadError + task :yardoc do + abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard" + end end Rakefile @@ -5,7 +5,7 @@ require 'perennial' module Marvin include Perennial - VERSION = [0, 8, 0, 2] + VERSION = [0, 8, 1, 0] # Client autoload :TestClient, 'marvin/test_client' lib/marvin.rb @@ -1,3 +1,6 @@ +# Generated by jeweler +# DO NOT EDIT THIS FILE +# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec` # -*- encoding: utf-8 -*- Gem::Specification.new do |s| @@ -6,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Darcy Laycock"] - s.date = %q{2009-09-27} + s.date = %q{2009-10-05} s.default_executable = %q{marvin} s.description = %q{Marvin is a library (also usable in framework / application form) that makes it simple and fast to build applications around IRC. With an emphasis @@ -16,28 +19,100 @@ and the like) easy, whilst still making it possible to do more complex thing working with IRC in an evented fashion fun and easy for all rubyists.} s.email = %q{sutto@sutto.net} s.executables = ["marvin"] - s.files = ["bin/marvin", "lib/marvin", "lib/marvin/abstract_client.rb", "lib/marvin/abstract_parser.rb", "lib/marvin/base.rb", "lib/marvin/client", "lib/marvin/client/actions.rb", "lib/marvin/client/default_handlers.rb", "lib/marvin/command_handler.rb", "lib/marvin/console.rb", "lib/marvin/core_commands.rb", "lib/marvin/distributed", "lib/marvin/distributed/client.rb", "lib/marvin/distributed/handler.rb", "lib/marvin/distributed/protocol.rb", "lib/marvin/distributed/server.rb", "lib/marvin/distributed.rb", "lib/marvin/dsl.rb", "lib/marvin/exception_tracker.rb", "lib/marvin/exceptions.rb", "lib/marvin/irc", "lib/marvin/irc/client.rb", "lib/marvin/irc/event.rb", "lib/marvin/irc/replies.rb", "lib/marvin/irc.rb", "lib/marvin/logging_handler.rb", "lib/marvin/middle_man.rb", "lib/marvin/parsers", "lib/marvin/parsers/command.rb", "lib/marvin/parsers/prefixes", "lib/marvin/parsers/prefixes/host_mask.rb", "lib/marvin/parsers/prefixes/server.rb", "lib/marvin/parsers/prefixes.rb", "lib/marvin/parsers/ragel_parser.rb", "lib/marvin/parsers/ragel_parser.rl", "lib/marvin/parsers/simple_parser.rb", "lib/marvin/parsers.rb", "lib/marvin/settings.rb", "lib/marvin/test_client.rb", "lib/marvin/util.rb", "lib/marvin.rb", "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", "test/abstract_client_test.rb", "test/parser_comparison.rb", "test/parser_test.rb", "test/test_helper.rb", "test/util_test.rb", "handlers/debug_handler.rb", "handlers/hello_world.rb", "handlers/keiki_thwopper.rb", "handlers/simple_logger.rb", "handlers/tweet_tweet.rb"] + s.extra_rdoc_files = [ + "README.markdown" + ] + s.files = [ + "bin/marvin", + "handlers/debug_handler.rb", + "handlers/hello_world.rb", + "handlers/keiki_thwopper.rb", + "handlers/simple_logger.rb", + "handlers/tweet_tweet.rb", + "lib/marvin.rb", + "lib/marvin/abstract_client.rb", + "lib/marvin/abstract_parser.rb", + "lib/marvin/base.rb", + "lib/marvin/client/actions.rb", + "lib/marvin/client/default_handlers.rb", + "lib/marvin/command_handler.rb", + "lib/marvin/console.rb", + "lib/marvin/core_commands.rb", + "lib/marvin/distributed.rb", + "lib/marvin/distributed/client.rb", + "lib/marvin/distributed/handler.rb", + "lib/marvin/distributed/protocol.rb", + "lib/marvin/distributed/server.rb", + "lib/marvin/dsl.rb", + "lib/marvin/exception_tracker.rb", + "lib/marvin/exceptions.rb", + "lib/marvin/irc.rb", + "lib/marvin/irc/client.rb", + "lib/marvin/irc/event.rb", + "lib/marvin/irc/replies.rb", + "lib/marvin/logging_handler.rb", + "lib/marvin/middle_man.rb", + "lib/marvin/parsers.rb", + "lib/marvin/parsers/command.rb", + "lib/marvin/parsers/prefixes.rb", + "lib/marvin/parsers/prefixes/host_mask.rb", + "lib/marvin/parsers/prefixes/server.rb", + "lib/marvin/parsers/ragel_parser.rb", + "lib/marvin/parsers/ragel_parser.rl", + "lib/marvin/parsers/simple_parser.rb", + "lib/marvin/settings.rb", + "lib/marvin/test_client.rb", + "lib/marvin/util.rb", + "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", + "test/abstract_client_test.rb", + "test/parser_comparison.rb", + "test/parser_test.rb", + "test/test_helper.rb", + "test/util_test.rb" + ] s.homepage = %q{http://sutto.net/} + s.rdoc_options = ["--charset=UTF-8"] s.require_paths = ["lib"] - s.rubygems_version = %q{1.3.2} + s.rubygems_version = %q{1.3.5} s.summary = %q{Evented IRC Library for Ruby, built on EventMachine and Perennial.} + s.test_files = [ + "test/abstract_client_test.rb", + "test/parser_comparison.rb", + "test/parser_test.rb", + "test/test_helper.rb", + "test/util_test.rb", + "examples/example_dsl.rb" + ] if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 3 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q<perennial>, [">= 1.0.0.0"]) + s.add_runtime_dependency(%q<perennial>, [">= 1.0.1"]) s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.8"]) s.add_runtime_dependency(%q<json>, [">= 0"]) + s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"]) + s.add_development_dependency(%q<yard>, [">= 0"]) else - s.add_dependency(%q<perennial>, [">= 1.0.0.0"]) + s.add_dependency(%q<perennial>, [">= 1.0.1"]) s.add_dependency(%q<eventmachine>, [">= 0.12.8"]) s.add_dependency(%q<json>, [">= 0"]) + s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"]) + s.add_dependency(%q<yard>, [">= 0"]) end else - s.add_dependency(%q<perennial>, [">= 1.0.0.0"]) + s.add_dependency(%q<perennial>, [">= 1.0.1"]) s.add_dependency(%q<eventmachine>, [">= 0.12.8"]) s.add_dependency(%q<json>, [">= 0"]) + s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"]) + s.add_dependency(%q<yard>, [">= 0"]) end end marvin.gemspec bda4ed783cf1ba8e0868c3db2a2c90843c21ab34 Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/bbf804dd38e9f5f528fa1634e21e04eb4616de3c bbf804dd38e9f5f528fa1634e21e04eb4616de3c 2009-10-05T06:58:20-07:00 2009-10-05T06:58:20-07:00 Switch to use jeweler 20c807e22e46aaf847e860c6f60337cf7a34f74c Darcy Laycock sutto@sutto.net