tetra 0.46.0 → 0.48.0

data/lib/tetra/maven_website.rb

@@ -53,7 +53,7 @@ module Tetra
     def download_pom(group_id, artifact_id, version)
       path = "#{group_id.gsub('.', '/')}/#{artifact_id}/#{version}/#{artifact_id}-#{version}.pom"
       log.debug("downloading #{path}...")
-      (RestClient.get "http://search.maven.org/remotecontent", params: { filepath: path }).to_s
+      (RestClient.get("http://search.maven.org/remotecontent", params: { filepath: path })).to_s
     end
   end
 end

data/lib/tetra/packages/archivable.rb

@@ -9,17 +9,9 @@ module Tetra
     # this will archive files in source_dir in
     # destination_dir/name/name.tar.xz
     def _to_archive(project, name, source_dir, destination_dir)
-      full_destination_dir = File.join(project.full_path, destination_dir, name)
-      log.debug "creating #{full_destination_dir}"
-      FileUtils.mkdir_p(full_destination_dir)
-
-      project.from_directory(source_dir) do
-        destination_path = File.join(full_destination_dir, "#{name}.tar.xz")
-        log.debug "tarring to #{destination_path}"
-
-        `tar -cJf #{destination_path} *`
-
-        destination_path
+      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

data/lib/tetra/packages/{kit.rb → kit_package.rb}

@@ -2,7 +2,7 @@
 
 module Tetra
   # a packaged set of binary build-time dependencies
-  class Kit
+  class KitPackage
     extend Forwardable
     include Archivable
     include Speccable

data/lib/tetra/packages/{built_package.rb → package.rb}

@@ -2,7 +2,7 @@
 
 module Tetra
   # represents a Java project packaged in tetra
-  class BuiltPackage
+  class Package
     extend Forwardable
     include Archivable
     include Speccable
@@ -20,7 +20,7 @@ module Tetra
 
     def initialize(project, pom_path = nil, filter = nil)
       @project = project
-      @kit = Tetra::Kit.new(project)
+      @kit = Tetra::KitPackage.new(project)
       @pom = pom_path.nil? ? nil : Tetra::Pom.new(pom_path)
       @filter = filter
     end

data/lib/tetra/packages/scriptable.rb

@@ -3,18 +3,16 @@
 module Tetra
   # generates a package build script from bash_history
   module Scriptable
+    # returns a build script for this package
     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(&:strip)
         relevant_lines =
           history_lines
           .reverse
-          .take_while { |e| e.match(/tetra +dry-run/).nil? }
+          .take_while { |e| e.match(/tetra +dry-run +start/).nil? }
           .reverse
-          .take_while { |e| e.match(/tetra +finish/).nil? }
+          .take_while { |e| e.match(/tetra +dry-run +finish/).nil? }
           .select { |e| e.match(/^#/).nil? }
 
         script_lines = [
@@ -22,16 +20,7 @@ module Tetra
           "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
+        ] + script_body(project, relevant_lines)
 
         new_content = script_lines.join("\n") + "\n"
 
@@ -44,5 +33,28 @@ module Tetra
         [result_path, conflict_count]
       end
     end
+
+    # returns the script body
+    def script_body(project, relevant_lines)
+      ant = if relevant_lines.any? { |e| e.match(/tetra +ant/) }
+              path = Tetra::Kit.new(project).find_executable("ant")
+              Tetra::Ant.new(project.full_path, path).ant(@options)
+            end
+
+      mvn = if relevant_lines.any? { |e| e.match(/tetra +mvn/) }
+              mvn_path = Tetra::Kit.new(project).find_executable("mvn")
+              mvn = Tetra::Mvn.new("$PROJECT_PREFIX", mvn_path)
+            end
+
+      relevant_lines.map do |line|
+        if line =~ /tetra +mvn/
+          line.gsub(/tetra +mvn/, "#{mvn.get_mvn_commandline(['-o'])}")
+        elsif line =~ /tetra +ant/
+          line.gsub(/tetra +ant/, "#{ant.get_ant_commandline([])}")
+        else
+          line
+        end
+      end
+    end
   end
 end

data/lib/tetra/project.rb

@@ -5,8 +5,7 @@ module Tetra
   class Project
     include Logging
 
-    attr_accessor :full_path
-    attr_accessor :git
+    attr_reader :full_path
 
     def initialize(path)
       @full_path = Tetra::Project.find_project_dir(File.expand_path(path))
@@ -89,21 +88,26 @@ module Tetra
       latest_tag_count(:dry_run_started) > latest_tag_count(:dry_run_finished)
     end
 
-    # ends a dry-run.
-    # if abort is true, reverts the whole directory
-    # if abort is false, reverts sources and updates output file lists
-    def finish(abort)
+    # ends a dry-run assuming a successful build
+    # reverts sources and updates output file lists
+    def finish
       if dry_running?
-        if abort
-          @git.revert_whole_directory(".", latest_tag(:dry_run_started))
-          @git.delete_tag(latest_tag(:dry_run_started))
-        else
-          take_snapshot("Changes during dry-run", :dry_run_changed)
+        take_snapshot("Changes during dry-run", :dry_run_changed)
 
-          @git.revert_whole_directory("src", latest_tag(:dry_run_started))
+        @git.revert_whole_directory("src", latest_tag(:dry_run_started))
 
-          take_snapshot("Dry run finished", :dry_run_finished)
-        end
+        take_snapshot("Dry run finished", :dry_run_finished)
+        return true
+      end
+      false
+    end
+
+    # ends a dry-run assuming the built went wrong
+    # reverts the whole project directory
+    def abort
+      if dry_running?
+        @git.revert_whole_directory(".", latest_tag(:dry_run_started))
+        @git.delete_tag(latest_tag(:dry_run_started))
         return true
       end
       false

data/lib/tetra/{commands/ant.rb → ui/ant_subcommand.rb}

@@ -2,20 +2,20 @@
 
 module Tetra
   # tetra ant
-  class AntCommand < Tetra::BaseCommand
+  class AntSubcommand < Tetra::Subcommand
     parameter "[ANT OPTIONS] ...", "ant options", attribute_name: "dummy"
 
-    # override parsing in order to pipe everything to mvn
-    # rubocop:disable TrivialAccessors
+    # options will be parsed by ant
     def parse(args)
-      @options = args
+      bypass_parsing(args)
     end
 
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(true, project) do
-          Tetra::AntRunner.new(project).ant(@options)
+          path = Tetra::Kit.new(project).find_executable("ant")
+          Tetra::Ant.new(project.full_path, path).ant(@options)
         end
       end
     end

data/lib/tetra/ui/dry_run_subcommand.rb

@@ -0,0 +1,44 @@
+# encoding: UTF-8
+
+module Tetra
+  # tetra dry-run
+  class DryRunSubcommand < Tetra::Subcommand
+    parameter "COMMAND", "\"start\" to begin, \"finish\" to end or \"abort\" to undo changes" do |command|
+      if %w(start finish abort).include?(command)
+        command
+      else
+        fail ArgumentError, "\"#{command}\" is not valid, must be one of \"start\", \"finish\" or \"abort\""
+      end
+    end
+
+    def execute
+      checking_exceptions do
+        project = Tetra::Project.new(".")
+
+        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
+        end
+      end
+    end
+  end
+end

data/lib/tetra/{commands/generate_all.rb → ui/generate_all_subcommand.rb}

@@ -2,7 +2,7 @@
 
 module Tetra
   # tetra generate-all
-  class GenerateAllCommand < Tetra::BaseCommand
+  class GenerateAllSubcommand < Tetra::Subcommand
     option %w(-f --filter), "FILTER", "filter files to be installed by this package spec", default: "*.jar"
     parameter "[POM]", "a package pom file path", default: "pom.xml"
 
@@ -10,13 +10,13 @@ module Tetra
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          GenerateKitCommand.new(@invocation_path).execute
+          GenerateKitSubcommand.new(@invocation_path).execute
 
-          GenerateScriptCommand.new(@invocation_path).execute
+          GenerateScriptSubcommand.new(@invocation_path).execute
 
-          GenerateArchiveCommand.new(@invocation_path).execute
+          GenerateArchiveSubcommand.new(@invocation_path).execute
 
-          command = GenerateSpecCommand.new(@invocation_path)
+          command = GenerateSpecSubcommand.new(@invocation_path)
           command.filter = filter
           command.pom = pom
           command.execute

data/lib/tetra/{commands/generate_archive.rb → ui/generate_archive_subcommand.rb}

@@ -2,12 +2,12 @@
 
 module Tetra
   # tetra generate-archive
-  class GenerateArchiveCommand < Tetra::BaseCommand
+  class GenerateArchiveSubcommand < Tetra::Subcommand
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          result_path = Tetra::BuiltPackage.new(project).to_archive
+          result_path = Tetra::Package.new(project).to_archive
           print_generation_result(project, result_path)
         end
       end

data/lib/tetra/{commands/generate_kit.rb → ui/generate_kit_subcommand.rb}

@@ -2,12 +2,12 @@
 
 module Tetra
   # tetra generate-kit
-  class GenerateKitCommand < Tetra::BaseCommand
+  class GenerateKitSubcommand < Tetra::Subcommand
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          kit = Tetra::Kit.new(project)
+          kit = Tetra::KitPackage.new(project)
           result_path, conflict_count = kit.to_spec
           print_generation_result(project, result_path, conflict_count)
 

data/lib/tetra/{commands/generate_script.rb → ui/generate_script_subcommand.rb}

@@ -2,14 +2,14 @@
 
 module Tetra
   # tetra generate-script
-  class GenerateScriptCommand < Tetra::BaseCommand
+  class GenerateScriptSubcommand < Tetra::Subcommand
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
           history = File.join(Dir.home, ".bash_history")
           result_path, conflict_count =
-            Tetra::BuiltPackage.new(project).to_script(history)
+            Tetra::Package.new(project).to_script(history)
           print_generation_result(project, result_path, conflict_count)
         end
       end

data/lib/tetra/{commands/generate_spec.rb → ui/generate_spec_subcommand.rb}

@@ -2,7 +2,7 @@
 
 module Tetra
   # tetra generate-spec
-  class GenerateSpecCommand < Tetra::BaseCommand
+  class GenerateSpecSubcommand < Tetra::Subcommand
     option %w(-f --filter), "FILTER", "filter files to be installed by this spec", default: "*.jar"
     parameter "[POM]", "a pom file path", default: "pom.xml"
 
@@ -11,7 +11,7 @@ module Tetra
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
           result_path, conflict_count =
-            Tetra::BuiltPackage.new(project, 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/get_pom.rb → ui/get_pom_subcommand.rb}

@@ -2,7 +2,7 @@
 
 module Tetra
   # tetra get-pom
-  class GetPomCommand < Tetra::BaseCommand
+  class GetPomSubcommand < Tetra::Subcommand
     parameter "NAME", "a jar file name or a `name-version` string (heuristic)"
 
     def execute

data/lib/tetra/{commands/init.rb → ui/init_subcommand.rb}

@@ -2,7 +2,7 @@
 
 module Tetra
   # tetra init
-  class InitCommand < Tetra::BaseCommand
+  class InitSubcommand < Tetra::Subcommand
     def execute
       checking_exceptions do
         Tetra::Project.init(".")

data/lib/tetra/{commands/move_jars_to_kit.rb → ui/move_jars_to_kit_subcommand.rb}

@@ -2,7 +2,7 @@
 
 module Tetra
   # tetra move-jars-to-kit
-  class MoveJarsToKitCommand < Tetra::BaseCommand
+  class MoveJarsToKitSubcommand < Tetra::Subcommand
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")

data/lib/tetra/{commands/mvn.rb → ui/mvn_subcommand.rb}

@@ -2,20 +2,20 @@
 
 module Tetra
   # tetra mvn
-  class MavenCommand < Tetra::BaseCommand
+  class MvnSubcommand < Tetra::Subcommand
     parameter "[MAVEN OPTIONS] ...", "mvn options", attribute_name: "dummy"
 
-    # override parsing in order to pipe everything to mvn
-    # rubocop:disable TrivialAccessors
+    # options will be parsed by mvn
     def parse(args)
-      @options = args
+      bypass_parsing(args)
     end
 
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(true, project) do
-          Tetra::MavenRunner.new(project).mvn(@options)
+          path = Tetra::Kit.new(project).find_executable("mvn")
+          Tetra::Mvn.new(project.full_path, path).mvn(@options)
         end
       end
     end

data/lib/tetra/{commands/base.rb → ui/subcommand.rb}

@@ -2,13 +2,13 @@
 
 module Tetra
   # implements common options and utility methods
-  class BaseCommand < Clamp::Command
+  class Subcommand < Clamp::Command
     include Logging
 
     # Options available to all tetra commands
-    option %w(-v --verbose), :flag, "verbose output"
-    option ["--very-verbose"], :flag, "very verbose output"
-    option ["--very-very-verbose"], :flag, "very very verbose output"
+    option "--verbose", :flag, "verbose output"
+    option "--very-verbose", :flag, "very verbose output"
+    option "--very-very-verbose", :flag, "very very verbose output"
 
     # verbosity handlers
     def very_very_verbose=(flag)
@@ -36,15 +36,24 @@ module Tetra
       end
     end
 
+    # override default option parsing to pass options to other commands
+    def bypass_parsing(args)
+      log.level = ::Logger::WARN if args.delete "--verbose"
+      log.level = ::Logger::INFO if args.delete "--very-verbose"
+      log.level = ::Logger::DEBUG if args.delete "--very-very-verbose"
+
+      @options = args
+    end
+
     # prints an error message and exits unless there is a dry-run in progress
     def ensure_dry_running(state, project)
       if project.dry_running? == state
         yield
       else
         if state == true
-          puts "Please start a dry-run first, use \"tetra dry-run\""
+          puts "Please start a dry-run first, use \"tetra dry-run start\""
         else
-          puts "Please finish or abort this dry-run first, use \"tetra finish\" or \"tetra finish --abort\""
+          puts "Please finish or abort this dry-run first, use \"tetra dry-run finish\" or \"tetra dry-run abort\""
         end
       end
     end
@@ -82,6 +91,10 @@ module Tetra
       $stderr.puts "This directory is already a tetra project"
     rescue ExecutableNotFoundError => e
       $stderr.puts "Executable #{e.executable} not found in kit/ or any of its subdirectories"
+    rescue ExecutionFailed => e
+      $stderr.puts "Failed to run `#{e.commandline}` (exit status #{e.status})"
+    rescue Interrupt
+      $stderr.puts "Execution interrupted by the user"
     end
   end
 end