raven 1.1.2 → 1.2

data/lib/raven.rb

@@ -34,7 +34,7 @@ module Raven
       opts.on('-m=ARG', '--mavenrepo repo_url', '[repository] Maven repository to build your gem repository from.') { |val| repo_url = val }
       opts.on('-p=ARG', '--proxy proxy_url', '[repository|install] Proxy url (http://<p_user>:<p_pwd>@<p_host>:<p_port>) for access outside corporate firewalls.') { |val| proxy_url = val }
       opts.on('-i=ARG', '--index index_url', '[install] URL of a directory containing repository indices.') { |val| index_url = val }
-      opts.on('-g=ARG', '--group', '[install] Install artifacts in the provided group.') { |val| groupId = val }
+      opts.on('-p=ARG', '--project group_id', '[install] Install artifacts in the provided project.') { |val| groupId = val }
       opts.on('-a', '--all', '[install] Install all selected artifacts.') { |val| all = true }
       opts.on('-v', '--allversions', '[install] Select all versions, not only the latest.') { |val| allver = true }
       
@@ -94,9 +94,11 @@ module Raven
           av = artifact.match(/([^:]*):?(.*)/).to_a
           # Trock to see if we've been passed a version number or an artifact
           begin
-            Integer(av[1][0..0])
-            av[2] = av[1]
-            av[1] = ''
+            aint = Integer(av[1][0..0])
+            if aint != 0
+              av[2] = av[1]
+              av[1] = ''
+            end
           rescue
           end
           begin
@@ -128,7 +130,7 @@ module Raven
         match = match.to_a
         match.shift
         puts "Using proxy #{match[2]} and port #{match[3]}"
-        [match[2], match[3], match[0], match[1].length == 0 ? 80 : Integer(match[1])]
+        [match[2], match[3].length == 0 ? 80 : Integer(match[3]), match[0], match[1]]
       else 
         nil
       end

data/lib/raven/deps_tasks.rb

@@ -122,7 +122,13 @@ module Raven
       local = select_gem(gemname, version, gems, true)
       puts "Using local gem #{local[0].name} (#{local[0].version}) to satisfy dependency #{gemname}" if RakeFileUtils.verbose_flag && local
       return local if local
-      gems = Gem::RemoteInstaller.new().search(/.*#{gemname}$/)
+      begin
+        gems = Gem::RemoteInstaller.new().search(/.*#{gemname}$/)
+      rescue Exception => rt
+        puts "The gem #{gemname} from your dependencies couldn't be found locally"
+        puts "and the connection to a Gem repository failed."
+        exit
+      end 
       remote = select_gem(gemname, version, gems.flatten, false)
       puts "Downloading remote gem #{remote[0].name} (#{remote[0].version}) to satisfy dependency #{gemname}" if RakeFileUtils.verbose_flag && remote
       return remote if remote

data/lib/raven/java_tasks.rb

@@ -45,8 +45,8 @@ module Raven
     
     def execute
       super
-      classpath = Raven.build_cp(prerequisites)
-      classpath << "target/classes"
+      @classpath = Raven.build_cp(prerequisites)
+      @classpath << "target/classes"
       @build_path = ["src/main/java"] unless @build_path
       
       puts "Building path #{@build_path.join(' ')}" if RakeFileUtils.verbose_flag
@@ -67,9 +67,9 @@ module Raven
           source_pkg = Set.new
           source_files.each { |src| source_pkg << File.join(File.dirname(src), '*.java') }
           # Executing javac
-          puts "javac -classpath \"#{classpath.join(CP_SEP)}\" -sourcepath \"#{@build_path.join(CP_SEP)}\" -d target/classes #{source_pkg.to_a.join(' ')}" if RakeFileUtils.verbose_flag
-          `javac -classpath "#{classpath.join(CP_SEP)}" -sourcepath "#{@build_path.join(CP_SEP)}" -d target/classes #{source_pkg.to_a.join(' ')}`
-          unless $? == 0
+          puts "javac -classpath \"#{@classpath.join(CP_SEP)}\" -sourcepath \"#{@build_path.join(CP_SEP)}\" -d target/classes #{source_pkg.to_a.join(' ')}" if RakeFileUtils.verbose_flag
+          `javac -classpath "#{@classpath.join(CP_SEP)}" -sourcepath "#{@build_path.join(CP_SEP)}" -d target/classes #{source_pkg.to_a.join(' ')}`
+          unless $?.exitstatus == 0
             puts "Build failed, see above errors."
             exit
           end
@@ -86,20 +86,58 @@ module Raven
         @build_path = [p]
       end
     end
+
+    class JUnitTask < JavacTask
+      def execute
+        @build_path = ["src/test/java"] unless @build_path
+        super
+        unless @test_classes
+          tests = @build_path.collect { |d| Dir.glob("#{d}/**/Test*.java").collect { |sd| sd[d.size+1..-1] } }
+          @test_classes = tests.flatten.collect { |d| d.gsub('/', '.')[0..-6] }
+        end
+        failures = false
+        @test_classes.flatten.each do |tc|
+          puts "Running test #{tc}"
+          result = `java -classpath "#{@classpath.join(CP_SEP)}" junit.textui.TestRunner #{tc}`
+          puts result
+          failures = true if /FAILURES/ =~ result || /ERRORS/ =~ result
+        end
+        if failures
+          puts "There were failures!"
+          exit(1)
+        end
+      end
+
+      def test_classes
+        @test_classes ||= []
+      end
+      
+      def test_classes=(c)
+        @test_classes = [c]
+      end
+    end
     
     # Builds a jar file from your compiled sources. The jarfile produced
     # will have the same name as your jar task.
     class JarTask < Rake::Task
       def execute
-        super      
+        super
         latest = Raven.latest_file('target/classes')
-        
-        if !File.exist?("target/#{name}") || File.stat("target/#{name}").ctime < latest
-          `jar -cf target/#{name} -C target/classes .`
+
+        # Manifest inclusion
+        mfest_param = @manifest ? "-m #{@manifest}" : ""
+
+        if !File.exist?("target/#{name}") || File.stat("target/#{name}").mtime < latest
+          `jar -cf target/#{name} #{mfest_param} -C target/classes .`
+          puts "Built jar file #{name}." if RakeFileUtils.verbose_flag
         else
           puts 'Nothing to do, jar is fresh enough.' if RakeFileUtils.verbose_flag
         end
       end
+    
+      def manifest=(f)
+        @manifest = f
+      end
     end
     
     # Builds a jar file from your sources. Customized by adding directories
@@ -127,7 +165,7 @@ module Raven
         mfest_param = @manifest ? "-m #{@manifest}" : ""
         
         # Building the jar from all sources
-        if !File.exist?("target/#{name}") || File.stat("target/#{name}").ctime < latest
+        if !File.exist?("target/#{name}") || File.stat("target/#{name}").mtime < latest
           `jar -cf target/#{name} #{mfest_param} -C #{@source_path.pop} .`
           while (p = @source_path.pop)
             `jar -uf target/#{name} -C #{p} .`
@@ -230,16 +268,20 @@ module Raven
         if (packages.size > 0)
           puts "javadoc -classpath #{classpath.join(CP_SEP)} -sourcepath #{@build_path.join(CP_SEP)} -d target/jdoc #{packages.join(' ')}" if RakeFileUtils.verbose_flag
           `javadoc -classpath #{classpath.join(CP_SEP)} -sourcepath #{@build_path.join(CP_SEP)} -d target/jdoc #{packages.join(' ')}`
-          unless $? == 0
-            puts "Build failed, see above errors."
+          unless $?.exitstatus == 0
+            puts "Javadoc failed, see above errors."
             exit
           end
         end
       end
-      
+
       def build_path
         @build_path ||= []
       end
+
+      def build_path=(p)
+        @build_path = [p]
+      end
     end
     
     # Wraps a jar file around a Gem. Useful for distributing it around.
@@ -365,7 +407,7 @@ module Raven
     def self.latest_file(dir)
       latest = Time.at(0)
       Raven.browse_files(dir) do |f|
-        change = File.stat(f).ctime
+        change = File.stat(f).mtime
         latest = change if change > latest
       end
       latest
@@ -388,6 +430,10 @@ module Raven
   def jar_source(args, &block)
     Raven::JarSourceTask.define_task(args, &block)
   end
+
+  def junit(args, &block)
+    Raven::JUnitTask.define_task(args, &block)
+  end
   
   def lib_dir(args, &block)
     Raven::LibDirTask.define_task(args, &block)

data/lib/raven/java_tasks.rb~

@@ -0,0 +1,459 @@
+#!/usr/bin/env ruby
+
+#  Copyright 2006 Matthieu Riou
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+require 'rake'
+require 'fileutils'
+require 'set'
+
+# Monkey patching FileUtils to support filtering in copy.
+module FileUtils
+  class Entry_
+    alias original copy
+    def copy(dest)
+      unless path['.svn'] || path['.cvs']
+        original(dest)
+      end
+    end
+  end
+end
+
+module Raven
+  CP_SEP = PLATFORM['mswin'] ? ';'  : ':'
+  
+  # Executes Javac by passing it everything it needs. Stuff like a
+  # classpath and sources. The classpath is built by checking the
+  # prerequisites of the javac task. When a prerequisite is a dependency
+  # declaration (dependency task), it takes each declared Gems and
+  # adds the jar files found in them to the classpath.
+  # 
+  # Can be customized by adding directories to the <em>build_path</em>
+  # using the << operator (if none defined, default is src/main/java). 
+  class JavacTask < Rake::Task
+    
+    def execute
+      super
+      @classpath = Raven.build_cp(prerequisites)
+      @classpath << "target/classes"
+      @build_path = ["src/main/java"] unless @build_path
+      
+      puts "Building path #{@build_path.join(' ')}" if RakeFileUtils.verbose_flag
+      
+      Dir.mkdir("target") unless File.exist?("target")
+      Dir.mkdir("target/classes")  unless File.exist?("target/classes")
+      # Getting the source files to compile. Filtrating sources already
+      # compiled having a fresh enough class
+      source_files = @build_path.collect do |d|
+        Dir.glob("#{d}/**/*.java").select do |java|
+          classfile = 'target/classes/' + java[d.length, (java.length - 5 - d.length)] + '.class'
+          File.exist?(classfile) ? File.stat(java).mtime > File.stat(classfile).mtime : true
+        end
+        end.flatten
+        
+        if (source_files.size > 0)
+          # Getting only package names, it shortens the command line
+          source_pkg = Set.new
+          source_files.each { |src| source_pkg << File.join(File.dirname(src), '*.java') }
+          # Executing javac
+          puts "javac -classpath \"#{@classpath.join(CP_SEP)}\" -sourcepath \"#{@build_path.join(CP_SEP)}\" -d target/classes #{source_pkg.to_a.join(' ')}" if RakeFileUtils.verbose_flag
+          `javac -classpath "#{@classpath.join(CP_SEP)}" -sourcepath "#{@build_path.join(CP_SEP)}" -d target/classes #{source_pkg.to_a.join(' ')}`
+          unless $?.exitstatus == 0
+            puts "Build failed, see above errors."
+            exit
+          end
+        else
+          puts 'All class files are up to date.' if RakeFileUtils.verbose_flag
+        end
+      end
+      
+      def build_path
+        @build_path ||= []
+      end
+      
+      def build_path=(p)
+        @build_path = [p]
+      end
+    end
+
+    class JUnitTask < JavacTask
+      def execute
+        @build_path = ["src/test/java"] unless @build_path
+        super
+        unless @test_classes
+          puts "IN"
+          tests = @build_path.collect { |d| Dir.glob("#{d}/**/Test*.java").collect { |sd| sd[d.size+1..-1] } }
+          puts tests
+          @test_classes = tests.flatten.collect { |d| d.gsub('/', '.')[0..-6] }
+          puts @test_classes
+        end
+        failures = false
+        @test_classes.flatten.each do |tc|
+          puts "Running test #{tc}"
+          result = `java -classpath "#{@classpath.join(CP_SEP)}" junit.textui.TestRunner #{tc}`
+          puts result
+          failures = true if /FAILURES/ =~ result || /ERRORS/ =~ result
+        end
+        if failures
+          puts "There were failures!"
+          exit(1)
+        end
+      end
+
+      def test_classes
+        @test_classes ||= []
+      end
+      
+      def test_classes=(c)
+        @test_classes = [c]
+      end
+    end
+    
+    # Builds a jar file from your compiled sources. The jarfile produced
+    # will have the same name as your jar task.
+    class JarTask < Rake::Task
+      def execute
+        super
+        latest = Raven.latest_file('target/classes')
+
+        # Manifest inclusion
+        mfest_param = @manifest ? "-m #{@manifest}" : ""
+
+        if !File.exist?("target/#{name}") || File.stat("target/#{name}").mtime < latest
+          `jar -cf target/#{name} #{mfest_param} -C target/classes .`
+          puts "Built jar file #{name}." if RakeFileUtils.verbose_flag
+        else
+          puts 'Nothing to do, jar is fresh enough.' if RakeFileUtils.verbose_flag
+        end
+      end
+    
+      def manifest=(f)
+        @manifest = f
+      end
+    end
+    
+    # Builds a jar file from your sources. Customized by adding directories
+    # to the <em>source_path</em> just like the JavacTask.
+    class JarSourceTask < Rake::Task
+      def execute
+        super
+        # Checking if any of our prerequisites is a JavacTask, if
+        # so we'll just use the build path to construct the jar.
+        Raven.prereq_filter(prerequisites, :build_path) do |javac_task|
+         (@source_path ||= []) << javac_task.build_path
+        end
+        
+        # Initializing source path
+        @source_path = ["src/main/java"] unless @source_path
+        @source_path.flatten!
+        
+        latest = Time.at(0)
+        @source_path.each do |dir|
+          dir_latest = Raven.latest_file(dir)
+          latest = dir_latest if dir_latest > latest
+        end
+        
+        # Manifest inclusion
+        mfest_param = @manifest ? "-m #{@manifest}" : ""
+        
+        # Building the jar from all sources
+        if !File.exist?("target/#{name}") || File.stat("target/#{name}").mtime < latest
+          `jar -cf target/#{name} #{mfest_param} -C #{@source_path.pop} .`
+          while (p = @source_path.pop)
+            `jar -uf target/#{name} -C #{p} .`
+          end
+        end
+      end
+      
+      def source_path
+        @source_path ||= []
+      end
+      
+      def manifest=(f)
+        @manifest = f
+      end
+    end
+    
+    # Produces a WAR from a web application directory. Includes the libraries
+    # needed in WEB-INF/lib (as long as the corresponding dependency task is
+    # declared as a prerequisite) and the compiled classes (if there are).
+    # 
+    # Can be customized by setting <em>webapp_dir</em> to the directory
+    # containing your web application resources (web.xml, jsp, images, ...).
+    # The default is src/main/webapp.
+    class WarTask < Rake::Task
+      DEFAULT_TARGET = 'target/webapp/'
+      LIB_SUBDIR = 'WEB-INF/lib/'
+      CLASSES_SUBDIR = 'WEB-INF/classes/'
+      
+      def execute
+        super
+        
+        # Build target structure
+        @webapp_dir = @webapp_dir || 'src/main/webapp'
+        Raven.mkdir_recurse(DEFAULT_TARGET)
+        
+        puts "Using web application directory #{@webapp_dir}" if RakeFileUtils.verbose_flag
+        
+        FileUtils.cp_r(@webapp_dir, DEFAULT_TARGET)
+        
+        # Eventually add classes compiled by javac
+        if (File.exist?('target/classes'))
+          Raven.mkdir_recurse(DEFAULT_TARGET + CLASSES_SUBDIR)
+          FileUtils.cp_r('target/classes/.', DEFAULT_TARGET + CLASSES_SUBDIR)
+        end
+        
+        # Make lib directory with all dependencies
+        Raven.mkdir_recurse(DEFAULT_TARGET + LIB_SUBDIR)
+        Raven.mk_libs(DEFAULT_TARGET + LIB_SUBDIR, prerequisites)
+        
+        # Build the war
+        `jar -cf target/#{name} -C #{DEFAULT_TARGET} .`
+      end
+      
+      def webapp_dir=(param)
+        @webapp_dir = param
+      end
+    end
+    
+    # Places all the dependencies in a given directory (useful mostly to
+    # build a distribution). The dependencies are selected from the 
+    # prerequisites (using declared dependency tasks). The  default 
+    # directory is lib. Can be customized by setting <em>target</em>.
+    class LibDirTask < Rake::Task
+      def execute
+        super
+        puts "Copying libraries in #{@target}" if RakeFileUtils.verbose_flag
+        @target = @target || 'lib'
+        Raven.mk_libs(@target, prerequisites)
+      end
+      
+      def target=(param)
+        @target = param
+      end
+    end
+    
+    # Executes JavaDoc by passing it everything it needs. Stuff like a
+    # classpath and sources. The result is generated in target/jdoc. Can
+    # be customized exactly in the same way as the javac task.
+    class JavaDocTask < Rake::Task
+      
+      def execute
+        super
+        classpath = Raven.build_cp(prerequisites)
+        classpath << "target/classes"
+        @build_path = ["src/main/java"] unless @build_path
+        
+        puts "Executing JavaDoc using source path #{@build_path.join(' ')}" if RakeFileUtils.verbose_flag
+        
+        Dir.mkdir("target") unless File.exist?("target")
+        Dir.mkdir("target/jdoc")  unless File.exist?("target/jdoc")
+        
+        packages = Set[]
+        @build_path.each do |d|
+          Dir.glob("#{d}/**/*.java").each do |java| 
+            packages << java[(d.length + 1)..(java.rindex('/') - 1)].gsub(%r{[\\/]}, '.')
+          end
+        end
+        packages = packages.to_a
+        
+        if (packages.size > 0)
+          puts "javadoc -classpath #{classpath.join(CP_SEP)} -sourcepath #{@build_path.join(CP_SEP)} -d target/jdoc #{packages.join(' ')}" if RakeFileUtils.verbose_flag
+          `javadoc -classpath #{classpath.join(CP_SEP)} -sourcepath #{@build_path.join(CP_SEP)} -d target/jdoc #{packages.join(' ')}`
+          unless $?.exitstatus == 0
+            puts "Javadoc failed, see above errors."
+            exit
+          end
+        end
+      end
+
+      def build_path
+        @build_path ||= []
+      end
+
+      def build_path=(p)
+        @build_path = [p]
+      end
+    end
+    
+    # Wraps a jar file around a Gem. Useful for distributing it around.
+    # The jar is taken from the target directory. You must at least
+    # specify <em>version</em> to produce the Gem. The artifact name and 
+    # group name default to the current directory name and its parent 
+    # directory name respectively. Convenient if you follow the classic
+    # project/module directory structure. Otherwise, just set the
+    # <em>artifact</em> and <em>group</em> to any value that suits you.
+    class GemWrapTask < Rake::Task
+      attr_writer :version, :artifact, :group
+      
+      def execute
+        super
+        puts "Wrapping jar in a Gem" if RakeFileUtils.verbose_flag
+        unless @version
+          puts "A version must be provided to produce a Gem!"
+        end
+        pwd = Dir.pwd
+        @artifact = pwd[(pwd.rindex('/') + 1)..pwd.length] unless @artifact
+        pwd = pwd[0..pwd.rindex('/') - 1]
+        @group = pwd[(pwd.rindex('/') + 1)..pwd.length] unless @group
+        Raven.mkdir_recurse('target/gem/ext')
+        FileUtils.cp(Dir.glob('target/*.jar'), 'target/gem/ext')
+        
+        Dir.chdir('target/gem') do
+          spec = Gem::Specification.new do |s|
+            s.platform = Gem::Platform::JAVA
+            s.summary = "Raven wrapped library #{@artifact} from project #{@group}."
+            s.name = "#{@group}-#{@artifact}"
+            s.version = @version
+            s.requirements << 'none'
+            s.require_path = 'ext'
+            s.autorequire = 'rake'
+            s.files = Dir.glob("{ext}/**/*")
+          end
+          Gem::Builder.new(spec).build
+        end
+        FileUtils.mv("target/gem/#{@group}-#{@artifact}-#{@version}-java.gem", 'target')  
+      end  
+    end
+    
+    # Wraps a jar file around a Gem and automatically installs it in your
+    # local Gem repository. See the gem wrap task for more info (same rules
+    # apply).
+    class GemInstallTask < GemWrapTask
+      def execute
+        super
+        params = [false]
+        params << RAVEN_HOME if defined?(GEMS_IN_HOME)
+        Gem::Installer.new("target/#{@group}-#{@artifact}-#{@version}-java.gem").install(*params)
+      end
+    end
+    
+    private
+    
+    # Builds the classpath by getting the path to the jars bundled
+    # in each gem dependency.
+    def self.build_cp(prerequisites)
+      classpath = []
+      Raven.prereq_filter(prerequisites, :gem_deps) do |dep_task|
+        dep_task.gem_deps.each do |gempath|
+          Dir.foreach(gempath + '/ext') do |file|
+            next if file == '.' || file == '..'
+            classpath << gempath + '/ext/' + file
+          end
+        end
+      end
+      classpath
+    end
+    
+    # Copies the jars corresponding to each Gem dependency to a given
+    # directory.
+    def self.mk_libs(target, prereq)
+      Raven.mkdir_recurse(target)
+      Raven.prereq_filter(prereq, :gem_deps) do |dep_task|
+        dep_task.gem_deps.each do |gempath|
+          Dir.foreach(gempath + '/ext') do |file|
+            next if file == '.' || file == '..'
+            FileUtils.copy(gempath + '/ext/' + file, target)
+          end
+        end
+      end
+    end
+    
+    # Duck typing selection of prerequisites
+    def self.prereq_filter(prerequisites, respond_to)
+      prerequisites.each do |prereq|
+        prereq_task = Rake::Task[prereq]
+        if prereq_task.respond_to?(respond_to)
+          yield(prereq_task)
+        end
+      end
+    end
+    
+    # Recursively creates a directory
+    def self.mkdir_recurse(dir)
+      if dir.rindex('/')
+        parent = dir[0, dir.rindex('/')]
+        mkdir_recurse(parent) unless File.exist?(parent)
+      end
+      Dir.mkdir(dir) unless File.exist?(dir)
+    end
+    
+    # Receursively browse a directory yielding on each file found.
+    def self.browse_files(root)
+      queue = [root]
+      while !queue.empty?
+        filename = queue.pop
+        if File.file?(filename)
+          yield(filename)
+        else
+          Dir.new(filename).each do |child|
+            unless ['..', '.', '.svn', '.cvs'].include?(child)
+              queue.push(filename + "/" + child)
+            end
+          end
+        end
+      end
+    end
+    
+    # Returns the latest file timestamp in a directory structure
+    def self.latest_file(dir)
+      latest = Time.at(0)
+      Raven.browse_files(dir) do |f|
+        change = File.stat(f).mtime
+        latest = change if change > latest
+      end
+      latest
+    end
+    
+  end
+  
+  
+  # Shortcut to the Javac task creation. Makes it handy.
+  def javac(args, &block)
+    Raven::JavacTask.define_task(args, &block)
+  end
+  
+  # Shortcut to jar. Only 3 letters, isn't that beautiful?
+  def jar(args, &block)
+    Raven::JarTask.define_task(args, &block)
+  end
+  
+  # I think you've got it now.
+  def jar_source(args, &block)
+    Raven::JarSourceTask.define_task(args, &block)
+  end
+
+  def junit(args, &block)
+    Raven::JUnitTask.define_task(args, &block)
+  end
+  
+  def lib_dir(args, &block)
+    Raven::LibDirTask.define_task(args, &block)
+  end
+  
+  def war(args, &block)
+    Raven::WarTask.define_task(args, &block)
+  end
+  
+  def javadoc(args, &block)
+    Raven::JavaDocTask.define_task(args, &block)
+  end
+  
+  def gem_wrap(args, &block)
+    Raven::GemWrapTask.define_task(args, &block)
+  end
+  
+  def gem_wrap_inst(args, &block)
+    Raven::GemInstallTask.define_task(args, &block)
+  end

data/lib/raven/repo_builder.rb

@@ -46,7 +46,7 @@ module Raven
     end
     
     def to_s
-      "#{artifactId} v#{versionId} (module #{groupId})"
+      "#{artifactId} v#{versionId} (project #{groupId})"
     end
   end
   

data/lib/raven/search_install.rb

@@ -107,11 +107,13 @@ module Raven
       # Getting server name and gz file size header
       server_addr = idx_file.gets.chomp.split("#")
       aid_line = /artifactId: (.*#{artifactId}.*)/
+      aidx_line = /artifactId: (#{artifactId})$/
       gid_line = /groupId: (.*#{groupId}.*)/
       vid_line = /versionId: "?(#{versionId})"?/
 
       # a, a+v, a+g, g, v+g, a+v+g
       found = []
+      exact_match = false
       while (lines = read_lines(idx_file, 5))
         ma, mg, mv = false, false, false
         ma = lines[2].strip =~ aid_line if artifactId
@@ -123,9 +125,18 @@ module Raven
             (ma && mg && mv) ||
             (mg && mv && artifactId.nil?) ||
             (mg && artifactId.nil? && versionId.nil?))
-           artifact = YAML.load(lines.join("\n"))
-           artifact.server = server_addr
-           found << artifact
+          artifact = YAML.load(lines.join("\n"))
+          artifact.server = server_addr
+          # We have an exact match, the rules change, only other exact matches 
+          # get selected
+          if lines[2].strip =~ aidx_line
+            unless exact_match
+             exact_match = true
+             found = []
+            end
+            found << artifact
+          end           
+          found << artifact unless exact_match
         end
       end
       found
@@ -143,7 +154,6 @@ module Raven
       
       if (versionId.nil? && !all_versions)
         artifacts = filtrate_latest(artifacts)
-        puts artifacts
       end
       
       # Selected several artifacts but supposed to have only one
@@ -151,20 +161,20 @@ module Raven
         puts "Gem indices couldn't be found properly (either you provided a wrong URL or the main site is down)."
         return
       end
-      raise GemTooManyInstallError.new(artifacts), "Too many artifacts" if (!all && artifacts.size > 1)
+      raise GemTooManyInstallError.new(artifacts) if (!all && artifacts.size > 1)
       
       if (artifacts.empty?)
         puts "Nothing found."
       else
         # TODO install from the servers returned by search
         # Proceeding with installation
-        FileUtils.mkdir('ext')
+        FileUtils.mkdir('ext') unless File.exist?('ext')
         puts "Installing Gems:"
         artifacts.each do |artifact|
           if @proxy_info
             http = Net::HTTP::Proxy(*@proxy_info).new(artifact.server[0], artifact.server[1])
           else
-            http = Net::HTTP.new(artifact.server[0], artifact.server[1])
+            http = Net::HTTP.new(artifact.server[0], Integer(artifact.server[1]))
           end        
           puts "  - #{artifact.to_s}"
           gemname = Raven.install_remote_gem(artifact, http, artifact.server[2], true)
@@ -225,15 +235,23 @@ module Raven
       false if !(Version === ver)
       return -1 if @timestamp && !ver.timestamp
       return 1 if !@timestamp && ver.timestamp
+      # Adding 0 to the end of the shortest one to get the same
+      # size, JRuby considers size first (even if size doesn't 
+      # always matter)
+      @me, you = @ver_struct.dup, ver.ver_struct.dup
+      if (@me.size != you.size)
+        shorty = @me.size > you.size ? you : @me
+        biggy = @me.size > you.size ? @me : you
+        (shorty.size..biggy.size-1).each { |m| shorty[m] = 0 }
+      end
       # Setting string elements to 0 (mostly weaker) if they need
       # to be compared to an int otherwise <=> could produce nil
-      @me, you = @ver_struct.dup, ver.ver_struct.dup
       (0..@me.size).each do |m|
         if (m < you.size && @me[m].class != you[m].class)
           @me[m] = 0 if String === @me[m]
           you[m] = 0 if String === you[m]
         end
-      end      
+      end
       @me <=> you
     end
     

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: raven
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2006-11-23 00:00:00 -08:00
+  version: "1.2"
+date: 2006-12-18 00:00:00 -08:00
 summary: Java build system based on Rake and Gem.
 require_paths: 
 - lib
@@ -33,7 +33,7 @@ files:
 - bin/raven
 - lib/raven
 - lib/raven.rb
-- lib/raven/search_install.rb~
+- lib/raven/java_tasks.rb~
 - lib/raven/deps_tasks.rb
 - lib/raven/gem_init.rb
 - lib/raven/java_tasks.rb

data/lib/raven/search_install.rb~

@@ -1,247 +0,0 @@
-#!/usr/bin/env ruby
-
-#  Copyright 2006 Matthieu Riou
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-require 'net/http'
-
-module Raven
-
-  class RepoIndexBuilder
-    def initialize(name, server, base_url, port, proxy_info)
-      @name, @server, @base_url, @port, @proxy_info = name, server, base_url, port, proxy_info
-    end
-    
-    def build_idx
-      require 'yaml'
-      require 'zlib'
-      Zlib::GzipWriter.open("#{@name}.mvnidx.gz") do |f|
-        f << @server + "#" + @port + "#" + @base_url + "\n"
-        Raven::Maven2Repository.new(@server, @base_url, @port, @proxy_info).each do |artifact, http|
-          f << YAML.dump(artifact)
-        end
-      end
-    end
-  end
-  
-  class GemSearchInstaller
-    def initialize(server, port, base_url, proxy_info)
-      @server, @base_url, @port, @proxy_info = server, base_url, port, proxy_info
-    end
-    
-    def list_indices
-      indices = []
-      if @proxy_info
-        http = Net::HTTP::Proxy(*@proxy_info).new(@server, @port)
-      else
-        http = Net::HTTP.new(@server, @port)
-      end
-      response = http.get(@base_url, nil)
-      puts "RESPONSE #{response}"
-      puts "BODY #{response.body}"
-      expr = /href="([^"]*idx.gz)"|HREF="([^"]*idx.gz)"/
-      if response.message.strip == "OK"
-        response.body.each_line do |line|
-          if expr =~ line
-            indices << expr.match(line)[1]
-          end
-        end
-      else
-        puts "Got a bad response from server http://#{@server}:#{@port}/#{@base_url}, couldn't update local index"
-      end
-      indices
-    end
-    
-    def get_indices
-      require 'stringio'
-      if @proxy_info
-        http = Net::HTTP::Proxy(*@proxy_info).new(@server, @port)
-      else
-        http = Net::HTTP.new(@server, @port)
-      end
-      
-      list_indices.each do |file|
-        http_fn, fs_fn = @base_url + file, RAVEN_HOME + file[0..-4]
-        
-        # Checking file size to see if it changed
-        header = http.head(http_fn)
-        zipsize = header["content-length"]
-        oldsize = File.exist?(fs_fn) ? File.new(fs_fn).readline.chomp : '0'
-        
-        unless (zipsize.to_i == oldsize.to_i)
-          puts "Refreshing index file #{file[0..-4]}"
-          response = StringIO.new(http.get(@base_url + file, nil).body)
-          zlib = Zlib::GzipReader.new(response)
-          file = File.new(RAVEN_HOME + file[0..-4], 'wb')
-          file << zipsize + "\n"
-          file.write(zlib.read)
-          file.close
-          zlib.close
-        end
-      end
-    end
-    
-    def search(artifactId, groupId=nil, versionId=nil)
-      idx_files = Dir[RAVEN_HOME + '*.mvnidx']
-      found = []
-      idx_files.each do |idx_file|
-        puts "Searching in #{idx_file}..."
-        f = File.new(idx_file)
-        found.concat(search_index(f, artifactId, groupId, versionId))
-      end
-      found
-    end
-    
-    def search_index(idx_file, artifactId, groupId, versionId)
-      # Removing gz file size header
-      idx_file.gets
-      # Getting server name and gz file size header
-      server_addr = idx_file.gets.chomp.split("#")
-      aid_line = /artifactId: (.*#{artifactId}.*)/
-      gid_line = /groupId: (.*#{groupId}.*)/
-      vid_line = /versionId: "?(#{versionId})"?/
-
-      # a, a+v, a+g, g, v+g, a+v+g
-      found = []
-      while (lines = read_lines(idx_file, 5))
-        ma, mg, mv = false, false, false
-        ma = lines[2].strip =~ aid_line if artifactId
-        mg = lines[1].strip =~ gid_line if groupId
-        mv = lines[3].strip =~ vid_line if versionId
-        if ((ma && groupId.nil? && versionId.nil?) ||
-            (ma && mg && versionId.nil?) ||
-            (ma && mv && groupId.nil?) ||
-            (ma && mg && mv) ||
-            (mg && mv && artifactId.nil?) ||
-            (mg && artifactId.nil? && versionId.nil?))
-           artifact = YAML.load(lines.join("\n"))
-           artifact.server = server_addr
-           found << artifact
-        end
-      end
-      found
-    end
-    
-    def read_lines(file, size)
-      lines = []
-      0.upto(size-1) { |m| lines[m] = file.gets }
-      return nil if lines[size-1].nil?
-      lines
-    end
-  
-    def install(artifactId, groupId, versionId, all=false, all_versions=false)
-      artifacts = search(artifactId, groupId, versionId).uniq
-      
-      if (versionId.nil? && !all_versions)
-        artifacts = filtrate_latest(artifacts)
-        puts artifacts
-      end
-      
-      # Selected several artifacts but supposed to have only one
-      if (artifacts.nil?)
-        puts "Gem indices couldn't be found properly (either you provided a wrong URL or the main site is down)."
-        return
-      end
-      raise GemTooManyInstallError.new(artifacts), "Too many artifacts" if (!all && artifacts.size > 1)
-      
-      if (artifacts.empty?)
-        puts "Nothing found."
-      else
-        # TODO install from the servers returned by search
-        # Proceeding with installation
-        FileUtils.mkdir('ext')
-        puts "Installing Gems:"
-        artifacts.each do |artifact|
-          if @proxy_info
-            http = Net::HTTP::Proxy(*@proxy_info).new(artifact.server[0], artifact.server[1])
-          else
-            http = Net::HTTP.new(artifact.server[0], artifact.server[1])
-          end        
-          puts "  - #{artifact.to_s}"
-          gemname = Raven.install_remote_gem(artifact, http, artifact.server[2], true)
-          params = [false]
-          params << RAVEN_HOME if defined?(GEMS_IN_HOME)
-          Gem::Installer.new(gemname).install(*params)      
-          FileUtils.rm(gemname)
-        end
-        FileUtils.rm_rf('ext')
-      end
-    end
-    
-    def filtrate_latest(artifacts)
-      # Create a hash with all versions of each artifact
-      arth = {}
-      artifacts.each do |art| 
-        key = "#{art.groupId}%#{art.artifactId}"
-        arth[key] ||= []
-        arth[key] << Version.new(art.versionId)
-      end
-      
-      arth.keys.collect do |key|
-        last_ver = arth[key].sort[-1].version
-        find_artifact(artifacts, *(key.split('%') << last_ver))
-      end
-    end
-    
-    def find_artifact(artifacts, groupId, artifactId, versionId)
-      artifacts.select do |art|
-        art if art.artifactId == artifactId && 
-                art.groupId == groupId && art.versionId == versionId
-      end[0]
-    end
-  end
-  
-  # Structured version class used to try to make some sense
-  # out of Maven version numbers. A difficult task indeed.
-  class Version
-    include Comparable
-    attr_reader :timestamp, :ver_struct, :version
-    
-    def initialize(version)
-      @version = version
-      elmts = @version.split(/\.|-/)
-      @timestamp = elmts[0].length > 3 ? true : false
-      @ver_struct = elmts.collect do |elmt|
-        val = ''
-        begin
-          val = Integer(elmt)
-        rescue ArgumentError
-          val = elmt
-        end
-        val
-      end
-    end
-    
-    def <=>(ver)
-      false if !(Version === ver)
-      return -1 if @timestamp && !ver.timestamp
-      return 1 if !@timestamp && ver.timestamp
-      # Setting string elements to 0 (mostly weaker) if they need
-      # to be compared to an int otherwise <=> could produce nil
-      @me, you = @ver_struct.dup, ver.ver_struct.dup
-      (0..@me.size).each do |m|
-        if (m < you.size && @me[m].class != you[m].class)
-          @me[m] = 0 if String === @me[m]
-          you[m] = 0 if String === you[m]
-        end
-      end      
-      @me <=> you
-    end
-    
-    def to_s
-      puts "v#{@version}, ts #{timestamp}, #{ @ver_struct.collect{ |v| v.class }.join('/') }"
-    end
-  end
-  
-end