maven-tools 0.29.2 → 0.29.3

data/lib/maven/tools/gem_project.rb

@@ -350,7 +350,8 @@ module Maven
         if packaging =~ /gem/ || plugin?(:gem)
           profile('executable') do |exe|
             exe.jar('de.saumya.mojo:gem-assembly-descriptors', '${jruby.plugins.version}').scope :runtime
-            exe.plugin(:assembly, '2.2-beta-5') do |a|
+            exe.plugin(:assembly) do |a|
+              a.version = versions[:assembly_plugin] unless a.version
               options = {
                 :descriptorRefs => ['jar-with-dependencies-and-gems'],
                 :archive => {:manifest => { :mainClass => 'de.saumya.mojo.assembly.Main' } }

data/lib/maven/tools/version.rb

@@ -1,5 +1,5 @@
 module Maven
   module Tools
-    VERSION = '0.29.2'.freeze
+    VERSION = '0.29.3'.freeze
   end
 end

data/lib/maven/tools/versions.rb

@@ -3,6 +3,7 @@ module Maven
     unless defined? VERSIONS
       VERSIONS = { 
         :jruby_rack => "1.1.6",
+        :assembly_plugin => "2.3",
         :war_plugin => "2.2",
         :jar_plugin => "2.4",
         :jruby_plugins => "0.29.0",

data/spec/jarfile_spec.rb

@@ -36,7 +36,7 @@ describe Maven::Tools::Jarfile do
   end
 
   it 'generates lockfile' do
-    subject.generate_lockfile(%w( a b c d e f))
+    subject.generate_lockfile(%w( a b c d e f ruby.bundler:bla))
     File.read(jfile_lock).must_equal <<-EOF
 a
 b

metadata

@@ -2,7 +2,7 @@
 name: maven-tools
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.29.2
+  version: 0.29.3
 platform: ruby
 authors: 
   - Kristian Meier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-06-15 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -83,7 +83,6 @@ files:
   - lib/maven/model/utils.rb~
   - lib/maven/model/model.rb~
   - spec/coordinate_spec.rb
-  - spec/#jarfile_spec.rb#
   - spec/jarfile_spec.rb
   - MIT-LICENSE
   - README.md

data/spec/#jarfile_spec.rb#

@@ -1,124 +0,0 @@
-require 'maven/tools/jarfile'
-
-class Container
-
-  attr_reader :artifacts, :repositories
-
-  def initialize
-    @artifacts = []
-    @repositories = []
-  end
-  
-  def add_artifact(a)
-    @artifacts << a
-  end
-
-  def add_repository(name, url)
-    @repositories << name
-  end
-end
-
-describe Maven::Tools::Jarfile do
-
-  let(:workdir) { 'target' }
-  let(:jfile) { File.join(workdir, 'tmp-jarfile') }
-  let(:jfile_lock) { jfile + ".lock"}
-  let(:container) { Container.new }
-  subject { Maven::Tools::Jarfile.new(jfile) }
-
-  before do
-    FileUtils.mkdir_p workdir
-    Dir[File.join(workdir, "tmp*")].each { |f| FileUtils.rm_f f }
-  end
-
-  after do
-    FileUtils.rm_rf(File.join(workdir, "tmp-*"))
-  end
-
-  it 'generates lockfile' do
-    subject.generate_lockfile(%w( a b c d e f ruby.bundler:bla))
-    File.read(jfile_lock).must_equal <<-EOF
-a
-b
-c
-d
-e
-f
-EOF
-  end
-
-  it 'check locked coordinate' do
-    File.open(jfile_lock, 'w') do |f|
-      f.write <<-EOF
-a:b:pom:3
-a:c:jar:1
-EOF
-    end
-    subject.locked.must_equal ["a:b:pom:3", "a:c:jar:1"]
-    subject.locked?("a:b:pom:321").must_equal true
-    subject.locked?("a:b:jar:321").must_equal true
-    subject.locked?("a:d:jar:432").must_equal false
-  end
-
-  it 'populate repositories' do
-    File.open(jfile, 'w') do |f|
-      f.write <<-EOF
-repository :first, "http://example.com/repo"
-source 'second', "http://example.org/repo"
-source "http://example.org/repo/3"
-EOF
-    end
-    subject.populate_unlocked container
-    container.repositories.size.must_equal 3
-    container.artifacts.size.must_equal 0
-    container.repositories[0].must_equal "first"
-    container.repositories[1].must_equal "second"
-    container.repositories[2].must_equal "http://example.org/repo/3"
-  end
-
-  it 'populate artifacts without locked' do
-    File.open(jfile, 'w') do |f|
-      f.write <<-EOF
-jar 'a:b', '123'
-pom 'x:y', '987'
-EOF
-    end
-    subject.populate_unlocked container
-    container.repositories.size.must_equal 0
-    container.artifacts.size.must_equal 2
-    container.artifacts[0].to_s.must_equal "a:b:jar:123"
-    container.artifacts[1].to_s.must_equal "x:y:pom:987"
-  end
-
-  it 'populate artifacts with locked' do
-    File.open(jfile, 'w') do |f|
-      f.write <<-EOF
-jar 'a:b', '123'
-pom 'x:y', '987'
-EOF
-    end
-    File.open(jfile_lock, 'w') do |f|
-      f.write <<-EOF
-a:b:jar:432
-EOF
-    end
-    
-    subject.populate_unlocked container
-    container.repositories.size.must_equal 0
-    container.artifacts.size.must_equal 1
-    container.artifacts[0].to_s.must_equal "x:y:pom:987"
-  end
-
-  it 'populate locked artifacts' do
-    File.open(jfile_lock, 'w') do |f|
-      f.write <<-EOF
-a:b:jar:432
-EOF
-    end
-    
-    subject.populate_locked container
-    container.repositories.size.must_equal 0
-    container.artifacts.size.must_equal 1
-    container.artifacts[0].to_s.must_equal "a:b:jar:432"
-  end
-end