Skip to content

Commit

Permalink
Merge pull request #7 from ResultadosDigitais/blackops-fix-gemfile
Browse files Browse the repository at this point in the history
Move dev gems to dev dependency group
  • Loading branch information
henrich-m authored Aug 29, 2018
2 parents c06519b + 07b33cf commit bc6c5b4
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 119 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: ruby
rvm:
- 2.2
- 2.3
- 2.4
17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
source "http://rubygems.org"
source 'https://rubygems.org'
# Add dependencies required to use your gem here.
# Example:
# gem "activesupport", ">= 2.3.5"

gem 'httparty'
gem 'json', '>= 1.7.7'
gem 'multi_xml', '>= 0.5.2'
gem 'webmock'
gem 'coveralls', :require => false

# Add dependencies to develop your gem here.
# Include everything needed to run rake, tests, features, etc.
group :development do
gem "shoulda", ">= 0"
gem "rdoc", "~> 3.12"
gem "bundler", ">= 1.0.0"
gem "jeweler", ">= 1.8.4"
gem "simplecov", ">= 0"
gem 'bundler', '>= 1.0.0'
gem 'coveralls', require: false
gem 'jeweler', '>= 1.8.4'
gem 'rdoc', '~> 3.12'
gem 'shoulda', '>= 0'
gem 'simplecov', '>= 0'
gem 'test-unit'
gem 'webmock'
end
6 changes: 5 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
activesupport (5.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -64,6 +64,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
power_assert (1.1.3)
psych (2.2.4)
public_suffix (2.0.5)
rack (2.0.1)
Expand All @@ -85,6 +86,8 @@ GEM
simplecov-html (0.10.0)
term-ansicolor (1.4.0)
tins (~> 1.0)
test-unit (3.2.8)
power_assert
thor (0.19.4)
thread_safe (0.3.6)
tins (1.13.2)
Expand All @@ -108,6 +111,7 @@ DEPENDENCIES
rdoc (~> 3.12)
shoulda
simplecov
test-unit
webmock

BUNDLED WITH
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# pipedrive-ruby

[![Gem Version](https://badge.fury.io/rb/pipedrive-ruby.png)](http://badge.fury.io/rb/pipedrive-ruby)
[![Code Climate](https://codeclimate.com/github/GeneralScripting/pipedrive-ruby.png)](https://codeclimate.com/github/GeneralScripting/pipedrive-ruby)
[![Build Status](https://travis-ci.org/GeneralScripting/pipedrive-ruby.png?branch=master)](https://travis-ci.org/GeneralScripting/pipedrive-ruby)
[![Coverage Status](https://coveralls.io/repos/GeneralScripting/pipedrive-ruby/badge.png?branch=master)](https://coveralls.io/r/GeneralScripting/pipedrive-ruby?branch=master)
[![Code Climate](https://codeclimate.com/github/ResultadosDigitais/pipedrive-ruby.png)](https://codeclimate.com/github/ResultadosDigitais/pipedrive-ruby)
[![Build Status](https://travis-ci.org/ResultadosDigitais/pipedrive-ruby.png?branch=master)](https://travis-ci.org/ResultadosDigitais/pipedrive-ruby)
[![Coverage Status](https://coveralls.io/repos/ResultadosDigitais/pipedrive-ruby/badge.png?branch=master)](https://coveralls.io/r/ResultadosDigitais/pipedrive-ruby?branch=master)

## Installation

Expand Down Expand Up @@ -31,7 +31,7 @@ You can check some of the calls at https://developers.pipedrive.com/v1


## Contributing to pipedrive-ruby

* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
* Fork the project.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.3
0.3.6
166 changes: 69 additions & 97 deletions pipedrive-ruby.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,112 +2,84 @@
# DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-

# stub: pipedrive-ruby 0.3.3 ruby lib

Gem::Specification.new do |s|
s.name = "pipedrive-ruby"
s.version = "0.3.3"
s.name = 'pipedrive-ruby'
s.version = '0.3.6'

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.require_paths = ["lib"]
s.authors = ["Jan Schwenzien", "Waldemar Kusnezow", "Joel Courtney"]
s.date = "2017-03-15"
s.description = "Ruby wrapper for the Pipedrive API"
s.email = "[email protected]"
s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
s.require_paths = ['lib']
s.authors = ['Jan Schwenzien', 'Waldemar Kusnezow', 'Joel Courtney']
s.date = '2017-03-15'
s.description = 'Ruby wrapper for the Pipedrive API'
s.email = '[email protected]'
s.extra_rdoc_files = [
"README.md"
'README.md'
]
s.files = [
".document",
"Gemfile",
"Gemfile.lock",
"README.md",
"Rakefile",
"VERSION",
"lib/pipedrive-ruby.rb",
"lib/pipedrive/activity-type.rb",
"lib/pipedrive/activity.rb",
"lib/pipedrive/authorization.rb",
"lib/pipedrive/base.rb",
"lib/pipedrive/currency.rb",
"lib/pipedrive/deal-field.rb",
"lib/pipedrive/deal.rb",
"lib/pipedrive/file.rb",
"lib/pipedrive/filter.rb",
"lib/pipedrive/goal.rb",
"lib/pipedrive/note.rb",
"lib/pipedrive/organization-field.rb",
"lib/pipedrive/organization.rb",
"lib/pipedrive/permission-set.rb",
"lib/pipedrive/person-field.rb",
"lib/pipedrive/person.rb",
"lib/pipedrive/pipeline.rb",
"lib/pipedrive/product-field.rb",
"lib/pipedrive/product.rb",
"lib/pipedrive/push-notification.rb",
"lib/pipedrive/role.rb",
"lib/pipedrive/search-result.rb",
"lib/pipedrive/stage.rb",
"lib/pipedrive/user-connection.rb",
"lib/pipedrive/user-setting.rb",
"lib/pipedrive/user.rb",
"lib/pipedrive/webhook.rb",
"pipedrive-ruby.gemspec",
"test/data/create_deal_body.json",
"test/data/create_note_body.json",
"test/data/create_organization_body.json",
"test/data/create_person_body.json",
"test/data/create_stages_body.json",
"test/helper.rb",
"test/test_pipedrive_authentication.rb",
"test/test_pipedrive_deal.rb",
"test/test_pipedrive_note.rb",
"test/test_pipedrive_organization.rb",
"test/test_pipedrive_person.rb",
"test/test_pipedrive_stage.rb"
'.document',
'Gemfile',
'Gemfile.lock',
'README.md',
'Rakefile',
'VERSION',
'lib/pipedrive-ruby.rb',
'lib/pipedrive/activity-type.rb',
'lib/pipedrive/activity.rb',
'lib/pipedrive/authorization.rb',
'lib/pipedrive/base.rb',
'lib/pipedrive/currency.rb',
'lib/pipedrive/deal-field.rb',
'lib/pipedrive/deal.rb',
'lib/pipedrive/file.rb',
'lib/pipedrive/filter.rb',
'lib/pipedrive/goal.rb',
'lib/pipedrive/note.rb',
'lib/pipedrive/organization-field.rb',
'lib/pipedrive/organization.rb',
'lib/pipedrive/permission-set.rb',
'lib/pipedrive/person-field.rb',
'lib/pipedrive/person.rb',
'lib/pipedrive/pipeline.rb',
'lib/pipedrive/product-field.rb',
'lib/pipedrive/product.rb',
'lib/pipedrive/push-notification.rb',
'lib/pipedrive/role.rb',
'lib/pipedrive/search-result.rb',
'lib/pipedrive/stage.rb',
'lib/pipedrive/user-connection.rb',
'lib/pipedrive/user-setting.rb',
'lib/pipedrive/user.rb',
'lib/pipedrive/webhook.rb',
'pipedrive-ruby.gemspec',
'test/data/create_deal_body.json',
'test/data/create_note_body.json',
'test/data/create_organization_body.json',
'test/data/create_person_body.json',
'test/data/create_stages_body.json',
'test/helper.rb',
'test/test_pipedrive_authentication.rb',
'test/test_pipedrive_deal.rb',
'test/test_pipedrive_note.rb',
'test/test_pipedrive_organization.rb',
'test/test_pipedrive_person.rb',
'test/test_pipedrive_stage.rb'
]
s.homepage = "https://github.com/GeneralScripting/pipedrive-ruby.git"
s.licenses = ["MIT"]
s.rubygems_version = "2.4.8"
s.summary = "Ruby wrapper for the Pipedrive API"

if s.respond_to? :specification_version then
s.specification_version = 4
s.homepage = 'https://github.com/GeneralScripting/pipedrive-ruby.git'
s.licenses = ['MIT']
s.rubygems_version = '2.4.8'
s.summary = 'Ruby wrapper for the Pipedrive API'

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<httparty>, [">= 0"])
s.add_runtime_dependency(%q<json>, [">= 1.7.7"])
s.add_runtime_dependency(%q<multi_xml>, [">= 0.5.2"])
s.add_runtime_dependency(%q<webmock>, [">= 0"])
s.add_runtime_dependency(%q<coveralls>, [">= 0"])
s.add_development_dependency(%q<shoulda>, [">= 0"])
s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
s.add_development_dependency(%q<simplecov>, [">= 0"])
else
s.add_dependency(%q<httparty>, [">= 0"])
s.add_dependency(%q<json>, [">= 1.7.7"])
s.add_dependency(%q<multi_xml>, [">= 0.5.2"])
s.add_dependency(%q<webmock>, [">= 0"])
s.add_dependency(%q<coveralls>, [">= 0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<rdoc>, ["~> 3.12"])
s.add_dependency(%q<bundler>, [">= 1.0.0"])
s.add_dependency(%q<jeweler>, [">= 1.8.4"])
s.add_dependency(%q<simplecov>, [">= 0"])
end
if s.respond_to?(:metadata)
s.metadata['allowed_push_host'] = 'https://resultadosdigitais.jfrog.io/resultadosdigitais/api/gems/gems'
else
s.add_dependency(%q<httparty>, [">= 0"])
s.add_dependency(%q<json>, [">= 1.7.7"])
s.add_dependency(%q<multi_xml>, [">= 0.5.2"])
s.add_dependency(%q<webmock>, [">= 0"])
s.add_dependency(%q<coveralls>, [">= 0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<rdoc>, ["~> 3.12"])
s.add_dependency(%q<bundler>, [">= 1.0.0"])
s.add_dependency(%q<jeweler>, [">= 1.8.4"])
s.add_dependency(%q<simplecov>, [">= 0"])
raise 'RubyGems 2.0 or newer is required to protect against ' \
'public gem pushes.'
end
end

s.add_runtime_dependency('httparty', ['>= 0'])
s.add_runtime_dependency('json', ['>= 1.7.7'])
s.add_runtime_dependency('multi_xml', ['>= 0.5.2'])
end
3 changes: 2 additions & 1 deletion test/test_pipedrive_authentication.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ class TestPipedriveAuthentication < Test::Unit::TestCase
should "send authentication token with each request" do
Pipedrive.authenticate("some-token")

stub_request(:get, "http://api.pipedrive.com/v1/?api_token=some-token").
stub_request(:get, "https://api.pipedrive.com/v1/?api_token=some-token").
with(:headers => {
'Accept'=>'application/json',
'Content-Type'=>'application/x-www-form-urlencoded',
'User-Agent'=>'Ruby.Pipedrive.Api'
}).
to_return(:status => 200, :body => "", :headers => {})

Pipedrive::Base.get("/")
end
end
4 changes: 2 additions & 2 deletions test/test_pipedrive_deal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def setup
"value" => "37k"
}

stub_request(:post, "http://api.pipedrive.com/v1/deals?api_token=some-token").
stub_request(:post, "https://api.pipedrive.com/v1/deals?api_token=some-token").
with(:body => body,
:headers => {
'Accept'=>'application/json',
Expand Down Expand Up @@ -44,4 +44,4 @@ def setup
#TODO
# flunk "to be tested"
end
end
end
2 changes: 1 addition & 1 deletion test/test_pipedrive_note.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def setup
# deal_id
}

stub_request(:post, "http://api.pipedrive.com/v1/notes?api_token=some-token").
stub_request(:post, "https://api.pipedrive.com/v1/notes?api_token=some-token").
with(:body => body, :headers => {
'Accept'=>'application/json',
'Content-Type'=>'application/x-www-form-urlencoded',
Expand Down
2 changes: 1 addition & 1 deletion test/test_pipedrive_organization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def setup
end

should "execute a valid person request" do
stub_request(:post, "http://api.pipedrive.com/v1/organizations?api_token=some-token").
stub_request(:post, "https://api.pipedrive.com/v1/organizations?api_token=some-token").
with(:body => {
"name" => "Dope.org"
},
Expand Down
2 changes: 1 addition & 1 deletion test/test_pipedrive_person.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def setup
"phone"=>["0123456789"]
}

stub_request(:post, "http://api.pipedrive.com/v1/persons?api_token=some-token").
stub_request(:post, "https://api.pipedrive.com/v1/persons?api_token=some-token").
with(:body => body, :headers => {
'Accept'=>'application/json',
'Content-Type'=>'application/x-www-form-urlencoded',
Expand Down
4 changes: 2 additions & 2 deletions test/test_pipedrive_stage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def setup
should "execute a valid stage request" do
body = {}

stub_request(:get, "http://api.pipedrive.com/v1/stages?api_token=some-token").
stub_request(:get, "https://api.pipedrive.com/v1/stages?api_token=some-token").
with(:body => body,
:headers => {
'Accept'=>'application/json',
Expand Down Expand Up @@ -38,4 +38,4 @@ def setup
assert_equal 1, first_stage.pipeline_id
assert_equal "Pipeline", first_stage.pipeline_name
end
end
end

0 comments on commit bc6c5b4

Please sign in to comment.