raven 1.2.3 → 1.2.4

data/lib/raven/java_tasks.rb

@@ -31,7 +31,7 @@ module FileUtils
 end
 
 module Raven
-  CP_SEP = PLATFORM['mswin'] ? ';'  : ':'
+  CP_SEP = File::PATH_SEPARATOR
   
   # Executes Javac by passing it everything it needs. Stuff like a
   # classpath and sources. The classpath is built by checking the
@@ -91,15 +91,14 @@ module Raven
     # The JUnit task runs all your test cases located in src/test/java or the
     # build_path that you can set. JUnit inherits from the JavacTask so it 
     # accepts every configuration that JavacTask accepts. In addition you can 
-    # provide an array containing your test classes (default pattern is **/Test*.java).
+    # add a pattern for your test classes (default pattern is **/Test*.java).
     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
+        pattern = (@test_classes.nil? || @test_classes.empty?) ? "**/Test*.java" : @test_classes.first
+        tests = @build_path.collect { |d| Dir.glob("#{d}/#{pattern}").collect { |sd| sd[d.size+1..-1] } }
+        @test_classes = tests.flatten.collect { |d| d.gsub('/', '.')[0..-6] }
         failures = false
         @test_classes.flatten.each do |tc|
           puts "Running test #{tc}"
@@ -368,18 +367,22 @@ module Raven
     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)
+        if (dep_task.gem_deps)
+          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
-        dep_task.libs.flatten.each do |libpath|
-          FileUtils.copy(libpath, target)
+        if (dep_task.libs)
+          dep_task.libs.flatten.each do |libpath|
+            FileUtils.copy(libpath, target)
+          end
         end
       end
     end
-    
+
     # Duck typing selection of prerequisites
     def self.prereq_filter(prerequisites, respond_to)
       prerequisites.each do |prereq|

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: raven
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
-date: 2007-05-12 00:00:00 -07:00
+  version: 1.2.4
+date: 2007-12-02 00:00:00 -08:00
 summary: Java build system based on Rake and Gem.
 require_paths: 
 - lib
@@ -30,16 +30,14 @@ authors:
 - Matthieu Riou
 files: 
 - bin/raven
-- lib/raven
 - lib/raven.rb
-- lib/raven/deps_tasks.rb~
-- lib/raven/index_gem_repository.rb
-- lib/raven/deps_tasks.rb
+- lib/raven
+- lib/raven/repo_builder.rb
 - lib/raven/java_tasks.rb
 - lib/raven/gem_init.rb
-- lib/raven/repo_builder.rb
+- lib/raven/index_gem_repository.rb
+- lib/raven/deps_tasks.rb
 - lib/raven/search_install.rb
-- lib/raven/gem_init.rb~
 - README.rdoc
 - LICENSE
 test_files: []

data/lib/raven/deps_tasks.rb~

@@ -1,182 +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 'rubygems'
-require 'rake'
-require 'set'
-require 'fileutils'
-
-module Raven
-
-  class GemNotFoundException < RuntimeError; end
-  class AmbiguousGemException < RuntimeError; end
-  
-  # Task used to declare a set of dependencies your project relies
-  # upon. As many dependency tasks as necessary can be declared
-  # (each grouping as many dependency as you like). For each declared
-  # dependency, a Gem is searched in your local repository and then if
-  # it can't be found, in the specified remote repositories (by setting
-  # <em>sources</em>). Gems are searched by name ENDING with the name
-  # you provided.
-  # 
-  # As an example, specifying 'wsdl4j' will correctly find the Gem
-  # named wsdl4j-wsdl4j but specifying 'axis2' WILL NOT give you all
-  # axis2 Gems. Actually only one Gem can be selected by each of the
-  # specified Gem, otherwise you'll see an error asking you to be more
-  # specific.
-  # 
-  # Once the correct Gem has been found, if it's not local it will be
-  # automatically be downloaded and installed.
-  # 
-  # If no version is provided, and the Gem isn't present locally, the 
-  # latest version will be fetched. If a local version can be found 
-  # locally, this version will be used without any download.
-  # 
-  # Example of dependency specification:
-  # 
-  # dependency 'deps' do |t| 
-  #   t.deps << [{'commons-logging' => '1.1'}, 'commons-pool']
-  #   t.deps << ['commons-lang', 'wsdl4j', 'log4j']
-  # end
-  # 
-  # See also Raven::MavenLocalRepoImport and Raven::GemRepoBuilder to 
-  # learn more about how to build a Gem repository to get started.
-  # 
-  # Alternatively dependencies can be directly declared manually on 
-  # jar files in your file system. This allows you to manage your 
-  # dependencies yourself without using Gem or any other repository.
-  # 
-  # dependency 'deps' do |t|
-  #   t.libs = Dir.glob('lib/**/*.jar')
-  # end
-  class DependencyTask < Rake::Task
-    attr_reader :gem_deps
-  
-    # Check dependencies and installs them sometimes.
-    def execute
-      super
-      ambiguous, notfound = [], []
-      # Installing missing Gems (if there are)
-      if @deps
-        @gem_deps = @deps.flatten.collect do |dep|
-          # Wrapping in an array, we might not have an array with version
-          # as dependency.
-          deparr = dep.respond_to?(:to_a) ? dep.to_a.flatten : [dep]
-          begin
-            Raven::GemInstaller.install_or_not(*deparr)
-          rescue GemNotFoundException => gnfe
-            notfound << gnfe.message
-          rescue AmbiguousGemException => age
-            ambiguous << age
-          end
-        end
-        unless notfound.empty? && ambiguous.empty?
-          raise(RuntimeError, notfound.join($/) + $/ + ambiguous.join($/))
-        end
-      end
-      # Getting dependencies from eventual prerequisites
-      Raven.prereq_filter(prerequisites, :gem_deps) do |dep_task|
-        @gem_deps += dep_task.gem_deps if dep_task.gem_deps
-      end
-    end
-    
-    def deps
-      @deps ||= []
-    end
-    
-    def libs 
-      @libs ||= [] 
-    end
-    def libs=(l)
-      @libs = l
-    end
-  end
-    
-  # Calls Gem installer to install a Gem (very predictible behaviour).
-  # Well, but if the Gem is already there, it won't be installed. This 
-  # guy's a smart one.
-  module GemInstaller
-  
-    # Possibly installs a Gem... or not. If it's already present installation
-    # will just be skipped. The path to the gem root is always returned though.
-    # The provided gem name is first looked up with a query in the repositories
-    # to support partial names (i.e only artifactId).
-    def self.install_or_not(gemname, version='*')
-      # TODO Add support for regular expressions for gem name, allows multiple 
-      # selected gems
-      hems = resolve(gemname, version)
-      gem_spec = hems[0]
-      # TODO Handle Gem dependencies
-      unless hems[1]
-        installer = Gem::RemoteInstaller.new
-        params = [gem_spec.name, gem_spec.version.to_s, false]
-        params << RAVEN_HOME if defined?(GEMS_IN_HOME)
-        gem_spec = installer.install(*params)[0]
-      end
-      gem_spec.full_gem_path
-    end
-    
-    # Resolves a Gem partial name (like only the artifactId) to a full name 
-    # and eventually checks its versions. Returns an array with the found Gem
-    # in the first position and a boolean indicating whether the array has
-    # been found locally or not in second position.
-    def self.resolve(gemname, version)
-      # Search local occurences first, it's faster. Moreover we'll only
-      # return local versions, avoiding a constant download of latest versions
-      # when nothing specific is provided.
-      gems = Gem::cache.search(/.*#{gemname}$/)
-      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
-      begin
-        gems = Gem::SourceInfoCache.search(/.*#{gemname}$/)
-      rescue Exception => rt
-        puts rt.to_s
-        puts rt.backtrace.join("\n")
-        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
-      
-      # Nothing found: Houston, we have a problem
-      raise(GemNotFoundException, "Couldn't find any Gem from name #{gemname} and version #{version}") unless remote
-    end
-    
-    private
-    
-    def self.select_gem(gemname, version, gems, local)
-      # We can only have different versions of the same Gem, different Gems 
-      # is a problem.      
-      if gems.collect{|gem| gem.name}.uniq.size > 1
-        raise(AmbiguousGemException, "Several different Gems can be found from name #{gemname} (#{gems.collect{|gem| gem.name}.uniq.join(' ')}), please be more specific.") 
-      end
-      version_gems = Hash[*gems.collect{ |gem| [gem.version.to_s, gem] }.flatten]
-      # Latest one will do when no version has been given.
-      return [version_gems.sort.reverse[0][1], local] if (version == '*' && !version_gems.empty?)
-      return [version_gems[version], local] if (version_gems[version] && !version_gems.empty?)
-      nil
-    end
-  end
-  
-end
-
-# Shortcut to the dependency task creation.
-def dependency(args, &block)
-  Raven::DependencyTask.define_task(args, &block)
-end

data/lib/raven/gem_init.rb~

@@ -1,85 +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 'rubygems'
-require 'fileutils'
-
-module Gem
-  # Adding Gems Java platform
-  module Platform
-    JAVA = 'java'
-  end
-  
-  # Unfortunately Maven artifacts have a rather free versioning scheme
-  class Version
-    def self.correct?(str)
-      true
-    end
-  end
-end
-
-begin
-  Gem.manage_gems
-rescue NoMethodError => ex
-  # Using rubygems prior to 0.6.1
-end
-
-# Let the user add or redefine his sources (hopefully we'll be
-# able to set a default one when a good soul will be able to
-# donate us space and bandwidth to host a Raven Gems repository).
-module Gem
-  def self.sources=(s) 
-    @sources = s
-  end 
-end
-require_gem("sources")
-def sources; Gem.sources; end
-def set_sources(s) Gem.sources = s; end
-set_sources(["http://gems.rubyraven.org/"])
-
-# To avoid polluting the regular Gem repository, we store our gems 
-# under the user home directory.
-GEMS_IN_HOME = true
-USER_HOME = ENV['HOME'] ? ENV['HOME'] : ENV['USERPROFILE'].gsub('\\', '/')
-RAVEN_HOME = File.join(USER_HOME, '.raven')
-FileUtils.mkdir(RAVEN_HOME) unless File.exist?(RAVEN_HOME)
-Dir.glob(File.join(RAVEN_HOME, "specifications", "*.gemspec")).each do |file_name|
-  gemspec = Gem::SourceIndex.load_specification(file_name.untaint)
-  Gem::cache.add_spec(gemspec) if gemspec
-end
-
-module Gem
-  # Making the remote installer silent. Otherwise it always asks you to 
-  # choose the version you want to install.
-  class RemoteInstaller
-    def find_gem_to_install(gem_name, version_requirement, caches)
-      specs_n_sources = []
-      caches.each do |source, cache|
-        cache.each do |name, spec|
-          if /^#{gem_name}$/i === spec.name &&
-             version_requirement.satisfied_by?(spec.version) then
-            specs_n_sources << [spec, source]
-          end
-        end
-      end
-      if specs_n_sources.empty? then
-        raise GemNotFoundException.new("Could not find #{gem_name} (#{version_requirement}) in the repository")
-      end
-      specs_n_sources = specs_n_sources.sort_by { |gs,| gs.version }.reverse
-      specs_n_sources[0]
-    end
-  end
-end