kamcaptcha 0.2.0 → 1.0.0

data/README.md

@@ -50,3 +50,7 @@ return head(:bad_request) unless kamcaptcha_validates?
 ```
 
 You can write your own helper and controller logic easily, take a look at the source.
+
+## License
+
+Released under the Apache License Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.html

data/bin/kamcaptcha

@@ -28,7 +28,7 @@ A default run creates a "./tmp" directory and generates 10 random five character
 Full list of options:
 EOS
 
-  opt :salt, "Salt to use, if not specified one will be generated"
+  opt :salt, "Salt to use, if not specified one will be generated", :type => :string
   opt :count, "How many words to generate", :default => 10
   opt :height, "Height of the word image in pixels", :default => 50
   opt :width, "Width of the word image in pixesks", :default => 240

data/kamcaptcha.gemspec

@@ -1,11 +1,11 @@
-Gem::Specification.new "kamcaptcha", "0.2.0" do |s|
+Gem::Specification.new "kamcaptcha", "1.0.0" do |s|
   s.summary     = "A captcha image generator that's a little less retarded"
   s.description = "Helps humankind with simpler captchas"
   s.authors     = [ "Morten Primdahl" ]
   s.email       = "primdahl@me.com"
   s.homepage    = "http://github.com/morten/kamcaptcha"
   s.files       = `git ls-files`.split("\n")
-  s.license     = "MIT"
+  s.license     = "Apache License Version 2.0"
 
   s.add_runtime_dependency("trollop", ">= 2.0")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamcaptcha
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -117,7 +117,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- MIT-LICENSE.txt
 - README.md
 - Rakefile
 - bin/kamcaptcha
@@ -135,7 +134,7 @@ files:
 - test/unit/test_validation.rb
 homepage: http://github.com/morten/kamcaptcha
 licenses:
-- MIT
+- Apache License Version 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:

data/MIT-LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2012 Morten Primdahl
-
-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.