tetra 0.43.0 → 0.44.0

data/lib/tetra/{jar_kit_item.rb → packages/jar_kit_item.rb}

@@ -4,21 +4,14 @@ module Tetra
   # represents a prebuilt package dependency from a jar file
   # in a kit
   class JarKitItem
-    # implement to_spec
-    include SpecGenerator
+    include Archivable
+    include Speccable
+
     attr_reader :project
     attr_reader :package_name
-    attr_reader :spec_dir
-    attr_reader :template_spec_name
     attr_reader :conflicts
-
-    # implement to_archive
-    include Archiver
     attr_reader :source_dir
     attr_reader :source_paths
-    attr_reader :destination_dir
-
-    # template-specific  attributes
     attr_reader :provides_symbol
     attr_reader :provides_version
     attr_reader :install_dir
@@ -29,17 +22,22 @@ module Tetra
 
       @project = project
       @package_name = "kit-item-#{name.to_s.gsub(".", "-")}"
-      @spec_dir = "kit"
-      @template_spec_name = "kit_item.spec"
       @conflicts = false
-
       @source_dir = File.join("kit", "jars")
       @source_paths = [path]
-      @destination_dir = @package_name
-
       @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/{maven_kit_item.rb → packages/maven_kit_item.rb}

@@ -4,21 +4,14 @@ module Tetra
   # represents a prebuilt package dependency from a Maven local repo
   # in a kit
   class MavenKitItem
-    # implement to_spec
-    include SpecGenerator
+    include Archivable
+    include Speccable
+
     attr_reader :project
     attr_reader :package_name
-    attr_reader :spec_dir
-    attr_reader :template_spec_name
     attr_reader :conflicts
-
-    # implement to_archive
-    include Archiver
     attr_reader :source_dir
     attr_reader :source_paths
-    attr_reader :destination_dir
-
-    # template-specific attributes
     attr_reader :provides_symbol
     attr_reader :provides_version
     attr_reader :install_dir
@@ -31,8 +24,6 @@ module Tetra
 
       @project = project
       @package_name = "kit-item-#{group_id.gsub(".", "-")}-#{artifact_id}-#{version}"
-      @spec_dir = "kit"
-      @template_spec_name = "kit_item.spec"
       @conflicts = false
 
       @provides_symbol = "tetra-mvn(#{group_id}:#{artifact_id})"
@@ -41,7 +32,16 @@ module Tetra
 
       @source_dir = File.join("kit", "m2")
       @source_paths = source_paths
-      @destination_dir = @package_name
+    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

data/lib/tetra/packages/scriptable.rb

@@ -0,0 +1,48 @@
+# encoding: UTF-8
+
+module Tetra
+  # generates a package build script from bash_history
+  module Scriptable
+    def _to_script(project, history_path)
+      ant_runner = Tetra::AntRunner.new(project)
+      maven_runner = Tetra::MavenRunner.new(project)
+
+      project.from_directory do
+        history_lines = File.readlines(history_path).map { |e| e.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? }
+
+        script_lines = [
+          "#!/bin/bash",
+          "set -xe",
+          "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
+
+        new_content = script_lines.join("\n") + "\n"
+
+        result_dir = File.join(project.packages_dir, project.name)
+        FileUtils.mkdir_p(result_dir)
+        result_path = File.join(result_dir, "build.sh")
+        conflict_count = project.merge_new_content(new_content, result_path, "Build script generated",
+                                                   "generate_build_script")
+
+        [result_path, conflict_count]
+      end
+    end
+  end
+end

data/lib/tetra/{spec_generator.rb → packages/speccable.rb}

@@ -1,40 +1,31 @@
 # encoding: UTF-8
 
 module Tetra
-  # implements a to_spec method
-  module SpecGenerator
-    # expected attributes:
-    #   project (Tetra::Project)
-    #   package_name (string)
-    #   spec_dir (string)
-    #   template_spec_name (string)
-
+  # adds methods to generate a spec file from a package object
+  module Speccable
     # 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
+    # destination_dir/name/name.spec
+    def _to_spec(project, name, template_spec_name, destination_dir)
       project.from_directory do
-        spec_name = "#{package_name}.spec"
+        spec_name = "#{name}.spec"
+        spec_dir = File.join(destination_dir, name)
+        FileUtils.mkdir_p(spec_dir)
+
         spec_path = File.join(spec_dir, spec_name)
 
         new_content = generate(template_spec_name, binding)
-        label = "Spec for #{package_name} generated"
+        label = "Spec for #{name} generated"
         conflict_count = project.merge_new_content(new_content, spec_path,
-                                                   label, "generate_#{package_name}_spec")
-
-        output_dir = File.join("output", package_name)
-        FileUtils.mkdir_p(output_dir)
-
-        spec_link_path = File.join(output_dir, spec_name)
-        FileUtils.symlink(File.expand_path(spec_path), spec_link_path, force: true)
-
-        [spec_link_path, conflict_count]
+                                                   label, "generate_#{name}_spec")
+        [spec_path, conflict_count]
       end
     end
 
     # returns the spec template path, exposed for testing
     def template_path
-      File.join(File.dirname(__FILE__), "..", "template")
+      File.join(File.dirname(__FILE__), "..", "..", "template")
     end
 
     private
@@ -43,7 +34,6 @@ module Tetra
     # 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)
 

data/lib/tetra/project.rb

@@ -21,6 +21,14 @@ module Tetra
       latest_tag_count(:dry_run_finished)
     end
 
+    def packages_dir
+      "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
@@ -54,8 +62,8 @@ module Tetra
         template_path = File.join(File.dirname(__FILE__), "..", "template")
 
         templates = {
-          "output" => ".",
           "kit" => ".",
+          "packages" => ".",
           "src" => ".",
           "gitignore" => ".gitignore"
         }
@@ -107,6 +115,16 @@ module Tetra
 
     # takes a revertable snapshot of this project
     def take_snapshot(message, tag_prefix, tag_message = nil)
+      # rename all .gitignore files by default as
+      # they prevent snapshotting
+      from_directory("src") do
+        Find.find(".") do |file|
+          next unless file =~ /\.gitignore$/
+
+          FileUtils.mv(file, "#{file}_disabled_by_tetra")
+        end
+      end
+
       @git.commit_whole_directory(message, next_tag(tag_prefix), tag_message)
     end
 
@@ -219,13 +237,4 @@ module Tetra
       @directory = directory
     end
   end
-
-  # current directory is not a tetra package directory
-  class NoPackageDirectoryError < StandardError
-    attr_reader :directory
-
-    def initialize(directory)
-      @directory = directory
-    end
-  end
 end

data/lib/tetra/version.rb

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

data/spec/lib/archivable_spec.rb

@@ -0,0 +1,36 @@
+# encoding: UTF-8
+
+require "spec_helper"
+
+describe Tetra::Archivable do
+  include Tetra::Mockers
+
+  # mock
+  class TestArchivableClass
+    include Tetra::Archivable
+  end
+
+  before(:each) do
+    create_mock_project
+  end
+
+  let(:instance) { TestArchivableClass.new }
+
+  after(:each) do
+    delete_mock_project
+  end
+
+  describe "#to_archive" do
+    it "generates an archive" do
+      @project.from_directory("kit") do
+        FileUtils.touch("kit_test")
+      end
+
+      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")
+      end
+    end
+  end
+end

data/spec/lib/{package_spec.rb → built_package_spec.rb}

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Tetra::Package do
+describe Tetra::BuiltPackage do
   include Tetra::Mockers
 
   before(:each) do
@@ -33,7 +33,7 @@ describe Tetra::Package do
 
     FileUtils.copy(File.join("spec", "data", "nailgun", "pom.xml"), @project_path)
 
-    @package = Tetra::Package.new(@project, File.join(@project_path, "pom.xml"), "*.jar")
+    @package = Tetra::BuiltPackage.new(@project, File.join(@project_path, "pom.xml"), "*.jar")
   end
 
   after(:each) do
@@ -45,7 +45,7 @@ describe Tetra::Package do
       @package.to_spec
 
       @project.from_directory do
-        spec_lines = File.readlines(File.join("output", "test-project", "test-project.spec"))
+        spec_lines = File.readlines(File.join("packages", "test-project", "test-project.spec"))
         expect(spec_lines).to include("Name:           test-project\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")
@@ -68,7 +68,7 @@ da39a3ee5e6b4b0d3255bfef95601890afd80709\n")
 
       @package.to_archive
       @project.from_directory do
-        expect(`tar -Jtf output/test-project/test-project.tar.xz`.split).to include("src_test")
+        expect(`tar -Jtf packages/test-project/test-project.tar.xz`.split).to include("src_test")
       end
     end
   end

data/spec/lib/git_spec.rb

@@ -30,17 +30,11 @@ describe Tetra::Git do
           file.write "test"
         end
 
-        # check that gitignore files are moved correctly
-        File.open(".gitignore", "w") do |file|
-          file.write "file1o"
-        end
-
         @git.commit_whole_directory("test", :test)
 
         files = `git ls-tree --name-only -r HEAD`.split("\n")
 
         expect(files).to include("file1")
-        expect(files).to include(".gitignore_disabled_by_tetra")
       end
     end
   end

data/spec/lib/glue_kit_item_spec.rb

@@ -21,7 +21,7 @@ describe Tetra::GlueKitItem do
 
       @project.from_directory do
         package_name = instance.package_name
-        spec_lines = File.readlines(File.join("output", package_name, "#{package_name}.spec"))
+        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")

data/spec/lib/maven_kit_item_spec.rb

@@ -39,7 +39,7 @@ describe Tetra::MavenKitItem 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"))
+        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")
@@ -65,7 +65,7 @@ describe Tetra::MavenKitItem do
       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
+        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

data/spec/lib/project_spec.rb

@@ -68,8 +68,16 @@ describe Tetra::Project do
       @project.from_directory do
         FileUtils.touch(File.join("kit", "test"))
 
+        # check that gitignore files are moved correctly
+        File.open(File.join("src", ".gitignore"), "w") do |file|
+          file.write "file"
+        end
+
         @project.take_snapshot("test", :revertable)
 
+        files = `git ls-tree --name-only -r HEAD`.split("\n")
+        expect(files).to include("src/.gitignore_disabled_by_tetra")
+
         expect(`git rev-list --all`.split("\n").length).to eq 2
         expect(@project.latest_tag(:revertable)).to eq "revertable_1"
       end

data/spec/lib/{script_generator_spec.rb → scriptable_spec.rb}

@@ -2,13 +2,11 @@
 
 require "spec_helper"
 
-describe Tetra::ScriptGenerator do
-  before(:each) do
-    @project_path = File.join("spec", "data", "test-project")
-    Dir.mkdir(@project_path)
+describe Tetra::Scriptable do
+  include Tetra::Mockers
 
-    Tetra::Project.init(@project_path)
-    @project = Tetra::Project.new(@project_path)
+  before(:each) do
+    create_mock_project
 
     @project.from_directory do
       File.open("history", "w") do |io|
@@ -22,23 +20,22 @@ describe Tetra::ScriptGenerator do
 
       FileUtils.mkdir_p(File.join("src", "test-package"))
       @project.dry_run
-
-      @generator = Tetra::ScriptGenerator.new(@project, "history")
     end
 
     mock_maven_executable
   end
 
   after(:each) do
-    FileUtils.rm_rf(@project_path)
+    delete_mock_project
   end
 
   describe "#generate_build_script" do
     it "generates a build script from the history" do
       @project.from_directory do
-        @generator.generate_build_script
+        @package = Tetra::BuiltPackage.new(@project)
+        @package.to_script("history")
 
-        lines = File.readlines(File.join("src", "build.sh"))
+        lines = File.readlines(File.join("packages", "test-project", "build.sh"))
 
         expect(lines).to include("#!/bin/bash\n")
         expect(lines).to include("cd somewhere significant\n")