pastebin 0.2.1 → 1.0.0

data/Gemfile

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.1.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.1"
+  gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.5.1)
+  rcov
+  rspec (~> 2.1.0)

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2010 dougsko
+
+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:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+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/README.rdoc

@@ -2,22 +2,22 @@
 
 pastebin is a CLI to http://pastebin.ca
 	Usage: pastebin [options] 
-	Examples: pastebin -f foo.rb -t ruby -e '1 d'
+	Examples: pastebin -f foo.rb -t ruby -e '10 Minutes'
 	          cat foo.pl | pastebin -f - -t perl
 
 Options:
     -f, --file <file>                Use a file for input, use "-" for STDIN
     -n, --name <name>                Assign a name/title to your paste
-    -d, --desc <description>         Give your paste a description
-    -c, --config <file>              Specify a config file.  Default is ~/.paster.yaml
+    -s, --subdomain <subdomain>      Paste to a specific subdomain
     -r, --raw <link>                 Return raw text from a paste link
-    -t, --tags <tags>                Tags for your paste
-    -e, --expire <time>              These can be abbriviated, as long as they are unambigous. Defaults to '1 month'
-                                     never, 5 minutes, 10 minutes, 15 minutes, 30 minutes, 45 minutes, 1 hour, 2 hours, 4 hours, 8 hours, 12 hours, 1 day, 2 days, 3 days, 1 week, 2 weeks, 3 weeks, 1 month, 2 months, 3 months, 4 months, 5 months, 6 months, 1 year
-    -l, --language <syntax>          Syntax types can be abbriviated, as long as they are unambigous. Defaults to 'raw'
-                                       action, ada, apache configuration, assembly (nasm), asterisk configuration, bash, c, c#, c++, css, delphi, html 4.0 strict, java, lisp, lua, microprocessor asm, mirc , objective c, pascal, perl, php, pl/i, python, raw, ruby, scheme, sql statement, visual basic, visual basic .net, xml document
+    -e, --expire <time>              These can be abbriviated, as long as they are unambigous. Defaults to '1 Month'
+                                     Never, 10 Minutes, 1 Hour, 1 Day, 1 Month
+    -l, --language <syntax>          Syntax types can be abbriviated, as long as they are unambigous. There are many more supported languages than what is listed here. Defaults to 'text'
+                                       perl, python, c, ruby, bash, cpp, groovy, latex, java, php, sql, xml
+    -p, --private                    Make paste private.
     -h, --help                       Show this message
 
+
 == Copyright
 
-Copyright (c) 2009 dougsko. See LICENSE for details.
+Copyright (c) 2010 dougsko. See LICENSE for details.

data/Rakefile

@@ -1,58 +1,50 @@
 require 'rubygems'
-require 'rake'
-
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "pastebin"
-    gem.summary = %Q{Command line interface to http://pastebin.ca}
-    gem.email = "dougtko@gmail.com"
-    gem.homepage = "http://github.com/dougsko/pastebin"
-    gem.authors = ["dougsko"]
-    gem.description = 'Command line interface to http://pastebin.ca'
-    gem.add_dependency 'httpclient'
-    gem.require_paths = ['/bin', '/lib']
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
 
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "pastebin"
+  gem.homepage = "http://github.com/dougsko/pastebin"
+  gem.license = "MIT"
+  gem.summary = %Q{CLI tool and library to work with pastebin.com}
+  gem.description = %Q{CLI tool and library to work with pastebin.com}
+  gem.email = "dougtko@gmail.com"
+  gem.authors = ["dougsko"]
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['--color']
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
-  spec.spec_opts = ['--color']
 end
 
-
 task :default => :spec
 
 require 'rake/rdoctask'
-#require 'darkfish-rdoc'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "pastebin #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.options += [
-          '-N',
- #         '-f', 'darkfish',
-          ]
 end
-

data/VERSION

@@ -1 +1 @@
-0.2.1
+1.0.0

data/bin/pastebin

@@ -1,22 +1,21 @@
 #!/usr/bin/env ruby
 
-# pastebin is a command line interface to pastebin.ca
+# pastebin is a command line interface to pastebin.com
 # It can read from a file or from STDIN
 #
-# Copyright (C) 2007 Doug Prostko 
+# Copyright (C) 2010 Doug Prostko 
 #
-# Requires the httpclient
 
 require 'rubygems'
 require 'optparse'
 require 'pastebin'
 
 # set up all the options stuff
-options = {"type" => "1"}
+options = {}
 opts = OptionParser.new do |opts|
 	opts.banner =  "pastebin is a CLI to http://pastebin.ca
 	Usage: pastebin [options] 
-	Examples: pastebin -f foo.rb -t ruby -e '1 d'
+	Examples: pastebin -f foo.rb -t ruby -e '10 Minutes'
 	          cat foo.pl | pastebin -f - -t perl"
 
 	opts.separator ""
@@ -24,112 +23,72 @@ opts = OptionParser.new do |opts|
 
 	opts.on("-f <file>", "--file <file>", String,
 	  	"Use a file for input, use \"-\" for STDIN") do |f|
-	        	options["content"] = f
+	        	options["paste_code"] = f
 	end
 
 	opts.on("-n", "--name <name>", String,
 		"Assign a name/title to your paste") do |n|
-			options["name"] = n
+			options["paste_name"] = n
 		end
 
-	opts.on("-d", "--desc <description>", Array,
-		"Give your paste a description") do |d|
-			options["description"] = d
+	opts.on("-s", "--subdomain <subdomain>", String,
+		"Paste to a specific subdomain") do |s|
+			options["paste_subdomain"] = s
 	end
 
-    opts.on("-c", "--config <file>", String,
-        "Specify a config file.  Default is ~/.paster.yaml") do |c|
-            options["config"] = c
+    opts.on("-r", "--raw <link>", String, 
+        "Return raw text from a paste link") do |r|
+            options["raw"] = r
     end
 
-    opts.on("-r", "--raw <link>", String, "Return raw text from a paste link") do |r|
-        options["raw"] = r
-    end
-
-    opts.on("-t", "--tags <tags>", String, "Tags for your paste") do |t|
-        options["tags"] = t
-    end
-
-	expire_array = [ "never",
-			 "5 minutes",
-			 "10 minutes",
-			 "15 minutes",
-			 "30 minutes",
-			 "45 minutes",
-			 "1 hour",
-			 "2 hours",
-			 "4 hours",
-			 "8 hours",
-			 "12 hours",
-			 "1 day",
-			 "2 days",
-			 "3 days",
-			 "1 week",
-			 "2 weeks",
-			 "3 weeks",
-			 "1 month",
-			 "2 months",
-			 "3 months",
-			 "4 months",
-			 "5 months",
-			 "6 months",
-			 "1 year"
+	expire_array = [ 
+             "Never",
+			 "10 Minutes",
+			 "1 Hour",
+			 "1 Day",
+			 "1 Month",
 	]
 	expire_list = expire_array.join(", ")
-	opts.on("-e", "--expire <time>", expire_array, "These can be abbriviated, as long as they are unambigous. Defaults to '1 month'", "#{expire_list}" ) do |e|
-			options["expiry"] = e
+	opts.on("-e", "--expire <time>", expire_array, "These can be abbriviated, as long as they are unambigous. Defaults to '1 Month'", "#{expire_list}" ) do |e|
+			options["paste_expire_date"] = e
 	end
 
-	syntax_hash = { "action" => "18",
-			"ada" => "19",
-			"apache configuration" => "20",
-			"assembly (nasm)" => "21",
-		 	"asterisk configuration" => "2",
-			"bash" => "23",
-			"c" => "3",
-			"c#" => "9",
-			"c++" => "4",
-			"css" => "24",
-			"delphi" => "25",
-			"html 4.0 strict" => "26",
-			"java" => "7",
-			"java" => "27",
-			"lisp" => "28",
-			"lua" => "29",
-			"microprocessor asm" => "30",
-			"objective c" => "31",
-			"php" => "5", "pl/i" => "14",
-			"pascal" => "12",
-			"perl" => "6",
-			"python" => "11",
-			"raw" => "1",
-			"ruby" => "10",
-			"sql statement" => "16",
-			"scheme" => "17",
-			"visual basic .net" => "32",
-			"visual basic" => "8",
-			"xml document" => "15",
-			"mirc " => "13"
-	}
-	code_list = syntax_hash.keys.sort.join(", ")
-	opts.on("-l", "--language <syntax>", syntax_hash, "Syntax types can be abbriviated, as long as they are unambigous. Defaults to 'raw'", "  #{code_list}") do |encoding|
-			options["type"] = encoding 
+    syntax_array = [ 'perl',
+        'python',
+        'c',
+        'ruby',
+        'bash',
+        'cpp',
+        'groovy',
+        'latex',
+        'java',
+        'php',
+        'sql',
+        'xml'
+    ]
+
+	code_list = syntax_array.join(", ")
+	opts.on("-l", "--language <syntax>", syntax_array, "Syntax types can be abbriviated, as long as they are unambigous. There are many more supported languages than what is listed here. Defaults to 'text'", "  #{code_list}") do |encoding|
+			options["paste_format"] = encoding 
 	end
 
+    opts.on("-p", "--private", "Make paste private.") do
+        options["paste_private"] = "1"
+    end
+
 	opts.on_tail("-h", "--help", "Show this message") do
 	   puts opts
-           exit
+       exit
 	end
 end
 
 # parse options
 opts.parse(ARGV)
 
+pbin = Pastebin.new(options)
 if options["raw"]
-    pbin = Pastebin.new
     puts pbin.get_raw(options["raw"])
 else
-    pbin = Pastebin.new(options)
     puts pbin.paste
 end
 

data/lib/pastebin.rb

@@ -1,95 +1,51 @@
 #!/usr/bin/env ruby
 #
-#  Class to work with http://pastebin.ca
+#  Class to work with http://pastebin.com
 #
 
 require 'rubygems'
-require 'yaml'
-require 'hpricot'
 require 'httpclient'
-require 'fileutils'
+require 'rexml/document'
 
 class Pastebin
-     # If you intend to make a paste with this object, give it a hash as
-     # its argument containing the POST variables.
-     #
-     #   pbin = Pastbin.new({ "content" => "file_path",
-     #                        "name" => "",
-     #                        "decription" => "",
-     #                        "tags" => "",
-     #                        "exipry" => "",
-     #                        "type" => "",
-     #                        "config" => "config file",
-     #                      })
-     #   pbin.paste    #=> "http://pastebin.ca/xxxxxxx"
-     #
-     # If you are going to use this object to retrieve text from a
-     # paste, then you do not need an argument.
-     #
-     #  pbin = Pastbin.new
-     #  pbin.get_raw("http://pastebin.ca/xxxxxxx") #=> "some text"
-     #
-    def initialize(options = {})
+    include REXML
+
+    # The only option required is 'paste_code', which holds your string.
+    #
+    def initialize(options)
         @options = options
-        if @options.has_key?("config")
-            @config = options["config"]
-            @options.delete("config")
-        else
-            @config = "#{ENV['HOME']}/.paster.yaml"
-        end
-        @options["type"] = "1"
-        if File.exists? @config
-            config = YAML.load(File.open(@config))
-        else
-            FileUtils.touch @config
-            config = {}
-            puts "Please enter your API key.  You'll only have to do this once."
-            print "You can get a key here: http://pastebin.ca/apikey.php \n "
-            config['key'] = gets.chomp
-            @options["api"] = config['key']
-            open(@config, 'w'){ |f| YAML.dump(config, f) }
-            puts "Thank you. Please run the script again. Run #{$0} --help to see all the options."
-            exit
-        end
     end
 
     # This POSTs the paste and returns the link
     #
-    #   pbin.paste    #=> "http://pastebin.ca/xxxxxxx"
+    #   pbin.paste    #=> "http://pastebin.com/xxxxxxx"
     #
     def paste
-        if @options.has_key?("content")
-            if @options["content"] == "-"
-                @options["content"] = $stdin.read
+        if @options.has_key?("paste_code")
+            if @options["paste_code"] == "-"
+                @options["paste_code"] = $stdin.read
             else
-                File.open(@options["content"]) do |file|
-                    @options["content"] = file.read
+                File.open(@options["paste_code"]) do |file|
+                    @options["paste_code"] = file.read
                 end
             end
-        else
-            puts "You must specify a file or '-' for STDIN"
-            exit
+        #else
+        #    puts "You must specify a file or '-' for STDIN"
+        #    exit
         end
         clnt = HTTPClient.new
-        clnt.post("http://pastebin.ca/quiet-paste.php", @options).content[/(\w+):([\w\s]+)/]
-        success_fail = $1
-        code_reason = $2
-        if success_fail == "SUCCESS"
-            "http://pastebin.ca/" + code_reason
-        elsif success_fail == "FAIL"
-            "#{$0} Error: #{$2}"
-        else
-            "#{$0} Error: Unknown Error"
-        end
+        clnt.post("http://pastebin.com/api_public.php", @options).content
     end
 
     # This method takes a link from a previous paste and returns the raw
     # text.
     #
-    #   pbin.get_raw("http://pastebin.ca/xxxxxxx")    #=> "some text"
+    #   pbin.get_raw("http://pastebin.com/xxxxxxx")    #=> "some text"
     #
     def get_raw(link)
-        clnt = HTTPClient.new(:agent_name => 'ruby httpclient')
-        clnt.get_content("http://pastebin.ca/raw/#{link[/\d+/]}")
+        clnt = HTTPClient.new(:agent_name => 'ruby pastebin gem')
+        paste = clnt.get_content("http://pastebin.com/raw.php?i=#{link[/[\w\d]+$/]}")
+        doc = Document.new(paste)
+        doc.elements.to_a("//pre")[0].text
     end
 end

data/spec/pastebin_spec.rb

@@ -3,22 +3,28 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Pastebin" do
   before do
       `echo "hello world" > /tmp/hw.txt`
-      options = {"content" => "/tmp/hw.txt", "expiry" => "5 minutes"}
+      options = {"paste_code" => "/tmp/hw.txt", 
+                 "paste_expire_date" => "10 Minutes",
+                 "paste_private" => "1"}
       @pbin = Pastebin.new(options)
   end
 
+  after do
+      `rm /tmp/hw.txt`
+  end
+
   it "tests that @pbin is indeed a Pastebin object" do
       @pbin.class.to_s.should == "Pastebin"
   end
 
   it "should paste some text and return a link" do
-      @paste = @pbin.paste
-      @paste.should match(/http:.*\/\d+/)
+      @link = @pbin.paste
+      @link.should match(/http:.*\/[\d\w]+/)
   end
 
   it "should return raw text from a paste link" do
-      @paste = @pbin.paste
-      text = @pbin.get_raw(@paste)
+      link = @pbin.paste
+      text = @pbin.get_raw(link)
       text.should match(/hello world/)
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
-require 'spec'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
 require 'pastebin'
 
-Spec::Runner.configure do |config|
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
   
 end

metadata

@@ -3,10 +3,10 @@ name: pastebin
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 2
   - 1
-  version: 0.2.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - dougsko
@@ -14,34 +14,81 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -04:00
+date: 2010-12-03 00:00:00 -05:00
 default_executable: pastebin
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: httpclient
-  prerelease: false
+  name: rspec
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id002
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  type: :development
+  version_requirements: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
-description: Command line interface to http://pastebin.ca
+  type: :development
+  version_requirements: *id004
+  prerelease: false
+description: CLI tool and library to work with pastebin.com
 email: dougtko@gmail.com
 executables: 
 - pastebin
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
+- LICENSE.txt
 - README.rdoc
 files: 
 - .document
-- .gitignore
-- LICENSE
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
@@ -51,22 +98,24 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/dougsko/pastebin
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
-- /bin
-- /lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -76,10 +125,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Command line interface to http://pastebin.ca
+summary: CLI tool and library to work with pastebin.com
 test_files: 
 - spec/pastebin_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg

data/LICENSE

@@ -1,15 +0,0 @@
-# Command line interface to http://pastebin.ca
-# Copyright (C) 2009 dougsko
-# 
-# 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 3 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, see <http://www.gnu.org/licenses/>.