patir 0.7.2 → 0.8.0

data/History.txt

@@ -1,3 +1,13 @@
+==0.8.0 / 2012-11-28
+* Patir::ShellCommand now has a timeout option to terminate a command after a timeout passes.
+* Removed Ruby warnings
+* Updated gem dependencies
+
+==0.7.3 / 2012-07-25
+* Maintenance release
+ * Updated gem dependencies
+ * Moved to separate repository
+ * Updated documenation
 ==0.7.2 / 2011-11-29
 * you can now use require in configuration files
 * better handling of paths in configuration files. Relative paths in chained configuration files are now correct

data/Manifest.txt

@@ -1,13 +1,16 @@
-COPYING.txt
 History.txt
 Manifest.txt
 README.txt
-COPYING.txt
 Rakefile
 lib/patir/base.rb
 lib/patir/command.rb
 lib/patir/configuration.rb
+test/samples/chain.cfg
+test/samples/config_fail.cfg
 test/samples/empty.cfg
+test/samples/failed.cfg
+test/samples/failed_unknown.cfg
+test/samples/syntax.cfg
 test/test_patir_base.rb
 test/test_patir_command.rb
 test/test_patir_configuration.rb

data/README.txt

@@ -3,10 +3,10 @@ patir http://patir.rubyforge.org
   
 patir provides code to enable project automation tasks:
 
-* A default logging format for ruby's built-in Logger
-* A command abstraction (Patir::Command) with a platform independent implementation for running shell commands (Patir::ShellCommand) and ruby code (Patir::RubyCommand)
+* A logging format for ruby's built-in Logger
+* A command abstraction with a platform independent implementation for running shell commands and ruby code
 * Command sequences using the same command abstraction as single commands.
-* Code that allows the use of configuration files written in ruby.
+* Configuration format for configuration files written in ruby.
 
 == INSTALL:
 
@@ -14,63 +14,25 @@ patir provides code to enable project automation tasks:
 
 == LICENSE:
 
-(The Ruby License)
+The MIT License)
 
-patir is copyright (c) 2007-2011 Vassilis Rizopoulos
+Copyright (c) 2007-2012 Vassilis Rizopoulos
 
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING.txt file), or the conditions below:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,6 +1,5 @@
 # -*- ruby -*-
 $:.unshift File.join(File.dirname(__FILE__),"lib")
-require 'rubygems'
 require 'hoe'
 require 'patir/base'
 
@@ -13,9 +12,9 @@ Hoe.spec('patir') do
   self.email = "vassilisrizopoulos@gmail.com"
   self.summary = 'patir (Project Automation Tools in Ruby) provides libraries for use in project automation tools'
   self.description = paragraphs_of('README.md', 1..4).join("\n\n")
-  self.url = "http://patir.rubyforge.org"
+  self.urls = ["http://patir.rubyforge.org","http://github.com/damphyr/patir"]
   self.changes = paragraphs_of('History.txt', 0..1).join("\n\n")
-  extra_deps<<['systemu',"~>2.3"]
+  extra_deps<<['systemu',"~>2.5"]
 end
 
 # vim: syntax=Ruby

data/lib/patir/base.rb

@@ -5,8 +5,8 @@ module Patir
   #The Patir version used
   module Version
     MAJOR=0
-    MINOR=7
-    TINY=2
+    MINOR=8
+    TINY=0
     STRING=[ MAJOR, MINOR, TINY ].join( "." )  	
   end
   #Error thrown usually in initialize methods when missing required parameters

data/lib/patir/command.rb

@@ -55,9 +55,7 @@ module Patir
     end
     #returns true if the command has been executed
     def run?
-      #use the accessor, because it initializes nil values
-      return false if self.status==:not_executed
-      return true
+      executed?
     end
     #executes the command and returns the status of the command.
     #
@@ -75,7 +73,7 @@ module Patir
       @error=""
       @status=:not_executed
     end
-    #returns false if the command has not been run
+    #returns false if the command has not been run, alias for run?
     def executed?
       return false if self.status==:not_executed
       return true
@@ -102,20 +100,22 @@ module Patir
   # :cmd - the shell command to execute (required - ParameterException will be raised).
   # :working_directory - specify the working directory (default is '.')
   # :name - assign a name to the command (default is "").
+  # :timeout - if the command runs longer than timeout, it will be interrupted and an error will be set.
+  #
+  #The timeout is set in seconds
   class ShellCommand
     include Command
     #The constructor will throw CommandError if :cmd is missing.
     #
     #CommandError will also be thrown if :working_directory does not exist.
-    def initialize *args
-      params=args[0] if args
-      raise ParameterException,"No ShellCommand parameters defined" unless params
+    def initialize params
       @name=params[:name]
       @working_directory=params[:working_directory] || "."
       #we need a command line :)
       raise ParameterException,"No :command defined" unless params[:cmd]
       @command=params[:cmd]
       @status=:not_executed
+      @timeout=params[:timeout]
     end
 
     #Executes the shell command and returns the status
@@ -125,16 +125,31 @@ module Patir
         #create the working directory if it does not exist
         FileUtils::mkdir_p(@working_directory,:verbose=>false)
         #create the actual command, run it, grab stderr and stdout and set output,error, status and execution time
-        status, @output, @error = systemu(@command,:cwd=>@working_directory)
-        #lets get the status how we want it
+        if @timeout 
+          @error=""
+          exited=nil
+          exitstatus=0
+          status, @output, err = systemu(@command,:cwd=>@working_directory) do |cid|
+              sleep @timeout
+              @error<<"Command timed out after #{@timeout}s"
+              exited=true
+              exitstatus=23
+              Process.kill 9,cid
+          end
+          @error<<"\n#{err}" unless err.empty?
+        else
+          status, @output, @error = systemu(@command,:cwd=>@working_directory) 
+          exitstatus = status.exitstatus
+        end
         begin
-          exited = status.exited?
+          exited||= status.exited?
         rescue NotImplementedError
-          # so, JRuby as of version 1.1 does not understand exited?
-          exited = true
-        end 
+          #oh look, it's jruby
+          exited=true
+        end
+        #lets get the status how we want it
         if exited
-          if status.exitstatus==0
+          if exitstatus ==0
             @status=:success
           else
             @status=:error

data/test/samples/chain.cfg

@@ -0,0 +1 @@
+configuration.load_from_file('empty.cfg')

data/test/samples/config_fail.cfg

@@ -0,0 +1 @@
+raise ConfigurationException, "because I can"

data/test/samples/failed.cfg

@@ -0,0 +1 @@
+raise "boohoo"

data/test/samples/failed_unknown.cfg

@@ -0,0 +1 @@
+configuration.foo = 'bar'

data/test/samples/syntax.cfg

@@ -0,0 +1,2 @@
+#ruby syntax error
+{

data/test/test_patir_command.rb

@@ -89,11 +89,7 @@ class TestShellCommand<Test::Unit::TestCase
   end
   #an exception should be thrown when :cmd is nil
   def test_missing_cmd
-    assert_raise(ParameterException){cmd=ShellCommand.new(:working_directory=>"missing/")}
-  end
-  #an exception should be thrown when no parameters are passed
-  def test_missing_params
-    assert_raise(ParameterException){cmd=ShellCommand.new()}
+    assert_raise(ParameterException){ShellCommand.new(:working_directory=>"missing/")}
   end
   #test with another program
   def test_ls
@@ -108,6 +104,19 @@ class TestShellCommand<Test::Unit::TestCase
       assert_not_equal("", cmd.error)
     end
   end
+  def test_timeout
+    cmd=ShellCommand.new(:cmd=>"ruby -e 't=0;while t<10 do p t;t+=1;sleep 1 end '",:timeout=>1)
+    assert_nothing_raised() { cmd.run  }
+    assert(cmd.run?, "Should be marked as run")
+    assert(!cmd.success?,"Should not have been successful")
+    assert(!cmd.error.empty?, "There should be an error message")
+    #test also for an exit within the timeout
+    cmd=ShellCommand.new(:cmd=>"ruby -e 't=0;while t<1 do p t;t+=1;sleep 1 end '",:timeout=>4)
+    assert_nothing_raised() { cmd.run  }
+    assert(cmd.run?, "Should be marked as run")
+    assert(cmd.success?,"Should have been successful")
+    assert(cmd.error.empty?, "There should be no error messages")
+  end
 end
 
 class TestCommandSequence<Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patir
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,57 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
-  requirement: &2161475600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2161475600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &2161471140 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *2161471140
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &2161360540 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *2161360540
-description: ! "##DESCRIPTION:\n  \npatir provides code to enable project automation
-  tasks:\n\n * A default logging format for ruby's built-in Logger\n * A command abstraction
-  with a platform independent implementation for running shell commands and ruby code\n
-  * Command sequences using the same command abstraction as single commands.\n * Code
-  that allows the use of configuration files written in ruby.\n\n##INSTALL:\n\n gem
-  install patir"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.3'
+description: ! "[patir](http://patir.rubyforge.org) provides code to enable project
+  automation tasks:\n\n * A logging format for ruby's built-in Logger\n * A command
+  abstraction with a platform independent implementation for running shell commands
+  and ruby code\n * Command sequences using the same command abstraction as single
+  commands.\n * Configuration format for configuration files written in ruby.\n\n##
+  Why?\nWe've been using the same things again and again and can't be bothered to
+  code it anew every time.\n\nThe command abstraction has been used the most, the
+  Logger defaults and formatting the least."
 email: vassilisrizopoulos@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- COPYING.txt
 - History.txt
 - Manifest.txt
 - README.txt
 files:
-- COPYING.txt
 - History.txt
 - Manifest.txt
 - README.txt
@@ -67,7 +82,12 @@ files:
 - lib/patir/base.rb
 - lib/patir/command.rb
 - lib/patir/configuration.rb
+- test/samples/chain.cfg
+- test/samples/config_fail.cfg
 - test/samples/empty.cfg
+- test/samples/failed.cfg
+- test/samples/failed_unknown.cfg
+- test/samples/syntax.cfg
 - test/test_patir_base.rb
 - test/test_patir_command.rb
 - test/test_patir_configuration.rb
@@ -88,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 813397894778583248
+      hash: -219927578421724398
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: patir
-rubygems_version: 1.8.8
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: patir (Project Automation Tools in Ruby) provides libraries for use in project

data/COPYING.txt

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program 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.
-
-    This program 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 this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.