Skip to content

Commit

Permalink
Fixing ruby 1.9 build
Browse files Browse the repository at this point in the history
  • Loading branch information
Guilherme Souza committed Oct 23, 2016
1 parent 332506e commit 537fc82
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.5
2.2.5
24 changes: 1 addition & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,10 @@ rvm:
- 'ruby-head'
- 'jruby'
- 'rbx-2'
- 'rbx-3.5'

addons:
apt:
packages:
- libevent-dev
- libxml2-dev
- libcurl4-gnutls-dev
- python2.7-dev
- python-virtualenv


install: bundle install --jobs=3 --retry=3

script:
# creating and activating virtualenv
- virtualenv -p python2.7 --distribute rubythumbor
- source ./rubythumbor/bin/activate

# install python requirements
- pip install -r test_requirements.txt --use-mirrors

# verify both requirements were met
- INSTALLDIR=$(python -c "import os; import thumbor; print(os.path.dirname(thumbor.__file__))")
script: bundle exec rake spec

# finally run tests
- bundle exec rake spec
after_success:
coveralls
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ gemspec

platforms :ruby do
gem 'coveralls', require: false
gem 'tins', '< 1.7.0' # the last one 1.9.2 compatible
end
17 changes: 0 additions & 17 deletions Guardfile

This file was deleted.

5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/bin/bash

run_all:
@rvm 1.9.2,1.9.3,2.0.0,2.1.0 do rvm gemset create rubythumbor
@rvm 1.9.2@rubythumbor,1.9.3@rubythumbor,2.0.0@rubythumbor,2.1.0@rubythumbor do bundle
@rvm 1.9.2@rubythumbor,1.9.3@rubythumbor,2.0.0@rubythumbor,2.1.0@rubythumbor do bundle exec rake spec

test unit:
@bundle exec rake spec

Expand Down
1 change: 0 additions & 1 deletion lib/ruby-thumbor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@

module Thumbor
end

23 changes: 13 additions & 10 deletions ruby-thumbor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,24 @@ $:.unshift lib unless $:.include?(lib)
require 'thumbor/version'

Gem::Specification.new do |s|
s.name = "ruby-thumbor"
s.name = 'ruby-thumbor'
s.version = Thumbor::VERSION

s.authors = ["Bernardo Heynemann", "Guilherme Souza"]
s.description = "ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor)."
s.email = ["heynemann@gmail.com", "guivideojob@gmail.com"]
s.files = Dir.glob('lib/**/*.rb') << 'README.rdoc'
s.authors = ['Bernardo Heynemann', 'Guilherme Souza']
s.description = 'ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor).'
s.email = ['heynemann@gmail.com', 'guivideojob@gmail.com']
s.files = Dir.glob('lib/**/*.rb') << 'README.rdoc'
s.test_files = Dir.glob('spec/**/*.rb')
s.homepage = "http://github.com/thumbor/ruby-thumbor"
s.rdoc_options = ["--main", "README.rdoc"]
s.summary = "ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor)."

s.homepage = 'http://github.com/thumbor/ruby-thumbor'
s.rdoc_options = ['--main', 'README.rdoc']
s.summary = 'ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor).'

s.add_development_dependency('rspec')
s.add_development_dependency('simplecov')
s.add_development_dependency('guard-rspec')
s.add_development_dependency('rake')
if RUBY_VERSION < '2.2'
s.add_development_dependency('json', ['< 2.0'])
s.add_development_dependency('term-ansicolor', ['< 1.4'])
s.add_development_dependency('tins', ['< 1.7'])
end
end

0 comments on commit 537fc82

Please sign in to comment.