tetra 0.49.0 → 0.50.0

data/spec/lib/project_spec.rb

@@ -83,7 +83,20 @@ describe Tetra::Project do
     end
   end
 
-  describe "#commit_whole_project" do
+  describe "#src_patched?"  do
+    it "checks whether src is dirty" do
+      @project.from_directory do
+        @project.dry_run
+        @project.finish
+        expect(@project.src_patched?).to be_falsey
+
+        FileUtils.touch(File.join("src", "test"))
+        expect(@project.src_patched?).to be_truthy
+      end
+    end
+  end
+
+  describe "#commit_whole_directory" do
     it "commits the project contents to git for later use" do
       @project.from_directory do
         FileUtils.touch(File.join("kit", "test"))
@@ -93,7 +106,7 @@ describe Tetra::Project do
           file.write "file"
         end
 
-        @project.commit_whole_project("test")
+        @project.commit_whole_directory(".", "test")
 
         files = `git ls-tree --name-only -r HEAD`.split("\n")
         expect(files).to include("src/.gitignore_disabled_by_tetra")
@@ -109,9 +122,6 @@ describe Tetra::Project do
         File.open(File.join("src", "test"), "w") { |f| f.write("A") }
       end
 
-      expect(@project.abort).to be_falsey
-      expect(@project.finish).to be_falsey
-
       expect(@project.dry_run).to be_truthy
 
       @project.from_directory do
@@ -123,11 +133,13 @@ describe Tetra::Project do
       expect(@project.dry_running?).to be_falsey
 
       @project.from_directory do
-        expect(`git rev-list --all`.split("\n").length).to eq 4
+        expect(`git rev-list --all`.split("\n").length).to eq 3
         expect(File.read("src/test")).to eq "A"
 
-        expect(`git diff-tree --no-commit-id --name-only -r HEAD~`.split("\n")).to include("src/test2")
+        expect(`git diff-tree --no-commit-id --name-only -r HEAD~`.split("\n")).to include("src/test")
         expect(File.exist?("src/test2")).to be_falsey
+
+        expect(`git show HEAD`.split("\n").map(&:strip)).to include("tetra: file-changed: src/test")
       end
     end
     it "ends the current dry-run phase after a failed build" do
@@ -136,9 +148,6 @@ describe Tetra::Project do
         File.open(File.join("kit", "test"), "w") { |f| f.write("A") }
       end
 
-      expect(@project.abort).to be_falsey
-      expect(@project.finish).to be_falsey
-
       expect(@project.dry_run).to be_truthy
 
       @project.from_directory do
@@ -164,8 +173,6 @@ describe Tetra::Project do
 
   describe "#dry_run" do
     it "starts a dry running phase" do
-      expect(@project.finish).to be_falsey
-
       @project.from_directory do
         FileUtils.touch(File.join("src", "test"))
       end
@@ -210,12 +217,48 @@ describe Tetra::Project do
     end
   end
 
+  describe "#archive_source" do
+    it "archives the latest source version" do
+      @project.from_directory do
+        FileUtils.touch(File.join("src", "Included.java"))
+        @project.commit_sources("first version", true)
+
+        FileUtils.touch(File.join("src", "Excluded.java"))
+        @project.commit_sources("patched version")
+
+        @project.archive_sources
+
+        file_list = `tar --list -f packages/test-project/test-project.tar.xz`.split
+        expect(file_list).to include("src/Included.java")
+        expect(file_list).not_to include("src/Excluded.java")
+      end
+    end
+  end
+
+  describe "#write_source_patches" do
+    it "writes patches from the tarball generated by archive_source" do
+      @project.from_directory do
+        test_file = File.join("src", "Test.java")
+        FileUtils.touch(test_file)
+        @project.commit_sources("first version", true)
+
+        File.open(test_file, "w") { |f| f.write("A") }
+        @project.commit_sources("patched version")
+
+        patches = @project.write_source_patches.map { |f| File.basename(f) }
+        expect(patches).to include("0001-patched-version.patch")
+
+        patch_contents = File.readlines(File.join("packages", "test-project", "0001-patched-version.patch"))
+        expect(patch_contents).to include("--- a/#{test_file}\n")
+      end
+    end
+  end
+
   describe "#purge_jars" do
     it "moves jars in kit/jars" do
       @project.from_directory do
         File.open(File.join("src", "test.jar"), "w") { |f| f.write("jarring") }
       end
-      expect(@project.finish).to be_falsey
 
       @project.purge_jars
 

data/spec/lib/{speccable.rb → speccable_spec.rb}

@@ -34,7 +34,7 @@ describe Tetra::Speccable do
 
   describe "#to_spec" do
     it "generates a first version" do
-      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "test.spec", "output")).to be_truthy
 
       @project.from_directory do
         spec_lines = File.readlines(@destination_path)
@@ -43,7 +43,7 @@ describe Tetra::Speccable do
     end
 
     it "generates a second version" do
-      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "test.spec", "output")).to be_truthy
 
       @project.from_directory do
         File.open(@destination_path, "a") do |io|
@@ -53,7 +53,7 @@ describe Tetra::Speccable do
 
       instance.world_property = "Mario!"
 
-      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "test.spec", "output")).to be_truthy
 
       @project.from_directory do
         spec_lines = File.readlines(@destination_path)
@@ -64,7 +64,7 @@ describe Tetra::Speccable do
     end
 
     it "generates a conflicting version" do
-      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "test.spec", "output")).to be_truthy
 
       @project.from_directory do
         spec_contents = File.read(@destination_path)
@@ -77,7 +77,7 @@ describe Tetra::Speccable do
 
       instance.world_property = "Mario!"
 
-      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "test.spec", "output")).to be_truthy
 
       @project.from_directory do
         spec_lines = File.readlines(@destination_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.50.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -174,9 +174,7 @@ 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/bundled/apache-ant-1.9.4/INSTALL
 - lib/template/bundled/apache-ant-1.9.4/KEYS
@@ -357,12 +355,10 @@ files:
 - lib/tetra/facades/git.rb
 - lib/tetra/facades/mvn.rb
 - lib/tetra/facades/process_runner.rb
-- lib/tetra/facades/tar.rb
 - lib/tetra/kit.rb
 - lib/tetra/logger.rb
 - lib/tetra/main.rb
 - lib/tetra/maven_website.rb
-- lib/tetra/packages/archivable.rb
 - lib/tetra/packages/kit_package.rb
 - lib/tetra/packages/package.rb
 - lib/tetra/packages/scriptable.rb
@@ -381,6 +377,7 @@ files:
 - lib/tetra/ui/init_subcommand.rb
 - lib/tetra/ui/move_jars_to_kit_subcommand.rb
 - lib/tetra/ui/mvn_subcommand.rb
+- lib/tetra/ui/patch_subcommand.rb
 - lib/tetra/ui/subcommand.rb
 - lib/tetra/version.rb
 - lib/tetra/version_matcher.rb
@@ -401,18 +398,17 @@ files:
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
 - spec/lib/ant_spec.rb
-- spec/lib/archivable_spec.rb
-- spec/lib/built_package_spec.rb
 - spec/lib/git_spec.rb
 - spec/lib/kit_package_spec.rb
 - spec/lib/kit_spec.rb
 - spec/lib/maven_website_spec.rb
 - spec/lib/mvn_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/scriptable_spec.rb
-- spec/lib/speccable.rb
+- spec/lib/speccable_spec.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb
 - tetra.gemspec

data/integration-tests/build-obs.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# A crude integration test that tries OBS building
-# assumes an OpenSUSE host is set up with passwordless SSH access
-# assumes this host has osc installed and properly configured in sudoers
-# assumes that a project directory exists
-
-set -e
-
-OBS_HOST=obs-client
-OBS_PROJECT_DIR=/home/silvio/obs/home\:SilvioMoioli\:tetra-test
-
-scp -r commons-collections/packages/* $OBS_HOST:/$OBS_PROJECT_DIR
-ssh -t $OBS_HOST <<EOF
-  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/tetra/facades/tar.rb

@@ -1,20 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # facade to tar
-  class Tar
-    include Logging
-    include ProcessRunner
-
-    def archive(name, source_dir, destination_dir)
-      log.debug("creating #{destination_dir}")
-      FileUtils.mkdir_p(destination_dir)
-
-      destination_path = File.join(destination_dir, "#{name}.tar.xz")
-
-      run("tar -cJf #{destination_path} -C #{source_dir} .")
-
-      destination_path
-    end
-  end
-end

data/lib/tetra/packages/archivable.rb

@@ -1,18 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # adds methods to generate a tarball from a package object
-  module Archivable
-    include Logging
-
-    # generates an archive and returns its name
-    # this will archive files in source_dir in
-    # destination_dir/name/name.tar.xz
-    def _to_archive(project, name, source_dir, destination_dir)
-      project.from_directory do
-        full_destination_dir = File.join(destination_dir, name)
-        Tetra::Tar.new.archive(name, source_dir, full_destination_dir)
-      end
-    end
-  end
-end

data/spec/lib/archivable_spec.rb

@@ -1,36 +0,0 @@
-# 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