tetra 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1e5c1456138783ecb6759fa94e795e71c1b4bba
-  data.tar.gz: c1a71c4a9802d350a7f08036a80d657b78675154
+SHA256:
+  metadata.gz: 49390dd466afdc5488d1bf1443d3fe67a0932b0c76a59b30bc60a2372689f608
+  data.tar.gz: d65544049f50356123f81ecaa383c339a92269c597c098b071b80b3dc96b78e4
 SHA512:
-  metadata.gz: b7c299c35196d1bed384db460b9fae82984de1cee142fd6643d762c4184a5f566ed2e5d8827ba5d1eb3f5c06d7c02cac7fc8075f0f424a44cae3667a7163b437
-  data.tar.gz: 6a9ff3327df7db1e85dc14156acaef6588ecd19f8ad2791aa333b933a5aa44e7db1e3b66fb7284bd45994b9404dd3884230b5df44936a163c23a6db9c84f1290
+  metadata.gz: 93b0aa29b27648e3c5a3307ecd42b25bd7ae7492d6928ffb75926ea5d7937dbf68e89bf56fa199e1e54a7ffd651344cfdb429c15a046a9a9cbb3c775ab6ddfab
+  data.tar.gz: ad216938b93bd70455f1ee3ea62b509a6ffdc65742bc760b6fe20a65bd5a0c3a6dada151bdb5a2bfea43c0e44071e4cd5f80b705b96c894b464d6e8c6ac86500

data/lib/tetra/facades/bash.rb

@@ -12,7 +12,7 @@ module Tetra
 
     # runs bash in a subshell, returns list of
     # commands that were run in the session
-    def bash
+    def bash(command = nil)
       Tempfile.open("tetra-history") do |history_file|
         Tempfile.open("tetra-bashrc") do |bashrc_file|
           kit = Tetra::Kit.new(@project)
@@ -31,12 +31,17 @@ module Tetra
           bashrc_file.write(bashrc_content)
           bashrc_file.flush
 
-          run_interactive("bash --rcfile #{bashrc_file.path} -i")
-          history = File.read(history_file)
-          log.debug "history contents:"
-          log.debug history
+          if command
+            run("bash --rcfile #{bashrc_file.path} -i -c '#{command}'")
+            [command]
+          else
+            run_interactive("bash --rcfile #{bashrc_file.path} -i")
+            history = File.read(history_file)
+            log.debug "history contents:"
+            log.debug history
 
-          history.split("\n").map(&:strip)
+            history.split("\n").map(&:strip)
+          end
         end
       end
     end

data/lib/tetra/facades/git.rb

@@ -161,7 +161,7 @@ module Tetra
     # since from_id
     def format_patch(directory, from_id, destination_path)
       Dir.chdir(@directory) do
-        run("git format-patch -o #{destination_path} --numbered #{from_id} -- #{directory}").split
+        run("git format-patch -o #{destination_path} --no-numbered #{from_id} -- #{directory}").split
       end
     end
   end

data/lib/tetra/packages/scriptable.rb

@@ -11,7 +11,7 @@ module Tetra
           "set -xe",
           "PROJECT_PREFIX=`readlink -e .`",
           "cd #{project.latest_dry_run_directory}"
-        ] + script_body(project)
+        ] + aliases(project) + project.build_script_lines
 
         new_content = script_lines.join("\n") + "\n"
 
@@ -25,27 +25,20 @@ module Tetra
       end
     end
 
-    # returns the script body by taking the last dry-run's
-    # build script lines and adjusting mvn and ant's paths
-    def script_body(project)
-      lines = project.build_script_lines
-
+    # setup aliases for adjusted versions of the packaging tools
+    def aliases(project)
       kit = Tetra::Kit.new(project)
+
+      aliases = []
       ant_path = kit.find_executable("ant")
       ant_commandline = Tetra::Ant.commandline("$PROJECT_PREFIX", ant_path)
+      aliases << "alias ant='#{ant_commandline}'"
 
       mvn_path = kit.find_executable("mvn")
       mvn_commandline = Tetra::Mvn.commandline("$PROJECT_PREFIX", mvn_path)
+      aliases << "alias mvn='#{mvn_commandline} -o'"
 
-      lines.map do |line|
-        if line =~ /^ant( .*)?$/
-          line.gsub(/^ant/, ant_commandline)
-        elsif line =~ /^mvn( .*)?$/
-          line.gsub(/^mvn/, "#{mvn_commandline} -o")
-        else
-          line
-        end
-      end
+      aliases
     end
   end
 end

data/lib/tetra/ui/dry_run_subcommand.rb

@@ -3,6 +3,7 @@
 module Tetra
   # tetra dry-run
   class DryRunSubcommand < Tetra::Subcommand
+    option ["-s", "--script"], "SCRIPT", "Run these commands to build the project instead of the interactive shell"
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
@@ -14,13 +15,17 @@ module Tetra
           puts "Dry run not started."
         else
           project.dry_run
-          puts "Dry-run started in a new bash shell."
-          puts "Build your project now, \"mvn\" and \"ant\" are already bundled by tetra."
-          puts "If the build succeedes end this dry run with ^D (Ctrl+D),"
-          puts "if the build does not succeed use ^C^D to abort and undo any change"
+          if script
+            puts "Scripted dry-run started."
+          else
+            puts "Dry-run started in a new bash shell."
+            puts "Build your project now, \"mvn\" and \"ant\" are already bundled by tetra."
+            puts "If the build succeedes end this dry run with ^D (Ctrl+D),"
+            puts "if the build does not succeed use ^C^D to abort and undo any change"
+          end
 
           begin
-            history = Tetra::Bash.new(project).bash
+            history = Tetra::Bash.new(project).bash(script)
             project.finish(history)
             puts "Dry-run finished"
           rescue ExecutionFailed

data/lib/tetra/version.rb

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

data/spec/lib/coarse/dry_run_subcommand_spec.rb

@@ -17,6 +17,7 @@ describe "`tetra dry-run`", type: :aruba do
     type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0
 
     expect(all_output).to include("Dry-run started")
+    expect(all_output).to include("bash shell")
     expect(all_output).to include("ciao")
     expect(all_output).to include("Dry-run finished")
 
@@ -28,4 +29,21 @@ describe "`tetra dry-run`", type: :aruba do
     expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("tetra: dry-run-finished")
     expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("tetra: build-script-line: echo ciao")
   end
+
+  it "does a scripted dry-run" do
+    run_simple("tetra init --no-archive mypackage")
+    cd("mypackage")
+
+    run_interactive("tetra dry-run -s 'echo ciao > ciao.jar'")
+
+    expect(all_output).to include("Scripted dry-run started")
+
+    # check that markers were written in git repo
+    run_simple("git rev-list --format=%B --max-count=1 HEAD~")
+    expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD~")).to include("tetra: dry-run-started")
+
+    run_simple("git rev-list --format=%B --max-count=1 HEAD")
+    expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("tetra: dry-run-finished")
+    expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("tetra: build-script-line: echo ciao > ciao.jar")
+  end
 end

data/spec/lib/fine/scriptable_spec.rb

@@ -39,9 +39,10 @@ describe Tetra::Scriptable do
 
         expect(lines).to include("#!/bin/bash\n")
         expect(lines).to include("cd somewhere significant\n")
-        expect(lines).to include("$PROJECT_PREFIX/kit/mvn/bin/mvn \
+        expect(lines).to include("mvn --options\n")
+        expect(lines).to include("alias mvn='$PROJECT_PREFIX/kit/mvn/bin/mvn \
 -Dmaven.repo.local=$PROJECT_PREFIX/kit/m2 --settings $PROJECT_PREFIX/kit/m2/settings.xml \
---strict-checksums -o --options\n"
+--strict-checksums -o'\n"
                                 )
 
         expect(lines).not_to include("some earlier command\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Silvio Moioli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -421,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tetra
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A tool to package Java projects