Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
reorganize deps for Travis + MRI 1.9
  • Loading branch information
e2 committed Jan 13, 2015
1 parent 785dcb7 commit 8dd020b
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -2,12 +2,13 @@
# xcodebuild which is not available in the ubuntu environment travis-ci
# provides.
language: ruby
bundler_args: --without development
rvm:
- 1.9.3
- 2.0.0
- 2.1.2
- 2.1.3
- rbx-2
gemfile: rubygem/Gemfile
script: make rubygem/lib/zeus/version.rb && cd rubygem && bundle exec rspec spec
script: make rubygem/lib/zeus/version.rb && cd rubygem && bundle install --without development && bundle exec rspec spec

13 changes: 10 additions & 3 deletions Gemfile
@@ -1,5 +1,12 @@
source 'https://rubygems.org'

gem 'rake'
gem 'ronn'
gem 'rspec'
group :test do
gem 'rspec'
end

# Only this group is skipped on Travis (--without development)
group :development do
gem 'rake' # called from ./man dir
gem 'ronn'
gem 'mustache', '=0.7.0', '<1.0' if RUBY_VERSION < '2.0'
end
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -26,7 +26,7 @@ rubygem-linux/pkg/%: \
rubygem/lib/zeus/version.rb \
rubygem/build \
Gemfile.lock
cd rubygem && bundle exec rake
cd rubygem && bundle install && bundle exec rake

rubygem/pkg/%: \
rubygem/build/fsevents-wrapper \
Expand Down
8 changes: 7 additions & 1 deletion rubygem/Gemfile
@@ -1,4 +1,10 @@
source 'https://rubygems.org'

# Specify your gem's dependencies in zeus.gemspec
gemspec
gemspec development_group: :gem_build_tools

gem 'rspec', '~> 3.1'

group :development do
gem 'rake' # ok to put here since Travis only runs rspec directly
end
6 changes: 2 additions & 4 deletions rubygem/zeus.gemspec
Expand Up @@ -27,9 +27,7 @@ Gem::Specification.new do |gem|
gem.version = version
gem.license = "MIT"

gem.add_development_dependency "rspec", '~> 3.1.0'
gem.add_development_dependency "rake"
gem.add_development_dependency "ronn", '>= 0.7.0'

gem.add_runtime_dependency "method_source", ">= 0.6.7"

gem.add_development_dependency "bundler", '~> 1.6'
end

0 comments on commit 8dd020b

Please sign in to comment.