parameters 0.4.0 → 0.4.2

data/.document

@@ -0,0 +1,3 @@
+-
+ChangeLog.md
+LICENSE.txt

data/.yardopts

@@ -1 +1 @@
---quiet --markup markdown --title 'Parameters Documentation' --protected --files ChangeLog.md,LICENSE.txt
+--quiet --markup markdown --title 'Parameters Documentation' --protected

data/ChangeLog.md

@@ -1,3 +1,15 @@
+### 0.4.2 / 2012-05-28
+
+* Fixed a typo in the gemspec, which incorrectly set
+  `required_rubygems_version` to the same value as `required_ruby_version`.
+
+### 0.4.1 / 2012-05-27
+
+* Changed the default `USAGE` for Regexp parameters to `/REGEXP/`
+  in {Parameters::Options::USAGES}.
+* Replaced ore-tasks with
+  [rubygems-tasks](https://github.com/postmodern/rubygems-tasks#readme).
+
 ### 0.4.0 / 2011-12-29
 
 * Added {Parameters::Options}.

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2008-2011 Hal Brodigan
+Copyright (c) 2008-2012 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 # Parameters
 
-* [Source](http://github.com/postmodern/parameters)
-* [Issues](http://github.com/postmodern/parameters/issues)
+* [Source](https://github.com/postmodern/parameters)
+* [Issues](https://github.com/postmodern/parameters/issues)
 * [Documentation](http://rubydoc.info/gems/parameters/frames)
 * [Email](mailto:postmodern.mod3 at gmail.com)
 
@@ -88,4 +88,3 @@ have configurable default values.
 ## License
 
 See {file:LICENSE.txt} for license information.
-

data/Rakefile

@@ -1,14 +1,16 @@
+# encoding: utf-8
+
 require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.4'
-  require 'ore/tasks'
+  gem 'rubygems-tasks', '~> 0.1'
+  require 'rubygems/tasks'
 
-  Ore::Tasks.new
+  Gem::Tasks.new
 rescue LoadError => e
   warn e.message
-  warn "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
 end
 
 begin
@@ -21,7 +23,8 @@ rescue LoadError => e
     abort "Please run `gem install rspec` to install RSpec."
   end
 end
-task :test => :spec
+
+task :test    => :spec
 task :default => :spec
 
 begin
@@ -34,3 +37,4 @@ rescue LoadError => e
     abort "Please run `gem install yard` to install YARD."
   end
 end
+task :doc => :yard

data/gemspec.yml

@@ -7,12 +7,12 @@ description:
 license: MIT
 authors: Postmodern
 email: postmodern.mod3@gmail.com
-homepage: http://github.com/postmodern/parameters
+homepage: https://github.com/postmodern/parameters#readme
 has_yard: true
 
 required_ruby_version: ">= 1.8.7"
 
 development_dependencies:
-  ore-tasks: ~> 0.4
+  rubygems-tasks: ~> 0.1
   rspec: ~> 2.4
   yard: ~> 0.7

data/lib/parameters/options.rb

@@ -16,7 +16,7 @@ module Parameters
       Types::Time     => 'TIME',
       Types::DateTime => 'DATE|TIME',
       Types::Date     => 'DATE',
-      Types::Regexp   => 'REGEXP',
+      Types::Regexp   => '/REGEXP/',
       Types::URI      => 'URI',
       Types::Array    => 'VALUE [...]',
       Types::Set      => 'VALUE [...]',

data/lib/parameters/version.rb

@@ -1,4 +1,4 @@
 module Parameters
   # The version of parameters
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

data/parameters.gemspec

@@ -2,126 +2,59 @@
 
 require 'yaml'
 
-Gem::Specification.new do |gemspec|
-  files = if File.directory?('.git')
-            `git ls-files`.split($/)
-          elsif File.directory?('.hg')
-            `hg manifest`.split($/)
-          elsif File.directory?('.svn')
-            `svn ls -R`.split($/).select { |path| File.file?(path) }
-          else
-            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
-          end
+Gem::Specification.new do |gem|
+  gemspec = YAML.load_file('gemspec.yml')
 
-  filter_files = lambda { |paths|
-    case paths
-    when Array
-      (files & paths)
-    when String
-      (files & Dir[paths])
-    end
-  }
-
-  version = {
-    :file => 'lib/parameters/version.rb',
-    :constant => 'Parameters::VERSION'
-  }
-
-  defaults = {
-    'name' => File.basename(File.dirname(__FILE__)),
-    'files' => files,
-    'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
-    'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
-    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
-  }
-
-  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
-
-  gemspec.name = metadata.fetch('name',defaults[:name])
-  gemspec.version = if metadata['version']
-                      metadata['version']
-                    elsif File.file?(version[:file])
-                      require File.join('.',version[:file])
-                      eval(version[:constant])
-                    end
-
-  gemspec.summary = metadata.fetch('summary',metadata['description'])
-  gemspec.description = metadata.fetch('description',metadata['summary'])
-
-  case metadata['license']
-  when Array
-    gemspec.licenses = metadata['license']
-  when String
-    gemspec.license = metadata['license']
-  end
-
-  case metadata['authors']
-  when Array
-    gemspec.authors = metadata['authors']
-  when String
-    gemspec.author = metadata['authors']
-  end
+  gem.name    = gemspec.fetch('name')
+  gem.version = gemspec.fetch('version') do
+                  lib_dir = File.join(File.dirname(__FILE__),'lib')
+                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-  gemspec.email = metadata['email']
-  gemspec.homepage = metadata['homepage']
+                  require 'parameters/version'
+                  Parameters::VERSION
+                end
 
-  case metadata['require_paths']
-  when Array
-    gemspec.require_paths = metadata['require_paths']
-  when String
-    gemspec.require_path = metadata['require_paths']
-  end
+  gem.summary     = gemspec['summary']
+  gem.description = gemspec['description']
+  gem.licenses    = Array(gemspec['license'])
+  gem.authors     = Array(gemspec['authors'])
+  gem.email       = gemspec['email']
+  gem.homepage    = gemspec['homepage']
 
-  gemspec.files = filter_files[metadata['files']]
+  glob = lambda { |patterns| gem.files & Dir[*patterns] }
 
-  gemspec.executables = metadata['executables']
-  gemspec.extensions = metadata['extensions']
+  gem.files = `git ls-files`.split($/)
+  gem.files = glob[gemspec['files']] if gemspec['files']
 
-  if Gem::VERSION < '1.7.'
-    gemspec.default_executable = gemspec.executables.first
+  gem.executables = gemspec.fetch('executables') do
+    glob['bin/*'].map { |path| File.basename(path) }
   end
+  gem.default_executable = gem.executables.first if Gem::VERSION < '1.7.'
 
-  gemspec.test_files = filter_files[metadata['test_files']]
-
-  unless gemspec.files.include?('.document')
-    gemspec.extra_rdoc_files = metadata['extra_doc_files']
-  end
-
-  gemspec.post_install_message = metadata['post_install_message']
-  gemspec.requirements = metadata['requirements']
-
-  if gemspec.respond_to?(:required_ruby_version=)
-    gemspec.required_ruby_version = metadata['required_ruby_version']
-  end
+  gem.extensions       = glob[gemspec['extensions'] || 'ext/**/extconf.rb']
+  gem.test_files       = glob[gemspec['test_files'] || '{test/{**/}*_test.rb']
+  gem.extra_rdoc_files = glob[gemspec['extra_doc_files'] || '*.{txt,md}']
 
-  if gemspec.respond_to?(:required_rubygems_version=)
-    gemspec.required_rubygems_version = metadata['required_rubygems_version']
-  end
+  gem.require_paths = Array(gemspec.fetch('require_paths') {
+    %w[ext lib].select { |dir| File.directory?(dir) }
+  })
 
-  parse_versions = lambda { |versions|
-    case versions
-    when Array
-      versions.map { |v| v.to_s }
-    when String
-      versions.split(/,\s*/)
-    end
-  }
+  gem.requirements              = gemspec['requirements']
+  gem.required_ruby_version     = gemspec['required_ruby_version']
+  gem.required_rubygems_version = gemspec['required_rubygems_version']
+  gem.post_install_message      = gemspec['post_install_message']
 
-  if metadata['dependencies']
-    metadata['dependencies'].each do |name,versions|
-      gemspec.add_dependency(name,parse_versions[versions])  
-    end
-  end
+  split = lambda { |string| string.split(/,\s*/) }
 
-  if metadata['runtime_dependencies']
-    metadata['runtime_dependencies'].each do |name,versions|
-      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+  if gemspec['dependencies']
+    gemspec['dependencies'].each do |name,versions|
+      gem.add_dependency(name,split[versions])
     end
   end
 
-  if metadata['development_dependencies']
-    metadata['development_dependencies'].each do |name,versions|
-      gemspec.add_development_dependency(name,parse_versions[versions])  
+  if gemspec['development_dependencies']
+    gemspec['development_dependencies'].each do |name,versions|
+      gem.add_development_dependency(name,split[versions])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parameters
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ore-tasks
-  requirement: &23003040 !ruby/object:Gem::Requirement
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *23003040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23002520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *23002520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &23002020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +53,12 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *23002020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: Parameters allows you to add annotated variables to your classes which
   may have configurable default values.
 email: postmodern.mod3@gmail.com
@@ -54,6 +69,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- .document
 - .gemtest
 - .gitignore
 - .rspec
@@ -127,7 +143,7 @@ files:
 - spec/types/time_spec.rb
 - spec/types/types_spec.rb
 - spec/types/uri_spec.rb
-homepage: http://github.com/postmodern/parameters
+homepage: https://github.com/postmodern/parameters#readme
 licenses:
 - MIT
 post_install_message: 
@@ -148,30 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Allows you to add annotated variables to your classes
-test_files:
-- spec/class_param_spec.rb
-- spec/instance_param_spec.rb
-- spec/options_spec.rb
-- spec/parameters_spec.rb
-- spec/types/array_spec.rb
-- spec/types/boolean_spec.rb
-- spec/types/class_spec.rb
-- spec/types/date_spec.rb
-- spec/types/date_time_spec.rb
-- spec/types/float_spec.rb
-- spec/types/hash_spec.rb
-- spec/types/integer_spec.rb
-- spec/types/object_spec.rb
-- spec/types/proc_spec.rb
-- spec/types/regexp_spec.rb
-- spec/types/set_spec.rb
-- spec/types/string_spec.rb
-- spec/types/symbol_spec.rb
-- spec/types/time_spec.rb
-- spec/types/types_spec.rb
-- spec/types/uri_spec.rb
-has_rdoc: 
+test_files: []