zentest-without-autotest 4.3.2 → 4.4.0

data/History.txt

@@ -1,3 +1,26 @@
+=== 4.4.0 / 2010-09-01
+
+* 1 major enhancement:
+
+  * Removed git building. I'm dropping direct support for rubinius.
+
+* 3 minor enhancements:
+
+  * Added multiruby  mri:list:x.y.z command so you can see what's available.
+  * Enabled installing specific patch versions of ruby.
+  * multiruby rubygems:update now forces a build to be less confusing.
+
+* 1 bug fix:
+
+  * Removed redundant test_to_normal, now in zentest_mappings
+
+=== 4.3.3 / 2010-06-17
+
+* 2 minor enhancements:
+
+  * Added options and removed pattern from Autotest::RCov
+  * update_rubygems now deletes cached rubygems installs
+
 === 4.3.2 / 2010-06-02
 
 * 1 minor enhancement:

data/VERSION

@@ -1 +1 @@
-4.3.2
+4.4.0

data/bin/multiruby_setup

@@ -30,6 +30,7 @@ ARGV.each do |spec|
     Multiruby.merge_rubygems
   when "rubygems:update", "update:rubygems" then
     Multiruby.update_rubygems
+    ARGV << "build"
   when "update" then
     Multiruby.update
   when "tags" then
@@ -57,6 +58,12 @@ ARGV.each do |spec|
     ARGV << "build"
   when /mri:svn:tag:(.*)/ then
     ARGV << "mri:svn:tag:#{$1}:#{$1}" << "build"
+  when /mri:list:(.*)/ then
+    v   = $1
+    ver = v[/\d+\.\d+/]
+    url = "#{Multiruby::RUBY_URL}/#{ver}/"
+
+    puts Multiruby.matching_versions(url, v).join("\n")
   when /mri:tar:(.*)/ then
     Multiruby.fetch_tar $1
     ARGV << "build"

data/bin/zentest

@@ -10,12 +10,7 @@ if defined? $v then
 end
 
 if defined? $h then
-  puts "usage: #{File.basename $0} [-h -v] test-and-implementation-files..."
-  puts "  -h display this information"
-  puts "  -v display version information"
-  puts "  -r Reverse mapping (ClassTest instead of TestClass)"
-  puts "  -e (Rapid XP) eval the code generated instead of printing it"
-  exit 0
+  ZenTest.usage_with_exit
 end
 
 code = ZenTest.fix(*ARGV)

data/lib/multiruby.rb

@@ -123,7 +123,7 @@ module Multiruby
   def self.clean
     self.each_scm_build_dir do |style|
       case style
-      when :svn, :git then
+      when :svn then
         if File.exist? "Rakefile" then
           run "rake clean"
         elsif File.exist? "Makefile" then
@@ -140,9 +140,8 @@ module Multiruby
       Dir["*"].each do |dir|
         next unless File.directory? dir
         Dir.chdir dir do
-          if File.exist?(".svn") || File.exist?(".git") then
-            scm = File.exist?(".svn") ? :svn : :git
-            yield scm
+          if File.exist?(".svn") then
+            yield :svn
           else
             yield :none
           end
@@ -151,23 +150,31 @@ module Multiruby
     end
   end
 
-  def self.extract_latest_version url, matching=nil
+  def self.matching_versions url, matching=nil
     file = URI.parse(url).read
-    versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.reject { |s|
-      s =~ /-rc\d/
-    }.sort_by { |s|
-      s.split(/\D+/).map { |i| i.to_i }
-    }.flatten
+
+    map = {
+      "preview" => "beta",
+      "rc"      => "beta2",
+      "p"       => "release",
+      "tar"     => "aargh",
+      "gz"      => "aargh",
+    }
+
+    versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.sort_by { |s|
+      s.scan(/\d+|[a-z]+/).map { |a| Integer(a) rescue map[a] || a }
+    }
 
     versions = versions.grep(/#{Regexp.escape(matching)}/) if matching
-    versions.last
+
+    versions
   end
 
   def self.fetch_tar v
     in_versions_dir do
       warn "  Determining latest version for #{v}"
       ver = v[/\d+\.\d+/]
-      base = extract_latest_version("#{RUBY_URL}/#{ver}/", v)
+      base = matching_versions("#{RUBY_URL}/#{ver}/", v).last
       abort "Could not determine release for #{v}" unless base
       url = File.join RUBY_URL, ver, base
       unless File.file? base then
@@ -181,13 +188,6 @@ module Multiruby
     end
   end
 
-  def self.git_clone url, dir
-    Multiruby.in_versions_dir do
-      Multiruby.run "git clone #{url} #{dir}" unless File.directory? dir
-      FileUtils.ln_sf "../versions/#{dir}", "../build/#{dir}"
-    end
-  end
-
   def self.gnu_utils_build inst_dir
     run "autoconf" unless test ?f, "configure"
     run "./configure --enable-shared --prefix #{inst_dir}", "log.configure" unless
@@ -201,31 +201,31 @@ module Multiruby
   end
 
   def self.in_build_dir
-    Dir.chdir File.join(self.root_dir, "build") do
+    in_root_dir "build" do
       yield
     end
   end
 
   def self.in_install_dir
-    Dir.chdir File.join(self.root_dir, "install") do
+    in_root_dir "install" do
       yield
     end
   end
 
-  def self.in_root_dir
-    Dir.chdir self.root_dir do
+  def self.in_root_dir subdir = ""
+    Dir.chdir File.join(self.root_dir, subdir) do
       yield
     end
   end
 
   def self.in_tmp_dir
-    Dir.chdir File.join(self.root_dir, "tmp") do
+    in_root_dir "tmp" do
       yield
     end
   end
 
   def self.in_versions_dir
-    Dir.chdir File.join(self.root_dir, "versions") do
+    in_root_dir "versions" do
       yield
     end
   end
@@ -370,13 +370,6 @@ module Multiruby
         else
           warn "  update in this svn dir not supported yet: #{dir}"
         end
-      when :git then
-        case dir
-        when /rubinius/ then
-          run "rake git:update build" # minor cheat by building here
-        else
-          warn "  update in this git dir not supported yet: #{dir}"
-        end
       else
         warn "  update in non-svn dir not supported yet: #{dir}"
       end

data/lib/zentest.rb

@@ -419,20 +419,6 @@ class ZenTest
     end # @klasses[klassname]
   end
 
-  def test_to_normal(_name, klassname=nil)
-    super do |name|
-      if defined? @inherited_methods then
-        known_methods = (@inherited_methods[klassname] || {}).keys.sort.reverse
-        known_methods_re = known_methods.map {|s| Regexp.escape(s) }.join("|")
-
-        name = name.sub(/^(#{known_methods_re})(_.*)?$/) { $1 } unless
-          known_methods_re.empty?
-
-        name
-      end
-    end
-  end
-
   # create a given method at a given
   # indentation. Returns an array containing
   # the lines of the method.
@@ -538,10 +524,51 @@ class ZenTest
     return @result.join("\n")
   end
 
+  # Provide a certain amount of help.
+  def self.usage
+    puts <<-EO_USAGE
+usage: #{File.basename $0} [options] test-and-implementation-files...
+
+ZenTest scans your target and unit-test code and writes your missing
+code based on simple naming rules, enabling XP at a much quicker
+pace. ZenTest only works with Ruby and Test::Unit.
+
+ZenTest uses the following rules to figure out what code should be
+generated:
+
+* Definition:
+  * CUT = Class Under Test
+  * TC = Test Class (for CUT)
+* TC's name is the same as CUT w/ "Test" prepended at every scope level.
+  * Example: TestA::TestB vs A::B.
+* CUT method names are used in CT, with "test_" prependend and optional "_ext" extensions for differentiating test case edge boundaries.
+  * Example:
+    * A::B#blah
+    * TestA::TestB#test_blah_normal
+    * TestA::TestB#test_blah_missing_file
+* All naming conventions are bidirectional with the exception of test extensions.
+
+options:
+  -h display this information
+  -v display version information
+  -r Reverse mapping (ClassTest instead of TestClass)
+  -e (Rapid XP) eval the code generated instead of printing it
+
+    EO_USAGE
+  end
+
+  # Give help, then quit.
+  def self.usage_with_exit
+    self.usage
+    exit 0
+  end
+
   # Runs ZenTest over all the supplied files so that
   # they are analysed and the missing methods have
   # skeleton code written.
+  # If no files are supplied, splutter out some help.
   def self.fix(*files)
+    ZenTest.usage_with_exit if files.empty?
     zentest = ZenTest.new
     zentest.scan_files(*files)
     zentest.analyze

data/zentest-without-autotest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zentest-without-autotest}
-  s.version = "4.3.2"
+  s.version = "4.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Davis"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-09-29}
   s.executables = ["multigem", "zentest", "multiruby", "multiruby_setup"]
   s.extra_rdoc_files = [
     "README.markdown"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 4
-  - 3
-  - 2
-  version: 4.3.2
+  - 4
+  - 0
+  version: 4.4.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: []