tetra 0.41.0 → 0.42.0

data/.gitignore

@@ -23,5 +23,5 @@ _yardoc
 doc/
 
 # integration test files
-integration-tests/commons
+integration-tests/commons-collections
 

data/README.md

@@ -35,33 +35,34 @@ With `tetra` you are not building all dependencies from source, just your packag
 
 ## A commons-collections walkthrough
 
-First, ceate a new `tetra` project, in this example named "myproject":
+First, ceate a new `tetra` project named after the package that we want to build:
 
-    mkdir myproject
-    cd myproject
+    mkdir commons-collections
+    cd commons-collections
     tetra init
 
-Second, place commons-collections source files in the `src/` folder. Specifically, every `src/` subfolder will become a separate package named after the folder itself, so you can use the following:
+Second, place source files in the `src/` folder:
 
     cd src
-    mkdir commons-collections
-    cd commons-collections
     wget http://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.zip
     unzip commons-collections-3.2.1-src.zip
     rm commons-collections-3.2.1-src.zip
 
 Third, put all non-source files needed for the build in `kit/`. This means all build dependencies and tools excluding the JDK: in this case it is just Maven:
 
-    cd ../../kit
+    cd ../kit
     wget http://www.eu.apache.org/dist/maven/binaries/apache-maven-3.1.1-bin.zip
     unzip apache-maven-3.1.1-bin.zip
     rm apache-maven-3.1.1-bin.zip
 
 Fourth, you need to show `tetra` how to build your package by running appropriate commands between `tetra dry-run` and `tetra finish`. Bash history will be recorded to generate a "starting-point" build script (that will be sufficient in simple cases like this):
 
-    cd ../src/commons-collections/commons-collections-3.2.1-src/
+    cd ../src
     tetra dry-run
+
+    cd commons-collections-3.2.1-src/
     tetra mvn package
+
     tetra finish
 
 Note that we used `tetra mvn package` instead of `mvn package`: this will use of the Maven copy we put in `kit/` and the repository in `kit/m2`.

data/SPECIAL_CASES.md

@@ -10,9 +10,9 @@ You can do any manual changes to spec and build.sh files and regenerate them lat
 
 * `tetra generate-kit-archive`: (re)generates the kit tarball;
 * `tetra generate-kit-spec`: (re)generates the kit spec;
-* `tetra generate-package-script`: (re)generates the `build.sh` file from the latest bash history (assumes `tetra dry-run` and `tetra finish`have been used). Assumes your current working directory is in a package folder (that is, a subdirectory of `src/<package name>/`);
-* `tetra generate-package-archive`: (re)generates a package tarball;
-* `tetra generate-package-spec`: (re)generates a package spec;
+* `tetra generate-package-script`: (re)generates the `build.sh` file from the latest bash history (assumes `tetra dry-run` and `tetra finish`have been used);
+* `tetra generate-package-archive`: (re)generates the package tarball;
+* `tetra generate-package-spec`: (re)generates the package spec;
 
 ## Kit sources
 
@@ -36,6 +36,12 @@ 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/integration-tests/build-commons.sh

@@ -2,55 +2,21 @@
 
 # A crude integration test that builds some Apache Commons libraries
 
-set -e
+set -ex
 
-rm -Rf commons
-mkdir commons
-cd commons
-tetra init
-
-cd src
+rm -Rf commons-collections
 mkdir commons-collections
 cd commons-collections
-wget http://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.zip
-unzip commons-collections-3.2.1-src.zip
-rm commons-collections-3.2.1-src.zip
-
-cd ../../kit
-wget http://apache.fastbull.org/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.zip
-unzip apache-maven-*.zip
-rm apache-maven-*.zip
-cd ..
-
-tetra dry-run --very-very-verbose
-cd src/commons-collections/commons-collections-3.2.1-src/
-tetra mvn package -DskipTests
-tetra finish
-
-tetra generate-kit-archive
-tetra generate-kit-spec
-tetra generate-package-archive
-tetra generate-package-spec
-# simulate tetra generate-package-script
-cat >../../../output/commons-collections/build.sh <<"EOF"
-#!/bin/bash
-PROJECT_PREFIX=`readlink -e .`
-cd .
-cd src/commons-collections/commons-collections-3.2.1-src/
-$PROJECT_PREFIX/kit/apache-maven-3.1.1/bin/mvn -Dmaven.repo.local=$PROJECT_PREFIX/kit/m2 -s$PROJECT_PREFIX/kit/m2/settings.xml -o package -DskipTests
-EOF
+tetra init
 
-cd ../../..
+cd kit
+unzip ../../apache-maven-3.1.1-bin.zip
 
-cd src
-mkdir commons-fileupload
-cd commons-fileupload
-wget http://archive.apache.org/dist/commons/fileupload/source/commons-fileupload-1.3-src.zip
-unzip commons-fileupload-1.3-src.zip
-rm commons-fileupload-1.3-src.zip
+cd ../src
+unzip ../../commons-collections-3.2.1-src.zip 
 
-tetra dry-run
-cd commons-fileupload-1.3-src/
+tetra dry-run --very-very-verbose
+cd commons-collections-3.2.1-src/
 tetra mvn package -DskipTests
 tetra finish
 
@@ -59,17 +25,15 @@ tetra generate-kit-spec
 tetra generate-package-archive
 tetra generate-package-spec
 # simulate tetra generate-package-script
-cat >../../../output/commons-fileupload/build.sh <<"EOF"
+cd ../..
+cat >src/build.sh <<"EOF"
 #!/bin/bash
 PROJECT_PREFIX=`readlink -e .`
 cd .
-cd src/commons-fileupload/commons-fileupload-1.3-src/
+cd src/commons-collections-3.2.1-src/
 $PROJECT_PREFIX/kit/apache-maven-3.1.1/bin/mvn -Dmaven.repo.local=$PROJECT_PREFIX/kit/m2 -s$PROJECT_PREFIX/kit/m2/settings.xml -o package -DskipTests
 EOF
 
-cd ../../..
-
-
 echo "**************** All Done ****************"
 
-ls -lah output/*
+ls -lah *

data/lib/template/kit/CONTENTS

@@ -1,8 +1,8 @@
-This directory contains all binary files needed to build a tetra project's
-packages.
+This directory contains all binary files needed to build software in src/.
 
-These files should only be used during build and should not be installed
-on users' systems.
+These files will be packaged as binary and will only be used at build time.
+They will not be installed on users' systems.
 
-Some generally useful configuration files are also placed here (eg.
-m2/settings.xml for Maven builds).
+ - jars/ contains simple jars that will be packaged singularly
+ - m2/ contains a Maven repo which artifacts will be packaged singularly
+ - everything else will be packaged in one "glue" package.

data/lib/template/kit/jars/CONTENTS

@@ -1 +1,3 @@
-This directory contains jars moved here from source archives.
+This directory contains binary files needed to build software in src/.
+
+Only jar files not in m2/ should be placed here.

data/lib/template/package.spec

@@ -37,6 +37,9 @@ 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
@@ -58,6 +61,14 @@ 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/template/src/CONTENTS

@@ -1,6 +1,3 @@
-For each package you want to create, you should create a subdirectory here
-named after the package name itself.
-
-In that directory, place all the source files "verbatim" (as checked out from
-the original source repository, ideally in a different subdirectory)
-plus any additional files you might need for the build.
+All "verbatim" source files should be placed here (as checked out from
+the original source repository), together with any additional files you
+might need for the build.

data/lib/tetra/commands/base.rb

@@ -78,8 +78,6 @@ module Tetra
       $stderr.puts e
     rescue NoProjectDirectoryError => e
       $stderr.puts "#{e.directory} is not a tetra project directory, see tetra init"
-    rescue NoPackageDirectoryError => e
-      $stderr.puts "#{e.directory} is not a tetra package directory, see README"
     rescue GitAlreadyInitedError
       $stderr.puts "This directory is already a tetra project"
     rescue ExecutableNotFoundError => e

data/lib/tetra/commands/finish.rb

@@ -3,7 +3,7 @@
 module Tetra
   # tetra finish
   class FinishCommand < Tetra::BaseCommand
-    option %w(-a --abort), :flag, "build abort, restore files as before dry-run"
+    option %w(-a --abort), :flag, "abort build, restore files as before dry-run"
 
     def execute
       checking_exceptions do

data/lib/tetra/commands/generate_all.rb

@@ -4,7 +4,6 @@ module Tetra
   # tetra generate-all
   class GenerateAllCommand < Tetra::BaseCommand
     option %w(-f --filter), "FILTER", "filter files to be installed by this package spec", default: "*.jar"
-    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", default: "."
     parameter "[POM]", "a package pom file path", default: "pom.xml"
 
     def execute
@@ -16,16 +15,13 @@ module Tetra
           GenerateKitSpecCommand.new(@invocation_path).execute
 
           script_command = GeneratePackageScriptCommand.new(@invocation_path)
-          script_command.directory = directory
           script_command.execute
 
           archive_command = GeneratePackageArchiveCommand.new(@invocation_path)
-          archive_command.directory = directory
           archive_command.execute
 
           archive_command = GeneratePackageSpecCommand.new(@invocation_path)
           archive_command.filter = filter
-          archive_command.directory = directory
           archive_command.pom = pom
           archive_command.execute
         end

data/lib/tetra/commands/generate_package_archive.rb

@@ -3,14 +3,11 @@
 module Tetra
   # tetra generate-package-archive
   class GeneratePackageArchiveCommand < Tetra::BaseCommand
-    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", default: "."
-
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          package_name = project.get_package_name(directory)
-          result_path = Tetra::Package.new(project, package_name).to_archive
+          result_path = Tetra::Package.new(project).to_archive
           print_generation_result(project, result_path)
         end
       end

data/lib/tetra/commands/generate_package_script.rb

@@ -3,16 +3,13 @@
 module Tetra
   # tetra generate-package-script
   class GeneratePackageScriptCommand < Tetra::BaseCommand
-    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", default: "."
-
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          package_name = project.get_package_name(directory)
           history_file = File.join(Dir.home, ".bash_history")
           result_path, conflict_count = Tetra::ScriptGenerator.new(project, history_file)
-            .generate_build_script(package_name)
+            .generate_build_script
           print_generation_result(project, result_path, conflict_count)
         end
       end

data/lib/tetra/commands/generate_package_spec.rb

@@ -4,16 +4,14 @@ module Tetra
   # tetra generate-package-spec
   class GeneratePackageSpecCommand < Tetra::BaseCommand
     option %w(-f --filter), "FILTER", "filter files to be installed by this spec", default: "*.jar"
-    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", default: "."
     parameter "[POM]", "a pom file path", default: "pom.xml"
 
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          package_name = project.get_package_name(directory)
           result_path, conflict_count =
-            Tetra::Package.new(project, package_name, pom, filter).to_spec
+            Tetra::Package.new(project, pom, filter).to_spec
           print_generation_result(project, result_path, conflict_count)
         end
       end

data/lib/tetra/commands/init.rb

@@ -7,7 +7,7 @@ module Tetra
       checking_exceptions do
         Tetra::Project.init(".")
         puts "Project inited."
-        puts "Add sources to src/<package name>, binary dependencies to kit/."
+        puts "Add sources to src/, binary dependencies to kit/."
         puts "When you are ready to test a build, use \"tetra dry-run\"."
       end
     end

data/lib/tetra/main.rb

@@ -35,37 +35,37 @@ module Tetra
 
     subcommand(
       "generate-kit-archive",
-      "Create or refresh the kit tarball",
+      "Create or refresh the kit tarballs",
       Tetra::GenerateKitArchiveCommand
     )
 
     subcommand(
       "generate-kit-spec",
-      "Create or refresh a spec file for the kit",
+      "Create or refresh the kit spec files",
       Tetra::GenerateKitSpecCommand
     )
 
     subcommand(
       "generate-package-script",
-      "Create or refresh a build.sh file for a package",
+      "Create or refresh the package build.sh file",
       Tetra::GeneratePackageScriptCommand
     )
 
     subcommand(
       "generate-package-archive",
-      "Create or refresh a package tarball",
+      "Create or refresh the package tarball",
       Tetra::GeneratePackageArchiveCommand
     )
 
     subcommand(
       "generate-package-spec",
-      "Create or refresh a spec file for a package",
+      "Create or refresh the package spec file",
       Tetra::GeneratePackageSpecCommand
     )
 
     subcommand(
       "generate-all",
-      "Create or refresh specs, archives, scripts for a package and the kit",
+      "Create or refresh all specs, archives, scripts",
       Tetra::GenerateAllCommand
     )
 

data/lib/tetra/package.rb

@@ -1,15 +1,12 @@
 # encoding: UTF-8
 
 module Tetra
-  # represents a Java project package in Tetra, corresponding to a directory
-  # in src/
+  # represents a Java project packaged in Tetra
   class Package
     extend Forwardable
     include SpecGenerator
 
-    attr_reader :name
-
-    def_delegator :@project, :name, :project_name
+    def_delegator :@project, :name, :name
 
     def_delegator :@kit, :items, :kit_items
 
@@ -20,20 +17,24 @@ module Tetra
     def_delegator :@pom, :version
     def_delegator :@pom, :runtime_dependency_ids
 
+    # implement to_spec
+    attr_reader :spec_dir
+
     # implement to_archive
     include Archiver
     attr_reader :source_dir
     attr_reader :source_paths
     attr_reader :destination_dir
 
-    def initialize(project, name, pom_path = nil, filter = nil)
+    def initialize(project, pom_path = nil, filter = nil)
       @project = project
       @kit = Tetra::Kit.new(project)
-      @name = name
       @pom = pom_path.nil? ? nil : Tetra::Pom.new(pom_path)
       @filter = filter
 
-      @source_dir = File.join("src", name)
+      @spec_dir = "src"
+
+      @source_dir = "src"
       @source_paths = ["*"]
       @destination_dir = name
     end
@@ -50,7 +51,7 @@ module Tetra
 
     # files produced by this package
     def outputs
-      @project.get_produced_files(@name).select do |file|
+      @project.produced_files.select do |file|
         File.fnmatch?(@filter, File.basename(file))
       end
     end
@@ -71,10 +72,6 @@ module Tetra
       name
     end
 
-    def spec_dir
-      File.join("src", name)
-    end
-
     def template_spec_name
       "package.spec"
     end

data/lib/tetra/project.rb

@@ -40,22 +40,6 @@ module Tetra
       File.directory?(File.join(dir, ".git"))
     end
 
-    # returns the package name corresponding to the specified dir, if any
-    # raises NoPackageDirectoryError if dir is not a (sub)directory of a package
-    def get_package_name(dir)
-      dir_path = Pathname.new(File.expand_path(dir)).relative_path_from(Pathname.new(@full_path))
-      components = dir_path.to_s.split(File::SEPARATOR)
-      if components.count >= 2 &&
-        components.first == "src" &&
-        Dir.exist?(File.join(@full_path, components[0], components[1]))
-        components[1]
-      else
-        fail NoPackageDirectoryError
-      end
-    rescue ArgumentError, NoProjectDirectoryError
-      raise NoPackageDirectoryError, dir
-    end
-
     # inits a new project directory structure
     def self.init(dir)
       Dir.chdir(dir) do
@@ -188,19 +172,18 @@ module Tetra
       @git.get_message(latest_tag(:dry_run_started))
     end
 
-    # returns a list of files produced during dry-runs in a certain package
-    def get_produced_files(package)
+    # returns a list of files produced during dry-runs
+    def produced_files
       dry_run_count = latest_tag_count(:dry_run_changed)
       log.debug "Getting produced files from #{dry_run_count} dry runs"
       if dry_run_count >= 1
-        package_dir = File.join("src", package)
         (1..dry_run_count).map do |i|
-          @git.changed_files_between("dry_run_started_#{i}", "dry_run_changed_#{i}", package_dir)
+          @git.changed_files_between("dry_run_started_#{i}", "dry_run_changed_#{i}", "src")
         end
           .flatten
           .uniq
           .sort
-          .map { |file| Pathname.new(file).relative_path_from(Pathname.new(package_dir)).to_s }
+          .map { |file| Pathname.new(file).relative_path_from(Pathname.new("src")).to_s }
       else
         []
       end

data/lib/tetra/script_generator.rb

@@ -12,7 +12,7 @@ module Tetra
       @history_path = history_path
     end
 
-    def generate_build_script(name)
+    def generate_build_script
       @project.from_directory do
         history_lines = File.readlines(@history_path).map { |e| e.strip }
         relevant_lines =
@@ -40,14 +40,11 @@ module Tetra
 
         new_content = script_lines.join("\n") + "\n"
 
-        script_name = "build.sh"
-        result_path = File.join("src", name, script_name)
+        result_path = File.join("src", "build.sh")
         conflict_count = @project.merge_new_content(new_content, result_path, "Build script generated",
-                                                    "generate_#{name}_build_script")
+                                                    "generate_build_script")
 
-        destination_dir = File.join("output", name)
-        FileUtils.mkdir_p(destination_dir)
-        destination_script_path =  File.join(destination_dir, script_name)
+        destination_script_path =  File.join("output", @project.name, "build.sh")
         FileUtils.symlink(File.expand_path(result_path), destination_script_path, force: true)
 
         [result_path, conflict_count]

data/lib/tetra/version.rb

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

data/spec/lib/package_spec.rb

@@ -3,13 +3,10 @@
 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)
+  include Tetra::Mockers
 
+  before(:each) do
+    create_mock_project
     @project.dry_run
     Dir.chdir(@project_path) do
       FileUtils.touch(File.join("kit", "jars", "test.jar"))
@@ -17,18 +14,18 @@ describe Tetra::Package do
     @project.finish(false)
 
     @project.from_directory do
-      FileUtils.mkdir_p File.join("src", "test", "out")
+      FileUtils.mkdir_p(File.join("src", "out"))
       (1..5).each do |i|
-        `touch src/test/test#{i}.java`
+        FileUtils.touch(File.join("src", "test#{i}.java"))
       end
       @project.dry_run
 
       (1..5).each do |i|
-        `touch src/test/test#{i}.class`
+        FileUtils.touch(File.join("src", "test#{i}.class"))
       end
 
       (1..5).each do |i|
-        `touch src/test/out/test#{i}.jar`
+        FileUtils.touch(File.join("src", "out", "test#{i}.jar"))
       end
 
       @project.finish(false)
@@ -36,11 +33,11 @@ describe Tetra::Package do
 
     FileUtils.copy(File.join("spec", "data", "nailgun", "pom.xml"), @project_path)
 
-    @package = Tetra::Package.new(@project, "test", File.join(@project_path, "pom.xml"), "*.jar")
+    @package = Tetra::Package.new(@project, File.join(@project_path, "pom.xml"), "*.jar")
   end
 
   after(:each) do
-    FileUtils.rm_rf(@project_path)
+    delete_mock_project
   end
 
   describe "#to_spec" do
@@ -48,8 +45,8 @@ describe Tetra::Package 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")
+        spec_lines = File.readlines(File.join("output", "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")
         expect(spec_lines).to include("Url:            http://martiansoftware.com/nailgun\n")
@@ -65,13 +62,13 @@ da39a3ee5e6b4b0d3255bfef95601890afd80709\n")
   describe "#to_archive" do
     it "generates an archive" do
       @project.from_directory("src") do
-        FileUtils.touch(File.join("test", "src_test"))
+        FileUtils.touch("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")
+        expect(`tar -Jtf output/test-project/test-project.tar.xz`.split).to include("src_test")
       end
     end
   end

data/spec/lib/project_spec.rb

@@ -35,54 +35,6 @@ describe Tetra::Project do
     end
   end
 
-  describe ".get_package_name"  do
-    it "raises an error with a directory outside a tetra project" do
-      expect do
-        @project.get_package_name("/")
-      end.to raise_error(Tetra::NoPackageDirectoryError)
-    end
-
-    it "raises an error with a tetra project directory" do
-      expect do
-        @project.get_package_name(@project_path)
-      end.to raise_error(Tetra::NoPackageDirectoryError)
-    end
-
-    it "raises an error with a tetra kit directory" do
-      expect do
-        @project.get_package_name(File.join(@project_path, "kit"))
-      end.to raise_error(Tetra::NoPackageDirectoryError)
-    end
-
-    it "raises an error with a tetra src directory" do
-      expect do
-        @project.get_package_name(File.join(@project_path, "src"))
-      end.to raise_error(Tetra::NoPackageDirectoryError)
-    end
-
-    it "raises an error with a nonexisting package directory" do
-      expect do
-        @project.get_package_name(File.join(@project_path, "src", "test_package"))
-      end.to raise_error(Tetra::NoPackageDirectoryError)
-    end
-
-    it "returns the package on an existing package directory" do
-      FileUtils.mkdir_p(File.join(@project_path, "src", "test_package"))
-      expect(@project.get_package_name(File.join(@project_path, "src", "test_package"))).to eq "test_package"
-    end
-
-    it "returns the package on an existing package subdirectory" do
-      FileUtils.mkdir_p(File.join(@project_path, "src", "test_package", "subdir1"))
-      expect(@project.get_package_name(File.join(@project_path, "src", "test_package", "subdir1"))).to eq "test_package"
-    end
-
-    it "returns the package on an existing package subsubdirectory" do
-      FileUtils.mkdir_p(File.join(@project_path, "src", "test_package", "subdir1", "subdir2"))
-      expect(@project.get_package_name(File.join(@project_path, "src", "test_package", "subdir1", "subdir2")))
-        .to eq "test_package"
-    end
-  end
-
   describe "full_path" do
     it "returns the project's full path" do
       expect(@project.full_path).to eq File.expand_path(@project_path)
@@ -114,7 +66,7 @@ describe Tetra::Project do
   describe "#take_snapshot" do
     it "commits the project contents to git for later use" do
       @project.from_directory do
-        `touch kit/test`
+        FileUtils.touch(File.join("kit", "test"))
 
         @project.take_snapshot("test", :revertable)
 
@@ -127,8 +79,7 @@ describe Tetra::Project do
   describe "#finish" do
     it "ends the current dry-run phase after a successful build" do
       @project.from_directory do
-        Dir.mkdir("src/abc")
-        `echo A > src/abc/test`
+        File.open(File.join("src", "test"), "w") { |f| f.write("A") }
       end
 
       expect(@project.finish(true)).to be_falsey
@@ -137,8 +88,8 @@ describe Tetra::Project do
       expect(@project.dry_run).to be_truthy
 
       @project.from_directory do
-        `echo B > src/abc/test`
-        `touch src/abc/test2`
+        File.open(File.join("src", "test"), "w") { |f| f.write("B") }
+        FileUtils.touch(File.join("src", "test2"))
       end
 
       expect(@project.finish(false)).to be_truthy
@@ -146,17 +97,16 @@ describe Tetra::Project do
 
       @project.from_directory do
         expect(`git rev-list --all`.split("\n").length).to eq 4
-        expect(File.read("src/abc/test")).to eq "A\n"
+        expect(File.read("src/test")).to eq "A"
 
-        expect(`git diff-tree --no-commit-id --name-only -r HEAD~`.split("\n")).to include("src/abc/test2")
-        expect(File.exist?("src/abc/test2")).to be_falsey
+        expect(`git diff-tree --no-commit-id --name-only -r HEAD~`.split("\n")).to include("src/test2")
+        expect(File.exist?("src/test2")).to be_falsey
       end
     end
     it "ends the current dry-run phase after a failed build" do
       @project.from_directory do
-        Dir.mkdir("src/abc")
-        `echo A > src/abc/test`
-        `echo A > kit/test`
+        File.open(File.join("src", "test"), "w") { |f| f.write("A") }
+        File.open(File.join("kit", "test"), "w") { |f| f.write("A") }
       end
 
       expect(@project.finish(true)).to be_falsey
@@ -165,10 +115,10 @@ describe Tetra::Project do
       expect(@project.dry_run).to be_truthy
 
       @project.from_directory do
-        `echo B > src/abc/test`
-        `touch src/abc/test2`
-        `echo B > kit/test`
-        `touch kit/test2`
+        File.open(File.join("src", "test"), "w") { |f| f.write("B") }
+        FileUtils.touch(File.join("src", "test2"))
+        File.open(File.join("kit", "test"), "w") { |f| f.write("B") }
+        FileUtils.touch(File.join("kit", "test2"))
       end
 
       expect(@project.finish(true)).to be_truthy
@@ -176,10 +126,10 @@ describe Tetra::Project do
 
       @project.from_directory do
         expect(`git rev-list --all`.split("\n").length).to eq 2
-        expect(File.read("src/abc/test")).to eq "A\n"
-        expect(File.exist?("src/abc/test2")).to be_falsey
+        expect(File.read("src/test")).to eq "A"
+        expect(File.exist?("src/test2")).to be_falsey
 
-        expect(File.read("kit/test")).to eq "A\n"
+        expect(File.read("kit/test")).to eq "A"
         expect(File.exist?("kit/test2")).to be_falsey
       end
     end
@@ -190,7 +140,7 @@ describe Tetra::Project do
       expect(@project.finish(false)).to be_falsey
 
       @project.from_directory do
-        `touch src/test`
+        FileUtils.touch(File.join("src", "test"))
       end
 
       @project.from_directory("src") do
@@ -206,27 +156,26 @@ describe Tetra::Project do
     end
   end
 
-  describe "#get_produced_files" do
+  describe "#produced_files" do
     it "gets a list of produced files" do
       @project.from_directory do
-        Dir.mkdir("src/abc")
-        `echo A > src/abc/added_outside_dry_run`
+        File.open(File.join("src", "added_outside_dry_run"), "w") { |f| f.write("A") }
       end
 
       expect(@project.dry_run).to be_truthy
       @project.from_directory do
-        `echo A > src/abc/added_in_first_dry_run`
-        `echo A > src/added_outside_directory`
+        File.open(File.join("src", "added_in_first_dry_run"), "w") { |f| f.write("A") }
+        File.open("added_outside_directory", "w") { |f| f.write("A") }
       end
       expect(@project.finish(false)).to be_truthy
 
       expect(@project.dry_run).to be_truthy
       @project.from_directory do
-        `echo A > src/abc/added_in_second_dry_run`
+        File.open(File.join("src", "added_in_second_dry_run"), "w") { |f| f.write("A") }
       end
       expect(@project.finish(false)).to be_truthy
 
-      list = @project.get_produced_files("abc")
+      list = @project.produced_files
       expect(list).to include("added_in_first_dry_run")
       expect(list).to include("added_in_second_dry_run")
 
@@ -238,7 +187,7 @@ describe Tetra::Project do
   describe "#purge_jars" do
     it "moves jars in kit/jars" do
       @project.from_directory do
-        `echo "jarring" > src/test.jar`
+        File.open(File.join("src", "test.jar"), "w") { |f| f.write("jarring") }
       end
       expect(@project.finish(false)).to be_falsey
 
@@ -247,7 +196,7 @@ describe Tetra::Project do
       @project.from_directory do
         expect(File.symlink?(File.join("src", "test.jar"))).to be_truthy
         expect(File.readlink(File.join("src", "test.jar"))).to eq "../kit/jars/test.jar"
-        expect(File.readlines(File.join("kit", "jars", "test.jar"))).to include("jarring\n")
+        expect(File.readlines(File.join("kit", "jars", "test.jar"))).to include("jarring")
       end
     end
   end

data/spec/lib/script_generator_spec.rb

@@ -36,9 +36,9 @@ describe Tetra::ScriptGenerator do
   describe "#generate_build_script" do
     it "generates a build script from the history" do
       @project.from_directory do
-        @generator.generate_build_script("test-package")
+        @generator.generate_build_script
 
-        lines = File.readlines(File.join("src", "test-package", "build.sh"))
+        lines = File.readlines(File.join("src", "build.sh"))
 
         expect(lines).to include("#!/bin/bash\n")
         expect(lines).to include("cd somewhere significant\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.42.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -158,8 +158,10 @@ files:
 - Rakefile
 - SPECIAL_CASES.md
 - bin/tetra
+- integration-tests/apache-maven-3.1.1-bin.zip
 - integration-tests/build-commons.sh
 - integration-tests/build-obs.sh
+- integration-tests/commons-collections-3.2.1-src.zip
 - lib/template/gitignore
 - lib/template/kit/CONTENTS
 - lib/template/kit/jars/CONTENTS