diff --git a/Gemfile b/Gemfile index 7544ec9..1aa98e4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,16 +1,2 @@ source "http://rubygems.org" -# Add dependencies required to use your gem here. -# Example: -# gem "activesupport", ">= 2.3.5" -gem "curb", "~> 0.7.12" -gem "json", '>= 1.5.1' -gem "activesupport", '>= 0' - -# Add dependencies to develop your gem here. -# Include everything needed to run rake, tests, features, etc. -group :development do - gem "rspec", "~> 2.5.0" - gem "bundler", ">= 1.0.0" - gem "jeweler", ">= 1.5.2" - gem "rcov", ">= 0" -end +gemspec diff --git a/Gemfile.lock b/Gemfile.lock index bada8c8..77167ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,40 @@ +PATH + remote: . + specs: + r_hapi (0.1.3) + activesupport (> 0) + curb (> 0.7.12) + json (> 1.5.1) + GEM remote: http://rubygems.org/ specs: - activesupport (3.0.5) - addressable (2.3.5) + activesupport (4.2.3) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.3.8) builder (3.2.2) - curb (0.7.12) - descendants_tracker (0.0.3) - diff-lcs (1.1.2) - faraday (0.9.0) + curb (0.8.8) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + diff-lcs (1.1.3) + faraday (0.9.1) multipart-post (>= 1.2, < 3) - git (1.2.6) - github_api (0.11.2) + git (1.2.9.1) + github_api (0.12.3) addressable (~> 2.3) - descendants_tracker (~> 0.0.1) + descendants_tracker (~> 0.0.4) faraday (~> 0.8, < 0.10) - hashie (>= 1.2) + hashie (>= 3.3) multi_json (>= 1.7.5, < 2.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6.3) oauth2 - hashie (2.0.5) - highline (1.6.20) + hashie (3.4.2) + highline (1.7.2) + i18n (0.7.0) jeweler (2.0.1) builder bundler (>= 1.0) @@ -29,43 +44,44 @@ GEM nokogiri (>= 1.5.10) rake rdoc - json (1.5.1) - jwt (0.1.11) - multi_json (>= 1.5) - mini_portile (0.5.2) - multi_json (1.8.4) + json (1.8.3) + jwt (1.5.1) + mini_portile (0.6.2) + minitest (5.7.0) + multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - oauth2 (0.9.3) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + oauth2 (1.0.0) faraday (>= 0.8, < 0.10) - jwt (~> 0.1.8) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (~> 1.2) - rack (1.5.2) - rake (10.1.1) - rcov (0.9.9) - rdoc (4.1.1) - json (~> 1.4) + rack (1.6.4) + rake (10.4.2) + rdoc (4.2.0) rspec (2.5.0) rspec-core (~> 2.5.0) rspec-expectations (~> 2.5.0) rspec-mocks (~> 2.5.0) - rspec-core (2.5.1) + rspec-core (2.5.2) rspec-expectations (2.5.0) diff-lcs (~> 1.1.2) rspec-mocks (2.5.0) + thread_safe (0.3.5) + tzinfo (1.2.2) + thread_safe (~> 0.1) PLATFORMS ruby DEPENDENCIES - activesupport bundler (>= 1.0.0) - curb (~> 0.7.12) jeweler (>= 1.5.2) - json (>= 1.5.1) - rcov + r_hapi! rspec (~> 2.5.0) + +BUNDLED WITH + 1.10.5 diff --git a/Rakefile b/Rakefile index a227da2..5079845 100644 --- a/Rakefile +++ b/Rakefile @@ -35,11 +35,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec| spec.pattern = FileList['spec/**/*_spec.rb'] end -RSpec::Core::RakeTask.new(:rcov) do |spec| - spec.pattern = 'spec/**/*_spec.rb' - spec.rcov = true -end - task :default => :spec require 'rdoc/task' diff --git a/lib/r_hapi/connection.rb b/lib/r_hapi/connection.rb index 3b36b28..14413fc 100644 --- a/lib/r_hapi/connection.rb +++ b/lib/r_hapi/connection.rb @@ -90,7 +90,7 @@ def get(url) RHapi::ConnectionError.raise_error("#{response.response_code}\n Error is: #{err.inspect}") end end - RHapi::ConnectionError.raise_error(response.header_str) unless response.response_code.to_s =~ /2\d\d/ + RHapi::ConnectionError.raise_error("#{response.header_str.inspect} #{response.response_code.inspect} #{response.body.inspect}") unless response.response_code.to_s =~ /2\d\d/ response end diff --git a/r_hapi.gemspec b/r_hapi.gemspec index fc9c413..0267ba5 100644 --- a/r_hapi.gemspec +++ b/r_hapi.gemspec @@ -44,43 +44,11 @@ Gem::Specification.new do |s| s.rubygems_version = "2.1.11" s.summary = "A ruby wrapper for the HubSpot API (HAPI)." - if s.respond_to? :specification_version then - s.specification_version = 4 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, ["~> 0.7.12"]) - s.add_runtime_dependency(%q, [">= 1.5.1"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, ["~> 2.5.0"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_development_dependency(%q, [">= 1.5.2"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, ["~> 0.7.12"]) - s.add_runtime_dependency(%q, [">= 1.5.1"]) - s.add_runtime_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, ["~> 0.7.12"]) - s.add_dependency(%q, [">= 1.5.1"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 2.5.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 1.5.2"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 0.7.12"]) - s.add_dependency(%q, [">= 1.5.1"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, ["~> 0.7.12"]) - s.add_dependency(%q, [">= 1.5.1"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 2.5.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 1.5.2"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 0.7.12"]) - s.add_dependency(%q, [">= 1.5.1"]) - s.add_dependency(%q, [">= 0"]) - end + s.specification_version = 4 + s.add_runtime_dependency(%q, ["> 0.7.12"]) + s.add_runtime_dependency(%q, ["~> 1.8.0"]) + s.add_runtime_dependency(%q, ["> 0"]) + s.add_development_dependency(%q, ["~> 2.5.0"]) + s.add_development_dependency(%q, [">= 1.0.0"]) + s.add_development_dependency(%q, [">= 1.5.2"]) end -