permutations 0.1.2 → 0.1.3

data/Rakefile

@@ -31,29 +31,23 @@ end
 
 desc 'Show files missing from gemspec'
 task :diff do
-  files = %w[
-    Rakefile
-    *README* *readme*
-    *LICENSE*
-    *.gemspec deps.rip
-    bin/*
-    lib/**/*
-    spec/**/*
-  ].map {|pattern| Dir.glob(pattern)}.flatten.select{|f| File.file?(f)}
+  all_files_and_dirs = Dir.glob('**/*')
+  files_and_dirs_to_ignore = %w[pkg coverage doc].map {|dir| Dir.glob("#{dir}/**/*")}.flatten
+  files_and_dirs = all_files_and_dirs - files_and_dirs_to_ignore
+  files = files_and_dirs.select{|f| File.file?(f)}
   missing_files = files - spec.files
   extra_files = spec.files - files
-  puts "Missing files:"
-  puts missing_files.join(" ")
-  puts "Extra files:"
-  puts extra_files.join(" ")
-end
-
-desc 'Local install the latest gem version'
-task :reinstall do
-  system("rm -f pkg/*.gem && rake gem && gem install pkg/*.gem")
+  unless missing_files.empty?
+    puts "Missing files:"
+    puts missing_files.join(" ")
+  end
+  unless extra_files.empty?
+    puts "Extra files:"
+    puts extra_files.join(" ")
+  end
 end
 
-desc 'Uninstall all Fresnel versions and install the latest gem version'
+desc "Uninstall all #{spec.name} versions and install version #{spec.version}"
 task :upgrade do
-  system("gem uninstall -a -x fresnel && rm -f pkg/*.gem && rake gem && gem install pkg/*.gem")
+  system("sudo gem uninstall -a -x #{spec.name} && rake gem && gem install pkg/#{spec.name}-#{spec.version}.gem")
 end

data/Readme.rdoc

@@ -1,13 +1,39 @@
 = Permutations
 
 Generate permutations for nested arrays or strings that offer one or more choices.
-You can use it as a Rails plugin.
+
+== Installation
+
+You can use it as a Rails plugin or as a normal ruby.
+
+  script/plugin install git://github.com/Narnach/permutations.git
+
+or
+
+  sudo gem install permutations
 
 == Example
 
+You can permutate array elements:
+  require 'permutations'
   [[1,2],[3,4]].permutations # =>[[1,3],[1,4],[2,3],[2,4]]
+
+You can also permutate choice sets extraced from strings. These choices are specified between curly braces:
   "{1,2}{3,4}".permutations # => ["13", "14", "23", "24"]
 
+It is possible to use a custom separator, and whitespace surrounding options is automatically removed to allow for more reader-friendly formatting of the choicees:
+  "{ 1 | 2 }{ 3 | 4 }".permutations("|") # => ["13", "14", "23", "24"]
+
+By default (custom) separators are regexp-escaped, but this can be turned off to use a regexp to determine the separation; for example when there are multiple separators:
+  "{1|2}{3,4}".permutations("[|,]", false) # => ["13", "14", "23", "24"]
+
+== Contributing
+
+Bugs and feature requests can be added in Lighthouse. Pull requests on github are welcome, too.
+When you submit code, it is very much appreciated when have specs and perhaps a bit of documentation for new features.
+
+https://narnach.lighthouseapp.com/projects/45010-permutations
+
 == Credits
 
 Created by Wes Oldenbeuving. Licensed under the MIT License.

data/lib/permutations.rb

@@ -1,6 +1,7 @@
 module Permutations
   module Array
     # Recursively permutate nested arrays.
+    #   [[1,2],[3,4]].permutations # =>[[1,3],[1,4],[2,3],[2,4]]
     def permutations(leftovers=self)
       tail = leftovers.last
       return tail.map{|e| [e]} if leftovers.size == 1
@@ -15,11 +16,12 @@ module Permutations
   end
 
   module String
-    # Create multi-level string permutations
-    # "{a,b,c}{1,2,3}".permutations # => ["a1", "a2", "a3", "b1", "b2", "b3", "c1", "c2", "c3"]
+    # Create all possible string permutations of the available choice groups.
+    #   "{a,b,c}{1,2,3}".permutations # => ["a1", "a2", "a3", "b1", "b2", "b3", "c1", "c2", "c3"]
     def permutations(separator=',', escape_separator=true)
       separator=Regexp.escape(separator) if escape_separator
       matches = self.scan(/(\{\s*(.*?)\s*\})/)
+      return [self] if matches.empty?
       substitutions = matches.map{|match| match[0]}
       permutations = matches.map{|match| match[1].split(/\s*#{separator}\s*/)}.permutations
       permutations.map do |permutation|

data/permutations.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.name         = 'permutations'
   s.summary      = "Permutations is a library that allows you to generate permutations from Arrays and Strings."
   s.description  = s.summary
-  s.version      = '0.1.2'
-  s.date         = '2010-01-21'
+  s.version      = '0.1.3'
+  s.date         = '2010-02-01'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Wes Oldenbeuving"]
   s.email        = "narnach@gmail.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: permutations
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Wes Oldenbeuving
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 +01:00
+date: 2010-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: []