tetra 0.49.0 → 0.50.0

data/lib/tetra/ui/ant_subcommand.rb

@@ -13,7 +13,7 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
-        ensure_dry_running(true, project) do
+        ensure_dry_running(:is_in_progress, project) do
           path = Tetra::Kit.new(project).find_executable("ant")
           Tetra::Ant.new(project.full_path, path).ant(@options)
         end

data/lib/tetra/ui/dry_run_subcommand.rb

@@ -14,30 +14,44 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
+        send(command, project)
+      end
+    end
 
-        if command == "start"
-          if project.dry_run
-            puts "Now dry-running, please start your build."
-            puts "To run a Maven installation from the kit, use \"tetra mvn\"."
-            puts "If the build succeedes end this dry run with \"tetra dry-run finish\"."
-            puts "If the build does not succeed use \"tetra dry-run abort\" to undo any change."
-          else
-            puts "Dry-run already in progress."
-            puts "Use \"tetra dry-run finish\" to end it or \"tetra dry-run abort\" to undo changes."
-          end
-        elsif command == "finish"
-          if project.finish
-            puts "Dry-run finished."
-          else
-            puts "No dry-run is in progress."
-          end
-        elsif command == "abort"
-          if project.abort
-            puts "Project reverted as before dry-run."
-          else
-            puts "No dry-run is in progress."
-          end
+    def start(project)
+      if !project.dry_running?
+        if project.src_patched?
+          puts "Some files in src/ were changed since last dry-run."
+          puts "Use \"tetra patch message\" to include changes in a patch before dry-running."
+          puts "Dry run not started."
+        else
+          project.dry_run
+          puts "Now dry-running, please start your build."
+          puts "To run a Maven installation from the kit, use \"tetra mvn\"."
+          puts "If the build succeedes end this dry run with \"tetra dry-run finish\"."
+          puts "If the build does not succeed use \"tetra dry-run abort\" to undo any change."
         end
+      else
+        puts "Dry-run already in progress."
+        puts "Use \"tetra dry-run finish\" to end it or \"tetra dry-run abort\" to undo changes."
+      end
+    end
+
+    def finish(project)
+      if project.dry_running?
+        project.finish
+        puts "Dry-run finished."
+      else
+        puts "No dry-run is in progress."
+      end
+    end
+
+    def abort(project)
+      if project.dry_running?
+        project.abort
+        puts "Project reverted as before dry-run."
+      else
+        puts "No dry-run is in progress."
       end
     end
   end

data/lib/tetra/ui/generate_all_subcommand.rb

@@ -9,7 +9,7 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
-        ensure_dry_running(false, project) do
+        ensure_dry_running(:has_finished, project) do
           GenerateKitSubcommand.new(@invocation_path).execute
 
           GenerateScriptSubcommand.new(@invocation_path).execute

data/lib/tetra/ui/generate_archive_subcommand.rb

@@ -6,8 +6,8 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
-        ensure_dry_running(false, project) do
-          result_path = Tetra::Package.new(project).to_archive
+        ensure_dry_running(:has_finished, project) do
+          result_path = project.archive_sources
           print_generation_result(project, result_path)
         end
       end

data/lib/tetra/ui/generate_kit_subcommand.rb

@@ -6,12 +6,12 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
-        ensure_dry_running(false, project) do
+        ensure_dry_running(:has_finished, project) do
           kit = Tetra::KitPackage.new(project)
           result_path, conflict_count = kit.to_spec
           print_generation_result(project, result_path, conflict_count)
 
-          result_path = kit.to_archive
+          result_path = project.archive_kit
           print_generation_result(project, result_path)
         end
       end

data/lib/tetra/ui/generate_script_subcommand.rb

@@ -6,7 +6,7 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
-        ensure_dry_running(false, project) do
+        ensure_dry_running(:has_finished, project) do
           history = File.join(Dir.home, ".bash_history")
           result_path, conflict_count =
             Tetra::Package.new(project).to_script(history)

data/lib/tetra/ui/generate_spec_subcommand.rb

@@ -9,10 +9,17 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
-        ensure_dry_running(false, project) do
-          result_path, conflict_count =
-            Tetra::Package.new(project, pom, filter).to_spec
+        ensure_dry_running(:has_finished, project) do
+          patches = project.write_source_patches
+          package = Tetra::Package.new(project, pom, filter, patches)
+
+          patches.each do |patch|
+            print_generation_result(project, patch)
+          end
+
+          result_path, conflict_count = package.to_spec
           print_generation_result(project, result_path, conflict_count)
+          puts "Warning: #{pom} not found, some spec fields will be left blank" unless File.file?(pom)
         end
       end
     end

data/lib/tetra/ui/get_pom_subcommand.rb

@@ -8,24 +8,26 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
-        pom_getter = Tetra::PomGetter.new
+        ensure_dry_running(:is_not_in_progress, project) do
+          pom_getter = Tetra::PomGetter.new
 
-        path, status = pom_getter.get_pom(name)
-        if path
-          text_status = (
-            if status == :found_in_jar
-              "was inside the jar"
-            elsif status == :found_via_sha1
-              "found by sha1 search from search.maven.org"
-            elsif status == :found_via_heuristic
-              "found by heuristic search from search.maven.org"
-            end
-          )
+          path, status = pom_getter.get_pom(name)
+          if path
+            text_status = (
+              if status == :found_in_jar
+                "was inside the jar"
+              elsif status == :found_via_sha1
+                "found by sha1 search from search.maven.org"
+              elsif status == :found_via_heuristic
+                "found by heuristic search from search.maven.org"
+              end
+            )
 
-          puts "#{format_path(path, project)} written, #{text_status}"
-        else
-          puts "#{name}'s pom not found. Try:"
-          puts "http://google.com/#q=#{URI.encode(pom_getter.cleanup_name(name) + ' pom')}"
+            puts "#{format_path(path, project)} written, #{text_status}"
+          else
+            puts "#{name}'s pom not found. Try:"
+            puts "http://google.com/#q=#{URI.encode(pom_getter.cleanup_name(name) + ' pom')}"
+          end
         end
       end
     end

data/lib/tetra/ui/move_jars_to_kit_subcommand.rb

@@ -7,7 +7,7 @@ module Tetra
       checking_exceptions do
         project = Tetra::Project.new(".")
 
-        ensure_dry_running(false, project) do
+        ensure_dry_running(:is_not_in_progress, project) do
           project.purge_jars.each do |original, final|
             puts "Replaced #{original} with symlink pointing to to #{final}"
           end

data/lib/tetra/ui/mvn_subcommand.rb

@@ -13,7 +13,7 @@ module Tetra
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
-        ensure_dry_running(true, project) do
+        ensure_dry_running(:is_in_progress, project) do
           path = Tetra::Kit.new(project).find_executable("mvn")
           Tetra::Mvn.new(project.full_path, path).mvn(@options)
         end

data/lib/tetra/ui/patch_subcommand.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+
+module Tetra
+  # tetra patch
+  class PatchSubcommand < Tetra::Subcommand
+    option %w(-n --new-tarball), :flag, "suppress patch creation, roll all changes so far in the tarball"
+    parameter "[MESSAGE]", "a short patch description", default: "Sources updated"
+
+    def execute
+      checking_exceptions do
+        project = Tetra::Project.new(".")
+        ensure_dry_running(:is_not_in_progress, project) do
+          project.commit_sources(message, new_tarball?)
+        end
+      end
+    end
+  end
+end

data/lib/tetra/ui/subcommand.rb

@@ -45,14 +45,23 @@ module Tetra
       @options = args
     end
 
-    # prints an error message and exits unless there is a dry-run in progress
+    # prints an error message and exits unless a dry-running
+    # condition is met. Conditions can be: :is_in_progress, :is_not_in_progress
+    # or :has_finished
     def ensure_dry_running(state, project)
-      if project.dry_running? == state
+      dry_running = project.dry_running?
+      has_finished = !project.version.nil?
+
+      if (state == :is_in_progress && dry_running) ||
+         (state == :is_not_in_progress && !dry_running) ||
+         (state == :has_finished && !dry_running && has_finished)
         yield
       else
-        if state == true
+        if (state == :is_in_progress) ||
+           (state == :has_finished && !dry_running && !has_finished)
           puts "Please start a dry-run first, use \"tetra dry-run start\""
-        else
+        elsif (state == :is_not_in_progress) ||
+              (state == :has_finished && dry_running)
           puts "Please finish or abort this dry-run first, use \"tetra dry-run finish\" or \"tetra dry-run abort\""
         end
       end
@@ -61,7 +70,7 @@ module Tetra
     # outputs output of a file generation
     def print_generation_result(project, result_path, conflict_count = 0)
       puts "#{format_path(result_path, project)} generated"
-      puts "Warning: #{conflict_count} unresolved conflicts" if conflict_count > 0
+      puts "Warning: #{conflict_count} unresolved conflicts, please review and commit" if conflict_count > 0
     end
 
     # generates a version of path relative to the current directory

data/lib/tetra/version.rb

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

data/spec/lib/git_spec.rb

@@ -41,53 +41,92 @@ describe Tetra::Git do
   describe "#commit_whole_directory" do
     it "commits all contents of a directory to git for later use" do
       Dir.chdir(@git_path) do
-        File.open("file1", "w") do |file|
-          file.write "test"
-        end
+        FileUtils.touch("file1")
+        Dir.mkdir("subdir")
+        FileUtils.touch(File.join("subdir", "file2"))
 
-        @git.commit_whole_directory("test")
+        @git.commit_whole_directory("subdir", "test")
 
         files = `git ls-tree --name-only -r HEAD`.split("\n")
 
-        expect(files).to include("file1")
+        expect(files).not_to include("file1")
+        expect(files).to include("subdir/file2")
       end
     end
   end
 
-  describe "#changed_files_between"  do
-    it "lists files changed between tetra tags" do
+  describe "#changed_files" do
+    it "checks if a directory is clean from changes" do
       Dir.chdir(@git_path) do
-        File.open("file1", "w") do |file|
-          file.write "test"
-        end
+        @git.commit_file(".", "initial commit")
+        Dir.mkdir("directory")
+        FileUtils.touch(File.join("directory", "file"))
+        expect(@git.changed_files("directory", "HEAD")).to include("directory/file")
 
-        @git.commit_whole_directory("test\ntetra: test_start")
+        `git add directory/file`
+        expect(@git.changed_files("directory", "HEAD")).to include("directory/file")
 
-        File.open("file2", "w") do |file|
-          file.write "test"
-        end
-        Dir.mkdir("subdir")
-        File.open(File.join("subdir", "file3"), "w") do |file|
-          file.write "test"
-        end
+        @git.commit_file(File.join("directory", "file"), "test")
+        expect(@git.changed_files("directory", "HEAD")).to be_empty
+
+        expect(@git.changed_files("directory", "HEAD~")).to include("directory/file")
+      end
+    end
+  end
 
-        @git.commit_whole_directory("test\ntetra: test_end")
+  describe "#archive" do
+    it "archives a version of a directory" do
+      Dir.chdir(@git_path) do
+        @git.commit_file(".", "initial commit")
 
-        File.open("file4", "w") do |file|
-          file.write "test"
-        end
+        FileUtils.touch(File.join("outside_not_archived"))
+        Dir.mkdir("directory")
+        FileUtils.touch(File.join("directory", "file"))
+        @git.commit_file("directory", "test")
 
-        @git.commit_whole_directory("test\ntetra: test_after")
+        FileUtils.touch(File.join("directory", "later_not_archived"))
 
-        start_id = @git.latest_id("tetra: test_start")
-        end_id = @git.latest_id("tetra: test_end")
+        @git.commit_file("directory", "later")
 
-        files = @git.changed_files_between(start_id, end_id, "subdir")
+        destination_path = @git.archive("directory", @git.latest_id("test"), "archive.tar.xz")
+        expect(destination_path).to match(/archive.tar.xz$/)
 
-        expect(files).not_to include("file1")
-        expect(files).not_to include("file2")
-        expect(files).to include("subdir/file3")
-        expect(files).not_to include("file4")
+        file_list = `tar --list -f archive.tar.xz`.split
+        expect(file_list).not_to include("outside_not_archived")
+        expect(file_list).to include("directory/file")
+        expect(file_list).not_to include("directory/later_not_archived")
+      end
+    end
+  end
+
+  describe "#format_patch" do
+    it "creates patch files from commits" do
+      Dir.chdir(@git_path) do
+        outside_dir_file = File.join("outside_dir")
+        inside_dir_not_patched_file = File.join("directory", "inside_dir_not_patched")
+        inside_dir_patched_file = File.join("directory", "inside_dir_patched")
+
+        Dir.mkdir("directory")
+        FileUtils.touch(outside_dir_file)
+        FileUtils.touch(inside_dir_not_patched_file)
+        FileUtils.touch(inside_dir_patched_file)
+        @git.commit_file(".", "initial")
+
+        File.open(outside_dir_file, "w") { |f| f.write("A") }
+        File.open(inside_dir_patched_file, "w") { |f| f.write("A") }
+        @git.commit_file(".", "patch")
+
+        Dir.mkdir("patches")
+        patch_names = @git.format_patch("directory", "HEAD~", "patches")
+
+        expect(patch_names).to include("patches/0001-patch.patch")
+
+        patch_contents = File.readlines(File.join("patches", "0001-patch.patch"))
+        expect(patch_contents).to include("--- a/#{inside_dir_patched_file}\n")
+        expect(patch_contents).not_to include("--- a/#{outside_dir_file}\n")
+        expect(patch_contents).not_to include("--- a/#{inside_dir_not_patched_file}\n")
+        expect(patch_contents).to include("@@ -0,0 +1 @@\n")
+        expect(patch_contents).to include("+A\n")
       end
     end
   end

data/spec/lib/kit_package_spec.rb

@@ -28,20 +28,4 @@ describe Tetra::KitPackage do
       end
     end
   end
-
-  describe "#to_archive" do
-    it "generates an archive" do
-      @project.from_directory(File.join("kit", "m2")) do
-        FileUtils.touch("kit.content")
-      end
-
-      expected_filename = File::SEPARATOR + "#{package_name}.tar.xz"
-      expect(instance.to_archive).to end_with(expected_filename)
-
-      @project.from_directory do
-        contents = `tar --list -f packages/#{package_name}/#{package_name}.tar.xz`.split
-        expect(contents).to include("./m2/kit.content")
-      end
-    end
-  end
 end

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

@@ -33,7 +33,8 @@ 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")
+    patches = @project.write_source_patches
+    @package = Tetra::Package.new(@project, File.join(@project_path, "pom.xml"), "*.jar", patches)
   end
 
   after(:each) do
@@ -56,18 +57,4 @@ describe Tetra::Package do
       end
     end
   end
-
-  describe "#to_archive" do
-    it "generates an archive" do
-      @project.from_directory("src") do
-        FileUtils.touch("src_test")
-      end
-      @project.finish
-
-      @package.to_archive
-      @project.from_directory do
-        expect(`tar -Jtf packages/test-project/test-project.tar.xz`.split).to include("./src_test")
-      end
-    end
-  end
 end