tetra 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49390dd466afdc5488d1bf1443d3fe67a0932b0c76a59b30bc60a2372689f608
-  data.tar.gz: d65544049f50356123f81ecaa383c339a92269c597c098b071b80b3dc96b78e4
+  metadata.gz: f7308c9913a1a487db62eb2458fd4b4dc06ee7141afe061cf7e7fdaf999b364d
+  data.tar.gz: ebdaac78695af6f8fc2d53cbca7e5e8eb67fe8d1e3e03a650ec6fb2f5b9c4cc7
 SHA512:
-  metadata.gz: 93b0aa29b27648e3c5a3307ecd42b25bd7ae7492d6928ffb75926ea5d7937dbf68e89bf56fa199e1e54a7ffd651344cfdb429c15a046a9a9cbb3c775ab6ddfab
-  data.tar.gz: ad216938b93bd70455f1ee3ea62b509a6ffdc65742bc760b6fe20a65bd5a0c3a6dada151bdb5a2bfea43c0e44071e4cd5f80b705b96c894b464d6e8c6ac86500
+  metadata.gz: bf8845f7cdbd2d5dfec4fc76fa5f3c4494264712712ee32d6ac6d57fe792758517ec24b4a01d140da210ea0a807fc25ab5fe1bc7a17e90c16999acd4503baf1f
+  data.tar.gz: 2fd601d21b078086097c62f97c6cdac6748601b2f21ecdb42685ae4e82075b35b381f899818955915eaa67e1ae3629a8e158f686d162436f6823d1918119604a

data/CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Development environment
 
 To develop tetra, you will need:
- * to install Bundler. On SUSE distros, use `sudo zypper in rubygem-bundler`;
+ * to install Bundler and Ruby development headers. On SUSE distros, use `sudo zypper install ruby2.5-rubygem-bundler ruby2.5-devel`;
  * to get development dependencies: `bundle install`;
 
 To install a development version of tetra use:
@@ -11,3 +11,8 @@ sudo rake install
 ```
 
 To run tests, simply run `rake`. Please note that tests are divided into fine (more similar to unit tests) and coarse (more similar to integration tests).
+
+# Release
+
+Install gem-release: `gem install gem-release`
+Bump a patch version: `gem bump -v patch -p -t -r`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tetra (2.0.3)
+    tetra (2.0.5)
       clamp
       json_pure
       open4
@@ -18,7 +18,7 @@ GEM
     builder (3.2.2)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
-    clamp (1.1.2)
+    clamp (1.3.1)
     cucumber (2.0.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.1.3)
@@ -28,29 +28,29 @@ GEM
       multi_test (>= 0.1.2)
     cucumber-core (1.1.3)
       gherkin (~> 2.12.0)
-    diff-lcs (1.2.5)
-    ffi (1.9.8)
+    diff-lcs (1.3)
+    ffi (1.12.2)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    json_pure (2.1.0)
+    json_pure (2.2.0)
     multi_json (1.11.0)
     multi_test (0.1.2)
     open4 (1.3.4)
     rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    rubyzip (1.2.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubyzip (2.2.0)
     text (1.3.1)
 
 PLATFORMS
@@ -63,4 +63,4 @@ DEPENDENCIES
   tetra!
 
 BUNDLED WITH
-   1.12.5
+   1.16.1

data/SPECIAL_CASES.md

@@ -122,7 +122,7 @@ Assuming your project uses the [Gradle Wrapper](http://gradle.org/docs/current/u
    export GRADLE_USER_HOME=/tmp/gradle
    ./gradlew --project-cache-dir /tmp/gradle-project clean build -x test
    ```
-   
+
  * after the build has finished but prior ending the dry-run, copy all files to your kit with:
     ```
     cp -r /tmp/gradle* ../../kit/
@@ -146,6 +146,32 @@ Also note that Gradle typically ships with libnative as a platform-dependent bin
 
 Finally note that if you want to upgrade gradle and remove the previous versions, you should remove /tmp/gradle* directories, as well as the kit/gradle* directories (use git rm for this). Of course remember to adjust your gradlew call, build.gradle and/or gradle-wrapper.properties files with the new version.
 
+### Upgrading Gradle
+
+When a newer Gradle is needed (eg. to support a newer JDK) in projects that use the Gradle Wrapper, the following procedure can be followed:
+
+```bash
+# update the Gradle URL to the new version
+sed -i "s#distributionUrl=.*#distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip#g" gradle/wrapper/gradle-wrapper.properties
+
+# run Gradle Wrapper to download the latest Gradle version
+export GRADLE_USER_HOME=/tmp/gradle
+./gradlew wrapper --gradle-version 4.10.2 --project-cache-dir /tmp/gradle-project
+
+# Patch sources
+git add gradlew* gradle/wrapper/gradle-wrapper.properties
+git commit -m "Update Gradle Wrapper"
+
+# Patch kit
+cp -r /tmp/gradle* ../../kit/
+cp gradle/wrapper/gradle-wrapper.jar ../../kit
+git add ../../kit
+git checkout gradle/wrapper/gradle-wrapper.jar
+git commit -m "Update Gradle"
+```
+
+Now dry-run again as per the above instructions.
+
 ## [OBS](build.opensuse.org) integration
 
 If you want to submit your package to OBS, you can do so by copying contents of the `packages` in a proper OBS project directory.

data/lib/template/bashrc

@@ -32,3 +32,5 @@ echo -e "\e[91mWARNING: mvn executable file not found in kit/, please check that
 echo -e "\e[91mDefaulting to system-provided mvn, this could make your builds non-reproducible."
 <% end %>
 alias mvn='<%= mvn_commandline %>'
+
+alias gradlew='<%= gradle_commandline %>'

data/lib/tetra.rb

@@ -29,6 +29,7 @@ require "tetra/facades/process_runner"
 require "tetra/facades/git"
 require "tetra/facades/ant"
 require "tetra/facades/mvn"
+require "tetra/facades/gradle"
 require "tetra/facades/bash"
 require "tetra/facades/unzip"
 require "tetra/facades/tar"

data/lib/tetra/facades/bash.rb

@@ -24,7 +24,9 @@ module Tetra
           mvn_in_kit = mvn_path != nil
           mvn_commandline = Tetra::Mvn.commandline(@project.full_path, mvn_path)
 
-          bashrc_content = Bashrc.new(history_file.path, ant_in_kit, ant_commandline, mvn_in_kit, mvn_commandline).to_s
+          gradle_commandline = Tetra::Gradle.commandline(@project.full_path)
+
+          bashrc_content = Bashrc.new(history_file.path, ant_in_kit, ant_commandline, mvn_in_kit, mvn_commandline, gradle_commandline).to_s
           log.debug "writing bashrc file: #{bashrc_file.path}"
           log.debug bashrc_content
 
@@ -56,13 +58,15 @@ module Tetra
     attr_reader :ant_commandline
     attr_reader :mvn_in_kit
     attr_reader :mvn_commandline
+    attr_reader :gradle_commandline
 
-    def initialize(history_file, ant_in_kit, ant_commandline, mvn_in_kit, mvn_commandline)
+    def initialize(history_file, ant_in_kit, ant_commandline, mvn_in_kit, mvn_commandline, gradle_commandline)
       @history_file = history_file
       @ant_in_kit = ant_in_kit
       @ant_commandline = ant_commandline
       @mvn_in_kit = mvn_in_kit
       @mvn_commandline = mvn_commandline
+      @gradle_commandline = gradle_commandline
     end
 
     def to_s

data/lib/tetra/facades/gradle.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+
+module Tetra
+  # encapsulates tetra-specific Gradle commandline options
+  class Gradle
+    # returns a command line for running Gradle
+    def self.commandline(project_path)
+      gradle_user_home = File.join(project_path, "kit", "gradle-home")
+
+      "./gradlew --gradle-user-home=#{gradle_user_home}"
+    end
+  end
+end

data/lib/tetra/maven_website.rb

@@ -7,36 +7,36 @@ module Tetra
 
     # returns a search result object from search.maven.com
     # searching by a jar sha1 hash
-    # see output format at http://search.maven.org/#api
+    # see output format at https://search.maven.org/#api
     def search_by_sha1(sha1)
       search(q: "1:\"#{sha1}\"")
     end
 
     # returns a search result object from search.maven.com
     # searching by keyword (name)
-    # see output format at http://search.maven.org/#api
+    # see output format at https://search.maven.org/#api
     def search_by_name(name)
       search(q: name)
     end
 
     # returns a search result object from search.maven.com
     # searching by Maven's group id and artifact id
-    # see output format at http://search.maven.org/#api
+    # see output format at https://search.maven.org/#api
     def search_by_group_id_and_artifact_id(group_id, artifact_id)
       search(q: "g:\"#{group_id}\" AND a:\"#{artifact_id}\"", core: "gav")
     end
 
     # returns a search result object from search.maven.com
     # searching by Maven's id (group id, artifact id and version)
-    # see output format at http://search.maven.org/#api
+    # see output format at https://search.maven.org/#api
     def search_by_maven_id(group_id, artifact_id, version)
       search(q: "g:\"#{group_id}\" AND a:\"#{artifact_id}\" AND v:\"#{version}\"")
     end
 
     # returns a search result object from search.maven.com
-    # see input and output format at http://search.maven.org/#api
+    # see input and output format at https://search.maven.org/#api
     def search(params)
-      response = get("http://search.maven.org/solrsearch/select?", params.merge("rows" => "100", "wt" => "json"))
+      response = get("https://search.maven.org/solrsearch/select?", params.merge("rows" => "100", "wt" => "json"))
       json = JSON.parse(response.to_s)
       json["response"]["docs"]
     end
@@ -51,7 +51,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}...")
-      get("http://repo1.maven.org/maven2/#{path}", {}).to_s
+      get("https://repo1.maven.org/maven2/#{path}", {}).to_s
     end
 
     def get(url, params)

data/lib/tetra/packages/scriptable.rb

@@ -38,6 +38,9 @@ module Tetra
       mvn_commandline = Tetra::Mvn.commandline("$PROJECT_PREFIX", mvn_path)
       aliases << "alias mvn='#{mvn_commandline} -o'"
 
+      gradle_commandline = Tetra::Gradle.commandline("$PROJECT_PREFIX")
+      aliases << "alias gradlew='#{gradle_commandline} --offline'"
+
       aliases
     end
   end

data/lib/tetra/ui/dry_run_subcommand.rb

@@ -18,8 +18,10 @@ module Tetra
           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 "Dry-run started in a new bash shell. Build your project now!"
+            puts "Note that:"
+            puts " - \"mvn\" and \"ant\" are already bundled by tetra"
+            puts " - you have to use \"gradlew\" instad of \"./gradlew\" to launch a Gradle wrapper"
             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

data/lib/tetra/version.rb

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

data/spec/lib/coarse/generate_all_subcommand_spec.rb

@@ -2,12 +2,12 @@ require "spec_helper"
 
 describe "`tetra generate-all`", type: :aruba do
   it "generates specs and tarballs for a sample package, source archive workflow" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.1-src.zip"))
+    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.zip"))
     write_file("commons-collections.zip", archive_contents)
 
     # init project
     run_simple("tetra init commons-collections commons-collections.zip")
-    cd(File.join("commons-collections", "src", "commons-collections4-4.1-src"))
+    cd(File.join("commons-collections", "src", "commons-collections4-4.4-src"))
 
     # first dry-run, all normal
     @aruba_timeout_seconds = 240
@@ -58,7 +58,7 @@ describe "`tetra generate-all`", type: :aruba do
   end
 
   it "generates specs and tarballs for a sample package, manual source workflow" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.1-src.zip"))
+    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.zip"))
     write_file("commons-collections.zip", archive_contents)
 
     # init project
@@ -79,7 +79,7 @@ describe "`tetra generate-all`", type: :aruba do
     expect(output_from("tetra change-sources ../commons-collections.zip")).to include("New sources committed")
 
     # second dry-run, all normal
-    cd(File.join("src", "commons-collections4-4.1-src"))
+    cd(File.join("src", "commons-collections4-4.4-src"))
     @aruba_timeout_seconds = 240
     run_interactive("tetra dry-run")
     type("mvn package -DskipTests")

data/spec/lib/coarse/generate_spec_subcommand_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "`tetra generate-spec`", type: :aruba do
   it "outputs a warning if source files are not found" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.1-src.zip"))
+    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.zip"))
     write_file("commons-collections.zip", archive_contents)
 
     run_simple("tetra init --no-archive commons-collections")
@@ -10,12 +10,12 @@ describe "`tetra generate-spec`", type: :aruba do
 
     cd("src")
     run_simple("unzip ../../commons-collections.zip")
-    cd("commons-collections4-4.1-src")
+    cd("commons-collections4-4.4-src")
 
     run_simple("tetra change-sources --no-archive")
     expect(output_from("tetra change-sources --no-archive")).to include("New sources committed")
 
-    @aruba_timeout_seconds = 240
+    @aruba_timeout_seconds = 300
     run_interactive("tetra dry-run")
     type("mvn package -DskipTests")
     type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0

data/spec/lib/coarse/init_subcommand_spec.rb

@@ -32,7 +32,7 @@ describe "`tetra`", type: :aruba do
   end
 
   it "inits a new project with a zip source file" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.1-src.zip"))
+    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.zip"))
     write_file("commons-collections.zip", archive_contents)
 
     run_simple("tetra init commons-collections commons-collections.zip")
@@ -48,8 +48,8 @@ describe "`tetra`", type: :aruba do
     cd("commons-collections")
     check_directory_presence([".git", "kit", "src", "packages"], true)
 
-    check_directory_presence([File.join("src", "commons-collections4-4.1-src")], true)
-    check_file_presence([File.join("src", "commons-collections4-4.1-src", "pom.xml")], true)
+    check_directory_presence([File.join("src", "commons-collections4-4.4-src")], true)
+    check_file_presence([File.join("src", "commons-collections4-4.4-src", "pom.xml")], true)
 
     check_file_presence([File.join("packages", "commons-collections", "commons-collections.zip")], true)
 
@@ -58,7 +58,7 @@ describe "`tetra`", type: :aruba do
   end
 
   it "inits a new project with a tar source file" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.1-src.tar.gz"))
+    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.tar.gz"))
     write_file("commons-collections.tar.gz", archive_contents)
 
     run_simple("tetra init commons-collections commons-collections.tar.gz")
@@ -74,8 +74,8 @@ describe "`tetra`", type: :aruba do
     cd("commons-collections")
     check_directory_presence([".git", "kit", "src", "packages"], true)
 
-    check_directory_presence([File.join("src", "commons-collections4-4.1-src")], true)
-    check_file_presence([File.join("src", "commons-collections4-4.1-src", "pom.xml")], true)
+    check_directory_presence([File.join("src", "commons-collections4-4.4-src")], true)
+    check_file_presence([File.join("src", "commons-collections4-4.4-src", "pom.xml")], true)
 
     check_file_presence([File.join("packages", "commons-collections", "commons-collections.tar.gz")], true)
 

data/spec/lib/fine/tar_spec.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 describe Tetra::Tar do
   include Tetra::Mockers
 
-  let(:zipfile) { File.join("spec", "data", "commons-collections4-4.1-src.tar.gz") }
+  let(:zipfile) { File.join("spec", "data", "commons-collections4-4.4-src.tar.gz") }
   let(:tar) { Tetra::Tar.new }
 
   describe "#decompress"  do
@@ -15,7 +15,7 @@ describe Tetra::Tar do
 
         files = Find.find(dir).to_a
 
-        expect(files).to include("#{dir}/commons-collections4-4.1-src/DEVELOPERS-GUIDE.html")
+        expect(files).to include("#{dir}/commons-collections4-4.4-src/DEVELOPERS-GUIDE.html")
       end
     end
   end

data/spec/lib/fine/unzip_spec.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 describe Tetra::Unzip do
   include Tetra::Mockers
 
-  let(:zipfile) { File.join("spec", "data", "commons-collections4-4.1-src.zip") }
+  let(:zipfile) { File.join("spec", "data", "commons-collections4-4.4-src.zip") }
   let(:unzip) { Tetra::Unzip.new }
 
   describe "#decompress"  do
@@ -15,7 +15,7 @@ describe Tetra::Unzip do
 
         files = Find.find(dir).to_a
 
-        expect(files).to include("#{dir}/commons-collections4-4.1-src/DEVELOPERS-GUIDE.html")
+        expect(files).to include("#{dir}/commons-collections4-4.4-src/DEVELOPERS-GUIDE.html")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Silvio Moioli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -329,6 +329,7 @@ files:
 - lib/tetra/facades/ant.rb
 - lib/tetra/facades/bash.rb
 - lib/tetra/facades/git.rb
+- lib/tetra/facades/gradle.rb
 - lib/tetra/facades/mvn.rb
 - lib/tetra/facades/process_runner.rb
 - lib/tetra/facades/tar.rb
@@ -368,8 +369,8 @@ files:
 - spec/data/ant-super-simple-code/src/mypackage/HW.java
 - spec/data/antlr/antlr-2.7.2.jar
 - spec/data/antlr/pom.xml
-- spec/data/commons-collections4-4.1-src.tar.gz
-- spec/data/commons-collections4-4.1-src.zip
+- spec/data/commons-collections4-4.4-src.tar.gz
+- spec/data/commons-collections4-4.4-src.zip
 - spec/data/commons-logging/commons-logging-1.1.1.jar
 - spec/data/commons-logging/parent_pom.xml
 - spec/data/commons-logging/pom.xml
@@ -421,8 +422,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tetra
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A tool to package Java projects
-test_files: []
+test_files:
+- spec/data/ant-super-simple-code/build.xml
+- spec/data/ant-super-simple-code/build/HW.class
+- spec/data/ant-super-simple-code/build/mypackage/HW.class
+- spec/data/ant-super-simple-code/dist/antsimple-20130618.jar
+- spec/data/ant-super-simple-code/lib/junit-4.11.jar
+- spec/data/ant-super-simple-code/lib/log4j-1.2.13.jar
+- spec/data/ant-super-simple-code/src/mypackage/HW.java
+- spec/data/antlr/antlr-2.7.2.jar
+- spec/data/antlr/pom.xml
+- spec/data/commons-collections4-4.4-src.tar.gz
+- spec/data/commons-collections4-4.4-src.zip
+- spec/data/commons-logging/commons-logging-1.1.1.jar
+- spec/data/commons-logging/parent_pom.xml
+- spec/data/commons-logging/pom.xml
+- spec/data/nailgun/nailgun-0.7.1.jar
+- spec/data/nailgun/pom.xml
+- spec/data/struts-apps/pom.xml
+- spec/data/tomcat/pom.xml
+- spec/lib/coarse/dry_run_subcommand_spec.rb
+- spec/lib/coarse/generate_all_subcommand_spec.rb
+- spec/lib/coarse/generate_spec_subcommand_spec.rb
+- spec/lib/coarse/init_subcommand_spec.rb
+- spec/lib/coarse/main_spec.rb
+- spec/lib/fine/ant_spec.rb
+- spec/lib/fine/git_spec.rb
+- spec/lib/fine/kit_package_spec.rb
+- spec/lib/fine/kit_spec.rb
+- spec/lib/fine/maven_website_spec.rb
+- spec/lib/fine/mvn_spec.rb
+- spec/lib/fine/package_spec.rb
+- spec/lib/fine/pom_getter_spec.rb
+- spec/lib/fine/pom_spec.rb
+- spec/lib/fine/project_spec.rb
+- spec/lib/fine/scriptable_spec.rb
+- spec/lib/fine/speccable_spec.rb
+- spec/lib/fine/tar_spec.rb
+- spec/lib/fine/unzip_spec.rb
+- spec/lib/fine/version_matcher_spec.rb
+- spec/spec_helper.rb