combinatorics 0.4.1 → 0.4.3

data/ChangeLog.md

@@ -1,3 +1,21 @@
+### 0.4.3 / 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.2 / 2012-05-27
+
+* Avoid warnings on JRuby by checking for `::Generator` before
+  `::Enumerator::Generator` in `combinatorics/generator`.
+* Raise a `NameError` when the `Generator` class cannot be found in
+  `combinatorics/generator`.
+* Replaced ore-tasks with
+  [rubygems-tasks](https://github.com/postmodern/rubygems-tasks#readme).
+
+### 0.4.1 / 2011-10-15
+
+* Fixed a typo in the gemspec.
+
 ### 0.4.0 / 2011-10-15
 
 * Added {Math.sigma}.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Hal Brodigan
+Copyright (c) 2010-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 @@
 # Combinatorics
 
-* [Source](http://github.com/postmodern/combinatorics)
-* [Issues](http://github.com/postmodern/combinatorics/issues)
+* [Source](https://github.com/postmodern/combinatorics)
+* [Issues](https://github.com/postmodern/combinatorics/issues)
 * [Documentation](http://rubydoc.info/gems/combinatorics)
 * [Email](mailto:postmodern.mod3 at gmail.com)
 
@@ -58,41 +58,6 @@ Power-set:
           #<Set: {"ab", "cd"}>,
           #<Set: {"ab", "cd", "ef"}>]
 
-Find the intersecting sub-range between two ranges:
-
-    (1..50) & (20..100)
-    # => (20..50)
-
-Enumerate over every sub-range between two ranges:
-
-    (1..5).upto(2..10).to_a
-    # => [1..5, 1..6, 1..7, 1..8, 1..9, 1..10,
-          2..5, 2..6, 2..7, 2..8, 2..9, 2..10]
-
-List comprehensions:
-
-    require 'combinatorics/list_comprehension'
-
-    [(0..10).step(2),('a'..'c')].comprehension.to_a
-    # => [[0, "a"],
-          [0, "b"],
-          [0, "c"],
-          [2, "a"],
-          [2, "b"],
-          [2, "c"],
-          [4, "a"],
-          [4, "b"],
-          [4, "c"],
-          [6, "a"],
-          [6, "b"],
-          [6, "c"],
-          [8, "a"],
-          [8, "b"],
-          [8, "c"],
-          [10, "a"],
-          [10, "b"],
-          [10, "c"]]
-
 Cartesian products:
 
     require 'combinatorics/cartesian_product'
@@ -148,21 +113,54 @@ Permutation cardinality:
 
     require 'combinatorics/permutation'
     
-    include Combinatorics::Permute
-    
-    Combinatorics::Permute::cardinality(128)
+    Combinatorics::Permute.cardinality(128)
     # => 8256
 
+List comprehensions:
+
+    require 'combinatorics/list_comprehension'
+
+    [(0..10).step(2),('a'..'c')].comprehension.to_a
+    # => [[0, "a"],
+          [0, "b"],
+          [0, "c"],
+          [2, "a"],
+          [2, "b"],
+          [2, "c"],
+          [4, "a"],
+          [4, "b"],
+          [4, "c"],
+          [6, "a"],
+          [6, "b"],
+          [6, "c"],
+          [8, "a"],
+          [8, "b"],
+          [8, "c"],
+          [10, "a"],
+          [10, "b"],
+          [10, "c"]]
+
+Find the intersecting sub-range between two ranges:
+
+    (1..50) & (20..100)
+    # => (20..50)
+
+Enumerate over every sub-range between two ranges:
+
+    (1..5).upto(2..10).to_a
+    # => [1..5, 1..6, 1..7, 1..8, 1..9, 1..10,
+          2..5, 2..6, 2..7, 2..8, 2..9, 2..10]
+
 ## Requirements
 
 * [ruby](http://www.ruby-lang.org/) >= 1.8.7
 
 ## Install
 
-      $ sudo gem install combinatorics
+    $ gem install combinatorics
 
 ## Copyright
 
-Copyright (c) 2010-2011 Hal Brodigan
+Copyright (c) 2010-2012 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -2,13 +2,13 @@ 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

data/combinatorics.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/combinatorics/version.rb',
-    :constant => 'Combinatorics::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 'combinatorics/version'
+                  Combinatorics::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

data/gemspec.yml

@@ -10,12 +10,12 @@ authors:
 email:
  - postmodern.mod3@gmail.com
  - super@manson.vistech.net
-homepage: http://github.com/postmodern/combinatorics
+homepage: https://github.com/postmodern/combinatorics#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/combinatorics/extensions/math.rb

@@ -113,7 +113,6 @@ module Math
     Math.pi(r)
   end
   
-
   #
   # Subfactorial function for calculation of derangement cardinalities.
   #

data/lib/combinatorics/generator.rb

@@ -1,17 +1,13 @@
 require 'enumerator'
-
-begin
-  require 'generator' # 1.8.7
-rescue LoadError
-end
+require 'generator' if RUBY_VERSION < '1.9'
 
 module Combinatorics
   # auto-detects the `Generator` class.
-  Generator = if defined?(::Enumerator::Generator) # 1.9
-                ::Enumerator::Generator
-              elsif defined?(::Generator) # 1.8.7
+  Generator = if defined?(::Generator) # 1.8.7
                 ::Generator
+              elsif defined?(::Enumerator::Generator) # 1.9
+                ::Enumerator::Generator
               else
-                raise("unable to find the Generator class")
+                raise(NameError,"unable to find the Generator class")
               end
 end

data/lib/combinatorics/version.rb

@@ -1,4 +1,4 @@
 module Combinatorics
   # Combinatorics module revision number
-  VERSION = '0.4.1'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combinatorics
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ore-tasks
-  requirement: &12746560 !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: *12746560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12744980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *12744980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12743140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,14 +54,23 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *12743140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: A collection of modules and methods for performing Combinatoric calculations.
 email:
 - postmodern.mod3@gmail.com
 - super@manson.vistech.net
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- Benchmarks.md
+- ChangeLog.md
+- LICENSE.txt
+- README.md
 files:
 - .document
 - .gemtest
@@ -135,7 +154,7 @@ files:
 - spec/power_set/mixin_examples.rb
 - spec/power_set/set_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/postmodern/combinatorics
+homepage: https://github.com/postmodern/combinatorics#readme
 licenses:
 - MIT
 post_install_message: 
@@ -156,28 +175,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: Bringing (more) Combinatorics to Ruby
-test_files:
-- spec/cartesian_product/array_spec.rb
-- spec/cartesian_product/cardinality_spec.rb
-- spec/cartesian_product/set_spec.rb
-- spec/choose/array_spec.rb
-- spec/choose/cardinality_spec.rb
-- spec/choose/set_spec.rb
-- spec/combinatorics_spec.rb
-- spec/derange/array_spec.rb
-- spec/derange/cardinality_spec.rb
-- spec/enumerator_spec.rb
-- spec/extensions/math_spec.rb
-- spec/extensions/range_spec.rb
-- spec/generator_spec.rb
-- spec/list_comprehension_spec.rb
-- spec/permute/array_spec.rb
-- spec/permute/cardinality_spec.rb
-- spec/permute/set_spec.rb
-- spec/power_set/array_spec.rb
-- spec/power_set/cardinality_spec.rb
-- spec/power_set/set_spec.rb
+test_files: []