raven 1.1.1 → 1.1.2

data/lib/raven.rb

@@ -30,8 +30,9 @@ module Raven
     def self.run(args)
       opts = OptionParser.new
       opts.banner = "Usage: raven [options] (import | repository * | server | install *)"
-      repo_url, index_url, all, groupId, allver = '', '', false, nil, false
+      repo_url, proxy_url, index_url, all, groupId, allver = '', '', '', false, nil, false
       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('-a', '--all', '[install] Install all selected artifacts.') { |val| all = true }
@@ -60,7 +61,7 @@ module Raven
           rel_url = '/maven2/'
         end
         puts "Using server #{server} and url #{rel_url}"
-        builder = Raven::GemRepoBuilder.new(server, rel_url)
+        builder = Raven::GemRepoBuilder.new(server, 80, rel_url, Raven::Command.parse_proxy(proxy_url))
         if (rest.size > 1)
           rest.shift
           puts "Packages #{rest}"
@@ -77,11 +78,12 @@ module Raven
         trap("INT") { s.shutdown }
         s.start
       when 'install'
-        params = ['raven.rubyforge.org', '80', '/indices/']
+        params = ['raven.rubyforge.org', 80, '/indices/']
         if (index_url.length > 0)
           params = Raven::Command.parse_url(index_url)
           params[2] = '/' if params[2].empty?
         end
+        params << Raven::Command.parse_proxy(proxy_url)
         installer = Raven::GemSearchInstaller.new(*params)
         # Refreshes local gem indices if needed
         installer.get_indices
@@ -108,7 +110,7 @@ module Raven
           end
         end
       when 'build_index'
-        RepoIndexBuilder.new('m2_central', 'repo1.maven.org', '/maven2/').build_idx
+        RepoIndexBuilder.new('m2_central', 'repo1.maven.org', '/maven2/', Raven::Command.parse_proxy(proxy_url)).build_idx
       else
         puts opts.to_s
       end
@@ -119,5 +121,17 @@ module Raven
       parsed.shift
       parsed
     end
+    
+    def self.parse_proxy(purl)
+      if (purl.length > 0)
+        match = purl.match('http://(.*):(.*)@([^/]*):([0-9]*)')
+        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])]
+      else 
+        nil
+      end
+    end
   end
 end

data/lib/raven/java_tasks.rb

@@ -60,340 +60,351 @@ module Raven
           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 $? == 0
-          puts "Build failed, see above errors."
-          exit
+        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 $? == 0
+            puts "Build failed, see above errors."
+            exit
+          end
+        else
+          puts 'All class files are up to date.' if RakeFileUtils.verbose_flag
         end
-      else
-        puts 'All class files are up to date.' if RakeFileUtils.verbose_flag
+      end
+      
+      def build_path
+        @build_path ||= []
+      end
+      
+      def build_path=(p)
+        @build_path = [p]
       end
     end
     
-    def build_path
-      @build_path ||= []
-    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')
-      
-      if !File.exist?("target/#{name}") || File.stat("target/#{name}").ctime < latest
-        `jar -cf target/#{name} -C target/classes .`
-      else
-        puts 'Nothing to do, jar is fresh enough.' if RakeFileUtils.verbose_flag
+    # 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')
+        
+        if !File.exist?("target/#{name}") || File.stat("target/#{name}").ctime < latest
+          `jar -cf target/#{name} -C target/classes .`
+        else
+          puts 'Nothing to do, jar is fresh enough.' if RakeFileUtils.verbose_flag
+        end
       end
     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
+    
+    # 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}").ctime < 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
       
-      # 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
+      def source_path
+        @source_path ||= []
       end
       
-      # Building the jar from all sources
-      if !File.exist?("target/#{name}") || File.stat("target/#{name}").ctime < latest
-        `jar -cf target/#{name} -C #{@source_path.pop} .`
-        while (p = @source_path.pop)
-          `jar -uf target/#{name} -C #{p} .`
-        end
+      def manifest=(f)
+        @manifest = f
       end
     end
     
-    def source_path
-      @source_path ||= []
+    # 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
-  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)
+    # 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
       
-      # 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)
+      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
       
-      # Make lib directory with all dependencies
-      Raven.mkdir_recurse(DEFAULT_TARGET + LIB_SUBDIR)
-      Raven.mk_libs(DEFAULT_TARGET + LIB_SUBDIR, prerequisites)
+      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 $? == 0
+            puts "Build failed, see above errors."
+            exit
+          end
+        end
+      end
       
-      # Build the war
-      `jar -cf target/#{name} -C #{DEFAULT_TARGET} .`
+      def build_path
+        @build_path ||= []
+      end
     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)
+    # 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
     
-    def target=(param)
-      @target = param
+    # 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
-  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{[\\/]}, '.')
+    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
-      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 $? == 0
-          puts "Build failed, see above errors."
-          exit
+      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
     
-    def build_path
-      @build_path ||= []
+    # 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
-  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!"
+    # 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
-      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}/**/*")
+      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
-        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
+    
+    # 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).ctime
+        latest = change if change > latest
+      end
+      latest
+    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
+  # Shortcut to the Javac task creation. Makes it handy.
+  def javac(args, &block)
+    Raven::JavacTask.define_task(args, &block)
   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
+  # Shortcut to jar. Only 3 letters, isn't that beautiful?
+  def jar(args, &block)
+    Raven::JarTask.define_task(args, &block)
   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
+  # I think you've got it now.
+  def jar_source(args, &block)
+    Raven::JarSourceTask.define_task(args, &block)
   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)
+  def lib_dir(args, &block)
+    Raven::LibDirTask.define_task(args, &block)
   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
+  def war(args, &block)
+    Raven::WarTask.define_task(args, &block)
   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).ctime
-      latest = change if change > latest
-    end
-    latest
+  def javadoc(args, &block)
+    Raven::JavaDocTask.define_task(args, &block)
   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 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
+  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

@@ -61,12 +61,16 @@ module Raven
       @group_filters
     end
     
-    def initialize(server, url, port="80")
-      @server, @url, @port = server, url, port
+    def initialize(server, port, url, proxy_info)
+      @server, @url, @port, @proxy_info = server, url, port, proxy_info
     end
     
     def each
-      http = Net::HTTP.new(@server, @port)
+      if @proxy_info
+        http = Net::HTTP::Proxy(*@proxy_info).new(@server, @port)
+      else
+        http = Net::HTTP.new(@server, @port)
+      end
       folder_regexp = /<img src="\/icons\/folder.gif" alt="\[DIR\]"> <a href="[^\/]*\/">/
       file_regexp = /<img src="\/icons\/unknown.gif" alt="\[   \]"> <a href="[^"]*">/
       read_page(http, @url, folder_regexp) do |url1, groupId|
@@ -104,12 +108,12 @@ module Raven
   class GemRepoBuilder
     attr_writer :group_filters
     
-    def initialize(server, port, url)
-      @server, @url = server, url
+    def initialize(server, port, url, proxy_info)
+      @server, @port, @url, @proxy_info = server, port, url, proxy_info
     end
     
     def build(overwrite = false)
-      repo = Maven2Repository.new(@server, @url)
+      repo = Maven2Repository.new(@server, @port, @url, @proxy_info)
       repo.group_filters = @group_filters unless @group_filters.nil?
       
       Dir.mkdir('gems') unless File.exist?('gems')

data/lib/raven/search_install.rb

@@ -19,8 +19,8 @@ require 'net/http'
 module Raven
 
   class RepoIndexBuilder
-    def initialize(name, server, base_url, port='80')
-      @name, @server, @base_url, @port = name, server, base_url, port
+    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
@@ -28,7 +28,7 @@ module Raven
       require 'zlib'
       Zlib::GzipWriter.open("#{@name}.mvnidx.gz") do |f|
         f << @server + "#" + @port + "#" + @base_url + "\n"
-        Raven::Maven2Repository.new(@server, @base_url, @port).each do |artifact, http|
+        Raven::Maven2Repository.new(@server, @base_url, @port, @proxy_info).each do |artifact, http|
           f << YAML.dump(artifact)
         end
       end
@@ -36,15 +36,19 @@ module Raven
   end
   
   class GemSearchInstaller
-    def initialize(server, port, base_url)
-      @server, @base_url, @port = server, base_url, port
+    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 = []
-      http = Net::HTTP.new(@server, @port)
+      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)
-      expr = /HREF="([^"]*idx.gz)"/
+      expr = /href="([^"]*idx.gz)"|HREF="([^"]*idx.gz)"/
       if response.message.strip == "OK"
         response.body.each_line do |line|
           if expr =~ line
@@ -59,7 +63,11 @@ module Raven
     
     def get_indices
       require 'stringio'
-      http = Net::HTTP.new(@server, @port)
+      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]
@@ -153,7 +161,11 @@ module Raven
         FileUtils.mkdir('ext')
         puts "Installing Gems:"
         artifacts.each do |artifact|
-          http = Net::HTTP.new(artifact.server[0], artifact.server[1])
+          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]

data/lib/raven/search_install.rb~

@@ -0,0 +1,247 @@
+#!/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

metadata

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