@@ -98,7 +98,7 @@ begin t.test_files = ['test/ts_xmpp4r.rb'] t.output_dir = "coverage" end -rescue Object +rescue LoadError end # DOT GRAPH @@ -133,16 +133,9 @@ end # What files/dirs should 'rake clean' remove? CLEAN.include ["*.gem", "pkg", "rdoc", "coverage", "tools/*.png"] -# Flag for RubyGems installation used to add rake package tasks conditionally. -# Full gem + tarball on systems with RubyGems. More limited on systems without. -@rubygems = nil - begin require 'rake/gempackagetask' - # RubyGems is installed, known since require 'rake/gempackagetask' succeeded. - @rubygems = true - spec = Gem::Specification.new do |s| s.name = PKG_NAME s.version = PKG_VERSION @@ -190,12 +183,11 @@ begin desc "Update Github Gemspec" task :update_gemspec do skip_fields = %w(new_platform original_platform date) - integer_fields = %w(specification_version) result = "# WARNING : RAKE AUTO-GENERATED FILE. DO NOT MANUALLY EDIT!\n" result << "# RUN : 'rake gem:update_gemspec'\n\n" result << "Gem::Specification.new do |s|\n" - spec.instance_variables.each do |ivar| + spec.instance_variables.sort.each do |ivar| value = spec.instance_variable_get(ivar) name = ivar.split("@").last next if skip_fields.include?(name) || value.nil? || value == "" || (value.respond_to?(:empty?) && value.empty?) @@ -208,8 +200,7 @@ begin case value when Array value = name != "files" ? value.inspect : value.sort.uniq.inspect.split(",").join(",\n") - when String - value = value.to_i if integer_fields.include?(name) + when String, Fixnum, true, false value = value.inspect else value = value.to_s.inspect @@ -228,8 +219,7 @@ begin task :gem => ['gem:update_gemspec'] rescue LoadError - @rubygems = false - warning = <<EOF + puts <<EOF ### Packaging Warning : RubyGems is apparently not installed on this system and any file add/remove/rename will not @@ -240,12 +230,11 @@ rescue LoadError gemspec will also stay in sync for others. ### EOF - puts warning end # we are apparently on a system that does not have RubyGems installed. # Lets try to provide only the basic tarball package tasks as a fallback. -if @rubygems == false +unless defined? Gem begin require 'rake/packagetask' Rake::PackageTask.new(PKG_NAME, PKG_VERSION) do |p| @@ -254,11 +243,10 @@ if @rubygems == false p.need_zip = true end rescue LoadError - warning = <<EOF + puts <<EOF ### Warning : Unable to require the 'rake/packagetask'. Is Rake installed? ### EOF - puts warning end end Rakefile @@ -2,17 +2,11 @@ # RUN : 'rake gem:update_gemspec' Gem::Specification.new do |s| - s.rubygems_version = "1.2.0" - s.homepage = "http://home.gna.org/xmpp4r/" - s.loaded = "false" - s.rubyforge_project = "xmpp4r" - s.summary = "XMPP4R is an XMPP/Jabber library for Ruby." - s.require_paths = ["lib"] + s.authors = ["Lucas Nussbaum", "Stephan Maka", "Glenn Rempe"] + s.bindir = "bin" s.description = "XMPP4R is an XMPP/Jabber library for Ruby." + s.email = "xmpp4r-devel@gna.org" s.extra_rdoc_files = ["README.rdoc", "README_ruby19.txt", "CHANGELOG", "LICENSE", "COPYING"] - s.platform = "ruby" - s.authors = ["Lucas Nussbaum", "Stephan Maka", "Glenn Rempe"] - s.name = "xmpp4r" s.files = ["CHANGELOG", "COPYING", "LICENSE", @@ -280,12 +274,18 @@ Gem::Specification.new do |s| "tools/gen_requires.bash", "tools/xmpp4r-gemspec-test.rb", "xmpp4r.gemspec"] - s.required_rubygems_version = ">= 0" - s.has_rdoc = "true" - s.specification_version = "2" - s.email = "xmpp4r-devel@gna.org" - s.version = "0.4" + s.has_rdoc = true + s.homepage = "http://home.gna.org/xmpp4r/" + s.loaded = false + s.name = "xmpp4r" + s.platform = "ruby" s.rdoc_options = ["--quiet", "--title", "XMPP4R is an XMPP/Jabber library for Ruby.", "--opname", "index.html", "--main", "lib/xmpp4r.rb", "--line-numbers", "--inline-source"] + s.require_paths = ["lib"] s.required_ruby_version = ">= 1.8.4" - s.bindir = "bin" + s.required_rubygems_version = ">= 0" + s.rubyforge_project = "xmpp4r" + s.rubygems_version = "1.2.0" + s.specification_version = 2 + s.summary = "XMPP4R is an XMPP/Jabber library for Ruby." + s.version = "0.4" end \ No newline at end of file xmpp4r.gemspec a315dcddd39e7728145f9392e446c2213f0d7d54 Astro astro@spaceboyz.net http://github.com/ln/xmpp4r/commit/3cbb15f52a64c389f4f276e23c4417ac0fce5d73 3cbb15f52a64c389f4f276e23c4417ac0fce5d73 2008-08-05T10:55:00-07:00 2008-08-05T10:55:00-07:00 Rakefile optimizations: * rescue only for LoadErrors * no @rubygems, but check with defined?, easier to read * update_gemspec: sort fields (less changes visible to version control), properly output fixnums, bools * output heredocs immediately 8de1e77aca21d2fb24fb0c48628ce959ea9b30ff Astro astro@spaceboyz.net