maven-tools 0.34.5 → 1.0.0.rc2

data/spec/pom_spec.rb

@@ -7,7 +7,9 @@ describe Maven::Tools::POM do
     if File.directory?( dir )
       it "should convert #{dir}" do
         pom = Maven::Tools::POM.new( dir )
-        pom_xml = File.read( File.join( dir, 'pom.xml' ) )
+        file = File.join( dir, 'pom.xml' )
+        file = File.join( File.dirname( dir ), 'pom.xml' ) unless File.exists? file
+        pom_xml = File.read( file )
         pom_xml.sub!( /<!--(.|\n)*-->\n/, '' )
         pom_xml.sub!( /<?.*?>\n/, '' )
         pom_xml.sub!( /<project([^>]|\n)*>/, '<project>' )

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.34.5
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -17,14 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-    none: false
+        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-    none: false
+        version: '1.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -34,13 +31,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -49,30 +44,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
-    none: false
+        version: '5.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-    none: false
+        version: '5.3'
   prerelease: false
   type: :development
 description: adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc
@@ -84,25 +61,16 @@ extra_rdoc_files: []
 files:
 - lib/maven_tools.rb
 - lib/maven-tools.rb
-- lib/maven/model/utils.rb
-- lib/maven/model/model.rb
-- lib/maven/model/dependencies.rb
 - lib/maven/tools/visitor.rb
 - lib/maven/tools/version.rb
 - lib/maven/tools/artifact.rb
-- lib/maven/tools/rails_project.rb
-- lib/maven/tools/pom_generator.rb
 - lib/maven/tools/model.rb
 - lib/maven/tools/versions.rb
-- lib/maven/tools/maven_project.rb
 - lib/maven/tools/gemspec_dependencies.rb
-- lib/maven/tools/minimal_project.rb
 - lib/maven/tools/gemfile_lock.rb
 - lib/maven/tools/dsl.rb
 - lib/maven/tools/jarfile.rb
-- lib/maven/tools/execute_in_phase.rb
 - lib/maven/tools/pom.rb
-- lib/maven/tools/gem_project.rb
 - lib/maven/tools/coordinate.rb
 - spec/artifact_spec.rb
 - spec/jarfile_spec.rb
@@ -113,6 +81,7 @@ files:
 - spec/gemfile_with_source/bouncy-castle-version.rb
 - spec/pom_maven_style/pom.rb
 - spec/gemspec_in_profile/bouncy-castle-version.rb
+- spec/gemfile_with_lock/bouncy-castle-version.rb
 - spec/pom_from_jarfile/pom.rb
 - spec/gemfile_include_jars/bouncy-castle-version.rb
 - spec/gemfile/bouncy-castle-version.rb
@@ -124,34 +93,12 @@ files:
 - spec/gemspec_with_extras/bouncy-castle-version.rb
 - spec/gemfile_with_extras/bouncy-castle-version.rb
 - spec/pom_maven_alternative_style/pom.rb
-- rspec/maven/model/dependencies_spec.rb
-- rspec/maven/model/model_spec.rb
-- rspec/maven/tools/rails_project_spec.rb
-- rspec/maven/tools/no-deps.gemspec
-- rspec/maven/tools/Gemfile.lockfile.lock
-- rspec/maven/tools/Jarfile.without
-- rspec/maven/tools/Jarfile.with
-- rspec/maven/tools/Gemfile.groups
-- rspec/maven/tools/Gemfile.minimal
-- rspec/maven/tools/Gemfile.simple
-- rspec/maven/tools/Gemfile.lockfile
-- rspec/maven/tools/gem_project_spec.rb
-- rspec/maven/tools/Gemfile.rails
-- rspec/maven/tools/minimal.gemspec
-- rspec/maven/tools/maven-tools.gemspec
-- rspec/maven/tools/Jarfile.with.lock
-- rspec/maven/tools/Gemfile.gems
-- rspec/maven/tools/spec_helper.rb
-- rspec/maven/tools/Gemfile.ignored
-- rspec/maven/tools/Gemfile.nolock
-- rspec/maven/tools/Gemfile.withlock.lock
-- rspec/maven/tools/deps.gemspec
-- rspec/maven/tools/Gemfile.withlock
 - MIT-LICENSE
 - README.md
 homepage: http://github.com/torquebox/maven-tools
 licenses:
 - MIT
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -161,18 +108,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-  none: false
+      version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: helpers for maven related tasks
 test_files:
 - spec/artifact_spec.rb
@@ -180,26 +125,3 @@ test_files:
 - spec/coordinate_spec.rb
 - spec/pom_spec.rb
 - spec/gemspec_dependencies_spec.rb
-- rspec/maven/model/dependencies_spec.rb
-- rspec/maven/model/model_spec.rb
-- rspec/maven/tools/rails_project_spec.rb
-- rspec/maven/tools/no-deps.gemspec
-- rspec/maven/tools/Gemfile.lockfile.lock
-- rspec/maven/tools/Jarfile.without
-- rspec/maven/tools/Jarfile.with
-- rspec/maven/tools/Gemfile.groups
-- rspec/maven/tools/Gemfile.minimal
-- rspec/maven/tools/Gemfile.simple
-- rspec/maven/tools/Gemfile.lockfile
-- rspec/maven/tools/gem_project_spec.rb
-- rspec/maven/tools/Gemfile.rails
-- rspec/maven/tools/minimal.gemspec
-- rspec/maven/tools/maven-tools.gemspec
-- rspec/maven/tools/Jarfile.with.lock
-- rspec/maven/tools/Gemfile.gems
-- rspec/maven/tools/spec_helper.rb
-- rspec/maven/tools/Gemfile.ignored
-- rspec/maven/tools/Gemfile.nolock
-- rspec/maven/tools/Gemfile.withlock.lock
-- rspec/maven/tools/deps.gemspec
-- rspec/maven/tools/Gemfile.withlock

data/lib/maven/model/dependencies.rb

@@ -1,249 +0,0 @@
-#
-# Copyright (C) 2013 Christian Meier
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# TODO make nice require after ruby-maven uses the same ruby files
-require File.join(File.dirname(__FILE__), 'utils.rb')
-require File.join(File.dirname(File.dirname(__FILE__)), 'tools', 'coordinate.rb')
-#require 'maven/tools/coordinate'
-
-module Maven
-  module Model
-
-    class DependencyArray < Array
-      def <<(dep)
-        raise "not of type Dependency" unless dep.is_a?(Dependency)
-        d = detect { |item| item == dep }
-        if d
-          d.version = dep.version
-          self
-        else
-          super
-        end
-      end
-      alias :push :<<
-    end
-
-    class ExclusionArray < Array
-      def <<(*dep)
-        excl = dep[0].is_a?(Exclusion) ? dep[0]: Exclusion.new(*dep.flatten)
-        delete_if { |item| item == excl }
-        super excl
-      end
-      alias :push :<<
-    end
-
-    class Coordinate < Tag
-
-      private
-
-      include ::Maven::Tools::Coordinate
-
-      public
-
-      tags :group_id, :artifact_id, :version
-      def initialize(*args)
-        @group_id, @artifact_id, @version = gav(*args.flatten)
-      end
-
-      def version?
-        !(@version.nil? || @version == '[0,)')
-      end
-
-      def hash
-        "#{group_id}:#{artifact_id}".hash
-      end
-
-      def ==(other)
-        group_id == other.group_id && artifact_id == other.artifact_id
-      end
-      alias :eql? :==
-
-    end
-
-    class Parent < Coordinate
-      tags :relative_path
-
-    end
-
-    class Exclusion < Tag
-      tags :group_id, :artifact_id
-      def initialize(*args)
-        @group_id, @artifact_id = group_artifact(*args)
-      end
-
-      def hash
-        "#{group_id}:#{artifact_id}".hash
-      end
-
-      def ==(other)
-        group_id == other.group_id && artifact_id == other.artifact_id
-      end
-      alias :eql? :==
-
-      private
-      
-      include ::Maven::Tools::Coordinate
-    end
-
-    class Dependency < Coordinate
-      tags :type, :scope, :classifier, :exclusions
-      def initialize(type, *args)
-        super(*args)
-        @type = type
-        args.flatten!
-        if args[0] =~ /:/ && args.size == 3
-          @classifier = args[2] unless args[2] =~ /[=~><]/
-        elsif args.size == 4
-          @classifier = args[3] unless args[3] =~ /[=~><]/
-        end
-      end
-
-      def hash
-        "#{group_id}:#{artifact_id}:#{@type}:#{@classifier}".hash
-      end
-
-      def ==(other)
-        super && @type == other.instance_variable_get(:@type) && @classifier == other.instance_variable_get(:@classifier)
-      end
-      alias :eql? :==
-
-      def self.new_gem(gemname, *args)
-        new(:gem, "rubygems", gemname, *args)
-      end
-
-      def self.new_pom(*args)
-        new(:pom, *args)
-      end
-
-      def self.new_jar(*args)
-        new(:jar, *args)
-      end
-
-      def self.new_test_jar(*args)
-        result = new(:jar, *args)
-        result.scope :test
-        result
-      end
-
-      def exclusions(&block)
-        @exclusions ||= ExclusionArray.new
-        if block
-          block.call(@exclusions)
-        end
-        @exclusions
-      end
-
-      def exclude(*args)
-        exclusions << args
-      end
-    end
-
-    module Dependencies
-    
-      def self.included(parent)
-        parent.tags :dependencies
-      end
-
-      def jar?(*args)
-        dependencies.member?(Dependency.new(:jar, *args))
-      end
-
-      def test_jar?(*args)
-        dependencies.member?(Dependency.new_test_jar(*args))
-      end
-
-      def gem?(*args)
-        dependencies.member?(Dependency.new(:gem, ['rubygems', *args].flatten))
-      end
-
-      def detect_gem(name)
-        dependencies.detect { |d| d.type.to_sym == :gem && d.artifact_id == name }
-      end
-
-      def pom?(*args)
-        dependencies.member?(Dependency.new_pom(*args))
-      end
-
-      def dependencies(&block)
-        @dependencies ||= DependencyArray.new
-        if block
-          block.call(self)
-        end
-        @dependencies
-      end
-
-      def add_dependency(dep, has_version = true, &block)
-        d = dependencies.detect { |d| d == dep }
-        if d
-          if has_version
-            d.version = dep.version
-          end
-          dep = d
-        else
-          dependencies << dep
-        end
-        block.call(dep) if block
-        dep
-      end
-      private :add_dependency
-
-      def add_gem(*args, &block)
-        args = args.flatten
-        if args.size == 1
-          dep = Dependency.new_gem(*args)
-          dep = dependencies.detect { |d| d == dep }
-          if dep
-            return dep
-          end
-          args[1] = ">= 0"
-        end
-        add_dependency(Dependency.new_gem(*args), &block)
-      end
-      private :add_gem
-
-      def add_something(method, args, block = nil)
-        if args.last.is_a?(Hash)
-          raise "hash not allowed for #{method.to_s.sub /new_/, ''}"
-        end
-        add_dependency(Dependency.send( method, *args), *args.size > 1, &block)
-      end
-      private :add_something
-
-      def jar(*args, &block)
-        add_something( :new_jar, args, block )
-      end
-
-      def test_jar(*args, &block)
-        add_something( :new_test_jar, args, block )
-      end
-      
-      def gem(*args, &block)
-        if args.last.is_a?(Hash)
-          raise "hash not allowed in that context"
-        end
-        add_gem(args, &block)
-      end
-
-      def pom(*args, &block)
-        add_something( :new_pom, args, block )
-      end
-    end
-  end
-end