coveralls 0.6.7 → 0.6.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bb459e184a87487cec1e9365bfbed5a4b2e85890
+  data.tar.gz: cb1c3e0a7429a1df758cadacbbb901e899272ec7
+SHA512:
+  metadata.gz: 0e3fb3fca099134d348cffe18ef846b53b396156ede97da46444646a637d3ee563bcb62bccde43155a0551c9d0d4abc5b001a44f6bfb2bf94dfd1451d88d4e9c
+  data.tar.gz: 088a7e7112eed4fc0a1957de1d339a49c20115ce9580f2ce5bcc4d354bc4c243f760fc04476dacc2552e61c9e9deaf537d44dc7a4d1576189f70852712d51d0e

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p448

data/.travis.yml

@@ -5,4 +5,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/coveralls-ruby.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Coveralls::VERSION
 
   gem.add_dependency 'rest-client'
-  gem.add_dependency 'colorize'
+  gem.add_dependency 'term-ansicolor'
   gem.add_dependency 'multi_json', '~> 1.3'
   gem.add_dependency 'thor'
 
@@ -24,10 +24,6 @@ Gem::Specification.new do |gem|
     gem.add_dependency 'simplecov', ">= 0.7"
   end
 
-  unless ENV["CI"]
-    gem.add_development_dependency 'debugger'
-  end
-
   gem.add_runtime_dependency('jruby-openssl') if RUBY_PLATFORM == 'java'
 
   gem.add_development_dependency 'rspec'

data/lib/coveralls.rb

@@ -1,19 +1,18 @@
-require 'colorize'
-
 require "coveralls/version"
 require "coveralls/configuration"
 require "coveralls/api"
+require "coveralls/output"
 require "coveralls/simplecov"
 
 module Coveralls
   extend self
 
   class NilFormatter
-    def format( result )
+    def format(result)
     end
   end
 
-  attr_accessor :testing, :noisy, :adapter, :run_locally
+  attr_accessor :testing, :noisy, :run_locally
 
   def wear!(simplecov_setting=nil, &block)
     setup!
@@ -49,9 +48,9 @@ module Coveralls
     # Load the appropriate adapter.
     if @@adapter == :simplecov
       ::SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-      puts "[Coveralls] Set up the SimpleCov formatter.".green
+      Coveralls::Output.puts("[Coveralls] Set up the SimpleCov formatter.", :color => "green")
     else
-      puts "[Coveralls] Couldn't find an appropriate adapter.".red
+      Coveralls::Output.puts("[Coveralls] Couldn't find an appropriate adapter.", :color => "red")
     end
 
   end
@@ -61,17 +60,17 @@ module Coveralls
       ::SimpleCov.add_filter 'vendor'
 
       if simplecov_setting
-        puts "[Coveralls] Using SimpleCov's '#{simplecov_setting}' settings.".green
+        Coveralls::Output.puts("[Coveralls] Using SimpleCov's '#{simplecov_setting}' settings.", :color => "green")
         if block_given?
-          ::SimpleCov.start(simplecov_setting) { instance_eval &block }
+          ::SimpleCov.start(simplecov_setting) { instance_eval(&block)}
         else
           ::SimpleCov.start(simplecov_setting)
         end
       elsif block_given?
-        puts "[Coveralls] Using SimpleCov settings defined in block.".green
-        ::SimpleCov.start { instance_eval &block }
+        Coveralls::Output.puts("[Coveralls] Using SimpleCov settings defined in block.", :color => "green")
+        ::SimpleCov.start { instance_eval(&block)}
       else
-        puts "[Coveralls] Using SimpleCov's default settings.".green
+        Coveralls::Output.puts("[Coveralls] Using SimpleCov's default settings.", :color => "green")
         ::SimpleCov.start
       end
     end
@@ -80,19 +79,19 @@ module Coveralls
   def should_run?
     # Fail early if we're not on a CI
     unless ENV["CI"] || ENV["JENKINS_URL"] ||
-      ENV["COVERALLS_RUN_LOCALLY"] || @testing
-      puts "[Coveralls] Outside the Travis environment, not sending data.".yellow
+      ENV["COVERALLS_RUN_LOCALLY"] || testing
+      Coveralls::Output.puts("[Coveralls] Outside the Travis environment, not sending data.", :color => "yellow")
       return false
     end
 
-    if ENV["COVERALLS_RUN_LOCALLY"] || @run_locally
-      puts "[Coveralls] Creating a new job on Coveralls from local coverage results.".cyan
+    if ENV["COVERALLS_RUN_LOCALLY"] || run_locally
+      Coveralls::Output.puts("[Coveralls] Creating a new job on Coveralls from local coverage results.", :color => "cyan")
     end
 
     true
   end
 
   def noisy?
-    ENV["COVERALLS_NOISY"] || @noisy
+    ENV["COVERALLS_NOISY"] || noisy
   end
 end

data/lib/coveralls/api.rb

@@ -12,19 +12,19 @@ module Coveralls
 		def self.post_json(endpoint, hash)
 			disable_net_blockers!
 			url = endpoint_to_url(endpoint)
-			puts MultiJson.dump(hash, :pretty => true).green if ENV['COVERALLS_DEBUG']
+      Coveralls::Output.puts("#{ MultiJson.dump(hash, :pretty => true) }", :color => "green") if ENV['COVERALLS_DEBUG']
 			hash = apified_hash hash
-			puts "[Coveralls] Submitting to #{API_BASE}".cyan
+      Coveralls::Output.puts "[Coveralls] Submitting to #{API_BASE}", :color => "cyan"
 			response = RestClient.post(url, :json_file => hash_to_file(hash))
 			response_hash = MultiJson.load(response.to_str)
-			puts ("[Coveralls] " + response_hash['message']).cyan
+      Coveralls::Output.puts "[Coveralls] #{ response_hash['message'] }", :color => "cyan"
 			if response_hash['message']
-				puts ("[Coveralls] " + response_hash['url'].underline).cyan
+        Coveralls::Output.puts("[Coveralls] #{ Coveralls::Output.format(response_hash['url'], :color => "underline") }", :color => "cyan")
 			end
 		rescue RestClient::ServiceUnavailable
-			puts ("[Coveralls] API timeout occured, but data should still be processed").red
+			Coveralls::Output.puts "[Coveralls] API timeout occured, but data should still be processed", :color => "red"
 		rescue RestClient::InternalServerError
-			puts ("[Coveralls] API internal error occured, we're on it!").red
+      Coveralls::Output.puts "[Coveralls] API internal error occured, we're on it!", :color => "red"
 		end
 
 		private
@@ -58,11 +58,11 @@ module Coveralls
 		def self.apified_hash hash
 			config = Coveralls::Configuration.configuration
 			if ENV['CI'] || ENV['COVERALLS_DEBUG'] || Coveralls.testing
-				puts "[Coveralls] Submiting with config:".yellow
-				puts MultiJson.dump(config, :pretty => true).
-					gsub(/"repo_token": "(.*?)"/,'"repo_token": "[secure]"').yellow
+        Coveralls::Output.puts "[Coveralls] Submiting with config:", :color => "yellow"
+        Coveralls::Output.puts MultiJson.dump(config, :pretty => true)
+					.gsub(/"repo_token": "(.*?)"/,'"repo_token": "[secure]"'), :color => "yellow"
 			end
 			hash.merge(config)
 		end
 	end
-end
+end

data/lib/coveralls/command.rb

@@ -57,12 +57,13 @@ module Coveralls
     def ensure_can_run_locally!
       config = Coveralls::Configuration.configuration
       if config[:repo_token].nil?
-        puts "Coveralls cannot run locally because no repo_secret_token is set in .coveralls.yml".red
-        puts "Please try again when you get your act together.".red
+        Coveralls::Output.puts "Coveralls cannot run locally because no repo_secret_token is set in .coveralls.yml", :color => "red"
+        Coveralls::Output.puts "Please try again when you get your act together.", :color => "red"
+
         return false
       end
       true
     end
 
   end
-end
+end

data/lib/coveralls/configuration.rb

@@ -109,8 +109,8 @@ module Coveralls
       hash
 
     rescue Exception => e
-      puts "Coveralls git error:".red
-      puts e.to_s.red
+      Coveralls::Output.puts "Coveralls git error:", :color => "red"
+      Coveralls::Output.puts e.to_s, :color => "red"
       nil
     end
 
@@ -150,4 +150,4 @@ module Coveralls
     end
 
   end
-end
+end

data/lib/coveralls/output.rb

@@ -0,0 +1,80 @@
+module Coveralls
+  #
+  # Public: Methods for formatting strings with Term::ANSIColor.
+  # Does not utilize monkey-patching and should play nicely when
+  # included with other libraries.
+  #
+  # All methods are module methods and should be called on
+  # the Coveralls::Output module.
+  #
+  # Examples
+  #
+  #   Coveralls::Output.format("Hello World", :color => "cyan")
+  #   # => "\e[36mHello World\e[0m"
+  #
+  #   Coveralls::Output.print("Hello World")
+  #   # Hello World => nil
+  #
+  #   Coveralls::Output.puts("Hello World", :color => "underline")
+  #   # Hello World
+  #   # => nil
+  module Output
+    require 'term/ansicolor'
+    extend self
+
+    # Public: Formats the given string with the specified color
+    # through Term::ANSIColor
+    #
+    # string  - the text to be formatted
+    # options - The hash of options used for formatting the text:
+    #           :color - The color to be passed as a method to
+    #                    Term::ANSIColor
+    #
+    # Examples
+    #
+    #   Coveralls::Output.format("Hello World!", :color => "cyan")
+    #   # => "\e[36mHello World\e[0m"
+    #
+    # Returns the formatted string.
+    def format(string, options = {})
+      if options[:color] && Term::ANSIColor.respond_to?(options[:color].to_sym)
+        Term::ANSIColor.send(options[:color].to_sym, string)
+      else
+        string
+      end
+    end
+
+    # Public: Passes .format to Kernel#puts
+    #
+    # string  - the text to be formatted
+    # options - The hash of options used for formatting the text:
+    #           :color - The color to be passed as a method to
+    #                    Term::ANSIColor
+    #
+    #
+    # Example
+    #
+    #   Coveralls::Output.puts("Hello World", :color => "cyan")
+    #
+    # Returns nil.
+    def puts(string, options = {})
+      Kernel.puts self.format(string, options)
+    end
+
+    # Public: Passes .format to Kernel#print
+    #
+    # string  - the text to be formatted
+    # options - The hash of options used for formatting the text:
+    #           :color - The color to be passed as a method to
+    #                    Term::ANSIColor
+    #
+    # Example
+    #
+    #   Coveralls::Output.print("Hello World!", :color => "underline")
+    #
+    # Returns nil.
+    def print(string, options = {})
+      Kernel.print self.format(string, options)
+    end
+  end
+end

data/lib/coveralls/simplecov.rb

@@ -7,19 +7,19 @@ module Coveralls
         if result.files.length > 0
           puts "[Coveralls] Some handy coverage stats:"
         else
-          puts "[Coveralls] There are no covered files.".yellow
+          Coveralls::Output.puts "[Coveralls] There are no covered files.", :color => "yellow"
         end
         result.files.each do |f|
           print "  * "
-          print "#{short_filename(f.filename)}".cyan
-          print " => ".white
+          Coveralls::Output.print short_filename(f.filename).to_s, :color => "cyan"
+          Coveralls::Output.print " => ", :color => "white"
           cov = "#{f.covered_percent.round}%"
           if f.covered_percent > 90
-            print cov.green
+            Coveralls::Output.print cov, :color => "green"
           elsif f.covered_percent > 80
-            print cov.yellow
+            Coveralls::Output.print cov, :color => "yellow"
           else
-            print cov.red
+            Coveralls::Output.print cov, :color => "red"
           end
           puts ""
         end
@@ -79,14 +79,14 @@ module Coveralls
       end
 
       def display_error(e)
-        puts "Coveralls encountered an exception:".red
-        puts e.class.to_s.red
-        puts e.message.red
+        Coveralls::Output.puts "Coveralls encountered an exception:", :color => "red"
+        Coveralls::Output.puts e.class.to_s, :color => "red"
+        Coveralls::Output.puts e.message, :color => "red"
         e.backtrace.each do |line|
-          puts line.red
+          Coveralls::Output.puts line, :color => "red"
         end if e.backtrace
         if e.respond_to?(:response) && e.response
-          puts e.response.to_s.red
+          Coveralls::Output.puts e.response.to_s, :color => "red"
         end
         false
       end
@@ -102,4 +102,4 @@ module Coveralls
 
     end
   end
-end
+end

data/lib/coveralls/version.rb

@@ -1,3 +1,3 @@
 module Coveralls
- VERSION = "0.6.7"
+ VERSION = "0.6.8"
 end

data/spec/coveralls/output_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Coveralls::Output do
+  describe '.format' do
+    it "accepts a color argument" do
+      string = 'Hello'
+      ansi_color_string =  Term::ANSIColor.red(string)
+      Coveralls::Output.format(string, :color => 'red').should eq(ansi_color_string)
+    end
+
+    it "also accepts no color arguments" do
+      unformatted_string = "Hi Doggie!"
+      Coveralls::Output.format(unformatted_string).should eq(unformatted_string)
+    end
+
+    it "rejects formats unrecognized by Term::ANSIColor" do
+      string = 'Hi dog!'
+      Coveralls::Output.format(string, :color => "not_a_real_color").should eq(string)
+    end
+
+    it "accepts more than 1 color argument" do
+      pending "Not implemented"
+
+      string = 'Hi dog!'
+      multi_formatted_string = Term::ANSIColor.red{ Term::ANSIColor.underline(string) }
+      Coveralls::Output.format(string, :color => 'red underline').should eq(multi_formatted_string)
+    end
+  end
+end

data/spec/coveralls/simplecov_spec.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls
 version: !ruby/object:Gem::Version
-  version: 0.6.7
-  prerelease: 
+  version: 0.6.8
 platform: ruby
 authors:
 - Nick Merwin
@@ -10,44 +9,39 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !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: colorize
+  name: term-ansicolor
   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: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,87 +56,62 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   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: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -151,7 +119,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -159,7 +126,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -167,7 +133,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -182,8 +147,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-version
 - .rspec
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -196,6 +161,7 @@ files:
 - lib/coveralls/api.rb
 - lib/coveralls/command.rb
 - lib/coveralls/configuration.rb
+- lib/coveralls/output.rb
 - lib/coveralls/rake/task.rb
 - lib/coveralls/simplecov.rb
 - lib/coveralls/version.rb
@@ -209,31 +175,31 @@ files:
 - spec/coveralls/fixtures/app/models/user.rb
 - spec/coveralls/fixtures/app/vendor/vendored_gem.rb
 - spec/coveralls/fixtures/sample.rb
+- spec/coveralls/output_spec.rb
 - spec/coveralls/simplecov_spec.rb
 - spec/spec_helper.rb
 homepage: https://coveralls.io
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby implementation of the Coveralls API.
 test_files:
 - spec/coveralls/configuration_spec.rb
@@ -246,6 +212,6 @@ test_files:
 - spec/coveralls/fixtures/app/models/user.rb
 - spec/coveralls/fixtures/app/vendor/vendored_gem.rb
 - spec/coveralls/fixtures/sample.rb
+- spec/coveralls/output_spec.rb
 - spec/coveralls/simplecov_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p194