coveralls 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a66719787cad85905b25461aac529d559d383bf3
-  data.tar.gz: 046a9ba8007720a67baf91e96425c3fe9ec8d66b
+  metadata.gz: e61500aefc96d02600f5c1f9e46bafeaca0ab065
+  data.tar.gz: ade2d0bd97e80983b542d4d58f181f6095cbcb3d
 SHA512:
-  metadata.gz: 12aeda5682589c208469044a3386b42d9599468db9859f38ef08fa72ba9606946eb0e15b54be776ecd128b9d6120ffea9228f3e58e64c9397cdc369b24dbd979
-  data.tar.gz: c0152de5216ac5b75ee38776b211474d51109de210b3349751779f793cc8262be74428f0963a1f193d1e05c2eceab5526d22453438fe62b1a238b5d5b4b760c5
+  metadata.gz: b376f04bbc679fdaf14a4a833eb318a9f8932635e5afc29e410df27ea3405490284ca3f051ffab45e083c62f7f417fab51d034e99d15dfd9b525261d2a63734b
+  data.tar.gz: 5a6edc4eae4b92be861c557c939eafc8f8705b3155772af764380629bc83f1689dfe9dd7d7d72c89a6825e5657ca29f32f2127a56fab57d95dc07db15fd8c0aa

data/Gemfile

@@ -12,7 +12,7 @@ gem 'webmock', '>= 1.20'
 
 platforms :ruby_18 do
   gem 'mime-types', '~> 1.25'
-  gem 'rest-client', '~> 1.6.0'
+  gem 'addressable', '~> 2.3.8', :group => :test
 end
 
 platforms :jruby do

data/coveralls-ruby.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.8.7'
 
   gem.add_dependency 'json', '~> 1.8'
-  gem.add_dependency 'rest-client', '>= 1.6.8', '< 2'
   gem.add_dependency 'simplecov', '~> 0.11.0'
   gem.add_dependency 'tins', '~> 1.6.0'
   gem.add_dependency 'term-ansicolor', '~> 1.3'

data/lib/coveralls/api.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'rest_client'
+require 'net/https'
 
 module Coveralls
   class API
@@ -16,20 +16,33 @@ module Coveralls
 
     def self.post_json(endpoint, hash)
       disable_net_blockers!
-      url = endpoint_to_url(endpoint)
+
+      uri = endpoint_to_uri(endpoint)
+
       Coveralls::Output.puts("#{ JSON.pretty_generate(hash) }", :color => "green") if ENV['COVERALLS_DEBUG']
-      hash = apified_hash hash
       Coveralls::Output.puts("[Coveralls] Submitting to #{API_BASE}", :color => "cyan")
-      response = RestClient::Request.execute(:method => :post, :url => url, :payload => { :json_file => hash_to_file(hash) }, :ssl_version => 'TLSv1', :verify_ssl => false)
-      response_hash = JSON.load(response.to_str)
-      Coveralls::Output.puts("[Coveralls] #{ response_hash['message'] }", :color => "cyan")
+
+      client  = build_client(uri)
+      request = build_request(uri.path, hash)
+
+      response = client.request(request)
+
+      response_hash = JSON.load(response.body.to_str)
+
       if response_hash['message']
+        Coveralls::Output.puts("[Coveralls] #{ response_hash['message'] }", :color => "cyan")
+      end
+
+      if response_hash['url']
         Coveralls::Output.puts("[Coveralls] #{ Coveralls::Output.format(response_hash['url'], :color => "underline") }", :color => "cyan")
       end
-    rescue RestClient::ServiceUnavailable
-      Coveralls::Output.puts("[Coveralls] API timeout occured, but data should still be processed", :color => "red")
-    rescue RestClient::InternalServerError
-      Coveralls::Output.puts("[Coveralls] API internal error occured, we're on it!", :color => "red")
+
+      case response
+      when Net::HTTPServiceUnavailable
+        Coveralls::Output.puts("[Coveralls] API timeout occured, but data should still be processed", :color => "red")
+      when Net::HTTPInternalServerError
+        Coveralls::Output.puts("[Coveralls] API internal error occured, we're on it!", :color => "red")
+      end
     end
 
     private
@@ -47,8 +60,43 @@ module Coveralls
       end
     end
 
-    def self.endpoint_to_url(endpoint)
-      "#{API_BASE}/#{endpoint}"
+    def self.endpoint_to_uri(endpoint)
+      URI.parse("#{API_BASE}/#{endpoint}")
+    end
+
+    def self.build_client(uri)
+      client = Net::HTTP.new(uri.host, uri.port)
+      client.use_ssl = true if uri.port == 443
+      client.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      unless client.respond_to?(:ssl_version=)
+        Net::HTTP.ssl_context_accessor("ssl_version")
+      end
+
+      client.ssl_version = 'TLSv1'
+
+      client
+    end
+
+    def self.build_request(path, hash)
+      request  = Net::HTTP::Post.new(path)
+      boundary = rand(1_000_000).to_s
+
+      request.body         = build_request_body(hash, boundary)
+      request.content_type = "multipart/form-data, boundary=#{boundary}"
+
+      request
+    end
+
+    def self.build_request_body(hash, boundary)
+      hash = apified_hash(hash)
+      file = hash_to_file(hash)
+
+      "--#{boundary}\r\n" \
+      "Content-Disposition: form-data; name=\"json_file\"; filename=\"#{File.basename(file.path)}\"\r\n" \
+      "Content-Type: text/plain\r\n\r\n" +
+      File.read(file.path) +
+      "\r\n--#{boundary}--\r\n"
     end
 
     def self.hash_to_file(hash)
@@ -62,7 +110,7 @@ module Coveralls
 
     def self.apified_hash hash
       config = Coveralls::Configuration.configuration
-      if ENV['CI'] || ENV['COVERALLS_DEBUG'] || Coveralls.testing
+      if ENV['COVERALLS_DEBUG'] || Coveralls.testing
         Coveralls::Output.puts "[Coveralls] Submitting with config:", :color => "yellow"
         output = JSON.pretty_generate(config).gsub(/"repo_token": ?"(.*?)"/,'"repo_token": "[secure]"')
         Coveralls::Output.puts output, :color => "yellow"

data/lib/coveralls/version.rb

@@ -1,3 +1,3 @@
 module Coveralls
- VERSION = "0.8.10"
+ VERSION = "0.8.11"
 end

data/spec/coveralls/simplecov_spec.rb

@@ -62,7 +62,8 @@ describe Coveralls::SimpleCov::Formatter do
 
     context "with api error" do
       it "rescues" do
-        e = RestClient::ResourceNotFound.new double('HTTP Response', :code => '502')
+        e = SocketError.new
+
         silence do
           Coveralls::SimpleCov::Formatter.new.display_error(e).should be_falsy
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - Nick Merwin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,26 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.8
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.8
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby implementation of the Coveralls API.