tetra 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    tetra (0.40.0)
+    tetra (1.0.0)
       clamp
-      json
-      nokogiri
+      json_pure
+      open4
       rest-client
       rubyzip (>= 1.0)
       text
@@ -12,32 +12,39 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    clamp (0.6.3)
+    clamp (0.6.5)
     diff-lcs (1.2.5)
-    json (1.8.1)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    netrc (0.7.7)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    rake (10.3.2)
-    rest-client (1.7.2)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    json_pure (1.8.2)
+    mime-types (2.6.1)
+    netrc (0.10.3)
+    open4 (1.3.4)
+    rake (10.4.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
-    rubyzip (1.1.6)
-    text (1.3.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    rubyzip (1.1.7)
+    text (1.3.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -14,6 +14,7 @@ You need:
 * [git](http://git-scm.com/);
 * bash;
 * a JDK that can compile whatever software you need to package;
+* Fedora only: packages to compile native gems, use `yum install ruby-devel gcc-c++ zlib-devel`;
 
 Install `tetra` via RubyGems:
 
@@ -50,16 +51,15 @@ First, ceate a new `tetra` project named after the package that we want to build
 Second, place source files in the `src/` folder:
 
     cd src
-    wget http://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.zip
-    unzip commons-collections-3.2.1-src.zip
-    rm commons-collections-3.2.1-src.zip
+    wget http://archive.apache.org/dist/commons/collections/source/commons-collections4-4.0-src.tar.gz
+    tar xf commons-collections4-4.0-src.tar.gz
+    rm commons-collections4-4.0-src.tar.gz
+    cd commons-collections4-4.0-src/
 
 Third, you need to show `tetra` how to build your package. Run `tetra dry-run` a new subshell will open, in there do anything you would normally do to build the package:
 
-    cd ../src
     tetra dry-run
 
-    cd commons-collections-3.2.1-src/
     mvn package
 
     ^D

data/lib/template/kit/.keep

@@ -0,0 +1 @@
+This file prevents git from deleting this directory in case it has no content.

data/lib/template/kit/jars/.keep

@@ -0,0 +1 @@
+This file prevents git from deleting this directory in case it has no content.

data/lib/template/packages/.keep

@@ -0,0 +1 @@
+This file prevents git from deleting this directory in case it has no content.

data/lib/template/src/.keep

@@ -0,0 +1 @@
+This file prevents git from deleting this directory in case it has no content.

data/lib/tetra.rb

@@ -10,15 +10,15 @@ require "logger"
 require "open-uri"
 require "pathname"
 require "singleton"
-require "text"
+require "rexml/document"
 
 # third party libraries
 require "clamp"
 require "json"
-require "nokogiri"
+require "open4"
 require "rest_client"
+require "text"
 require "zip"
-require "open4"
 
 # base components
 require "tetra/logger"

data/lib/tetra/facades/bash.rb

@@ -3,6 +3,7 @@
 module Tetra
   # runs Bash with tetra-specific options
   class Bash
+    include Logging
     include ProcessRunner
 
     def initialize(project)
@@ -21,8 +22,11 @@ module Tetra
           mvn_path = kit.find_executable("mvn")
           mvn_commandline = Tetra::Mvn.commandline(@project.full_path, mvn_path)
 
-          bashrc = Bashrc.new(history_file.path, ant_commandline, mvn_commandline)
-          bashrc_file.write(bashrc.to_s)
+          bashrc_content = Bashrc.new(history_file.path, ant_commandline, mvn_commandline).to_s
+          log.debug "writing bashrc file: #{bashrc_file.path}"
+          log.debug bashrc_content
+
+          bashrc_file.write(bashrc_content)
           bashrc_file.flush
 
           run_interactive("bash --rcfile #{bashrc_file.path}")

data/lib/tetra/kit.rb

@@ -14,7 +14,7 @@ module Tetra
     def find_executable(name)
       @project.from_directory do
         Find.find("kit") do |path|
-          next unless path =~ /(.*bin)\/#{name}$/
+          next unless path =~ %r{(.*bin)/#{name}$}
           result = Regexp.last_match[1]
 
           log.debug("found #{name} executable in #{result}")

data/lib/tetra/maven_website.rb

@@ -38,7 +38,7 @@ module Tetra
     def search(params)
       response = RestClient.get("http://search.maven.org/solrsearch/select",
                                 params: params.merge("rows" => "100", "wt" => "json")
-      )
+                               )
       json = JSON.parse(response.to_s)
       json["response"]["docs"]
     end

data/lib/tetra/pom.rb

@@ -5,56 +5,55 @@ module Tetra
   class Pom
     def initialize(filename)
       content = open(filename).read if filename && File.file?(filename)
-      @doc = Nokogiri::XML(content)
-      @doc.remove_namespaces!
+      @doc = REXML::Document.new(content)
     end
 
     def group_id
-      @doc.xpath("project/groupId").text || ""
+      @doc.text("project/groupId") || ""
     end
 
     def artifact_id
-      @doc.xpath("project/artifactId").text || ""
+      @doc.text("project/artifactId") || ""
     end
 
     def name
-      @doc.xpath("project/name").text || ""
+      @doc.text("project/name") || ""
     end
 
     def version
-      @doc.xpath("project/version").text || ""
+      @doc.text("project/version") || ""
     end
 
     def description
-      @doc.xpath("project/description").text || ""
+      @doc.text("project/description") || ""
     end
 
     def url
-      @doc.xpath("project/url").text || ""
+      @doc.text("project/url") || ""
     end
 
     def license_name
-      @doc.xpath("project/licenses/license/name").text || ""
+      @doc.text("project/licenses/license/name") || ""
     end
 
     def runtime_dependency_ids
-      @doc.xpath("project/dependencies/dependency[\
+      @doc.get_elements("project/dependencies/dependency[\
         not(optional='true') and not(scope='provided') and not(scope='test') and not(scope='system')\
       ]").map do |element|
-        [element.xpath("groupId").text, element.xpath("artifactId").text, element.xpath("version").text]
+        [element.text("groupId"), element.text("artifactId"), element.text("version")]
       end
     end
 
     def modules
-      @doc.xpath("project/modules/module").map { |e| e.text }
+      @doc.get_elements("project/modules/module").map(&:text)
     end
 
     def scm_connection
-      @doc.xpath("project/scm/connection").text || ""
+      @doc.text("project/scm/connection") || ""
     end
 
     def scm_url
-      @doc.xpath("project/scm/url").text || ""
+      @doc.text("project/scm/url") || ""
     end
   end
 end

data/lib/tetra/pom_getter.rb

@@ -21,7 +21,7 @@ module Tetra
       log.debug("Attempting unpack of #{file} to find a POM")
       begin
         Zip::File.foreach(file) do |entry|
-          if entry.name =~ /\/pom.xml$/
+          if entry.name =~ %r{/pom.xml$}
             log.info("pom.xml found in #{file}##{entry.name}")
             return entry.get_input_stream.read, :found_in_jar
           end
@@ -46,7 +46,7 @@ module Tetra
           unless result.nil?
             log.info("pom.xml for #{file} found on search.maven.org for sha1 #{sha1}\
               (#{result['g']}:#{result['a']}:#{result['v']})"
-            )
+                    )
             group_id, artifact_id, version = site.get_maven_id_from result
             return site.download_pom(group_id, artifact_id, version), :found_via_sha1
           end
@@ -70,7 +70,7 @@ module Tetra
         result = site.search_by_name(my_artifact_id).first
         log.debug("Artifact id search result: #{result}")
         unless result.nil?
-          group_id, artifact_id, _ = site.get_maven_id_from result
+          group_id, artifact_id, = site.get_maven_id_from result
           results = site.search_by_group_id_and_artifact_id(group_id, artifact_id)
           log.debug("All versions: #{results}")
           their_versions = results.map { |doc| doc["v"] }
@@ -86,7 +86,7 @@ module Tetra
           group_id, artifact_id, version = site.get_maven_id_from(best_matched_result)
           log.warn("pom.xml for #{filename} found on search.maven.org with heuristic search\
             (#{group_id}:#{artifact_id}:#{version})"
-          )
+                  )
 
           return site.download_pom(group_id, artifact_id, version), :found_via_heuristic
         end

data/lib/tetra/project.rb

@@ -127,9 +127,7 @@ module Tetra
       comments += build_script_lines.map { |l| "tetra: build-script-line: #{l}" }
 
       # if this is the first dry-run, mark sources as tarball
-      if first_dry_run
-        comments << "tetra: sources-tarball"
-      end
+      comments << "tetra: sources-tarball" if first_dry_run
 
       # commit end of dry run
       commit_whole_directory(".", *comments)
@@ -226,7 +224,7 @@ module Tetra
     def produced_files
       @git.latest_comment("tetra: dry-run-finished")
         .split("\n")
-        .map { |line| line[/^tetra: file-changed: src\/(.+)$/, 1] }
+        .map { |line| line[%r{^tetra: file-changed: src/(.+)$}, 1] }
         .compact
         .sort
     end

data/lib/tetra/version.rb

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

data/spec/lib/package_spec.rb

@@ -52,7 +52,8 @@ describe Tetra::Package do
         expect(spec_lines).to include("Summary:        Nailgun is a client, protocol, and server for running Java\n")
         expect(spec_lines).to include("Url:            http://martiansoftware.com/nailgun\n")
         expect(spec_lines).to include("BuildRequires:  test-project-kit == #{@project.version}\n")
-        expect(spec_lines).to include("Provides:       mvn(com.martiansoftware:nailgun-all) == 0.9.1\n")
+        expect(spec_lines).to include("Provides:       mvn(com.martiansoftware:nailgun-server) == 0.9.1\n")
+        expect(spec_lines).to include("Provides:       mvn(com.martiansoftware:nailgun-examples) == 0.9.1\n")
         expect(spec_lines).to include("cp -a out/test3.jar %{buildroot}%{_javadir}/test3.jar\n")
       end
     end

data/spec/lib/pom_spec.rb

@@ -3,67 +3,96 @@
 require "spec_helper"
 
 describe Tetra::Pom do
-  let(:pom) { Tetra::Pom.new(File.join("spec", "data", "commons-logging", "pom.xml")) }
+  let(:commons_pom) { Tetra::Pom.new(File.join("spec", "data", "commons-logging", "pom.xml")) }
+  let(:nailgun_pom) { Tetra::Pom.new(File.join("spec", "data", "nailgun", "pom.xml")) }
+  let(:struts_apps_pom) { Tetra::Pom.new(File.join("spec", "data", "struts-apps", "pom.xml")) }
 
   describe "#group_id" do
     it "reads the group id" do
-      expect(pom.group_id).to eq "commons-logging"
+      expect(commons_pom.group_id).to eq "commons-logging"
+      expect(nailgun_pom.group_id).to eq "com.martiansoftware"
+      expect(struts_apps_pom.group_id).to eq "org.apache.struts"
     end
   end
 
   describe "#artifact_id" do
     it "reads the artifact id" do
-      expect(pom.artifact_id).to eq "commons-logging"
+      expect(commons_pom.artifact_id).to eq "commons-logging"
+      expect(nailgun_pom.artifact_id).to eq "nailgun-all"
+      expect(struts_apps_pom.artifact_id).to eq "struts2-apps"
     end
   end
 
   describe "#name" do
     it "reads artifact name" do
-      expect(pom.name).to eq "Commons Logging"
+      expect(commons_pom.name).to eq "Commons Logging"
+      expect(nailgun_pom.name).to eq "nailgun-all"
+      expect(struts_apps_pom.name).to eq "Webapps"
     end
   end
 
   describe "#version" do
     it "reads the version" do
-      expect(pom.version).to eq "1.1.1"
+      expect(commons_pom.version).to eq "1.1.1"
+      expect(nailgun_pom.version).to eq "0.9.1"
+      expect(struts_apps_pom.version).to eq ""
     end
   end
 
   describe "#description" do
     it "reads the description" do
-      expect(pom.description).to eq "Commons Logging is a thin adapter allowing configurable bridging to other,\n    " \
-        "well known logging systems."
+      expect(commons_pom.description).to eq "Commons Logging is a thin adapter allowing configurable bridging to other,
+    well known logging systems."
+      expect(nailgun_pom.description).to eq "
+        Nailgun is a client, protocol, and server for running Java programs 
+        from the command line without incurring the JVM startup overhead. 
+        Programs run in the server (which is implemented in Java), and are 
+        triggered by the client (written in C), which handles all I/O.
+    
+        This project contains the server and examples.
+    "
+      expect(struts_apps_pom.description).to eq ""
     end
   end
 
   describe "#url" do
     it "reads the url" do
-      expect(pom.url).to eq "http://commons.apache.org/logging"
+      expect(commons_pom.url).to eq "http://commons.apache.org/logging"
+      expect(nailgun_pom.url).to eq "http://martiansoftware.com/nailgun"
+      expect(struts_apps_pom.url).to eq ""
     end
   end
 
   describe "#license_name" do
     it "reads the license name" do
-      expect(pom.license_name).to eq ""
+      expect(commons_pom.license_name).to eq ""
+      expect(nailgun_pom.license_name).to eq "The Apache Software License, Version 2.0"
+      expect(struts_apps_pom.license_name).to eq ""
     end
   end
 
   describe "#runtime_dependency_ids" do
     it "reads the dependency maven ids" do
-      expect(pom.runtime_dependency_ids).to eq []
+      expect(commons_pom.runtime_dependency_ids).to eq []
+      expect(nailgun_pom.runtime_dependency_ids).to eq []
+      expect(struts_apps_pom.runtime_dependency_ids).to eq [["org.apache.struts", "struts2-core", "${project.version}"]]
     end
   end
 
   describe "#scm_connection" do
     it "reads the SCM connection address" do
-      expect(pom.scm_connection).to eq "scm:svn:http://svn.apache.org/repos/asf/commons/proper/" \
+      expect(commons_pom.scm_connection).to eq "scm:svn:http://svn.apache.org/repos/asf/commons/proper/" \
         "logging/tags/commons-logging-1.1.1"
+      expect(nailgun_pom.scm_connection).to eq "scm:git:git@github.com:martylamb/nailgun.git"
+      expect(struts_apps_pom.scm_connection).to eq "scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps"
     end
   end
 
   describe "#scm_url" do
     it "reads the SCM connection url" do
-      expect(pom.scm_url).to eq "http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
+      expect(commons_pom.scm_url).to eq "http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
+      expect(nailgun_pom.scm_url).to eq "scm:git:git@github.com:martylamb/nailgun.git"
+      expect(struts_apps_pom.scm_url).to eq "http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps"
     end
   end
 end

data/spec/lib/scriptable_spec.rb

@@ -42,7 +42,7 @@ describe Tetra::Scriptable do
         expect(lines).to include("$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"
-        )
+                                )
 
         expect(lines).not_to include("some earlier command\n")
         expect(lines).not_to include("tetra dry-run --unwanted-options\n")

data/tetra.gemspec

@@ -23,10 +23,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
 
   s.add_runtime_dependency "clamp"
-  s.add_runtime_dependency "rubyzip", ">= 1.0"
+  s.add_runtime_dependency "json_pure"
+  s.add_runtime_dependency "open4"
   s.add_runtime_dependency "rest-client"
-  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "rubyzip", ">= 1.0"
   s.add_runtime_dependency "text"
-  s.add_runtime_dependency "nokogiri"
-  s.add_runtime_dependency "open4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,23 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: open4
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: text
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,9 +122,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: text
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -345,12 +329,12 @@ files:
 - lib/template/bundled/apache-maven-3.2.5/lib/wagon-provider-api.license
 - lib/template/gitignore
 - lib/template/kit.spec
-- lib/template/kit/CONTENTS
-- lib/template/kit/jars/CONTENTS
+- lib/template/kit/.keep
+- lib/template/kit/jars/.keep
 - lib/template/kit/m2/settings.xml
 - lib/template/package.spec
-- lib/template/packages/CONTENTS
-- lib/template/src/CONTENTS
+- lib/template/packages/.keep
+- lib/template/src/.keep
 - lib/tetra.rb
 - lib/tetra/facades/ant.rb
 - lib/tetra/facades/bash.rb

data/lib/template/kit/CONTENTS

@@ -1,9 +0,0 @@
-This directory contains all binary files needed to build software in src/.
-
-These files will be packaged as binary and will only be used at build time.
-They will not be installed on users' systems.
-
- - jars/ contains simple jars (eg. for Ant use)
- - m2/ contains a Maven repo
- - apache-ant-* contains a stable Ant release
- - apache-maven-* contains a stable Maven release

data/lib/template/kit/jars/CONTENTS

@@ -1,3 +0,0 @@
-This directory contains binary files needed to build software in src/.
-
-Only jar files not in m2/ should be placed here.

data/lib/template/packages/CONTENTS

@@ -1 +0,0 @@
-tetra will save all output files it generates (specs, archives, etc.) here.

data/lib/template/src/CONTENTS

@@ -1,3 +0,0 @@
-All "verbatim" source files should be placed here (as checked out from
-the original source repository), together with any additional files you
-might need for the build.