tetra 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    tetra (1.0.0)
+    tetra (1.1.0)
       clamp
       json_pure
       open4
-      rest-client
       rubyzip (>= 1.0)
       text
 
@@ -14,19 +13,9 @@ GEM
   specs:
     clamp (0.6.5)
     diff-lcs (1.2.5)
-    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.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -42,9 +31,6 @@ GEM
     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

@@ -10,7 +10,7 @@ See [MOTIVATION.md](MOTIVATION.md) for further information.
 
 You need:
 
-* [Ruby 1.9](https://www.ruby-lang.org/en/);
+* [Ruby 1.9.2](https://www.ruby-lang.org/en/) or later;
 * [git](http://git-scm.com/);
 * bash;
 * a JDK that can compile whatever software you need to package;

data/lib/tetra.rb

@@ -11,6 +11,7 @@ require "open-uri"
 require "pathname"
 require "singleton"
 require "rexml/document"
+require "net/http"
 
 # third party libraries
 require "clamp"

data/lib/tetra/maven_website.rb

@@ -36,9 +36,7 @@ module Tetra
     # returns a search result object from search.maven.com
     # see input and output format at http://search.maven.org/#api
     def search(params)
-      response = RestClient.get("http://search.maven.org/solrsearch/select",
-                                params: params.merge("rows" => "100", "wt" => "json")
-                               )
+      response = get("http://search.maven.org/solrsearch/select?", params.merge("rows" => "100", "wt" => "json"))
       json = JSON.parse(response.to_s)
       json["response"]["docs"]
     end
@@ -53,7 +51,17 @@ 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
+      get("http://repo1.maven.org/maven2/#{path}", {}).to_s
     end
+
+    def get(url, params)
+      response = Net::HTTP.get_response(URI.parse(url + URI.encode_www_form(params)))
+      fail NotFoundOnMavenWebsiteError if response.code == "404"
+
+      response.body
+    end
+  end
+
+  class NotFoundOnMavenWebsiteError < StandardError
   end
 end

data/lib/tetra/pom_getter.rb

@@ -51,7 +51,7 @@ module Tetra
             return site.download_pom(group_id, artifact_id, version), :found_via_sha1
           end
         end
-      rescue RestClient::ResourceNotFound
+      rescue NotFoundOnMavenWebsiteError
         log.warn("Got a 404 error while looking for #{file}'s SHA1 in search.maven.org")
       end
       nil
@@ -90,7 +90,7 @@ module Tetra
 
           return site.download_pom(group_id, artifact_id, version), :found_via_heuristic
         end
-      rescue RestClient::ResourceNotFound
+      rescue NotFoundOnMavenWebsiteError
         log.warn("Got a 404 error while looking for #{filename} heuristically in search.maven.org")
       end
       nil

data/lib/tetra/version.rb

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

data/spec/lib/maven_website_spec.rb

@@ -52,5 +52,10 @@ describe Tetra::MavenWebsite do
       pom_path = File.join(dir_path, "pom.xml")
       expect(site.download_pom("antlr", "antlrall", "2.7.2")).to eq(File.read(pom_path))
     end
+    it "returns an error on file not found" do
+      expect do
+        site.download_pom("does_not_exist", "does_not_exist", "does_not_exist")
+      end.to raise_error(Tetra::NotFoundOnMavenWebsiteError)
+    end
   end
 end

data/spec/lib/pom_spec.rb

@@ -39,6 +39,7 @@ describe Tetra::Pom do
     end
   end
 
+  # rubocop:disable Metrics/LineLength, Style/TrailingWhitespace
   describe "#description" do
     it "reads the description" do
       expect(commons_pom.description).to eq "Commons Logging is a thin adapter allowing configurable bridging to other,
@@ -54,6 +55,7 @@ describe Tetra::Pom do
       expect(struts_apps_pom.description).to eq ""
     end
   end
+  # rubocop:enable Metrics/LineLength, Style/TrailingWhitespace
 
   describe "#url" do
     it "reads the url" do
@@ -84,13 +86,15 @@ describe Tetra::Pom do
       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"
+      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(commons_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

data/tetra.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "clamp"
   s.add_runtime_dependency "json_pure"
   s.add_runtime_dependency "open4"
-  s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "rubyzip", ">= 1.0"
   s.add_runtime_dependency "text"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement