Commit 8f33dd394a700ae52e7e2e87d39e98fc34acb415
1 parent
794a03be
Exists in
master
update bundle
Showing
4 changed files
with
20 additions
and
14 deletions
Show diff stats
Gemfile
Gemfile.lock
1 | GEM | 1 | GEM |
2 | remote: http://rubygems.org/ | 2 | remote: http://rubygems.org/ |
3 | specs: | 3 | specs: |
4 | + archive-tar-minitar (0.5.2) | ||
4 | columnize (0.3.6) | 5 | columnize (0.3.6) |
5 | diff-lcs (1.1.3) | 6 | diff-lcs (1.1.3) |
6 | git (1.2.5) | 7 | git (1.2.5) |
@@ -8,10 +9,9 @@ GEM | @@ -8,10 +9,9 @@ GEM | ||
8 | bundler (~> 1.0) | 9 | bundler (~> 1.0) |
9 | git (>= 1.2.5) | 10 | git (>= 1.2.5) |
10 | rake | 11 | rake |
11 | - linecache (0.46) | ||
12 | - rbx-require-relative (> 0.0.4) | ||
13 | - rake (0.8.7) | ||
14 | - rbx-require-relative (0.0.5) | 12 | + linecache19 (0.5.12) |
13 | + ruby_core_source (>= 0.1.4) | ||
14 | + rake (0.9.2.2) | ||
15 | rspec (2.8.0) | 15 | rspec (2.8.0) |
16 | rspec-core (~> 2.8.0) | 16 | rspec-core (~> 2.8.0) |
17 | rspec-expectations (~> 2.8.0) | 17 | rspec-expectations (~> 2.8.0) |
@@ -20,17 +20,22 @@ GEM | @@ -20,17 +20,22 @@ GEM | ||
20 | rspec-expectations (2.8.0) | 20 | rspec-expectations (2.8.0) |
21 | diff-lcs (~> 1.1.2) | 21 | diff-lcs (~> 1.1.2) |
22 | rspec-mocks (2.8.0) | 22 | rspec-mocks (2.8.0) |
23 | - ruby-debug (0.10.4) | ||
24 | - columnize (>= 0.1) | ||
25 | - ruby-debug-base (~> 0.10.4.0) | ||
26 | - ruby-debug-base (0.10.4) | ||
27 | - linecache (>= 0.3) | 23 | + ruby-debug-base19 (0.11.25) |
24 | + columnize (>= 0.3.1) | ||
25 | + linecache19 (>= 0.5.11) | ||
26 | + ruby_core_source (>= 0.1.4) | ||
27 | + ruby-debug19 (0.11.6) | ||
28 | + columnize (>= 0.3.1) | ||
29 | + linecache19 (>= 0.5.11) | ||
30 | + ruby-debug-base19 (>= 0.11.19) | ||
31 | + ruby_core_source (0.1.5) | ||
32 | + archive-tar-minitar (>= 0.5.2) | ||
28 | 33 | ||
29 | PLATFORMS | 34 | PLATFORMS |
30 | ruby | 35 | ruby |
31 | 36 | ||
32 | DEPENDENCIES | 37 | DEPENDENCIES |
33 | jeweler | 38 | jeweler |
34 | - rake (= 0.8.7) | 39 | + rake |
35 | rspec | 40 | rspec |
36 | - ruby-debug | 41 | + ruby-debug19 |
Rakefile
@@ -27,6 +27,6 @@ Spec::Rake::SpecTask.new(:rcov) do |spec| | @@ -27,6 +27,6 @@ Spec::Rake::SpecTask.new(:rcov) do |spec| | ||
27 | spec.rcov = true | 27 | spec.rcov = true |
28 | end | 28 | end |
29 | 29 | ||
30 | -task :spec => :check_dependencies | 30 | +#task :spec => :check_dependencies |
31 | 31 | ||
32 | task :default => :spec | 32 | task :default => :spec |
spec/spec_helper.rb
1 | $LOAD_PATH.unshift(File.dirname(__FILE__)) | 1 | $LOAD_PATH.unshift(File.dirname(__FILE__)) |
2 | $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) | 2 | $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) |
3 | +require 'rspec' | ||
3 | require 'settingslogic' | 4 | require 'settingslogic' |
4 | require 'settings' | 5 | require 'settings' |
5 | require 'settings2' | 6 | require 'settings2' |