lib/echoe/net.rb vendor/rake/MIT-LICENSE vendor/rake/lib/rake/contrib/compositepublisher.rb vendor/rake/lib/rake/contrib/ftptools.rb vendor/rake/lib/rake/contrib/publisher.rb vendor/rake/lib/rake/contrib/rubyforgepublisher.rb vendor/rake/lib/rake/contrib/sshpublisher.rb vendor/rake/lib/rake/contrib/sys.rb @@ -2,6 +2,7 @@ CHANGELOG echoe.gemspec lib/echoe/client.rb lib/echoe/extensions.rb +lib/echoe/net.rb lib/echoe/platform.rb lib/echoe/rubygems.rb lib/echoe.rb @@ -11,3 +12,10 @@ MIT-LICENSE Rakefile README TODO +vendor/rake/lib/rake/contrib/compositepublisher.rb +vendor/rake/lib/rake/contrib/ftptools.rb +vendor/rake/lib/rake/contrib/publisher.rb +vendor/rake/lib/rake/contrib/rubyforgepublisher.rb +vendor/rake/lib/rake/contrib/sshpublisher.rb +vendor/rake/lib/rake/contrib/sys.rb +vendor/rake/MIT-LICENSE Manifest @@ -1,5 +1,5 @@ - -require 'lib/echoe' +($:.unshift File.expand_path(File.join( File.dirname(__FILE__), 'lib' ))).uniq! +require 'echoe' Echoe.new('echoe') do |p| p.project = 'fauna' @@ -7,9 +7,8 @@ Echoe.new('echoe') do |p| p.summary = 'A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.' p.url = 'http://blog.evanweaver.com/files/doc/fauna/echoe/' p.docs_host = 'blog.evanweaver.com:~/www/bax/public/files/doc/' - p.runtime_dependencies = ['rubyforge >=1.0.0', 'highline'] + p.runtime_dependencies = ['rubyforge >=1.0.2', 'highline'] p.development_dependencies = [] p.retain_gemspec = true - p.require_signed = true end Rakefile @@ -2,23 +2,21 @@ Gem::Specification.new do |s| s.name = %q{echoe} - s.version = "3.1" + s.version = "3.1.3" s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version= s.authors = ["Evan Weaver"] - s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"] - s.date = %q{2009-02-03} + s.date = %q{2009-06-16} s.description = %q{A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.} s.email = %q{} - s.extra_rdoc_files = ["CHANGELOG", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "lib/echoe.rb", "LICENSE", "README", "TODO"] - s.files = ["CHANGELOG", "echoe.gemspec", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "lib/echoe.rb", "LICENSE", "Manifest", "MIT-LICENSE", "Rakefile", "README", "TODO"] + s.extra_rdoc_files = ["CHANGELOG", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/net.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "lib/echoe.rb", "LICENSE", "README", "TODO"] + s.files = ["CHANGELOG", "echoe.gemspec", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/net.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "lib/echoe.rb", "LICENSE", "Manifest", "MIT-LICENSE", "Rakefile", "README", "TODO", "vendor/rake/lib/rake/contrib/compositepublisher.rb", "vendor/rake/lib/rake/contrib/ftptools.rb", "vendor/rake/lib/rake/contrib/publisher.rb", "vendor/rake/lib/rake/contrib/rubyforgepublisher.rb", "vendor/rake/lib/rake/contrib/sshpublisher.rb", "vendor/rake/lib/rake/contrib/sys.rb", "vendor/rake/MIT-LICENSE"] s.has_rdoc = true s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/echoe/} s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Echoe", "--main", "README"] s.require_paths = ["lib"] s.rubyforge_project = %q{fauna} s.rubygems_version = %q{1.3.1} - s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem} s.summary = %q{A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.} if s.respond_to? :specification_version then @@ -26,14 +24,14 @@ Gem::Specification.new do |s| s.specification_version = 2 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q<rubyforge>, [">= 1.0.0"]) + s.add_runtime_dependency(%q<rubyforge>, [">= 1.0.2"]) s.add_runtime_dependency(%q<highline>, [">= 0"]) else - s.add_dependency(%q<rubyforge>, [">= 1.0.0"]) + s.add_dependency(%q<rubyforge>, [">= 1.0.2"]) s.add_dependency(%q<highline>, [">= 0"]) end else - s.add_dependency(%q<rubyforge>, [">= 1.0.0"]) + s.add_dependency(%q<rubyforge>, [">= 1.0.2"]) s.add_dependency(%q<highline>, [">= 0"]) end end echoe.gemspec @@ -1,21 +1,29 @@ $HERE = File.dirname(__FILE__) require "#{$HERE}/echoe/platform" -require "#{$HERE}/echoe/extensions" require 'rake' require 'rake/clean' -require 'rake/contrib/sshpublisher' +require "#{$HERE}/../vendor/rake/lib/rake/contrib/compositepublisher" +require "#{$HERE}/../vendor/rake/lib/rake/contrib/sshpublisher" require 'rake/gempackagetask' require 'rake/rdoctask' require 'rake/testtask' +begin +require 'spec/rake/spectask' +rescue LoadError +end require 'rbconfig' require 'open-uri' +require "#{$HERE}/echoe/extensions" + require 'rubygems' +require 'rubygems/specification' require "#{$HERE}/echoe/rubygems" require 'rubyforge' +require "#{$HERE}/echoe/net" require "#{$HERE}/echoe/client" require 'highline/import' @@ -65,8 +73,6 @@ Note that you can also set the key and certificate locations in the Rakefile its Echoe does not force packages to depend on Echoe itself. Instead, it generates a <tt>gemspec</tt> from your <tt>Rakefile</tt> and includes that. Downstream repackagers can use the <tt>gemspec</tt> as-is to build new versions of your gem even without Echoe. -However, Echoe is added to the <tt>development_dependencies</tt> array so that users can automatically install it via <tt>gem install --development</tt> if they prefer. You can override this behavior by setting <tt>p.development_dependencies = []</tt>. - == Cross-packaging Echoe supports platform Rake targets to allow you to cross-package your gems. Just write the spec assuming <tt>RUBY_PLATFORM</tt> will be what you need it to be for each architecture, and then invoke Rake with the platform name when you're cross-packaging. @@ -107,6 +113,8 @@ Testing options: * <tt>clean_pattern</tt> - A filename array, glob array, or regex for files that should be removed when <tt>rake clean</tt> is run. * <tt>test_pattern</tt> - A filename array, glob array, or regex for test runners. Overridden by <tt>"test/test_all.rb"</tt>, if it exists. + +* <tt>spec_pattern</tt> - A filename array, glob array, or regex for test runners. * <tt>rcov_options</tt> - Any extra flags to pass to RCov when coverage reports are run. Uncommon packaging options: @@ -144,7 +152,7 @@ Documentation options: class Echoe # user-configurable - attr_accessor :author, :changes, :clean_pattern, :description, :email, :runtime_dependencies, :development_dependencies, :need_tgz, :need_tar_gz, :need_gem, :need_zip, :rdoc_pattern, :project, :summary, :test_pattern, :url, :version, :docs_host, :rdoc_template, :manifest_name, :install_message, :extension_pattern, :private_key, :certificate_chain, :require_signed, :ruby_version, :platform, :ignore_pattern, :executable_pattern, :changelog, :rcov_options, :gemspec_format + attr_accessor :author, :changes, :clean_pattern, :description, :email, :runtime_dependencies, :development_dependencies, :need_tgz, :need_tar_gz, :need_gem, :need_zip, :rdoc_pattern, :project, :summary, :test_pattern, :spec_pattern, :url, :version, :docs_host, :rdoc_template, :manifest_name, :install_message, :extension_pattern, :private_key, :certificate_chain, :require_signed, :ruby_version, :platform, :ignore_pattern, :executable_pattern, :changelog, :rcov_options, :gemspec_format # best left alone attr_accessor :name, :lib_files, :test_files, :bin_files, :spec, :rdoc_options, :rubyforge_name, :has_rdoc, :include_gemspec, :include_rakefile, :gemspec_name, :retain_gemspec, :rakefile_name, :eval, :files, :changelog_patterns, :rubygems_version, :use_sudo, :gem_bin @@ -163,6 +171,7 @@ class Echoe self.email = "" self.clean_pattern = ["pkg", "doc", 'build/*', '**/coverage', '**/*.o', '**/*.so', '**/*.a', '**/*.log', "{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}", "ext/Makefile", "{ext,lib}/**/*.{bundle,so,obj,pdb,lib,def,exp}", "ext/**/Makefile", "pkg", "*.gem", ".config"] self.test_pattern = File.exist?("test/test_all.rb") ? "test/test_all.rb" : ['test/**/test_*.rb', 'test/**/*_test.rb'] + self.spec_pattern = "spec/**/*_spec.rb" self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/ self.changelog_patterns = { @@ -226,7 +235,7 @@ class Echoe # read manifest begin - self.files = File.read(manifest_name).split + + self.files = File.readlines(manifest_name).map { |x| x.strip } + [(gemspec_name if include_gemspec)] + [(rakefile_name if include_rakefile)] self.files = files.compact.uniq @@ -255,14 +264,16 @@ class Echoe end end - self.changes = if File.exist? changelog - Array(changelog_patterns[:changes]).map do |pattern| - open(changelog) do |log| - log.read[pattern, 1] - end - end.compact.first or "" - else - "" + unless self.changes + self.changes = if File.exist? changelog + Array(changelog_patterns[:changes]).map do |pattern| + open(changelog) do |log| + log.read[pattern, 1] + end + end.compact.first or "" + else + "" + end end # set some post-defaults @@ -276,6 +287,7 @@ class Echoe self.rdoc_pattern = apply_pattern(rdoc_pattern, files) - [manifest_name] self.executable_pattern = apply_pattern(executable_pattern, files) self.test_pattern = apply_pattern(test_pattern) + self.spec_pattern = apply_pattern(spec_pattern) define_tasks end @@ -385,7 +397,8 @@ class Echoe puts "#{var}: #{instance_variable_get(var).inspect}" end end - + + desc "Builds the .gemspec" task :build_gemspec do # Construct the gemspec file, if needed. if include_gemspec @@ -403,11 +416,15 @@ class Echoe end end end + puts "Gemspec generated" end # Chain it to the gemspec task prerequisite task gemspec_name.to_sym => [:build_gemspec] + desc "Generates manifest & gemspec in one go" + task :build => [:manifest, :build_gemspec] + task :package do # Chain some cleanup tasks to the default :package task. # Remove the gemfile if it wasn't actually requested. @@ -506,7 +523,8 @@ class Echoe end end - task :test => [:compile] + task :test => [:compile] if test_pattern.any? + task :spec => :compile if spec_pattern.any? end @@ -586,7 +604,15 @@ class Echoe File.open(filename, 'w') do |f| f.write "Subject: #{name.capitalize} #{version}\n\n" f.write "#{name.capitalize} has been updated to #{version}. #{name.capitalize} is #{summary.uncapitalize}\n\n" - f.write "Changes in this version: #{changes.sub(/^\s*[\w\d\.]+\s+/, '').uncapitalize}\n\n" unless changes.empty? + unless changes.empty? + f.write "Changes in this version: " + if changes.include?("\n") + f.write(changes) + else + f.write(changes.sub(/^\s*[\w\d\.]+\s+/, '').uncapitalize) + end + f.write("\n\n") + end f.write "More information is available at #{url} .\n\n" unless url.empty? end end @@ -694,9 +720,17 @@ class Echoe end end + task :default => :test end - task :default => :test + if spec_pattern.any? + desc "Run the spec suite" + Spec::Rake::SpecTask.new('spec') do |t| + t.spec_files = spec_pattern + end + + task :default => :spec + end if defined? Rcov Rcov::RcovTask.new(:coverage) do |t| lib/echoe.rb @@ -1,36 +1,38 @@ ### Platform check regexes -module Platform - def self.windows? - @windows ||= RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ - !@windows.nil? - end +class Echoe + module Platform + def self.windows? + @windows ||= RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ + !@windows.nil? + end - def self.gcc? - @gcc ||= RUBY_PLATFORM =~ /mingw/ - !@gcc.nil? - end + def self.gcc? + @gcc ||= RUBY_PLATFORM =~ /mingw/ + !@gcc.nil? + end - def self.msvc? - @msvc ||= RUBY_PLATFORM =~ /mswin/ - !@msvc.nil? - end + def self.msvc? + @msvc ||= RUBY_PLATFORM =~ /mswin/ + !@msvc.nil? + end - def self.java? - @java ||= RUBY_PLATFORM =~ /java/ - !@java.nil? - end + def self.java? + @java ||= RUBY_PLATFORM =~ /java/ + !@java.nil? + end - def self.suffix - @suffix ||= Gem.default_exec_format[2..-1] - end + def self.suffix + @suffix ||= Gem.default_exec_format[2..-1] + end - def self.rake - windows? ? "rake#{suffix}.bat" : "rake#{suffix}" - end + def self.rake + windows? ? "rake#{suffix}.bat" : "rake#{suffix}" + end - def self.make - msvc? ? 'nmake' : 'make' + def self.make + msvc? ? 'nmake' : 'make' + end end end lib/echoe/platform.rb bdf15a4174ddfdf6954df5c8caa5b0b1369bbdaa 6a3b91137498612121c08690eda6986609f9bc74 Evan Weaver eweaver@twitter.com http://github.com/fauna/echoe/commit/ca5d41af856099e72ba72af8a5ec63568a9ecfb0 ca5d41af856099e72ba72af8a5ec63568a9ecfb0 2009-08-27T17:01:52-07:00 2009-08-27T17:01:52-07:00 Merge branch 'master' of git@github.com:fauna/echoe Conflicts: CHANGELOG echoe.gemspec 2c41336fbdd0da9564b4f2d4fcd79c39f17a7ee1 Evan Weaver eweaver@twitter.com