From 30ce303d3e3374222fd79ae4d518e69023b15bff Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Fri, 8 Jul 2011 17:16:07 +0000
Subject: use Bundler to manage dependencies; just run "bundle" to install
 everything that CodeRay needs to test and build.

---
 Gemfile                       | 13 ++++++++++++
 Rakefile                      |  1 -
 coderay.gemspec               | 46 +++++++++++++++++++++++++++++++++++++++++++
 rake_tasks/documentation.rake |  2 +-
 rake_tasks/gem.rake           | 42 ++-------------------------------------
 5 files changed, 62 insertions(+), 42 deletions(-)
 create mode 100644 Gemfile
 create mode 100644 coderay.gemspec

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..bac8282
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in coderay.gemspec
+gemspec
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rake", "~> 0.9.2"
+  gem "shoulda-context", "= 1.0.0.beta1"
+  gem "json" unless RUBY_VERSION >= '1.9.1'
+  gem "bundler", "~> 1.0.0"
+end
diff --git a/Rakefile b/Rakefile
index 6bca085..b0d604d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,7 +2,6 @@ $:.unshift File.dirname(__FILE__) unless $:.include? '.'
 
 ROOT = '.'
 LIB_ROOT = File.join ROOT, 'lib'
-EXTRA_RDOC_FILES = %w(README.rdoc FOLDERS)
 
 task :default => :test
 
diff --git a/coderay.gemspec b/coderay.gemspec
new file mode 100644
index 0000000..a3b9199
--- /dev/null
+++ b/coderay.gemspec
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+def svn_head_revision
+  $svn_head_revision ||= `svnversion`.scan(/\d+/).map { |r| r.to_i }.max
+end
+
+def coderay_version
+  $coderay_version ||= begin
+    $:.unshift './lib'
+    require 'coderay'
+    
+    version = CodeRay::VERSION
+    unless ENV['final']
+      version << ".#{svn_head_revision}.pre"
+    end
+    
+    version
+  end
+end
+
+$gemspec = Gem::Specification.new do |s|
+  s.name        = 'coderay'
+  s.version     = coderay_version
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Kornelius Kalnbach']
+  s.email       = ['murphy@rubychan.de']
+  s.homepage    = 'http://coderay.rubychan.de'
+  s.summary     = 'Fast syntax highlighting for selected languages.'
+  s.description = 'Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.'
+  
+  # s.add_dependency "paint", '~> 0.8.2'
+  
+  # s.files         = `git ls-files`.split("\n")
+  # 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.files         = Dir['lib/**/*.rb'] + %w(Rakefile README.rdoc LICENSE) + Dir['test/functional/*.rb']
+  s.test_files    = Dir['test/functional/*.rb']
+  s.executables   = ['coderay']
+  s.require_paths = ['lib']
+  
+  s.rubyforge_project = s.name
+  s.rdoc_options      = '-SNw2', '-mREADME.rdoc', '-t CodeRay Documentation'
+  s.extra_rdoc_files  = 'README.rdoc'
+end
diff --git a/rake_tasks/documentation.rake b/rake_tasks/documentation.rake
index 796e281..39e2ea0 100644
--- a/rake_tasks/documentation.rake
+++ b/rake_tasks/documentation.rake
@@ -16,7 +16,7 @@ Rake::RDocTask.new :doc do |rd|
   template = File.join ROOT, 'rake_helpers', 'coderay_rdoc_template.rb'
   rd.template = Pathname.new(template).expand_path.to_s
   
-  rd.rdoc_files.add EXTRA_RDOC_FILES
+  rd.rdoc_files.add 'README.rdoc'
   rd.rdoc_files.add Dir['lib']
   rd.rdoc_dir = 'doc'
 end
diff --git a/rake_tasks/gem.rake b/rake_tasks/gem.rake
index 71b55a1..2b09a68 100644
--- a/rake_tasks/gem.rake
+++ b/rake_tasks/gem.rake
@@ -1,51 +1,13 @@
 require 'rubygems/package_task'
 
-def svn_head_revision
-  @svn_head_revision ||= `svnversion`.scan(/\d+/).map { |r| r.to_i }.max
-end
-
-def coderay_version
-  @coderay_version ||= begin
-    $:.unshift './lib'
-    require 'coderay'
-    
-    version = CodeRay::VERSION
-    unless ENV['final']
-      version << ".#{svn_head_revision}.pre"
-    end
-    
-    version
-  end
-end
-
-def gemspec
-  Gem::Specification.new do |s|
-    s.name        = 'coderay'
-    s.version     = coderay_version
-    s.platform    = Gem::Platform::RUBY
-    s.authors     = ['murphy']
-    s.email       = ['murphy@rubychan.de']
-    s.homepage    = 'http://coderay.rubychan.de'
-    s.summary     = 'Fast syntax highlighting for selected languages.'
-    s.description = 'Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.'
-    
-    s.files         = Dir['lib/**/*.rb'] + %w(Rakefile README.rdoc LICENSE) + Dir['test/functional/*.rb']
-    s.test_files    = Dir['test/functional/*.rb']
-    s.executables   = ['coderay']
-    s.require_paths = ['lib']
-    
-    s.rubyforge_project = s.name
-    s.rdoc_options      = '-SNw2', '-mREADME.rdoc', '-t CodeRay Documentation'
-    s.extra_rdoc_files  = EXTRA_RDOC_FILES
-  end
-end
+load File.expand_path('../../coderay.gemspec', __FILE__)
 
 def gem_path
   "pkg/coderay-#{coderay_version}.gem"
 end
 
 namespace :gem do
-  Gem::PackageTask.new gemspec do |pkg|
+  Gem::PackageTask.new $gemspec do |pkg|
     pkg.need_zip = true
     pkg.need_tar = true
   end
-- 
cgit v1.2.1