tetra 0.44.0 → 0.45.0

data/SPECIAL_CASES.md

@@ -35,12 +35,6 @@ You can also use:
 
 To get a list of jars that have one or more `.class` file which does not have a corresponding `.java` file in `kit/` (or zip files in `kit/`).
 
-## Replacing kit packages
-
-After you built a package, you might want to use it instead of some binary packages to build other ones.
-
-`tetra` automatically creates some of the needed instructions inside of the spec file, you need to uncomment them and edit them manually to be fully functional.
-
 ## Ant builds
 
 `tetra` is currently optimized for Maven as it is the most common build tool, but it can work with any other. In particular, support for Ant has already been implemented and `tetra ant` works like `tetra mvn`.

data/lib/template/package.spec

@@ -37,9 +37,6 @@ Requires:       java
 Requires:       mvn(<%= dependency_id[0] %>:<%= dependency_id[1] %>) <% if dependency_id[3] != nil %>==<%= dependency_id[3] %><% end %>
 <% end %>
 
-# to use this package in other tetra builds, uncomment the following
-#Provides:       tetra-mvn(<%= group_id %>:<%= artifact_id %>) == <%= version %>
-
 %description
 <%=
   description
@@ -61,14 +58,6 @@ mkdir -p %{buildroot}%{_javadir}
 cp -a <%= output %> %{buildroot}%{_javadir}/<%= File.basename(output) %>
 <% end %>
 
-# to use this package in other tetra builds, uncomment and edit appropriately
-#%define _kitdir %{_datadir}/tetra/m2/<%= group_id.gsub(".", "/") %>/<%= artifact_id %>/<%= version %>
-#mkdir -p %_kitdir
-<% outputs.each do |output| %>
-#ln -s %{buildroot}%{_javadir}/<%= File.basename(output) %> %_kitdir
-<% end %>
-#ln -s <pomfile> %_kitdir
-
 %files
 %defattr(-,root,root)
 <% outputs.each do |output| %>

data/lib/tetra/packages/jar_kit_item.rb

@@ -19,9 +19,10 @@ module Tetra
     def initialize(project, path)
       _, name = Pathname.new(path).split
       hash = Digest::SHA1.file(path).hexdigest
+      short_hash = hash.slice(0, 5)
 
       @project = project
-      @package_name = "kit-item-#{name.to_s.gsub(".", "-")}"
+      @package_name = "kit-item-#{name.to_s.gsub(".", "-")}-#{short_hash}"
       @conflicts = false
       @source_dir = File.join("kit", "jars")
       @source_paths = [path]

data/lib/tetra/packages/maven_kit_item.rb

@@ -21,13 +21,15 @@ module Tetra
       rest, version = path_split(path)
       group_directory, artifact_id = path_split(rest)
       group_id = path_to_group(group_directory)
+      hash = Digest::SHA1.hexdigest(source_paths.to_s)
+      short_hash = hash.slice(0, 5)
 
       @project = project
-      @package_name = "kit-item-#{group_id.gsub(".", "-")}-#{artifact_id}-#{version}"
+      @package_name = "kit-item-#{artifact_id}-#{short_hash}"
       @conflicts = false
 
-      @provides_symbol = "tetra-mvn(#{group_id}:#{artifact_id})"
-      @provides_version = version
+      @provides_symbol = "tetra-mvn(#{group_id}:#{artifact_id}:#{version})"
+      @provides_version = hash
       @install_dir = "m2"
 
       @source_dir = File.join("kit", "m2")

data/lib/tetra/version.rb

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

data/spec/lib/maven_kit_item_spec.rb

@@ -19,18 +19,20 @@ describe Tetra::MavenKitItem do
   let(:dir) { File.join(group_id.gsub(".", File::SEPARATOR), artifact_id, version) }
   let(:pom) { File.join(dir, "#{artifact_id}-#{version}.pom") }
   let(:jar) { File.join(dir, "#{artifact_id}.jar") }
-  let(:package_name) { "kit-item-#{group_id.gsub(".", "-")}-#{artifact_id}-#{version}" }
+  let(:hash) { Digest::SHA1.hexdigest([pom, jar].to_s) }
+  let(:short_hash) { hash.slice(0, 5) }
+  let(:package_name) { "kit-item-#{artifact_id}-#{short_hash}" }
   let(:maven_kit_item) { Tetra::MavenKitItem.new(@project, pom, [pom, jar]) }
 
   describe "#provides_symbol" do
     it "returns the sepec Provides: symbol" do
-      expect(maven_kit_item.provides_symbol).to eq("tetra-mvn(com.company.project:artifact)")
+      expect(maven_kit_item.provides_symbol).to eq("tetra-mvn(com.company.project:artifact:1.0)")
     end
   end
 
   describe "#provides_version" do
     it "returns the spec Provides: version" do
-      expect(maven_kit_item.provides_version).to eq("1.0")
+      expect(maven_kit_item.provides_version).to eq(hash)
     end
   end
 
@@ -42,9 +44,9 @@ describe Tetra::MavenKitItem do
         spec_lines = File.readlines(File.join("packages", "kit", package_name, "#{package_name}.spec"))
 
         expect(spec_lines).to include("# spec file for a build-time dependency of project \"test-project\"\n")
-        expect(spec_lines).to include("Name:           kit-item-com-company-project-artifact-1.0\n")
+        expect(spec_lines).to include("Name:           #{package_name}\n")
         expect(spec_lines).to include("Summary:        Build-time dependency of project \"test-project\"\n")
-        expect(spec_lines).to include("Provides:       tetra-mvn(#{group_id}:#{artifact_id}) == #{version}\n")
+        expect(spec_lines).to include("Provides:       tetra-mvn(#{group_id}:#{artifact_id}:#{version}) == #{hash}\n")
 
         expect(spec_lines).to include("install -d -m 0755 %{buildroot}%{_datadir}/tetra/m2\n")
         expect(spec_lines).to include("cp -a * %{buildroot}%{_datadir}/tetra/m2\n")
@@ -61,7 +63,7 @@ describe Tetra::MavenKitItem do
         FileUtils.touch(jar)
       end
 
-      expected_filename = File::SEPARATOR + "kit-item-com-company-project-artifact-1.0.tar.xz"
+      expected_filename = File::SEPARATOR + "#{package_name}.tar.xz"
       expect(maven_kit_item.to_archive).to end_with(expected_filename)
 
       @project.from_directory do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.45.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake