Skip to content

Commit

Permalink
Remove usage of Rubyforge (Fixes #734)
Browse files Browse the repository at this point in the history
Switch to hosting the website at sequel.jeremyevans.net.
  • Loading branch information
jeremyevans committed Nov 10, 2013
1 parent 7d17b47 commit 8cda8f9
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 50 deletions.
10 changes: 0 additions & 10 deletions CONTRIBUTING
Expand Up @@ -31,13 +31,3 @@ Pull Request Guidelines

5) All code in pull requests is assummed to be MIT licensed. Do not
submit a pull request if that isn't the case.

Documentation Links on GitHub
-----------------------------

Links in the documentation on GitHub are broken, this is a known issue.
The links in the documentation are designed to work correctly on the
website (http://sequel.rubyforge.org), and fixing them on GitHub would
break them on the website. So please don't submit any pull requests
to make the links work on GitHub, unless you can do so in such a way
that makes them still work correctly on the website.
4 changes: 2 additions & 2 deletions README.rdoc
Expand Up @@ -18,12 +18,12 @@ toolkit for Ruby.

== Resources

* {Website}[http://sequel.rubyforge.org]
* {Website}[http://sequel.jeremyevans.net]
* {Blog}[http://sequel.heroku.com]
* {Source code}[http://github.com/jeremyevans/sequel]
* {Bug tracking}[http://github.com/jeremyevans/sequel/issues]
* {Google group}[http://groups.google.com/group/sequel-talk]
* {RDoc}[http://sequel.rubyforge.org/rdoc]
* {RDoc}[http://sequel.jeremyevans.net/rdoc]

To check out the source code:

Expand Down
52 changes: 20 additions & 32 deletions Rakefile
Expand Up @@ -38,16 +38,11 @@ task :website do
sh %{#{FileUtils::RUBY} www/make_www.rb}
end

desc "Update Non-RDoc section of sequel.rubyforge.org"
task :website_rf_base=>[:website] do
sh %{rsync -rt www/public/*.html rubyforge.org:/var/www/gforge-projects/sequel/}
end

### RDoc

RDOC_DEFAULT_OPTS = ["--line-numbers", "--inline-source", '--title', 'Sequel: The Database Toolkit for Ruby']

allow_website_rdoc = begin
begin
# Sequel uses hanna-nouveau for the website RDoc.
# Due to bugs in older versions of RDoc, and the
# fact that hanna-nouveau does not support RDoc 4,
Expand Down Expand Up @@ -80,33 +75,26 @@ if rdoc_task_class
rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/**/*.rb doc/*.rdoc doc/release_notes/*.txt"
end

if allow_website_rdoc
desc "Make rdoc for website"
task :website_rdoc=>[:website_rdoc_main, :website_rdoc_adapters, :website_rdoc_plugins]

rdoc_task_class.new(:website_rdoc_main) do |rdoc|
rdoc.rdoc_dir = "www/public/rdoc"
rdoc.options += RDOC_OPTS + %w'--no-ignore-invalid'
rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/*.rb lib/sequel/*.rb lib/sequel/{connection_pool,dataset,database,model}/*.rb doc/*.rdoc doc/release_notes/*.txt lib/sequel/extensions/migration.rb lib/sequel/extensions/core_extensions.rb"
end

rdoc_task_class.new(:website_rdoc_adapters) do |rdoc|
rdoc.rdoc_dir = "www/public/rdoc-adapters"
rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
rdoc.rdoc_files.add %w"lib/sequel/adapters/**/*.rb"
end

rdoc_task_class.new(:website_rdoc_plugins) do |rdoc|
rdoc.rdoc_dir = "www/public/rdoc-plugins"
rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
rdoc.rdoc_files.add %w"lib/sequel/{extensions,plugins}/**/*.rb doc/core_*"
end

desc "Update sequel.rubyforge.org"
task :website_rf=>[:website, :website_rdoc] do
sh %{rsync -rvt www/public/* rubyforge.org:/var/www/gforge-projects/sequel/}
end
desc "Make rdoc for website"
task :website_rdoc=>[:website_rdoc_main, :website_rdoc_adapters, :website_rdoc_plugins]

rdoc_task_class.new(:website_rdoc_main) do |rdoc|
rdoc.rdoc_dir = "www/public/rdoc"
rdoc.options += RDOC_OPTS + %w'--no-ignore-invalid'
rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/*.rb lib/sequel/*.rb lib/sequel/{connection_pool,dataset,database,model}/*.rb doc/*.rdoc doc/release_notes/*.txt lib/sequel/extensions/migration.rb lib/sequel/extensions/core_extensions.rb"
end

rdoc_task_class.new(:website_rdoc_adapters) do |rdoc|
rdoc.rdoc_dir = "www/public/rdoc-adapters"
rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
rdoc.rdoc_files.add %w"lib/sequel/adapters/**/*.rb"
end

rdoc_task_class.new(:website_rdoc_plugins) do |rdoc|
rdoc.rdoc_dir = "www/public/rdoc-plugins"
rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
rdoc.rdoc_files.add %w"lib/sequel/{extensions,plugins}/**/*.rb doc/core_*"
end
end

### Specs
Expand Down
2 changes: 1 addition & 1 deletion bin/sequel
Expand Up @@ -26,7 +26,7 @@ options = OptionParser.new do |opts|
opts.separator " sequel postgres://localhost/my_blog"
opts.separator " sequel config/database.yml"
opts.separator ""
opts.separator "For more information see http://sequel.rubyforge.org"
opts.separator "For more information see http://sequel.jeremyevans.net"
opts.separator ""
opts.separator "Options:"

Expand Down
3 changes: 1 addition & 2 deletions sequel.gemspec
@@ -1,7 +1,6 @@
require File.expand_path("../lib/sequel/version", __FILE__)
SEQUEL_GEMSPEC = Gem::Specification.new do |s|
s.name = 'sequel'
s.rubyforge_project = 'sequel'
s.version = Sequel.version
s.platform = Gem::Platform::RUBY
s.has_rdoc = true
Expand All @@ -11,7 +10,7 @@ SEQUEL_GEMSPEC = Gem::Specification.new do |s|
s.description = s.summary
s.author = "Jeremy Evans"
s.email = "code@jeremyevans.net"
s.homepage = "http://sequel.rubyforge.org"
s.homepage = "http://sequel.jeremyevans.net"
s.license = 'MIT'
s.required_ruby_version = ">= 1.8.7"
s.files = %w(MIT-LICENSE CHANGELOG README.rdoc Rakefile bin/sequel) + Dir["doc/**/*.{rdoc,txt}"] + Dir["{spec,lib}/**/*.{rb,RB}"]
Expand Down
2 changes: 1 addition & 1 deletion www/layout.html.erb
Expand Up @@ -29,7 +29,7 @@
<li><a href="http://sequel.heroku.com">Blog</a></li>
</ul>
<form action="http://www.google.com/search">
<input type="hidden" name="sitesearch" value="sequel.rubyforge.org" />
<input type="hidden" name="sitesearch" value="sequel.jeremyevans.net" />
<input id="searchbox" type="search" placeholder="Site Search" name="q" value="" />
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion www/pages/development
Expand Up @@ -8,7 +8,7 @@

<h3>Source Code</h3>

<p>The master source code repository is <a href="https://github.com/jeremyevans/sequel/">jeremyevans/sequel on github</a>. The latest release version also has a git clone at RubyForge.</p>
<p>The master source code repository is <a href="https://github.com/jeremyevans/sequel/">jeremyevans/sequel on github</a>.</p>

<h3>Submitting Patches</h3>

Expand Down
2 changes: 1 addition & 1 deletion www/pages/plugins
Expand Up @@ -172,7 +172,7 @@
<li><a href="rdoc-plugins/files/lib/sequel/extensions/inflector_rb.html">inflector</a>: Adds instance-level inflection methods to String.</li>
<li><a href="rdoc-plugins/files/lib/sequel/extensions/meta_def_rb.html">meta_def</a>: Adds meta_def method for defining methods to Database, Dataset, and Model classes and instances.</li>
<li><a href="rdoc-plugins/files/lib/sequel/extensions/migration_rb.html">migration</a>: Adds Migration and Migrator classes for easily migrating the database schema forward or reverting to a previous version.</li>
<li><a href="rdoc-plugins/files/lib/sequel/extensions/named_timezones_rb.html">named_timezones</a>: Allows you to use named timezones instead of just :local and :utc (requires <a href="http://tzinfo.rubyforge.org/">TZInfo</a>).</li>
<li><a href="rdoc-plugins/files/lib/sequel/extensions/named_timezones_rb.html">named_timezones</a>: Allows you to use named timezones instead of just :local and :utc (requires <a href="http://tzinfo.github.io/">TZInfo</a>).</li>
<li><a href="rdoc-plugins/files/lib/sequel/extensions/pg_array_ops_rb.html">pg_array_ops</a>: Adds DSL support for calling PostgreSQL array operators and functions.</li>
<li><a href="rdoc-plugins/files/lib/sequel/extensions/pg_hstore_ops_rb.html">pg_hstore_ops</a>: Adds DSL support for calling PostgreSQL hstore operators and functions.</li>
<li><a href="rdoc-plugins/files/lib/sequel/extensions/pg_json_ops_rb.html">pg_json_ops</a>: Adds DSL support for calling PostgreSQL json operators and functions.</li>
Expand Down

0 comments on commit 8cda8f9

Please sign in to comment.