Skip to content
Browse files

getting ready for new version

:
  • Loading branch information...
1 parent 92f223e commit 50d85d2115e791d237ce3dfb9af80c666b38956b @slagyr committed Dec 13, 2012
Showing with 18 additions and 12 deletions.
  1. +1 −1 .rvmrc
  2. +1 −1 Gemfile
  3. +10 −2 Gemfile.lock
  4. +3 −5 Rakefile
  5. +2 −2 lib/statemachine/version.rb
  6. +1 −1 spec/spec_helper.rb
View
2 .rvmrc
@@ -1 +1 @@
-rvm use ruby-1.9.2-p290@statemachine
+rvm use ruby-1.9.3-p194@statemachine --create
View
2 Gemfile
@@ -2,5 +2,5 @@ source :rubygems
group :development do
gem 'rake'
- gem 'rspec', "1.3.0"
+ gem 'rspec', ">= 2.0.0"
end
View
12 Gemfile.lock
@@ -1,12 +1,20 @@
GEM
remote: http://rubygems.org/
specs:
+ diff-lcs (1.1.3)
rake (0.9.2)
- rspec (1.3.0)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.1)
+ rspec-expectations (2.12.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.12.0)
PLATFORMS
ruby
DEPENDENCIES
rake
- rspec (= 1.3.0)
+ rspec (>= 2.0.0)
View
8 Rakefile
@@ -3,7 +3,7 @@ require 'rubygems'
require 'rake/gempackagetask'
require 'rake/clean'
require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
require 'statemachine'
require "bundler/gem_tasks"
@@ -19,10 +19,8 @@ PKG_FILES = FileList[
task :default => :spec
-desc "Run all specs"
-Spec::Rake::SpecTask.new do |t|
- t.spec_files = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
+
WEB_ROOT = File.expand_path('~/Projects/slagyr.github.com/statemachine/')
View
4 lib/statemachine/version.rb
@@ -2,8 +2,8 @@ module Statemachine
module VERSION #:nodoc:
unless defined? MAJOR
MAJOR = 2
- MINOR = 0
- TINY = 1
+ MINOR = 1
+ TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')
TAG = "REL_" + [MAJOR, MINOR, TINY].join('_')
View
2 spec/spec_helper.rb
@@ -1,6 +1,6 @@
$:.unshift(File.dirname(__FILE__) + '/../lib')
require 'rubygems'
-require 'spec'
+require 'rspec'
require 'statemachine'
$IS_TEST = true

0 comments on commit 50d85d2

Please sign in to comment.
Something went wrong with that request. Please try again.