tetra 0.53.0 → 0.54.0

data/lib/template/package.spec

@@ -32,7 +32,9 @@ BuildRequires:  xz
 BuildRequires:  java-devel
 BuildRequires:  <%= kit_name %> == <%= kit_version %>
 BuildArch:      noarch
+<% artifact_ids.each do |artifact_id| %>
 Provides:       mvn(<%= group_id %>:<%= artifact_id %>) == <%= version %>
+<% end %>
 Requires:       java
 <% runtime_dependency_ids.each do |dependency_id| %>
 Requires:       mvn(<%= dependency_id[0] %>:<%= dependency_id[1] %>) <% if dependency_id[3] != nil %>==<%= dependency_id[3] %><% end %>
@@ -64,8 +66,6 @@ cp -a <%= output %> %{buildroot}%{_javadir}/<%= File.basename(output) %>
 
 %files
 %defattr(-,root,root)
-<% outputs.each do |output| %>
-%{_javadir}/<%= File.basename(output) %>
-<% end %>
+%{_javadir}/*
 
 %changelog

data/lib/tetra/packages/package.rb

@@ -15,7 +15,6 @@ module Tetra
     def_delegator :@pom, :license_name, :license
     def_delegator :@pom, :url
     def_delegator :@pom, :group_id
-    def_delegator :@pom, :artifact_id
     def_delegator :@pom, :version
     def_delegator :@pom, :runtime_dependency_ids
 
@@ -27,6 +26,10 @@ module Tetra
       @patches = patches.map { |f| File.basename(f) }
     end
 
+    def artifact_ids
+      @pom.modules.any? ? @pom.modules : [@pom.artifact_id]
+    end
+
     # a short summary from the POM
     def summary
       cleanup_description(@pom.description, 60)

data/lib/tetra/pom.rb

@@ -45,6 +45,10 @@ module Tetra
       end
     end
 
+    def modules
+      @doc.xpath("project/modules/module").map { |e| e.text }
+    end
+
     def scm_connection
       @doc.xpath("project/scm/connection").text || ""
     end

data/lib/tetra/project.rb

@@ -90,12 +90,7 @@ module Tetra
     # since last mark
     def src_patched?
       from_directory do
-        latest_id = @git.latest_id("tetra: sources-")
-        if latest_id
-          @git.changed_files("src", latest_id).any?
-        else
-          false
-        end
+        @git.changed_files("src", "HEAD").any?
       end
     end
 
@@ -132,7 +127,7 @@ module Tetra
       comments += build_script_lines.map { |l| "tetra: build-script-line: #{l}" }
 
       # if this is the first dry-run, mark sources as tarball
-      if @git.latest_id("tetra: dry-run-finished").nil?
+      if first_dry_run
         comments << "tetra: sources-tarball"
       end
 
@@ -140,6 +135,11 @@ module Tetra
       commit_whole_directory(".", *comments)
     end
 
+    # returns true if this is the first dry-run
+    def first_dry_run
+      @git.latest_id("tetra: dry-run-finished").nil?
+    end
+
     # ends a dry-run assuming the build went wrong
     # reverts the whole project directory
     def abort

data/lib/tetra/ui/dry_run_subcommand.rb

@@ -7,14 +7,14 @@ module Tetra
       checking_exceptions do
         project = Tetra::Project.new(".")
 
-        if project.src_patched?
+        if project.src_patched? && !project.first_dry_run
           puts "Some files in src/ were changed since last dry-run,"
           puts "use \"tetra patch message\" to include changes in a patch before dry-running."
           puts "Dry run not started"
         else
           project.dry_run
           puts "Dry-run started in a new bash shell."
-          puts "Build your project now, you can use \"tetra mvn\" and \"tetra ant\"."
+          puts "Build your project now, \"mvn\" and \"ant\" are already bundled by tetra."
           puts "If the build succeedes end this dry run with ^D (Ctrl+D),"
           puts "if the build does not succeed use ^C^D to abort and undo any change"
 

data/lib/tetra/version.rb

@@ -2,5 +2,5 @@
 
 # base module for tetra
 module Tetra
-  VERSION = "0.53.0"
+  VERSION = "0.54.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake