From 4f58a86f8f59a107e73e73c4fa387e70a57048c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 12 Feb 2014 15:41:19 +0100 Subject: update Bundle --- Gemfile | 11 +++++++++++ Gemfile.lock | 18 +++++++++--------- Rakefile | 3 ++- zorglub.gemspec | 6 ------ 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index eac7e47..deac4c2 100644 --- a/Gemfile +++ b/Gemfile @@ -3,3 +3,14 @@ source "http://rubygems.org" # gem's dependencies are in zorglub.gemspec gemspec +gem 'rack' + +group :test do + gem 'rake' + gem 'rspec' +end + +group :test, :development do + gem 'haml' + gem 'sass' +end diff --git a/Gemfile.lock b/Gemfile.lock index 82083e9..c1514ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,32 +2,32 @@ PATH remote: . specs: zorglub (0.0.8) - rack GEM remote: http://rubygems.org/ specs: - diff-lcs (1.2.4) - haml (4.0.3) + diff-lcs (1.2.5) + haml (4.0.5) tilt rack (1.5.2) - rake (10.1.0) + rake (10.1.1) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rspec-core (2.14.5) - rspec-expectations (2.14.2) + rspec-core (2.14.7) + rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.3) - sass (3.2.10) - tilt (1.4.1) + rspec-mocks (2.14.5) + sass (3.2.14) + tilt (2.0.0) PLATFORMS ruby DEPENDENCIES haml + rack rake rspec sass diff --git a/Rakefile b/Rakefile index f2c6857..8b66d8f 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,7 @@ require 'bundler/gem_tasks' - require 'rspec/core/rake_task' + RSpec::Core::RakeTask.new task :default => :spec + diff --git a/zorglub.gemspec b/zorglub.gemspec index c60a8ce..274a5b7 100644 --- a/zorglub.gemspec +++ b/zorglub.gemspec @@ -21,12 +21,6 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ["lib"] - - s.add_runtime_dependency "rack" - s.add_development_dependency "rspec" - s.add_development_dependency "rake" - s.add_development_dependency "haml" - s.add_development_dependency "sass" end # # EOF -- cgit v1.1-2-g2b99