decko 0.10.0 → 0.11.0

data/lib/decko/generators/deck/templates/rspec.erb

@@ -0,0 +1,6 @@
+--color
+--profile
+--backtrace
+\\--format documentation
+--default-path '<%= File.expand_path spec_path %>'
+--require '<%= File.expand_path spec_helper_path %>'

data/lib/decko/generators/{decko → deck}/templates/script/decko

@@ -1,4 +1,5 @@
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+# This command will be run when you use `decko` from within your deck.
 
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require File.expand_path('../../config/boot',  __FILE__)

data/lib/decko/generators/deck/templates/script/decko_cucumber

@@ -0,0 +1,8 @@
+
+# used to run cucumber in RubyMine
+
+ENV["RAILS_ENV"] = "cucumber"
+ENV["RAILS_ROOT"] = "."
+BUNDLE_GEMFILE = File.expand_path "../../Gemfile",  __FILE__
+ARGV.insert 0, "cucumber", "--"
+load File.expand_path("../decko",  __FILE__)

data/lib/decko/generators/deck/templates/script/decko_rspec

@@ -0,0 +1,8 @@
+
+# used to run rspec in RubyMine
+
+ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ROOT"] = "."
+BUNDLE_GEMFILE = File.expand_path "../../Gemfile",  __FILE__
+ARGV.insert 0, "rspec", "--no-simplecov", "--"
+load File.expand_path("../decko",  __FILE__)

data/lib/decko/generators/{decko/templates/bin → deck/templates/script}/delayed_job

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+
 ENV["RAILS_ENV"] ||= "production"
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "config", "environment"))
 require "delayed/command"

data/lib/decko/generators/deck/templates/simplecov.rb.erb

@@ -0,0 +1,34 @@
+
+if ENV["<%= 'REPO_' if platypus? %>TMPSETS"] && ENV["COVERAGE"] != "false"
+  SimpleCov.start do
+    def add_mod_group modname
+      mod_dir = /(card-mod-)?#{Regexp.escape modname}/
+      add_group "Mod: #{modname}", %r{(^|card-mod-|mod/|/tmp.*/.*/mod\d{3}-)#{mod_dir}}
+    end
+    <% if platypus? %>
+    root "<%= expanded_repo_path %>"
+
+    add_filter "/generators/"
+    add_filter "_spec_helper"
+    add_filter "test_seed"
+
+    add_group "Card", "card/"
+    add_group "Cardname", "cardname"
+    add_group "Decko", "decko"
+
+    Dir["#{root}/{card/mod/*,card-mod-*}"].each do |path|
+      match = path.match %r{/card[-/]mod[-/](?<modname>.*)$}
+      add_mod_group match[:modname]
+    end
+    <% else %>
+    Dir["mod/*"].each do |path|
+      modname = path.gsub "mod/", ""
+      add_mod_group modname
+    end
+    <% end %>
+    add_filter "/spec/"
+    add_filter "/features/"
+    add_filter "/config/"
+    add_filter "/tasks/"
+  end
+end

data/lib/decko/generators/{decko/templates/spec/javascripts/support/deck_jasmine.yml → deck/templates/spec/javascripts/support/deck_jasmine.yml.erb}

@@ -28,7 +28,7 @@ css_files:
     # - "**/*.{css,scss}"
 # THIS IS IMPORTANT!!
 include_dir: "mod"
-  #- <%= @cardio_gem_root+"/mod/machines/lib/javascript" %>
+#- <%= cardio_gem_root%>/card-mod-script/lib/javascript
 # path to parent directory of spec_files
 # relative path from Rails.root
 #

data/lib/decko/generators/{decko/templates/spec/javascripts/support/decko_jasmine.yml → deck/templates/spec/javascripts/support/decko_jasmine.yml.erb}

@@ -2,7 +2,7 @@
 # relative path from Rails.root
 # defaults to app/assets/javascripts
 # useless for decko file structure
-src_dir: <%= @cardio_gem_root %>/mod/machines/lib/javascript
+src_dir: <%= cardio_gem_root %>/card-mod-script/lib/javascript
 #"app/assets/javascripts"
 
 # path to additional directory of source file that are not part of assets pipeline and need to be included
@@ -15,7 +15,7 @@ src_dir: <%= @cardio_gem_root %>/mod/machines/lib/javascript
 # relative path from Rails.root
 # defaults to app/assets/stylesheets
 # useless for decko file structure
-css_dir: <%= @cardio_gem_root %>/mod/machines/lib/stylesheets
+css_dir: <%= cardio_gem_root %>/card-mod-style/lib/stylesheets
 
 # list of file expressions to include as source files
 # relative path from src_dir
@@ -46,7 +46,7 @@ css_files:
     # - "**/*.{css,scss}"
 # THIS IS IMPORTANT!!!
 include_dir:
-  - <%= @cardio_gem_root %>/mod/machines/lib/javascript
+  - <%= cardio_gem_root %>/card-mod-script/lib/javascript
 # path to parent directory of spec_files
 # relative path from Rails.root
 #

data/lib/decko/mods_spec_helper.rb

@@ -1,9 +1,8 @@
 # -*- encoding : utf-8 -*-
-# require 'codeclimate-test-reporter'
-# CodeClimate::TestReporter.start
 
-require "decko" # only for card_gem_root
-require File.join Decko.card_gem_root, "spec/support/card_spec_loader.rb"
+require "cardio" # only for card_gem_root
+require File.join Cardio.gem_root, "spec/support/card_spec_loader.rb"
+require "simplecov"
 
 CardSpecLoader.init
 

data/lib/decko/response.rb

@@ -6,6 +6,7 @@ module Decko
     end
 
     private
+
     def respond format, result, status
       if status.in? [302, 303]
         hard_redirect result

data/lib/decko/tasks/decko.rake

@@ -101,7 +101,7 @@ decko_namespace = namespace :decko do
   desc "set symlink for assets"
   task update_assets_symlink: :environment do
     prepped_asset_path do |assets_path|
-      Card::Mod.dirs.each_assets_path do |mod, target|
+      Cardio::Mod.dirs.each_assets_path do |mod, target|
         link = File.join assets_path, mod
         FileUtils.rm_rf link
         FileUtils.ln_s target, link, force: true
@@ -148,35 +148,6 @@ decko_namespace = namespace :decko do
     load_task << "_without_reset" unless with_cache_reset
     Rake::Task[load_task].invoke
   end
-
-  namespace :emergency do
-    task rescue_watchers: :environment do
-      follower_hash = Hash.new { |h, v| h[v] = [] }
-
-      Card.where("right_id" => 219).each do |watcher_list|
-        watcher_list.include_set_modules
-        next unless watcher_list.left
-        watching = watcher_list.left.name
-        watcher_list.item_names.each do |user|
-          follower_hash[user] << watching
-        end
-      end
-
-      Card.search(right: { codename: "following" }).each do |following|
-        Card::Auth.as_bot do
-          following.update! content: ""
-        end
-      end
-
-      follower_hash.each do |user, items|
-        next unless (card = Card.fetch(user)) && card.account
-        Card::Auth.as(user) do
-          following = card.fetch "following", new: {}
-          following.items = items
-        end
-      end
-    end
-  end
 end
 
 def failing_loudly task

data/lib/decko/tasks/decko/docs.rake

@@ -0,0 +1,26 @@
+# rake decko:docs:...
+
+# NOTE: for the moment these are Platypus tasks.
+# Until they're more monkey friendly, let's not write descriptions
+#
+# Make sure: you're:
+#   (A) running in a development environment, and
+#   (B) pointing to a repo gem
+namespace :decko do
+  namespace :docs do
+    # trigger tmpsets and then run yardoc
+    task :update do
+      Rake::Task["decko:tmpsets:trigger"].invoke
+      Rake::Task["decko:docs:yardoc"].invoke
+    end
+
+    # run yardoc command, which generates the docs content in the repo root
+    #
+    # If you run this while decko is a gem, you could get some funky docs in
+    # your gems directory...
+    task :yardoc do
+      doc_dir = File.expand_path "..", Decko.gem_root
+      system %(cd #{doc_dir}; yardoc)
+    end
+  end
+end

data/lib/decko/tasks/decko/tmpsets.rake

@@ -0,0 +1,25 @@
+namespace :decko do
+  namespace :tmpsets do
+    # We have to load the environment with `env REPO_TMPSETS=true` in
+    # development mode to trigger the tmpset generation.
+    # There's probably a more elegant way?
+    task :trigger do
+      ENV["REPO_TMPSETS"] = "true"
+      Rake::Task["decko:tmpsets:dummy"].invoke
+    end
+
+    # just load environment and trigger Card load
+    task dummy: :environment do
+      Card
+    end
+
+    task :copy do
+      require "fileutils"
+      require "cardio"
+
+      target = "#{Cardio.gem_root}/tmpsets"
+      FileUtils.rm_r Dir["#{target}/set*"]
+      FileUtils.cp_r Dir["#{Cardio.root}/tmpsets/set*"], "#{Cardio.gem_root}/tmpsets"
+    end
+  end
+end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Ethan McCutchen
 - Philipp Kühl
-- Lewis Hoffman
 - Gerry Gleason
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -19,15 +18,29 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.100.0
+        version: 1.101.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.100.0
-description: a wiki approach to stuctured data, dynamic interaction,  and web design
+        version: 1.101.0
+- !ruby/object:Gem::Dependency
+  name: card-mod-defaults
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+description: a wiki approach to structured data, dynamic interaction,  and web design
 email:
 - info@decko.org
 executables:
@@ -35,26 +48,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- GPL
-- LICENSE
-- README.rdoc
-- app/assets/images/body-bg.bmp
-- app/assets/images/body-bg.png
-- app/assets/images/external_link.png
-- app/assets/images/smoothness/animated-overlay.gif
-- app/assets/images/smoothness/ui-bg_flat_0_aaaaaa_40x100.png
-- app/assets/images/smoothness/ui-bg_flat_75_ffffff_40x100.png
-- app/assets/images/smoothness/ui-bg_glass_55_fbf9ee_1x400.png
-- app/assets/images/smoothness/ui-bg_glass_65_ffffff_1x400.png
-- app/assets/images/smoothness/ui-bg_glass_75_dadada_1x400.png
-- app/assets/images/smoothness/ui-bg_glass_75_e6e6e6_1x400.png
-- app/assets/images/smoothness/ui-bg_glass_95_fef1ec_1x400.png
-- app/assets/images/smoothness/ui-bg_highlight-soft_75_cccccc_1x100.png
-- app/assets/images/smoothness/ui-icons_222222_256x240.png
-- app/assets/images/smoothness/ui-icons_2e83ff_256x240.png
-- app/assets/images/smoothness/ui-icons_454545_256x240.png
-- app/assets/images/smoothness/ui-icons_888888_256x240.png
-- app/assets/images/smoothness/ui-icons_cd0a0a_256x240.png
 - bin/decko
 - lib/decko.rb
 - lib/decko/all.rb
@@ -79,42 +72,46 @@ files:
 - lib/decko/config/initializers/sedate_parser.rb
 - lib/decko/config/initializers/session_store.rb
 - lib/decko/engine.rb
-- lib/decko/generators/decko/USAGE
-- lib/decko/generators/decko/decko_generator.rb
-- lib/decko/generators/decko/decko_generator/interactive.rb
-- lib/decko/generators/decko/templates/Gemfile
-- lib/decko/generators/decko/templates/Rakefile
-- lib/decko/generators/decko/templates/bin/delayed_job
-- lib/decko/generators/decko/templates/bin/spring
-- lib/decko/generators/decko/templates/config.ru
-- lib/decko/generators/decko/templates/config/application.rb
-- lib/decko/generators/decko/templates/config/boot.rb
-- lib/decko/generators/decko/templates/config/cucumber.yml
-- lib/decko/generators/decko/templates/config/databases/frontbase.yml
-- lib/decko/generators/decko/templates/config/databases/ibm_db.yml
-- lib/decko/generators/decko/templates/config/databases/jdbc.yml
-- lib/decko/generators/decko/templates/config/databases/jdbcmysql.yml
-- lib/decko/generators/decko/templates/config/databases/jdbcpostgresql.yml
-- lib/decko/generators/decko/templates/config/databases/jdbcsqlite3.yml
-- lib/decko/generators/decko/templates/config/databases/mysql.yml
-- lib/decko/generators/decko/templates/config/databases/oracle.yml
-- lib/decko/generators/decko/templates/config/databases/postgresql.yml
-- lib/decko/generators/decko/templates/config/databases/sqlite3.yml
-- lib/decko/generators/decko/templates/config/deck.yml
-- lib/decko/generators/decko/templates/config/environment.rb
-- lib/decko/generators/decko/templates/config/initializers/cypress_dev.rb
-- lib/decko/generators/decko/templates/config/initializers/cypress_on_rails.rb
-- lib/decko/generators/decko/templates/config/puma.rb
-- lib/decko/generators/decko/templates/config/routes.erb
-- lib/decko/generators/decko/templates/gitignore
-- lib/decko/generators/decko/templates/public/files/htaccess
-- lib/decko/generators/decko/templates/public/robots.txt
-- lib/decko/generators/decko/templates/rspec
-- lib/decko/generators/decko/templates/script/decko
-- lib/decko/generators/decko/templates/simplecov
-- lib/decko/generators/decko/templates/spec/javascripts/support/deck_jasmine.yml
-- lib/decko/generators/decko/templates/spec/javascripts/support/decko_jasmine.yml
-- lib/decko/generators/decko/templates/spec/spec_helper.rb
+- lib/decko/generators/deck/USAGE
+- lib/decko/generators/deck/deck_generator.rb
+- lib/decko/generators/deck/deck_generator/deck_helper.rb
+- lib/decko/generators/deck/deck_generator/interactive.rb
+- lib/decko/generators/deck/deck_generator/rails_overrides.rb
+- lib/decko/generators/deck/templates/Gemfile.erb
+- lib/decko/generators/deck/templates/Rakefile.erb
+- lib/decko/generators/deck/templates/bin/spring.erb
+- lib/decko/generators/deck/templates/config.ru.erb
+- lib/decko/generators/deck/templates/config/application.rb.erb
+- lib/decko/generators/deck/templates/config/boot.rb.erb
+- lib/decko/generators/deck/templates/config/cucumber.yml
+- lib/decko/generators/deck/templates/config/databases/frontbase.yml
+- lib/decko/generators/deck/templates/config/databases/ibm_db.yml
+- lib/decko/generators/deck/templates/config/databases/jdbc.yml
+- lib/decko/generators/deck/templates/config/databases/jdbcmysql.yml
+- lib/decko/generators/deck/templates/config/databases/jdbcpostgresql.yml
+- lib/decko/generators/deck/templates/config/databases/jdbcsqlite3.yml
+- lib/decko/generators/deck/templates/config/databases/mysql.yml
+- lib/decko/generators/deck/templates/config/databases/oracle.yml
+- lib/decko/generators/deck/templates/config/databases/postgresql.yml
+- lib/decko/generators/deck/templates/config/databases/sqlite3.yml
+- lib/decko/generators/deck/templates/config/deck.yml
+- lib/decko/generators/deck/templates/config/environment.rb.erb
+- lib/decko/generators/deck/templates/config/initializers/cypress.rb
+- lib/decko/generators/deck/templates/config/puma.rb
+- lib/decko/generators/deck/templates/config/routes.rb.erb
+- lib/decko/generators/deck/templates/gitignore
+- lib/decko/generators/deck/templates/pryrc
+- lib/decko/generators/deck/templates/public/files/htaccess
+- lib/decko/generators/deck/templates/public/robots.txt
+- lib/decko/generators/deck/templates/rspec.erb
+- lib/decko/generators/deck/templates/script/decko
+- lib/decko/generators/deck/templates/script/decko_cucumber
+- lib/decko/generators/deck/templates/script/decko_rspec
+- lib/decko/generators/deck/templates/script/delayed_job
+- lib/decko/generators/deck/templates/simplecov.rb.erb
+- lib/decko/generators/deck/templates/spec/javascripts/support/deck_jasmine.yml.erb
+- lib/decko/generators/deck/templates/spec/javascripts/support/decko_jasmine.yml.erb
+- lib/decko/generators/deck/templates/spec/spec_helper.rb
 - lib/decko/mods_spec_helper.rb
 - lib/decko/response.rb
 - lib/decko/rest_spec_helper.rb
@@ -126,23 +123,11 @@ files:
 - lib/decko/tasks/cucumber.rake
 - lib/decko/tasks/db.rake
 - lib/decko/tasks/decko.rake
+- lib/decko/tasks/decko/docs.rake
 - lib/decko/tasks/decko/seed.rake
-- rails/application-routes.rb
-- rails/assets/external_link.png
-- rails/assets/jasmine/404.html
-- rails/assets/jasmine/500.html
-- rails/assets/jasmine/card_form.html
-- rails/assets/jquery.min.map
-- rails/controllers/application_controller.rb
-- rails/controllers/card_controller.rb
-- rails/engine-routes.rb
-- script/autospec
-- script/decko
-- script/rails
-- script/test_filter
+- lib/decko/tasks/decko/tmpsets.rake
 homepage: http://decko.org
 licenses:
-- GPL-2.0
 - GPL-3.0
 metadata: {}
 post_install_message:

data/GPL

@@ -1,331 +0,0 @@
-The GNU General Public License (GPL)
-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. 
-
-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)
-
-    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) year 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.