Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

. removes a few error messages when running rake

Bundler and RVM should really work together and it's to the detriment of all Ruby that they don't.
  • Loading branch information...
commit fa1d35786776bcf5ea3d40447a6be82238ba65e9 1 parent 61afbac
@kschiess authored
Showing with 12 additions and 11 deletions.
  1. +2 −2 Gemfile
  2. +2 −1  Gemfile.lock
  3. +6 −7 Rakefile
  4. +2 −1  parslet.gemspec
View
4 Gemfile
@@ -1,4 +1,3 @@
-# A sample Gemfile
source "http://rubygems.org"
gem 'rake'
@@ -7,7 +6,8 @@ gem 'blankslate', '~> 2'
group :development do
gem 'rspec'
gem 'flexmock'
-
+
+ gem 'rdoc'
gem 'sdoc'
gem 'guard'
View
3  Gemfile.lock
@@ -22,7 +22,7 @@ GEM
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
sanitize (2.0.3)
- nokogiri (>= 1.4.4, < 1.6)
+ nokogiri (< 1.6, >= 1.4.4)
sdoc (0.3.11)
json (>= 1.1.3)
rdoc (~> 3)
@@ -39,5 +39,6 @@ DEPENDENCIES
guard
guard-rspec
rake
+ rdoc
rspec
sdoc
View
13 Rakefile
@@ -1,7 +1,8 @@
-require "rubygems"
-require "rake/rdoctask"
+require 'rdoc/task'
+require 'sdoc'
+
require 'rspec/core/rake_task'
-require "rake/gempackagetask"
+require "rubygems/package_task"
desc "Run all tests: Exhaustive."
RSpec::Core::RakeTask.new
@@ -15,10 +16,8 @@ end
task :default => :spec
-require 'sdoc'
-
# Generate documentation
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
rdoc.title = "parslet - construction of parsers made easy"
rdoc.options << '--line-numbers'
rdoc.options << '--fmt' << 'shtml' # explictly set shtml generator
@@ -36,7 +35,7 @@ task :gem => :spec
spec = eval(File.read('parslet.gemspec'))
desc "Generate the gem package."
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
pkg.gem_spec = spec
end
View
3  parslet.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = 'parslet'
- s.version = '1.2.1'
+ s.version = '1.2.2'
s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
s.authors = ['Kaspar Schiess']
@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rspec'
s.add_development_dependency 'flexmock'
+ s.add_development_dependency 'rdoc'
s.add_development_dependency 'sdoc'
end
Please sign in to comment.
Something went wrong with that request. Please try again.