tetra 0.40.0 → 0.41.0

data/lib/tetra/spec_generator.rb

@@ -1,60 +1,56 @@
 # encoding: UTF-8
 
 module Tetra
-  # creates and updates spec files
-  class SpecGenerator
-    include Logging
-
-    def initialize(project)
-      @project = project
-    end
-
-    def generate_kit_spec
-      @project.from_directory do
-        spec_name = "#{@project.name}-kit.spec"
-        spec_path = File.join("kit", spec_name)
-        output_dir = File.join("output", "#{@project.name}-kit")
+  # implements a to_spec method
+  module SpecGenerator
+    # expected attributes:
+    #   project (Tetra::Project)
+    #   package_name (string)
+    #   spec_dir (string)
+    #   template_spec_name (string)
+
+    # saves a specfile for this object in correct directories
+    # returns the spec path and the conflict count with the previously generated
+    # version, if any
+    def to_spec
+      project.from_directory do
+        spec_name = "#{package_name}.spec"
+        spec_path = File.join(spec_dir, spec_name)
+
+        new_content = generate(template_spec_name, binding)
+        conflict_count = project.merge_new_content(new_content, spec_path,
+                                                   "Spec generated", "generate_#{package_name}_spec")
+
+        output_dir = File.join("output", package_name)
         FileUtils.mkdir_p(output_dir)
 
-        adapter = Tetra::KitSpecAdapter.new(@project)
-        conflict_count = generate_merging("kit.spec", adapter.public_binding, spec_path, :generate_kit_spec)
-
-        symlink_to_output(spec_path, output_dir)
+        spec_link_path = File.join(output_dir, spec_name)
+        FileUtils.symlink(File.expand_path(spec_path), spec_link_path, force: true)
 
         [spec_path, conflict_count]
       end
     end
 
-    def generate_package_spec(name, pom_path, filter)
-      pom = Tetra::Pom.new(pom_path)
-      @project.from_directory do
-        spec_name = "#{name}.spec"
-        spec_path = File.join("src", name, spec_name)
-        output_dir = File.join("output", name)
-        FileUtils.mkdir_p(output_dir)
-
-        adapter = Tetra::PackageSpecAdapter.new(@project, name, pom, filter)
-        conflict_count = generate_merging("package.spec", adapter.public_binding, spec_path, "generate_#{name}_spec")
-
-        symlink_to_output(spec_path, output_dir)
-
-        [spec_path, conflict_count]
-      end
+    # returns the spec template path, exposed for testing
+    def template_path
+      File.join(File.dirname(__FILE__), "..", "template")
     end
 
     private
 
-    # generates a spec file from a template and 3-way merges it
-    def generate_merging(template, binding, path, tag_prefix)
-      new_content = TemplateManager.new.generate(template, binding)
-      @project.merge_new_content(new_content, path, "Spec generated", tag_prefix)
-    end
+    # generates content from an ERB template and an object binding
+    # if destination_path is given, write it to that file, otherwise just
+    # return it
+    def generate(template_name, object_binding, destination_path = nil)
+      template_path = File.join(File.dirname(__FILE__), "..", "template")
+      erb = ERB.new File.read(File.join(template_path, template_name)), nil, "<>"
+      new_content =  erb.result(object_binding)
+
+      unless destination_path.nil?
+        File.open(destination_path, "w") { |io| io.write new_content }
+      end
 
-    # links a spec file in a subdirectory of output/
-    def symlink_to_output(spec_path, destination_dir)
-      spec_name = Pathname.new(spec_path).basename.to_s
-      destination_spec_path = File.join(destination_dir, spec_name)
-      FileUtils.symlink(File.expand_path(spec_path), destination_spec_path, force: true)
+      new_content
     end
   end
 end

data/lib/tetra/version.rb

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

data/spec/lib/archiver_spec.rb

@@ -3,103 +3,47 @@
 require "spec_helper"
 
 describe Tetra::Archiver 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)
-  end
-
-  after(:each) do
-    FileUtils.rm_rf(@project_path)
-  end
-
-  let(:archiver) { Tetra::Archiver.new(@project) }
-
-  describe "#archive_single" do
-    it "archives a list of files" do
-      @project.from_directory do
-        File.open("test", "w") { |io| io.puts "test content" }
-
-        archiver.archive_single(".", "test.tar.xz")
-        expect(`tar -Jtf test.tar.xz`.split).to include("test")
-      end
+  include Tetra::Mockers
+
+  # mock
+  class TestArchiverClass
+    include Tetra::Archiver
+
+    attr_reader :project
+    attr_reader :package_name
+    attr_reader :source_dir
+    attr_reader :source_paths
+    attr_reader :destination_dir
+
+    def initialize(project)
+      @project = project
+      @package_name = "test-package"
+      @source_dir = "kit"
+      @source_paths = ["*"]
+      @destination_dir = "test-package"
     end
   end
 
-  describe "#archive_incremental" do
-    it "archives an increment of a directory" do
-      @project.from_directory do
-        File.open("test", "w") { |io| io.puts "test content 1" }
-        File.open("test2", "w") { |io| io.puts "test content 1" }
-        archiver.archive_incremental(".", ".", "test", ".tar.xz", :archive_kit)
-        expect(`tar -Jtf test.tar.xz`.split).to include("test")
-
-        @project.take_snapshot("test archive snapshot 1", :archive_kit)
-
-        File.open("test", "w") { |io| io.puts "test content 2" }
-        File.open("test3", "w") { |io| io.puts "test content 2" }
-
-        @project.take_snapshot("test archive snapshot 2")
-
-        archiver.archive_incremental(".", ".", "test", ".tar.xz", :archive_kit)
-        files = `tar -Jtf test_0001.tar.xz`.split
-
-        expect(files).to include("test")
-        expect(files).to include("test3")
-        expect(files).not_to include("test2")
-      end
-    end
+  before(:each) do
+    create_mock_project
   end
 
-  describe "#archive_kit" do
-    it "archives a kit package files, not incrementally" do
-      @project.from_directory do
-        File.open(File.join("kit", "kit_test"), "w") { |io| io.puts "test content" }
-      end
-      @project.finish(false)
-
-      archiver.archive_kit(true)
-      @project.from_directory do
-        expect(`tar -Jtf output/test-project-kit/test-project-kit.tar.xz`.split).to include("kit_test")
-      end
-    end
-    it "archives a kit package files incrementally" do
-      @project.from_directory do
-        File.open(File.join("kit", "kit_test"), "w") { |io| io.puts "test content" }
-      end
-      @project.finish(false)
-
-      archiver.archive_kit(false)
-      @project.from_directory do
-        expect(`tar -Jtf output/test-project-kit/test-project-kit.tar.xz`.split).to include("kit_test")
-      end
+  let(:instance) { TestArchiverClass.new(@project) }
 
-      @project.from_directory do
-        File.open(File.join("kit", "kit_test2"), "w") { |io| io.puts "test content" }
-      end
-
-      archiver.archive_kit(false)
-      @project.from_directory do
-        files = `tar -Jtf output/test-project-kit/test-project-kit_0001.tar.xz`.split
-        expect(files).to include("kit_test2")
-        expect(files).not_to include("kit_test")
-      end
-    end
+  after(:each) do
+    delete_mock_project
   end
 
-  describe "#archive_package" do
-    it "archives a package files" do
-      @project.from_directory do
-        Dir.mkdir(File.join("src", "package-name"))
-        File.open(File.join("src", "package-name", "src_test"), "w") { |io| io.puts "test content" }
+  describe "#to_archive" do
+    it "generates an archive" do
+      @project.from_directory("kit") do
+        FileUtils.touch("kit_test")
       end
-      @project.finish(false)
 
-      archiver.archive_package "package-name"
+      instance.to_archive
+
       @project.from_directory do
-        expect(`tar -Jtf output/package-name/package-name.tar.xz`.split).to include("src_test")
+        expect(`tar -Jtf output/test-package/test-package.tar.xz`.split).to include("kit_test")
       end
     end
   end

data/spec/lib/git_spec.rb

@@ -35,7 +35,7 @@ describe Tetra::Git do
           file.write "file1o"
         end
 
-        @git.commit_whole_directory("test", "test")
+        @git.commit_whole_directory("test", :test)
 
         files = `git ls-tree --name-only -r HEAD`.split("\n")
 
@@ -52,15 +52,15 @@ describe Tetra::Git do
           file.write "test"
         end
 
-        @git.commit_whole_directory("test", "test")
+        @git.commit_whole_directory("test", :test_start)
 
         File.open("file2", "w") do |file|
           file.write "test"
         end
 
-        @git.commit_whole_directory("test end")
+        @git.commit_whole_directory("test end", :test_end)
 
-        files = @git.changed_files_since("test")
+        files = @git.changed_files_since(:test_start)
 
         expect(files).not_to include("file1")
         expect(files).to include("file2")
@@ -75,7 +75,7 @@ describe Tetra::Git do
           file.write "test"
         end
 
-        @git.commit_whole_directory("test", "test_start")
+        @git.commit_whole_directory("test", :test_start)
 
         File.open("file2", "w") do |file|
           file.write "test"
@@ -85,15 +85,15 @@ describe Tetra::Git do
           file.write "test"
         end
 
-        @git.commit_whole_directory("test", "test_end")
+        @git.commit_whole_directory("test", :test_end)
 
         File.open("file4", "w") do |file|
           file.write "test"
         end
 
-        @git.commit_whole_directory("test")
+        @git.commit_whole_directory("test", :test_after)
 
-        files = @git.changed_files_between("test_start", "test_end", "subdir")
+        files = @git.changed_files_between(:test_start, :test_end, "subdir")
 
         expect(files).not_to include("file1")
         expect(files).not_to include("file2")

data/spec/lib/glue_kit_item_spec.rb

@@ -0,0 +1,31 @@
+# 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("output", 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/kit_spec.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+
+require "spec_helper"
+
+describe Tetra::Kit do
+  include Tetra::Mockers
+
+  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)
+
+        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")
+        ]
+
+        expected_source_paths.each do |file|
+          FileUtils.touch(file)
+        end
+
+        actual_maven_kit_item = @kit.maven_kit_items.first
+        expect(actual_maven_kit_item.source_paths.sort).to eql(expected_source_paths)
+      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")
+      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
+
+  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")
+      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

data/spec/lib/maven_kit_item_spec.rb

@@ -0,0 +1,74 @@
+# 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(:package_name) { "kit-item-#{group_id.gsub(".", "-")}-#{artifact_id}-#{version}" }
+  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)")
+    end
+  end
+
+  describe "#provides_version" do
+    it "returns the spec Provides: version" do
+      expect(maven_kit_item.provides_version).to eq("1.0")
+    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("output", 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("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("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 + "kit-item-com-company-project-artifact-1.0.tar.xz"
+      expect(maven_kit_item.to_archive).to end_with(expected_filename)
+
+      @project.from_directory do
+        contents = `tar -Jtf output/#{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