tetra 0.40.0 → 0.41.0

data/spec/lib/package_spec.rb

@@ -0,0 +1,78 @@
+# encoding: UTF-8
+
+require "spec_helper"
+
+describe Tetra::Package do
+  before(:each) do
+    @project_path = File.join("spec", "data", "test-project")
+    Dir.mkdir(@project_path)
+
+    Tetra::Project.init(@project_path)
+    @project = Tetra::Project.new(@project_path)
+
+    @project.dry_run
+    Dir.chdir(@project_path) do
+      FileUtils.touch(File.join("kit", "jars", "test.jar"))
+    end
+    @project.finish(false)
+
+    @project.from_directory do
+      FileUtils.mkdir_p File.join("src", "test", "out")
+      (1..5).each do |i|
+        `touch src/test/test#{i}.java`
+      end
+      @project.dry_run
+
+      (1..5).each do |i|
+        `touch src/test/test#{i}.class`
+      end
+
+      (1..5).each do |i|
+        `touch src/test/out/test#{i}.jar`
+      end
+
+      @project.finish(false)
+    end
+
+    FileUtils.copy(File.join("spec", "data", "nailgun", "pom.xml"), @project_path)
+
+    @package = Tetra::Package.new(@project, "test", File.join(@project_path, "pom.xml"), "*.jar")
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(@project_path)
+  end
+
+  describe "#to_spec" do
+    it "generates the first version" do
+      @package.to_spec
+
+      @project.from_directory do
+        spec_lines = File.readlines(File.join("output", "test", "test.spec"))
+        expect(spec_lines).to include("Name:           test\n")
+        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("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
+    end
+  end
+
+  describe "#to_archive" do
+    it "generates an archive" do
+      @project.from_directory("src") do
+        FileUtils.touch(File.join("test", "src_test"))
+      end
+      @project.finish(false)
+
+      @package.to_archive
+      @project.from_directory do
+        expect(`tar -Jtf output/test/test.tar.xz`.split).to include("src_test")
+      end
+    end
+  end
+end

data/spec/lib/project_spec.rb

@@ -116,7 +116,7 @@ describe Tetra::Project do
       @project.from_directory do
         `touch kit/test`
 
-        @project.take_snapshot "test", :revertable
+        @project.take_snapshot("test", :revertable)
 
         expect(`git rev-list --all`.split("\n").length).to eq 2
         expect(@project.latest_tag(:revertable)).to eq "revertable_1"

data/spec/lib/spec_generator_spec.rb

@@ -3,127 +3,99 @@
 require "spec_helper"
 
 describe Tetra::SpecGenerator do
-  before(:each) do
-    @project_path = File.join("spec", "data", "test-project")
-    Dir.mkdir(@project_path)
+  include Tetra::Mockers
+
+  # mock
+  class SpecGeneratorTestClass
+    attr_accessor :world_property
 
-    Tetra::Project.init(@project_path)
-    @project = Tetra::Project.new(@project_path)
+    include Tetra::SpecGenerator
+    attr_reader :project
+    attr_reader :package_name
+    attr_reader :spec_dir
+    attr_reader :template_spec_name
 
-    @project.dry_run
-    Dir.chdir(@project_path) do
-      test_file = File.join("kit", "test")
-      File.open(test_file, "w") { |io| io.puts "kit content test file" }
+    def initialize(project)
+      @world_property = "World!"
+
+      @project = project
+      @package_name = "test-package"
+      @spec_dir = "kit"
+      @template_spec_name = "test.spec"
     end
-    @project.finish(false)
+  end
 
-    @spec_generator = Tetra::SpecGenerator.new(@project)
+  before(:each) do
+    create_mock_project
+
+    @template_path = File.join(instance.template_path, "test.spec")
+    File.open(@template_path, "w") { |io| io.puts "Hello <%= world_property %>\nintentionally blank line\n" }
+
+    @destination_path = File.join("output", instance.package_name, "#{instance.package_name}.spec")
   end
 
+  let(:instance) { SpecGeneratorTestClass.new(@project) }
+
   after(:each) do
-    FileUtils.rm_rf(@project_path)
+    delete_mock_project
+    FileUtils.rm_rf(@template_path)
   end
 
-  describe "#generate_kit_spec" do
-    it "generates the first version" do
-      expect(@spec_generator.generate_kit_spec).to be_truthy
+  describe "#to_spec" do
+    it "generates a first version" do
+      expect(instance.to_spec).to be_truthy
 
       @project.from_directory do
-        spec_lines = File.readlines(File.join("output", "test-project-kit", "test-project-kit.spec"))
-        expect(spec_lines).to include("Name:           test-project-kit\n")
-        expect(spec_lines).to include("Version:        1\n")
-        expect(spec_lines).to include("Source0:        test-project-kit.tar.xz\n")
+        spec_lines = File.readlines(@destination_path)
+        expect(spec_lines).to include("Hello World!\n")
       end
     end
+
     it "generates a second version" do
-      expect(@spec_generator.generate_kit_spec).to be_truthy
-      @project.dry_run
-      Dir.chdir(@project_path) do
-        test_file = File.join("kit", "test")
-        File.open(test_file, "w") { |io| io.puts "changed kit content test file" }
-
-        File.open(File.join("output", "test-project-kit", "test-project-kit.spec"), "a") do |io|
-          io.write("nonconflicting line")
+      expect(instance.to_spec).to be_truthy
+
+      @project.from_directory do
+        File.open(@destination_path, "a") do |io|
+          io.write("nonconflicting line\n")
         end
       end
-      @project.finish(false)
 
-      expect(@spec_generator.generate_kit_spec).to be_truthy
+      instance.world_property = "Mario!"
+
+      expect(instance.to_spec).to be_truthy
 
       @project.from_directory do
-        spec_lines = File.readlines(File.join("output", "test-project-kit", "test-project-kit.spec"))
-        expect(spec_lines).to include("Name:           test-project-kit\n")
-        expect(spec_lines).to include("Version:        2\n")
-        expect(spec_lines).to include("Source0:        test-project-kit.tar.xz\n")
+        spec_lines = File.readlines(@destination_path)
+        expect(spec_lines).not_to include("Hello World!\n")
+        expect(spec_lines).to include("Hello Mario!\n")
         expect(spec_lines).to include("nonconflicting line\n")
       end
     end
-    it "generates a conflicting version" do
-      expect(@spec_generator.generate_kit_spec).to be_truthy
-      @project.dry_run
-      Dir.chdir(@project_path) do
-        test_file = File.join("kit", "test")
-        File.open(test_file, "w") { |io| io.puts "changed kit content test file" }
 
-        spec_path = File.join("output", "test-project-kit", "test-project-kit.spec")
-        spec_contents = File.read spec_path
+    it "generates a conflicting version" do
+      expect(instance.to_spec).to be_truthy
 
-        spec_contents.gsub!(/^Version:.*$/, "CONFLICTING!")
+      @project.from_directory do
+        spec_contents = File.read(@destination_path)
+        spec_contents.gsub!(/Hello World/, "CONFLICTING!")
 
-        File.open(spec_path, "w+") do |io|
+        File.open(@destination_path, "w+") do |io|
           io.write(spec_contents)
         end
       end
-      @project.finish(false)
 
-      expect(@spec_generator.generate_kit_spec).to be_truthy
+      instance.world_property = "Mario!"
+
+      expect(instance.to_spec).to be_truthy
 
       @project.from_directory do
-        spec_lines = File.readlines(File.join("output", "test-project-kit", "test-project-kit.spec"))
-        expect(spec_lines).to include("Name:           test-project-kit\n")
-        expect(spec_lines).to include("Source0:        test-project-kit.tar.xz\n")
+        spec_lines = File.readlines(@destination_path)
         expect(spec_lines).to include("<<<<<<< newly generated\n")
-        expect(spec_lines).to include("Version:        2\n")
+        expect(spec_lines).to include("Hello Mario!\n")
         expect(spec_lines).to include("=======\n")
-        expect(spec_lines).to include("CONFLICTING!\n")
+        expect(spec_lines).to include("CONFLICTING!!\n")
         expect(spec_lines).to include(">>>>>>> user edited\n")
-      end
-    end
-  end
-
-  describe "#generate_package_spec" do
-    it "generates the first version" do
-
-      @project.from_directory do
-        FileUtils.mkdir_p File.join("src", "test", "out")
-        (1..5).each do |i|
-          `touch src/test/test#{i}.java`
-        end
-        @project.dry_run
-
-        (1..5).each do |i|
-          `touch src/test/test#{i}.class`
-        end
-
-        (1..5).each do |i|
-          `touch src/test/out/test#{i}.jar`
-        end
-
-        @project.finish(false)
-      end
-
-      FileUtils.copy(File.join("spec", "data", "nailgun", "pom.xml"), @project_path)
-      @spec_generator.generate_package_spec "test", File.join(@project_path, "pom.xml"), "*.jar"
-
-      @project.from_directory do
-        spec_lines = File.readlines(File.join("output", "test", "test.spec"))
-        expect(spec_lines).to include("Name:           test\n")
-        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:  #{@project.name}-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")
+        expect(spec_lines).to include("intentionally blank line\n")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,18 +151,20 @@ files:
 - .gitignore
 - .rubocop.yml
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - MOTIVATION.md
 - README.md
 - Rakefile
 - SPECIAL_CASES.md
 - bin/tetra
-- integration-tests/commons.sh
+- integration-tests/build-commons.sh
+- integration-tests/build-obs.sh
 - 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/output/CONTENTS
 - lib/template/package.spec
 - lib/template/src/CONTENTS
@@ -187,21 +189,23 @@ files:
 - lib/tetra/commands/move_jars_to_kit.rb
 - lib/tetra/commands/mvn.rb
 - lib/tetra/git.rb
+- lib/tetra/glue_kit_item.rb
+- lib/tetra/jar_kit_item.rb
+- lib/tetra/kit.rb
 - lib/tetra/kit_checker.rb
 - lib/tetra/kit_runner.rb
-- lib/tetra/kit_spec_adapter.rb
 - lib/tetra/logger.rb
 - lib/tetra/main.rb
+- lib/tetra/maven_kit_item.rb
 - lib/tetra/maven_runner.rb
 - lib/tetra/maven_website.rb
-- lib/tetra/package_spec_adapter.rb
+- lib/tetra/package.rb
 - lib/tetra/pom.rb
 - lib/tetra/pom_getter.rb
 - lib/tetra/project.rb
 - lib/tetra/script_generator.rb
 - lib/tetra/source_getter.rb
 - lib/tetra/spec_generator.rb
-- lib/tetra/template_manager.rb
 - lib/tetra/version.rb
 - lib/tetra/version_matcher.rb
 - spec/data/ant-super-simple-code/build.xml
@@ -223,16 +227,19 @@ files:
 - spec/lib/ant_runner_spec.rb
 - spec/lib/archiver_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/package_spec.rb
 - spec/lib/pom_getter_spec.rb
 - spec/lib/pom_spec.rb
 - spec/lib/project_spec.rb
 - spec/lib/script_generator_spec.rb
 - spec/lib/source_getter_spec.rb
 - spec/lib/spec_generator_spec.rb
-- spec/lib/template_manager_spec.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/kit_runner_examples.rb

data/lib/template/kit.spec

@@ -1,64 +0,0 @@
-#
-# spec file for tetra kit for project "<%= name %>"
-#
-# Copyright (c) <%= Time.now.year %> <%= Etc.getlogin %>
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-Name:           <%= name %>-kit
-Version:        <%= version %>
-Release:        1
-License:        Apache-2.0
-Summary:        Build-time dependencies for tetra project <%= name %>
-Url:            https://github.com/SilvioMoioli/tetra
-Group:          Development/Libraries/Java
-<% archives.each_with_index do |archive, i| %>
-Source<%= i %>:        <%= archive %>
-<% end %>
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-BuildRequires:  xz
-BuildRequires:  fdupes
-Provides:       tetra(kit)
-# no two kits should ever be installed at any given time
-Conflicts:      otherproviders(tetra(kit))
-
-%description
-This package has been automatically created by tetra in order to
-satisfy build time dependencies of some Java packages. It should
-not be used except for rebuilding those packages and it should never
-be installed on end users' systems.
-
-%prep
-<% (0..(archives.length-1)).each do |i| %>
-<% if i > 0 %>
-%setup -q -c -T -D -b <%= i %>
-<% else %>
-%setup -q -c -T -b <%= i %>
-<% end %>
-<% end %>
-
-%build
-# nothing to do, tetra kits are precompiled by design
-
-%install
-export NO_BRP_CHECK_BYTECODE_VERSION=true
-install -d -m 0755 %{buildroot}%{_datadir}/tetra/%{name}/
-cp -a * %{buildroot}%{_datadir}/tetra/%{name}/
-%fdupes -s %{buildroot}%{_datadir}/tetra/%{name}/
-
-%files
-%defattr(-,root,root)
-%{_datadir}/tetra/
-
-%changelog

data/lib/tetra/kit_spec_adapter.rb

@@ -1,28 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # encapsulates details of a kit needed by the spec file
-  # retrieving them from other objects
-  class KitSpecAdapter
-    attr_reader :name
-    attr_reader :version
-    attr_reader :archives
-
-    def initialize(project)
-      @name = project.name
-      @version = project.version
-
-      @archives =
-        project.from_directory do
-          ["#{name}-kit.tar.xz"] +
-          Dir.entries("output/#{name}-kit")
-            .select { |f| f =~ /_[0-9]+.tar.xz$/ }
-            .sort
-        end
-    end
-
-    def public_binding
-      binding
-    end
-  end
-end