DRY up license/copyright info

chrisk · Jan 1, 2009 · 273e01b · 273e01b
1 parent ff14175
commit 273e01b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 101 deletions.
diff --git a/.manifest b/.manifest
@@ -1,5 +1,5 @@
 CHANGELOG
-COPYING
+LICENSE.txt
 README.rdoc
 Rakefile
 lib

diff --git a/COPYING → LICENSE.txt b/COPYING → LICENSE.txt
diff --git a/README.rdoc b/README.rdoc
@@ -121,18 +121,20 @@ like OpenURI, as well as a ton of libraries for popular web services.
 
 Copyright 2006-2007 Blaine Cook
 
-Copyright 2008 various contributors
+Copyright 2008-2009 various contributors
 
-FakeWeb is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+  FakeWeb is free software; you can redistribute it and/or modify it under the
+  terms of the GNU General Public License as published by the Free Software
+  Foundation; either version 2 of the License, or (at your option) any later
+  version.
 
-FakeWeb is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  FakeWeb is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+  details.
 
-You should have received a copy of the GNU General Public License
-along with FakeWeb; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  You should have received a copy of the GNU General Public License along
+  with FakeWeb; if not, write to the Free Software Foundation, Inc., 51
+  Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+See LICENSE.txt[link:files/LICENSE_txt.html] for the full terms.
diff --git a/Rakefile b/Rakefile
@@ -1,20 +1,3 @@
-# FakeWeb - Ruby Helper for Faking Web Requests
-# Copyright 2006 Blaine Cook <romeda@gmail.com>.
-# 
-# FakeWeb is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# FakeWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with FakeWeb; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 require 'rubygems'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -32,7 +15,7 @@ desc "Generate Documentation"
 Rake::RDocTask.new do |rdoc|
   rdoc.main = "README.rdoc"
   rdoc.rdoc_dir = "doc"
-  rdoc.rdoc_files.include("README.rdoc", "COPYING", "CHANGELOG", "lib/*.rb")
+  rdoc.rdoc_files.include("README.rdoc", "CHANGELOG", "LICENSE.txt", "lib/*.rb")
   rdoc.title = "FakeWeb API Documentation"
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.options << '--charset' << 'utf-8'

diff --git a/fakeweb.gemspec b/fakeweb.gemspec
@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/chrisk/fakeweb"
   s.has_rdoc = true
   s.authors  = ["Blaine Cook"]
-  s.files    = %w(CHANGELOG COPYING README.rdoc Rakefile lib lib/fake_net_http.rb lib/fake_web.rb test test/fixtures test/fixtures/test_example.txt test/fixtures/test_request test/test_allow_net_connect.rb test/test_fake_web.rb test/test_fake_web_open_uri.rb test/test_helper.rb test/test_query_string.rb)
+  s.files    = %w(CHANGELOG LICENSE.txt README.rdoc Rakefile lib lib/fake_net_http.rb lib/fake_web.rb test test/fixtures test/fixtures/test_example.txt test/fixtures/test_request test/test_allow_net_connect.rb test/test_fake_web.rb test/test_fake_web_open_uri.rb test/test_helper.rb test/test_query_string.rb)
   s.test_files = %w(test/fixtures test/fixtures/test_example.txt test/fixtures/test_request test/test_allow_net_connect.rb test/test_fake_web.rb test/test_fake_web_open_uri.rb test/test_helper.rb test/test_query_string.rb)
   s.rdoc_options = ["--main", "README.rdoc"]
-  s.extra_rdoc_files = ["CHANGELOG", "COPYING", "README.rdoc"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE.txt", "README.rdoc"]
 end
diff --git a/lib/fake_net_http.rb b/lib/fake_net_http.rb
@@ -1,20 +1,3 @@
-# FakeWeb - Ruby Helper for Faking Web Requests
-# Copyright 2006 Blaine Cook <romeda@gmail.com>.
-#
-# FakeWeb is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# FakeWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with FakeWeb; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 require 'net/http'
 require 'net/https'
 require 'stringio'

diff --git a/lib/fake_web.rb b/lib/fake_web.rb
@@ -1,20 +1,3 @@
-# FakeWeb - Ruby Helper for Faking Web Requests
-# Copyright 2006 Blaine Cook <romeda@gmail.com>.
-# 
-# FakeWeb is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# FakeWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with FakeWeb; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 require 'fake_net_http'
 require 'singleton'
 

diff --git a/test/test_fake_web.rb b/test/test_fake_web.rb
@@ -1,20 +1,3 @@
-# FakeWeb - Ruby Helper for Faking Web Requests
-# Copyright 2006 Blaine Cook <romeda@gmail.com>.
-#
-# FakeWeb is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# FakeWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with FakeWeb; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 require File.join(File.dirname(__FILE__), "test_helper")
 
 class TestFakeWeb < Test::Unit::TestCase

diff --git a/test/test_fake_web_open_uri.rb b/test/test_fake_web_open_uri.rb
@@ -1,20 +1,3 @@
-# FakeWeb - Ruby Helper for Faking Web Requests
-# Copyright 2006 Blaine Cook <romeda@gmail.com>.
-# 
-# FakeWeb is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# FakeWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with FakeWeb; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 require File.join(File.dirname(__FILE__), "test_helper")
 
 class TestFakeWebOpenURI < Test::Unit::TestCase