raven 1.2.2 → 1.2.3

data/README.rdoc

@@ -28,8 +28,6 @@
 # require 'raven'
 # require 'rake/clean'
 # 
-# set_sources(["http://localhost:2233"])
-# 
 # CLEAN.include('target')
 # 
 # dependency 'compile_deps' do |t| 

data/lib/raven.rb

@@ -108,9 +108,9 @@ module Raven
             installer.install(av[1].length > 0 ? av[1] : nil, 
                 groupId, av[2].length > 0 ? av[2] : nil, all, allver)
           rescue GemTooManyInstallError => toomany
-            puts "Couldn't install a gem from name #{av[1]||groupId}, more than on potential"
+            puts "Couldn't install a gem from name #{av[1]||groupId}, more than one potential"
             puts "gem was found for this name. If this is intentional and you want to"
-            puts "install all these Gems please run again with the --all option."
+            puts "install all these gems please run again with the --all option."
             toomany.artifacts.each { |a| puts "   #{a.to_s}"}
           end
         end

data/lib/raven/deps_tasks.rb

@@ -87,6 +87,10 @@ module Raven
           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
@@ -138,8 +142,14 @@ module Raven
       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::RemoteInstaller.new().search(/.*#{gemname}$/)
+        if (Gem::RubyGemsPackageVersion != "0.9.0")
+          gems = Gem::SourceInfoCache.search(/.*#{gemname}$/)
+        else
+          gems = Gem::RemoteInstaller.new().search(/.*#{gemname}$/)
+        end
       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

data/lib/raven/deps_tasks.rb~

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

@@ -45,7 +45,11 @@ module Gem
     @sources = s
   end 
 end
-require_gem("sources")
+if (Gem::RubyGemsPackageVersion != "0.9.0")
+  gem("sources")
+else
+  require_gem("sources")
+end
 def sources; Gem.sources; end
 def set_sources(s) Gem.sources = s; end
 set_sources(["http://gems.rubyraven.org/"])
@@ -53,10 +57,10 @@ 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']
-RAVEN_HOME = USER_HOME + '/.raven/'
+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(RAVEN_HOME + "/specifications/*.gemspec").each do |file_name|
+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
@@ -65,21 +69,29 @@ 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]
+    if (Gem::RubyGemsPackageVersion != "0.9.0")
+      def find_gem_to_install(gem_name, version_requirement)
+        specs_n_sources = specs_n_sources_matching gem_name, version_requirement
+        # we always give exact name / version to RubyGems
+        specs_n_sources.first
+      end
+    else
+      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
-      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

data/lib/raven/gem_init.rb~

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

data/lib/raven/java_tasks.rb

@@ -56,6 +56,7 @@ module Raven
       # Getting the source files to compile. Filtrating sources already
       # compiled having a fresh enough class
       source_files = @build_path.collect do |d|
+        puts "Warning: build path #{d} doesn't exist!" unless File.exist? 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

data/lib/raven/search_install.rb

@@ -70,7 +70,7 @@ module Raven
       end
       
       list_indices.each do |file|
-        http_fn, fs_fn = @base_url + file, RAVEN_HOME + file[0..-4]
+        http_fn, fs_fn = @base_url + file, File.join(RAVEN_HOME, file[0..-4])
         
         # Checking file size to see if it changed
         header = http.head(http_fn)
@@ -81,7 +81,7 @@ module Raven
           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 = File.new(File.join(RAVEN_HOME, file[0..-4]), 'wb')
           file << zipsize + "\n"
           file.write(zlib.read)
           file.close
@@ -91,7 +91,7 @@ module Raven
     end
     
     def search(artifactId, groupId=nil, versionId=nil)
-      idx_files = Dir[RAVEN_HOME + '*.mvnidx']
+      idx_files = Dir[File.join(RAVEN_HOME, '*.mvnidx')]
       found = []
       idx_files.each do |idx_file|
         puts "Searching in #{idx_file}..."
@@ -260,4 +260,4 @@ module Raven
     end
   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.2.2
-date: 2007-01-22 00:00:00 -08:00
+  version: 1.2.3
+date: 2007-05-12 00:00:00 -07:00
 summary: Java build system based on Rake and Gem.
 require_paths: 
 - lib
@@ -32,12 +32,14 @@ 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/java_tasks.rb
 - lib/raven/gem_init.rb
 - lib/raven/repo_builder.rb
 - lib/raven/search_install.rb
+- lib/raven/gem_init.rb~
 - README.rdoc
 - LICENSE
 test_files: []