pompompom 2.0.0.b1-java → 2.0.0.b2-java

data/lib/pompompom/installer.rb

@@ -15,13 +15,18 @@ module PomPomPom
         coordinate.to_ivy_module_id, 
         ivy.settings.default_resolver.name, 
         INSTALL_RESOLVER_NAME, 
-        install_options
+        install_options(coordinate.attributes)
       )
     end
 
   private
 
     INSTALL_RESOLVER_NAME = 'install'.freeze
+    DEFAULT_INSTALL_ATTRIBUTES = {
+      :overwrite => true,
+      :transitive => true,
+      :type_filter => 'jar,bundle'.freeze
+    }.freeze
 
     def ivy
       @ivy ||= begin
@@ -45,13 +50,13 @@ module PomPomPom
       install_resolver
     end
 
-    def install_options
-      @install_options ||= begin
-        install_options = Ivy::InstallOptions.new
-        install_options.set_overwrite(true)
-        install_options.set_artifact_filter(Ivy::FilterHelper.get_artifact_type_filter('jar,bundle'))
-        install_options
-      end
+    def install_options(attributes)
+      attributes = DEFAULT_INSTALL_ATTRIBUTES.merge(attributes)
+      install_options = Ivy::InstallOptions.new
+      install_options.set_overwrite(attributes[:overwrite])
+      install_options.set_transitive(attributes[:transitive])
+      install_options.set_artifact_filter(Ivy::FilterHelper.get_artifact_type_filter(attributes[:type_filter]))
+      install_options
     end
 
     def install_pattern

data/lib/pompompom/maven_coordinate.rb

@@ -2,19 +2,44 @@
 
 module PomPomPom
   class MavenCoordinate
+    attr_reader :group_id, :artifact_id, :version, :attributes
+
     def self.parse(str)
-      new(*str.split(':'))
+      coordinate, attrs = str.split('|')
+      attributes = parse_attributes(attrs)
+      gid, aid, v = coordinate.split(':')
+      new(gid, aid, v, attributes)
     end
 
-    attr_reader :group_id, :artifact_id, :version
-
     def initialize(*args)
-      @group_id, @artifact_id, @version = args
+      @group_id, @artifact_id, @version, @attributes = args
+      @attributes ||= {}
     end
 
     begin :conversions
+      def self.parse_attributes(attrs)
+        return {} unless attrs
+        pairs = attrs.split(',').map { |a| k, v = a.split('='); [k, v] }
+        pairs.map! do |k, v|
+          vv = begin
+            case v
+            when 'true' then true
+            when 'false' then false
+            else v
+            end
+          end
+          [k.to_sym, vv]
+        end
+        Hash[pairs]
+      end
+
       def to_s
-        "#{group_id}:#{artifact_id}:#{version}"
+        str = "#{group_id}:#{artifact_id}:#{version}"
+        unless attributes.empty?
+          attrs = attributes.map { |k, v| "#{k}=#{v}" }.join(',')
+          str << "|#{attrs}"
+        end
+        str
       end
 
       def to_ivy_module_id

data/lib/pompompom/version.rb

@@ -1,3 +1,3 @@
 module PomPomPom
-  VERSION = '2.0.0.b1'
+  VERSION = '2.0.0.b2'
 end

data/lib/pompompom.rb

@@ -34,9 +34,11 @@ module PomPomPom
         destination = c['destination'] if c['destination']
       end
       destination = extra_config[:destination] if extra_config[:destination]
+      repositories.merge!(extra_config[:repositories]) if extra_config[:repositories]
+      dependencies.concat(extra_config[:dependencies]).uniq! if extra_config[:dependencies]
       {
-        :repositories => create_repositories(repositories.merge(extra_config[:repositories])),
-        :dependencies => (dependencies + extra_config[:dependencies]).uniq,
+        :repositories => create_repositories(repositories),
+        :dependencies => dependencies,
         :install_pattern => File.expand_path("#{destination}/[artifact]-[revision]-[type].[ext]")
       }
     end
@@ -52,7 +54,7 @@ module PomPomPom
           coordinate
         when Array
           MavenCoordinate.new(*coordinate)
-        when /^[^:]+:[^:]+:[^:]+$/ # TODO: also /^[^#]+#[^;];.+$/
+        when /^[^:]+:[^:]+:[^:]+(:[^:]+)*$/ # TODO: also /^[^#]+#[^;];.+$/
           MavenCoordinate.parse(coordinate)
         else
           raise ArgumentError, %("#{coordinate}" could not be converted to a Maven coordinate)

metadata

@@ -2,14 +2,14 @@
 name: pompompom
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 2.0.0.b1
+  version: 2.0.0.b2
 platform: java
 authors:
 - Theo Hultberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000Z
+date: 2012-06-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ivy-jars