tetra 0.45.0 → 0.46.0

data/.rubocop.yml

@@ -7,6 +7,9 @@ LineLength:
 MethodLength:
   Max: 40
 
+AbcSize:
+  Max: 50
+
 StringLiterals:
   EnforcedStyle: double_quotes
 

data/README.md

@@ -72,7 +72,7 @@ Finally, generate build scripts, spec files and tarballs in the `packages/` dire
 
     tetra generate-all
 
-Note that `tetra` will generate files for the commons-collections package and all binary-only build-time dependencies in the `kit/` folder.
+Note that `tetra` will generate files for the commons-collections package and all binary-only build-time dependencies in the `packages/` folder.
 
 ## In-depth information
 

data/SPECIAL_CASES.md

@@ -11,11 +11,11 @@ You can do any manual changes to spec and build.sh files and regenerate them lat
 * `tetra generate-script`: (re)generates the `build.sh` file from the latest bash history (assumes `tetra dry-run` and `tetra finish` have been used);
 * `tetra generate-archive`: (re)generates the package tarball;
 * `tetra generate-spec`: (re)generates the package spec;
-* `tetra generate-kit`: (re)generates all kit tarballs and specs;
+* `tetra generate-kit`: (re)generates the kit tarball and spec;
 
 ## Kit sources
 
-Your kit packages are basically binary blobs. If its sources are needed for proper packaging, for example to comply with the GPL, some extra steps are needed.
+Your kit package is basically a binary blob. If its sources are needed for proper packaging, for example to comply with the GPL, some extra steps are needed.
 
 If you use Maven, most (~90%) of the sources can be automatically downloaded:
 
@@ -55,26 +55,27 @@ Other build tools are currently unsupported but will be added in the future. You
 
 ## [OBS](build.opensuse.org) integration
 
-If you want to submit your package to OBS, you can do so by copying contents of the `packages` and `packages/kit` in proper OBS project directories.
+If you want to submit your package to OBS, you can do so by copying contents of the `packages` in a proper OBS project directory.
 
 Packages will rebuild cleanly in OBS because no Internet access is needed - all files were already downloaded during dry-run and are included in the kit.
 
-Note that packages in `kit` are only needed at build time only by OBS, no end user should ever install them, so you can place them in non-public repositories.
-
-Also note that you can mix and match packages from `kit` with other `tetra`-built packages, even from other users, as they are designed to be immutable and will not break your builds.
+Note that the kit packages is only needed at build time by OBS, no end user should ever install it, so you can place it in a non-public project/repository if you so wish.
 
 ## Gotchas
 
 * `tetra` internally uses `git` to keep track of files, any tetra project is actually also a `git` repo. Feel free to navigate it, you can commit, push and pull as long as the `tetra` tags are preserved. You can also delete commits and tags, effectively rewinding tetra history (just make sure to delete all tags pointing to a certain commit when you discard it);
 * some Maven plugins like the Eclipse Project ones ([Tycho](https://www.eclipse.org/tycho/)) will save data in `/tmp` downloaded from the Internet and will produce errors if this data is not there during offline builds. One way to work around that is to force Java to use a kit subdirectory as `/tmp`. Add the following option to `tetra mvn` during your build:
 
-    -DskipTests=true -Djava.io.tmpdir=<full path to project>/kit/tmp
+    -Djava.io.tmpdir=<full path to project>/kit/tmp
 
 Use the following option in `mvn` in your build.sh file to make it reproducible:
 
-    -DskipTests=true -Djava.io.tmpdir=$PROJECT_PREFIX/kit/tmp
+    -Djava.io.tmpdir=$PROJECT_PREFIX/kit/tmp
 
 * Tycho builds may also require NSS, so if you get NSS errors be sure to add `mozilla-nss` or an equivalent package in a BuildRequires: line;
+* some badly designed testsuites might not work in OBS. If you are using `tetra mvn` you can add the following option to disable them:
+
+   -DskipTests=true
 
 * if you want to be 100% sure your package builds without network access, you can use scripts in the `utils/` folder to create a special `nonet` user that cannot use the Internet and retry the build from that user.
 

data/integration-tests/build-obs.sh

@@ -8,14 +8,12 @@
 set -e
 
 OBS_HOST=obs-client
-OBS_PROJECT_DIR=/home/silvio/obs/home\:SilvioMoioli
+OBS_PROJECT_DIR=/home/silvio/obs/home\:SilvioMoioli\:tetra-test
 
-scp -r commons/output/* $OBS_HOST:/$OBS_PROJECT_DIR
+scp -r commons-collections/packages/* $OBS_HOST:/$OBS_PROJECT_DIR
 ssh -t $OBS_HOST <<EOF
-  cd $OBS_PROJECT_DIR/commons-kit/ &&\
-  osc build -k../rpms -p../rpms &&\
-  cd ../commons-collections/ &&\
-  osc build -k../rpms -p../rpms &&\
-  cd ../commons-fileupload/ &&\
-  osc build -k../rpms -p../rpms
+  cd $OBS_PROJECT_DIR/commons-collections-kit &&\
+  osc build -k../../rpms -p../../rpms &&\
+  cd $OBS_PROJECT_DIR/commons-collections &&\
+  osc build -k../../rpms -p../../rpms
 EOF

data/lib/template/{kit_item.spec → kit.spec}

@@ -12,21 +12,19 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-Name:           <%= package_name %>
-Version:        1
+Name:           <%= name %>
+Version:        <%= version %>
 Release:        1
 License:        SUSE-NonFree
-Summary:        Build-time dependency of project "<%= project.name %>"
+Summary:        Build-time dependency of project "<%= project_name %>"
 Url:            https://github.com/SilvioMoioli/tetra
 Group:          Development/Libraries/Java
 Source0:        %{name}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 BuildRequires:  xz
-Provides:       <%= provides_symbol %> == <%= provides_version %>
-<% if conflicts %>
-Conflicts:      otherproviders(<%= provides_symbol %>)
-<% end %>
+Provides:       tetra-kit
+Conflicts:      otherproviders(tetra-kit)
 
 %description
 This package has been automatically created by tetra in order to
@@ -42,12 +40,11 @@ thus it should never be installed on end users' systems.
 
 %install
 export NO_BRP_CHECK_BYTECODE_VERSION=true
-install -d -m 0755 %{buildroot}%{_datadir}/tetra/<%= install_dir %>
-cp -a * %{buildroot}%{_datadir}/tetra/<%= install_dir %>
+install -d -m 0755 %{buildroot}%{_datadir}/tetra/
+cp -a * %{buildroot}%{_datadir}/tetra/
 
 %files
 %defattr(-,root,root)
-%{_datadir}/tetra
-%{_datadir}/tetra/<%= install_dir %>
+%{_datadir}/tetra/
 
 %changelog

data/lib/template/package.spec

@@ -27,9 +27,7 @@ Source1:        build.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  xz
 BuildRequires:  java-devel
-<% kit_items.each do |item| %>
-BuildRequires:  <%= item.provides_symbol %> == <%= item.provides_version %>
-<% end %>
+BuildRequires:  <%= kit_name %> == <%= kit_version %>
 BuildArch:      noarch
 Provides:       mvn(<%= group_id %>:<%= artifact_id %>) == <%= version %>
 Requires:       java

data/lib/template/packages/CONTENTS

@@ -1,3 +1 @@
 tetra will save all output files it generates (specs, archives, etc.) here.
-
-Feel free to use this directory as an OBS project root.

data/lib/tetra.rb

@@ -38,9 +38,6 @@ require "tetra/kit_checker"
 require "tetra/packages/archivable"
 require "tetra/packages/speccable"
 require "tetra/packages/scriptable"
-require "tetra/packages/maven_kit_item"
-require "tetra/packages/jar_kit_item"
-require "tetra/packages/glue_kit_item"
 require "tetra/packages/kit"
 require "tetra/packages/built_package"
 

data/lib/tetra/ant_runner.rb

@@ -7,7 +7,7 @@ module Tetra
 
     # runs ant in a subprocess
     def ant(options)
-      run_executable("#{get_ant_commandline(@project.full_path)} #{options.join(" ")}")
+      run_executable("#{get_ant_commandline(@project.full_path)} #{options.join(' ')}")
     end
 
     # returns a command line for running Ant from the specified

data/lib/tetra/commands/generate_kit.rb

@@ -7,13 +7,12 @@ module Tetra
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          Tetra::Kit.new(project).items.each do |item|
-            result_path, conflict_count = item.to_spec
-            print_generation_result(project, result_path, conflict_count)
+          kit = Tetra::Kit.new(project)
+          result_path, conflict_count = kit.to_spec
+          print_generation_result(project, result_path, conflict_count)
 
-            result_path = item.to_archive
-            print_generation_result(project, result_path)
-          end
+          result_path = kit.to_archive
+          print_generation_result(project, result_path)
         end
       end
     end

data/lib/tetra/commands/get_pom.rb

@@ -25,7 +25,7 @@ module Tetra
           puts "#{format_path(path, project)} written, #{text_status}"
         else
           puts "#{name}'s pom not found. Try:"
-          puts "http://google.com/#q=#{URI.encode(pom_getter.cleanup_name(name) + " pom")}"
+          puts "http://google.com/#q=#{URI.encode(pom_getter.cleanup_name(name) + ' pom')}"
         end
       end
     end

data/lib/tetra/commands/list_kit_missing_sources.rb

@@ -12,7 +12,7 @@ module Tetra
           puts "Some source files were not found in these archives:"
           kit_checker.unsourced_archives.each do |archive|
             percentage = 100.0 * archive[:unsourced_class_names].length / archive[:class_names].length
-            puts "#{format_path(archive[:archive], project)} (~#{format("%.2f", percentage)}% missing)"
+            puts "#{format_path(archive[:archive], project)} (~#{format('%.2f', percentage)}% missing)"
           end
         end
       end

data/lib/tetra/maven_runner.rb

@@ -21,11 +21,7 @@ module Tetra
     def get_effective_pom(pom_path)
       effective_pom_path = "#{pom_path}.effective"
       success = mvn(["help:effective-pom", "-f#{pom_path}", "-Doutput=#{File.split(effective_pom_path)[1]}"])
-      if success
-        effective_pom_path
-      else
-        nil
-      end
+      effective_pom_path if success
     end
 
     # returns a command line for running Maven from the specified
@@ -38,7 +34,7 @@ module Tetra
         repo_path = File.join(prefix, "kit", "m2")
         config_path = File.join(prefix, "kit", "m2", "settings.xml")
 
-        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path} #{options.join(" ")}"
+        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path} #{options.join(' ')}"
       else
         fail ExecutableNotFoundError, "mvn"
       end

data/lib/tetra/maven_website.rb

@@ -51,7 +51,7 @@ module Tetra
 
     # downloads a POM from a search.maven.com search result
     def download_pom(group_id, artifact_id, version)
-      path = "#{group_id.gsub(".", "/")}/#{artifact_id}/#{version}/#{artifact_id}-#{version}.pom"
+      path = "#{group_id.gsub('.', '/')}/#{artifact_id}/#{version}/#{artifact_id}-#{version}.pom"
       log.debug("downloading #{path}...")
       (RestClient.get "http://search.maven.org/remotecontent", params: { filepath: path }).to_s
     end

data/lib/tetra/packages/archivable.rb

@@ -6,9 +6,9 @@ module Tetra
     include Logging
 
     # generates an archive and returns its name
-    # this will archive source_paths starting from source_dir in
+    # this will archive files in source_dir in
     # destination_dir/name/name.tar.xz
-    def _to_archive(project, name, source_dir, source_paths, destination_dir)
+    def _to_archive(project, name, source_dir, destination_dir)
       full_destination_dir = File.join(project.full_path, destination_dir, name)
       log.debug "creating #{full_destination_dir}"
       FileUtils.mkdir_p(full_destination_dir)
@@ -17,7 +17,7 @@ module Tetra
         destination_path = File.join(full_destination_dir, "#{name}.tar.xz")
         log.debug "tarring to #{destination_path}"
 
-        `tar -cJf #{destination_path} #{source_paths.join(" ")}`
+        `tar -cJf #{destination_path} *`
 
         destination_path
       end

data/lib/tetra/packages/built_package.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 module Tetra
-  # represents a Java project packaged in Tetra
+  # represents a Java project packaged in tetra
   class BuiltPackage
     extend Forwardable
     include Archivable
@@ -9,7 +9,8 @@ module Tetra
     include Scriptable
 
     def_delegator :@project, :name, :name
-    def_delegator :@kit, :items, :kit_items
+    def_delegator :@kit, :name, :kit_name
+    def_delegator :@kit, :version, :kit_version
     def_delegator :@pom, :license_name, :license
     def_delegator :@pom, :url
     def_delegator :@pom, :group_id
@@ -51,7 +52,7 @@ module Tetra
     end
 
     def to_archive
-      _to_archive(@project, name, "src", ["*"], @project.packages_dir)
+      _to_archive(@project, name, "src", @project.packages_dir)
     end
 
     def to_spec

data/lib/tetra/packages/kit.rb

@@ -1,73 +1,31 @@
 # encoding: UTF-8
 
 module Tetra
-  # represents a set of binary dependency packages
+  # a packaged set of binary build-time dependencies
   class Kit
-    include Logging
+    extend Forwardable
+    include Archivable
+    include Speccable
+
+    attr_reader :name
+    attr_reader :version
+    def_delegator :@project, :name, :project_name
 
     def initialize(project)
       @project = project
-    end
-
-    def items
-      managed_items = maven_kit_items + jar_kit_items
-
-      managed_items + glue_kit_items(managed_items)
-    end
 
-    def maven_kit_items
-      @project.from_directory(File.join("kit", "m2")) do
-        files_in_dir = {}
-        poms = []
-        Find.find(".") do |file|
-          dir = File.dirname(file)
-          if files_in_dir.key?(dir)
-            files_in_dir[dir] << file
-          else
-            files_in_dir[dir] = [file]
-          end
-
-          if file =~ /\.pom$/
-            log.debug "pom found in #{file}"
-            poms << file
-          end
-        end
-
-        poms.map do |pom|
-          Tetra::MavenKitItem.new(@project, pom, files_in_dir[File.dirname(pom)])
-        end
-      end
+      @name = "#{project.name}-kit"
+      @version = "#{project.version}"
     end
 
-    def jar_kit_items
-      @project.from_directory(File.join("kit", "jars")) do
-        Pathname.new(".").children.select do |child|
-          child.to_s =~ /.jar$/
-        end.sort.map do |jar|
-          Tetra::JarKitItem.new(@project, jar)
-        end
-      end
+    def to_archive
+      _to_archive(@project, name, "kit",
+                  @project.packages_dir)
     end
 
-    def glue_kit_items(managed_items)
-      managed_files = managed_items.map do |item|
-        item.source_paths.map do |e|
-          Pathname.new(File.join(item.source_dir, e)).cleanpath
-        end
-      end.flatten
-
-      unmanaged_files = []
-
-      @project.from_directory do
-        Find.find("kit") do |file|
-          pathname = Pathname.new(file)
-          if !managed_files.include?(pathname) && !File.directory?(pathname)
-            unmanaged_files << pathname.relative_path_from(Pathname.new("kit"))
-          end
-        end
-      end
-
-      [Tetra::GlueKitItem.new(@project, unmanaged_files)]
+    def to_spec
+      _to_spec(@project, name, "kit.spec",
+               @project.packages_dir)
     end
   end
 end

data/lib/tetra/packages/scriptable.rb

@@ -8,14 +8,14 @@ module Tetra
       maven_runner = Tetra::MavenRunner.new(project)
 
       project.from_directory do
-        history_lines = File.readlines(history_path).map { |e| e.strip }
+        history_lines = File.readlines(history_path).map(&:strip)
         relevant_lines =
           history_lines
-            .reverse
-            .take_while { |e| e.match(/tetra +dry-run/).nil? }
-            .reverse
-            .take_while { |e| e.match(/tetra +finish/).nil? }
-            .select { |e| e.match(/^#/).nil? }
+          .reverse
+          .take_while { |e| e.match(/tetra +dry-run/).nil? }
+          .reverse
+          .take_while { |e| e.match(/tetra +finish/).nil? }
+          .select { |e| e.match(/^#/).nil? }
 
         script_lines = [
           "#!/bin/bash",
@@ -23,15 +23,15 @@ module Tetra
           "PROJECT_PREFIX=`readlink -e .`",
           "cd #{project.latest_dry_run_directory}"
         ] +
-        relevant_lines.map do |line|
-          if line =~ /tetra +mvn/
-            line.gsub(/tetra +mvn/, "#{maven_runner.get_maven_commandline("$PROJECT_PREFIX", ["-o"])}")
-          elsif line =~ /tetra +ant/
-            line.gsub(/tetra +ant/, "#{ant_runner.get_ant_commandline("$PROJECT_PREFIX")}")
-          else
-            line
-          end
-        end
+                       relevant_lines.map do |line|
+                         if line =~ /tetra +mvn/
+                           line.gsub(/tetra +mvn/, "#{maven_runner.get_maven_commandline('$PROJECT_PREFIX', ['-o'])}")
+                         elsif line =~ /tetra +ant/
+                           line.gsub(/tetra +ant/, "#{ant_runner.get_ant_commandline('$PROJECT_PREFIX')}")
+                         else
+                           line
+                         end
+                       end
 
         new_content = script_lines.join("\n") + "\n"
 

data/lib/tetra/pom_getter.rb

@@ -45,7 +45,7 @@ module Tetra
           result = results.first
           unless result.nil?
             log.info("pom.xml for #{file} found on search.maven.org for sha1 #{sha1}\
-              (#{result["g"]}:#{result["a"]}:#{result["v"]})"
+              (#{result['g']}:#{result['a']}:#{result['v']})"
             )
             group_id, artifact_id, version = site.get_maven_id_from result
             return site.download_pom(group_id, artifact_id, version), :found_via_sha1

data/lib/tetra/project.rb

@@ -25,10 +25,6 @@ module Tetra
       "packages"
     end
 
-    def kit_packages_dir
-      File.join(packages_dir, "kit")
-    end
-
     # finds the project directory up in the tree, like git does
     def self.find_project_dir(starting_dir)
       result = starting_dir
@@ -44,8 +40,8 @@ module Tetra
     # returns true if the specified directory is a valid tetra project
     def self.project?(dir)
       File.directory?(File.join(dir, "src")) &&
-      File.directory?(File.join(dir, "kit")) &&
-      File.directory?(File.join(dir, ".git"))
+        File.directory?(File.join(dir, "kit")) &&
+        File.directory?(File.join(dir, ".git"))
     end
 
     # inits a new project directory structure
@@ -217,8 +213,8 @@ module Tetra
           FileUtils.mv(file, new_location)
 
           link_target = Pathname.new(new_location)
-            .relative_path_from(Pathname.new(file).split.first)
-            .to_s
+                        .relative_path_from(Pathname.new(file).split.first)
+                        .to_s
 
           File.symlink(link_target, file)
           result << [file, new_location]

data/lib/tetra/version.rb

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

data/lib/tetra/version_matcher.rb

@@ -26,24 +26,25 @@ module Tetra
     #  - score weighs differently on chunk index (first chunks are most important)
     #  - lowest score wins
     def best_match(my_version, their_versions)
-      log.debug("version comparison: #{my_version} vs #{their_versions.join(", ")}")
+      log.debug("version comparison: #{my_version} vs #{their_versions.join(', ')}")
 
       my_chunks = my_version.split(/[\.\-\_ ~,]/)
       their_chunks_hash = Hash[
-        their_versions.map do |their_version|
-          their_chunks_for_version = (
-            if !their_version.nil?
-              their_version.split(/[\.\-\_ ~,]/)
-            else
-              []
-            end
-          )
-          their_chunks_for_version += [nil] * [my_chunks.length - their_chunks_for_version.length, 0].max
-          [their_version, their_chunks_for_version]
-        end
+                          their_versions.map do |their_version|
+                            their_chunks_for_version = (
+                              if !their_version.nil?
+                                their_version.split(/[\.\-\_ ~,]/)
+                              else
+                                []
+                              end
+                            )
+                            chunks_count = [my_chunks.length - their_chunks_for_version.length, 0].max
+                            their_chunks_for_version += [nil] * chunks_count
+                            [their_version, their_chunks_for_version]
+                          end
       ]
 
-      max_chunks_length = ([my_chunks.length] + their_chunks_hash.values.map { |chunk| chunk.length }).max
+      max_chunks_length = ([my_chunks.length] + their_chunks_hash.values.map(&:length)).max
 
       scoreboard = []
       their_versions.each do |their_version|

data/spec/lib/archivable_spec.rb

@@ -26,7 +26,7 @@ describe Tetra::Archivable do
         FileUtils.touch("kit_test")
       end
 
-      instance._to_archive(@project, "test-package", "kit", ["*"], @project.packages_dir)
+      instance._to_archive(@project, "test-package", "kit", @project.packages_dir)
 
       @project.from_directory do
         expect(`tar -Jtf packages/test-package/test-package.tar.xz`.split).to include("kit_test")

data/spec/lib/built_package_spec.rb

@@ -50,9 +50,7 @@ describe Tetra::BuiltPackage do
         expect(spec_lines).to include("License:        The Apache Software License, Version 2.0\n")
         expect(spec_lines).to include("Summary:        Nailgun is a client, protocol, and server for running Java\n")
         expect(spec_lines).to include("Url:            http://martiansoftware.com/nailgun\n")
-        expect(spec_lines).to include("BuildRequires:  tetra-jar(test.jar) == \
-da39a3ee5e6b4b0d3255bfef95601890afd80709\n")
-        expect(spec_lines).to include("BuildRequires:  tetra-glue == test-project-2\n")
+        expect(spec_lines).to include("BuildRequires:  test-project-kit == 2\n")
         expect(spec_lines).to include("Provides:       mvn(com.martiansoftware:nailgun-all) == 0.9.1\n")
         expect(spec_lines).to include("cp -a out/test3.jar %{buildroot}%{_javadir}/test3.jar\n")
       end

data/spec/lib/kit_spec.rb

@@ -7,61 +7,41 @@ describe Tetra::Kit do
 
   before(:each) do
     create_mock_project
-
-    @project.dry_run
-    @project.finish(false)
-
-    @kit = Tetra::Kit.new(@project)
   end
 
   after(:each) do
     delete_mock_project
   end
 
-  describe "#maven_kit_items" do
-    it "finds binary packages" do
-      @project.from_directory(File.join("kit", "m2")) do
-        maven_kit_item_path = File.join(".", "com", "company",
-                                        "project", "artifact", "1.0")
-        FileUtils.mkdir_p(maven_kit_item_path)
+  let(:instance) { Tetra::Kit.new(@project) }
+  let(:package_name) { instance.name }
 
-        expected_source_paths = [
-          File.join(maven_kit_item_path, "artifact-1.0.jar"),
-          File.join(maven_kit_item_path, "artifact-1.0.pom"),
-          File.join(maven_kit_item_path, "artifact-1.0.sha1")
-        ]
+  describe "#to_spec" do
+    it "generates a specfile" do
+      expect(instance.to_spec).to be_truthy
 
-        expected_source_paths.each do |file|
-          FileUtils.touch(file)
-        end
+      @project.from_directory do
+        spec_lines = File.readlines(File.join("packages", package_name, "#{package_name}.spec"))
 
-        actual_maven_kit_item = @kit.maven_kit_items.first
-        expect(actual_maven_kit_item.source_paths.sort).to eql(expected_source_paths)
+        expect(spec_lines).to include("Conflicts:      otherproviders(tetra-kit)\n")
+        expect(spec_lines).to include("Provides:       tetra-kit\n")
       end
     end
   end
 
-  describe "#jar_kit_items" do
-    it "finds binary packages" do
-      @project.from_directory(File.join("kit", "jars")) do
-        FileUtils.touch("test1.jar")
+  describe "#to_archive" do
+    it "generates an archive" do
+      @project.from_directory(File.join("kit", "m2")) do
+        FileUtils.touch("kit.content")
       end
 
-      actual_jar_kit_item = @kit.jar_kit_items.first
-      expect(actual_jar_kit_item.source_paths).to eql([Pathname.new("test1.jar")])
-    end
-  end
+      expected_filename = File::SEPARATOR + "#{package_name}.tar.xz"
+      expect(instance.to_archive).to end_with(expected_filename)
 
-  describe "#glue_kit_items" do
-    it "finds binary packages" do
-      @project.from_directory(File.join("kit")) do
-        FileUtils.touch(File.join("jars", "test1.jar"))
-        FileUtils.touch("test2.jar")
+      @project.from_directory do
+        contents = `tar --list -f packages/#{package_name}/#{package_name}.tar.xz`.split
+        expect(contents).to include("m2/kit.content")
       end
-
-      actual_glue_kit_items = @kit.glue_kit_items(@kit.jar_kit_items).first
-      expect(actual_glue_kit_items.source_paths).not_to include(Pathname.new("test1.jar"))
-      expect(actual_glue_kit_items.source_paths).to include(Pathname.new("test2.jar"))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.46.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -163,13 +163,12 @@ files:
 - integration-tests/build-obs.sh
 - integration-tests/commons-collections-3.2.1-src.zip
 - lib/template/gitignore
+- lib/template/kit.spec
 - lib/template/kit/CONTENTS
 - lib/template/kit/jars/CONTENTS
 - lib/template/kit/m2/settings.xml
-- lib/template/kit_item.spec
 - lib/template/package.spec
 - lib/template/packages/CONTENTS
-- lib/template/packages/kit/CONTENTS
 - lib/template/src/CONTENTS
 - lib/tetra.rb
 - lib/tetra/ant_runner.rb
@@ -198,10 +197,7 @@ files:
 - lib/tetra/maven_website.rb
 - lib/tetra/packages/archivable.rb
 - lib/tetra/packages/built_package.rb
-- lib/tetra/packages/glue_kit_item.rb
-- lib/tetra/packages/jar_kit_item.rb
 - lib/tetra/packages/kit.rb
-- lib/tetra/packages/maven_kit_item.rb
 - lib/tetra/packages/scriptable.rb
 - lib/tetra/packages/speccable.rb
 - lib/tetra/pom.rb
@@ -230,10 +226,8 @@ files:
 - spec/lib/archivable_spec.rb
 - spec/lib/built_package_spec.rb
 - spec/lib/git_spec.rb
-- spec/lib/glue_kit_item_spec.rb
 - spec/lib/kit_checker_spec.rb
 - spec/lib/kit_spec.rb
-- spec/lib/maven_kit_item_spec.rb
 - spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
 - spec/lib/pom_getter_spec.rb

data/lib/template/packages/kit/CONTENTS

@@ -1,3 +0,0 @@
-tetra will save all binary build dependency packages here.
-
-Feel free to use this as a subproject in OBS.

data/lib/tetra/packages/glue_kit_item.rb

@@ -1,41 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # represents a prebuilt package dependency from a jar file
-  # in a kit
-  class GlueKitItem
-    include Archivable
-    include Speccable
-
-    attr_reader :project
-    attr_reader :package_name
-    attr_reader :conflicts
-    attr_reader :source_dir
-    attr_reader :source_paths
-    attr_reader :provides_symbol
-    attr_reader :provides_version
-    attr_reader :install_dir
-
-    def initialize(project, source_paths)
-      @project = project
-      @package_name = "kit-item-glue-#{project.name}"
-      @conflicts = true
-      @source_dir = "kit"
-      @source_paths = source_paths
-
-      @provides_symbol = "tetra-glue"
-      @provides_version = "#{project.name}-#{project.version}"
-      @install_dir = ""
-    end
-
-    def to_archive
-      _to_archive(@project, @package_name, @source_dir,
-                  @source_paths, @project.kit_packages_dir)
-    end
-
-    def to_spec
-      _to_spec(@project, @package_name, "kit_item.spec",
-               @project.kit_packages_dir)
-    end
-  end
-end

data/lib/tetra/packages/jar_kit_item.rb

@@ -1,44 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # represents a prebuilt package dependency from a jar file
-  # in a kit
-  class JarKitItem
-    include Archivable
-    include Speccable
-
-    attr_reader :project
-    attr_reader :package_name
-    attr_reader :conflicts
-    attr_reader :source_dir
-    attr_reader :source_paths
-    attr_reader :provides_symbol
-    attr_reader :provides_version
-    attr_reader :install_dir
-
-    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(".", "-")}-#{short_hash}"
-      @conflicts = false
-      @source_dir = File.join("kit", "jars")
-      @source_paths = [path]
-      @provides_symbol = "tetra-jar(#{name})"
-      @provides_version = hash
-      @install_dir = "jars"
-    end
-
-    def to_archive
-      _to_archive(@project, @package_name, @source_dir,
-                  @source_paths, @project.kit_packages_dir)
-    end
-
-    def to_spec
-      _to_spec(@project, @package_name, "kit_item.spec",
-               @project.kit_packages_dir)
-    end
-  end
-end

data/lib/tetra/packages/maven_kit_item.rb

@@ -1,66 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # represents a prebuilt package dependency from a Maven local repo
-  # in a kit
-  class MavenKitItem
-    include Archivable
-    include Speccable
-
-    attr_reader :project
-    attr_reader :package_name
-    attr_reader :conflicts
-    attr_reader :source_dir
-    attr_reader :source_paths
-    attr_reader :provides_symbol
-    attr_reader :provides_version
-    attr_reader :install_dir
-
-    def initialize(project, pom, source_paths)
-      path, _ = path_split(pom)
-      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-#{artifact_id}-#{short_hash}"
-      @conflicts = false
-
-      @provides_symbol = "tetra-mvn(#{group_id}:#{artifact_id}:#{version})"
-      @provides_version = hash
-      @install_dir = "m2"
-
-      @source_dir = File.join("kit", "m2")
-      @source_paths = source_paths
-    end
-
-    def to_archive
-      _to_archive(@project, @package_name, @source_dir,
-                  @source_paths, @project.kit_packages_dir)
-    end
-
-    def to_spec
-      _to_spec(@project, @package_name, "kit_item.spec",
-               @project.kit_packages_dir)
-    end
-
-    private
-
-    # splits a path string into a [head, tail] string couple
-    def path_split(path)
-      Pathname.new(path).split.map { |e| e.to_s }
-    end
-
-    # transforms a path into a Maven group
-    def path_to_group(path)
-      splits = path_split(path)
-      if splits[0] == "."
-        return splits[1]
-      else
-        return "#{path_to_group(splits[0])}.#{splits[1]}"
-      end
-    end
-  end
-end

data/spec/lib/glue_kit_item_spec.rb

@@ -1,31 +0,0 @@
-# encoding: UTF-8
-
-require "spec_helper"
-
-describe Tetra::GlueKitItem do
-  include Tetra::Mockers
-
-  before(:each) do
-    create_mock_project
-  end
-
-  after(:each) do
-    delete_mock_project
-  end
-
-  let(:instance) { Tetra::GlueKitItem.new(@project, []) }
-
-  describe "#to_spec" do
-    it "generates a specfile" do
-      expect(instance.to_spec).to be_truthy
-
-      @project.from_directory do
-        package_name = instance.package_name
-        spec_lines = File.readlines(File.join("packages", "kit", package_name, "#{package_name}.spec"))
-
-        expect(spec_lines).to include("Conflicts:      otherproviders(tetra-glue)\n")
-        expect(spec_lines).to include("Provides:       tetra-glue == test-project-0\n")
-      end
-    end
-  end
-end

data/spec/lib/maven_kit_item_spec.rb

@@ -1,76 +0,0 @@
-# encoding: UTF-8
-
-require "spec_helper"
-
-describe Tetra::MavenKitItem do
-  include Tetra::Mockers
-
-  before(:each) do
-    create_mock_project
-  end
-
-  after(:each) do
-    delete_mock_project
-  end
-
-  let(:group_id) { "com.company.project" }
-  let(:artifact_id) { "artifact" }
-  let(:version) { "1.0" }
-  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(: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:1.0)")
-    end
-  end
-
-  describe "#provides_version" do
-    it "returns the spec Provides: version" do
-      expect(maven_kit_item.provides_version).to eq(hash)
-    end
-  end
-
-  describe "#to_spec" do
-    it "generates a specfile" do
-      expect(maven_kit_item.to_spec).to be_truthy
-
-      @project.from_directory 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:           #{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}) == #{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")
-        expect(spec_lines).to include("%{_datadir}/tetra/m2\n")
-      end
-    end
-  end
-
-  describe "#to_archive" do
-    it "generates an archive" do
-      @project.from_directory(File.join("kit", "m2")) do
-        FileUtils.mkdir_p(dir)
-        FileUtils.touch(pom)
-        FileUtils.touch(jar)
-      end
-
-      expected_filename = File::SEPARATOR + "#{package_name}.tar.xz"
-      expect(maven_kit_item.to_archive).to end_with(expected_filename)
-
-      @project.from_directory do
-        contents = `tar -Jtf packages/kit/#{package_name}/#{package_name}.tar.xz`.split
-        expect(contents).to include("com/company/project/artifact/1.0/artifact-1.0.pom")
-        expect(contents).to include("com/company/project/artifact/1.0/artifact.jar")
-      end
-    end
-  end
-end