spruz 0.2.10 → 0.2.11

data/.gitignore

@@ -0,0 +1,3 @@
+pkg
+Gemfile.lock
+.*.sw[pon]

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ruby-head
+  - ree
+  - rbx
+  - jruby

data/Gemfile

@@ -0,0 +1,5 @@
+# vim: set filetype=ruby et sw=2 ts=2:
+
+source :rubygems
+
+gemspec

data/Rakefile

@@ -1,93 +1,30 @@
 # vim: set filetype=ruby et sw=2 ts=2:
 
-begin
-  require 'rubygems/package_task'
-rescue LoadError
-end
-require 'rake/clean'
-CLEAN.include 'coverage', 'doc'
-require 'rbconfig'
-include Config
-
-PKG_NAME = 'spruz'
-PKG_VERSION = File.read('VERSION').chomp
-PKG_FILES = FileList['**/*'].exclude(/(CVS|\.svn|pkg|coverage|doc)/)
-
-desc "Installing library"
-task :install  do
-  ruby 'install.rb'
-end
-
-desc "Creating documentation"
-task :doc do
-  sh "sdoc -t Spruz -o doc -m README README #{Dir['lib/**/*.rb']} * ' '}"
-end
-
-desc "Testing library"
-task :test  do
-  ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -Ilib"
-  sh 'testrb ./tests/test_*.rb'
-end
-
-desc "Testing library with coverage"
-task :coverage  do
-  sh "rcov -Ilib -x '/gems/' -x 'tests/.*\.rb' tests/test_*.rb"
-end
-
-if defined? Gem
-  spec = Gem::Specification.new do |s|
-    s.name = PKG_NAME
-    s.version = PKG_VERSION
-    s.summary = "Useful stuff."
-    s.description = "All the stuff that isn't good/big enough for a real library."
-
-    s.files = PKG_FILES
-
-    s.require_path = 'lib'
-
-    s.bindir = "bin"
-    s.executables << "enum"
-
-    s.extra_rdoc_files << 'README'
-    s.rdoc_options << '--title' <<  'Spruz' << '--main' << 'README'
-    s.test_files.concat Dir['tests/test_*.rb']
-
-    s.author = "Florian Frank"
-    s.email = "flori@ping.de"
-    s.homepage = "http://flori.github.com/spruz"
-  end
-
-  task :gemspec do
-    File.open('spruz.gemspec', 'w') do |output|
-      output.write spec.to_ruby
+require 'gem_hadar'
+
+GemHadar do
+  name        'spruz'
+  author      'Florian Frank'
+  email       'flori@ping.de'
+  homepage    "http://flori.github.com/#{name}"
+  summary     'Useful stuff.'
+  description 'All the stuff that isn\'t good/big enough for a real library.'
+  bindir      'bin'
+  executables << 'enum'
+  test_dir    'tests'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
+  readme      'README.rdoc'
+
+
+  install_library do
+    libdir = CONFIG["sitelibdir"]
+    cd 'lib' do
+      for file in Dir['**/*.rb']
+        dst = File.join(libdir, file)
+        mkdir_p File.dirname(dst)
+        install file, dst
+      end
     end
-  end
-
-  Gem::PackageTask.new(spec) do |pkg|
-    pkg.need_tar = true
-    pkg.package_files += PKG_FILES
+    install 'bin/enum', File.join(CONFIG['bindir'], 'enum')
   end
 end
-
-desc m = "Writing version information for #{PKG_VERSION}"
-task :version do
-  puts m
-  File.open(File.join('lib', PKG_NAME, 'version.rb'), 'w') do |v|
-    v.puts <<EOT
-module Spruz
-  # Spruz version
-  VERSION         = '#{PKG_VERSION}'
-  VERSION_ARRAY   = VERSION.split(/\\./).map { |x| x.to_i } # :nodoc:
-  VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
-  VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
-  VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
-end
-EOT
-  end
-end
-
-desc "Default task: write version and test"
-task :default => [ :version, :test ]
-
-desc "Prepare a release"
-task :release => [ :clean, :version, :package ]

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/lib/spruz/go.rb

@@ -21,7 +21,11 @@ module Spruz
         until p == ''
           o = p.slice!(0, 1)
           if v.key?(o)
-            v[o] = if p == '' then args.shift or break 1 else p end
+            if p == '' then
+              v[o] = args.shift or break 1
+            else
+              v[0] = p
+            end
             break
           elsif b.key?(o)
             b[o] = true

data/lib/spruz/time_dummy.rb

@@ -4,13 +4,11 @@ module Spruz
       modul.module_eval do
         class << self
           alias really_new new
+          remove_method :now rescue nil
+          remove_method :new rescue nil
         end
 
         extend ClassMethods
-
-        class << self
-          alias now new
-        end
       end
     end
 
@@ -24,6 +22,8 @@ module Spruz
           really_new
         end
       end
+
+      alias now new
     end
   end
 end

data/lib/spruz/version.rb

@@ -1,6 +1,6 @@
 module Spruz
   # Spruz version
-  VERSION         = '0.2.10'
+  VERSION         = '0.2.11'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spruz.gemspec

@@ -2,29 +2,33 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spruz}
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Florian Frank}]
-  s.date = %q{2011-07-15}
+  s.authors = ["Florian Frank"]
+  s.date = %q{2011-07-16}
+  s.default_executable = %q{enum}
   s.description = %q{All the stuff that isn't good/big enough for a real library.}
   s.email = %q{flori@ping.de}
-  s.executables = [%q{enum}]
-  s.extra_rdoc_files = [%q{README}]
-  s.files = [%q{tests}, %q{tests/test_spruz_memoize.rb}, %q{tests/test_spruz.rb}, %q{LICENSE}, %q{Rakefile}, %q{spruz.gemspec}, %q{lib}, %q{lib/spruz.rb}, %q{lib/spruz}, %q{lib/spruz/hash_symbolize_keys_recursive.rb}, %q{lib/spruz/string_underscore.rb}, %q{lib/spruz/hash_union.rb}, %q{lib/spruz/write.rb}, %q{lib/spruz/version.rb}, %q{lib/spruz/round.rb}, %q{lib/spruz/go.rb}, %q{lib/spruz/generator.rb}, %q{lib/spruz/string_camelize.rb}, %q{lib/spruz/shuffle.rb}, %q{lib/spruz/deep_dup.rb}, %q{lib/spruz/memoize.rb}, %q{lib/spruz/subhash.rb}, %q{lib/spruz/bijection.rb}, %q{lib/spruz/limited.rb}, %q{lib/spruz/attempt.rb}, %q{lib/spruz/to_proc.rb}, %q{lib/spruz/module_group.rb}, %q{lib/spruz/null.rb}, %q{lib/spruz/xt.rb}, %q{lib/spruz/once.rb}, %q{lib/spruz/xt}, %q{lib/spruz/xt/named.rb}, %q{lib/spruz/xt/hash_symbolize_keys_recursive.rb}, %q{lib/spruz/xt/string_underscore.rb}, %q{lib/spruz/xt/hash_union.rb}, %q{lib/spruz/xt/write.rb}, %q{lib/spruz/xt/irb.rb}, %q{lib/spruz/xt/round.rb}, %q{lib/spruz/xt/string_camelize.rb}, %q{lib/spruz/xt/shuffle.rb}, %q{lib/spruz/xt/deep_dup.rb}, %q{lib/spruz/xt/symbol_to_proc.rb}, %q{lib/spruz/xt/subhash.rb}, %q{lib/spruz/xt/attempt.rb}, %q{lib/spruz/xt/null.rb}, %q{lib/spruz/xt/p.rb}, %q{lib/spruz/xt/partial_application.rb}, %q{lib/spruz/xt/time_dummy.rb}, %q{lib/spruz/xt/string.rb}, %q{lib/spruz/xt/full.rb}, %q{lib/spruz/xt/range_plus.rb}, %q{lib/spruz/xt/count_by.rb}, %q{lib/spruz/xt/blank.rb}, %q{lib/spruz/xt/uniq_by.rb}, %q{lib/spruz/p.rb}, %q{lib/spruz/minimize.rb}, %q{lib/spruz/partial_application.rb}, %q{lib/spruz/time_dummy.rb}, %q{lib/spruz/range_plus.rb}, %q{lib/spruz/count_by.rb}, %q{lib/spruz/uniq_by.rb}, %q{bin}, %q{bin/enum}, %q{README}, %q{VERSION}, %q{install.rb}]
+  s.executables = ["enum"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/spruz.rb", "lib/spruz/hash_symbolize_keys_recursive.rb", "lib/spruz/string_underscore.rb", "lib/spruz/hash_union.rb", "lib/spruz/write.rb", "lib/spruz/version.rb", "lib/spruz/round.rb", "lib/spruz/go.rb", "lib/spruz/generator.rb", "lib/spruz/string_camelize.rb", "lib/spruz/shuffle.rb", "lib/spruz/deep_dup.rb", "lib/spruz/memoize.rb", "lib/spruz/subhash.rb", "lib/spruz/bijection.rb", "lib/spruz/limited.rb", "lib/spruz/attempt.rb", "lib/spruz/to_proc.rb", "lib/spruz/module_group.rb", "lib/spruz/null.rb", "lib/spruz/xt.rb", "lib/spruz/once.rb", "lib/spruz/xt/named.rb", "lib/spruz/xt/hash_symbolize_keys_recursive.rb", "lib/spruz/xt/string_underscore.rb", "lib/spruz/xt/hash_union.rb", "lib/spruz/xt/write.rb", "lib/spruz/xt/irb.rb", "lib/spruz/xt/round.rb", "lib/spruz/xt/string_camelize.rb", "lib/spruz/xt/shuffle.rb", "lib/spruz/xt/deep_dup.rb", "lib/spruz/xt/symbol_to_proc.rb", "lib/spruz/xt/subhash.rb", "lib/spruz/xt/attempt.rb", "lib/spruz/xt/null.rb", "lib/spruz/xt/p.rb", "lib/spruz/xt/partial_application.rb", "lib/spruz/xt/time_dummy.rb", "lib/spruz/xt/string.rb", "lib/spruz/xt/full.rb", "lib/spruz/xt/range_plus.rb", "lib/spruz/xt/count_by.rb", "lib/spruz/xt/blank.rb", "lib/spruz/xt/uniq_by.rb", "lib/spruz/p.rb", "lib/spruz/minimize.rb", "lib/spruz/partial_application.rb", "lib/spruz/time_dummy.rb", "lib/spruz/range_plus.rb", "lib/spruz/count_by.rb", "lib/spruz/uniq_by.rb"]
+  s.files = [".gitignore", ".travis.yml", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "VERSION", "bin/enum", "lib/spruz.rb", "lib/spruz/attempt.rb", "lib/spruz/bijection.rb", "lib/spruz/count_by.rb", "lib/spruz/deep_dup.rb", "lib/spruz/generator.rb", "lib/spruz/go.rb", "lib/spruz/hash_symbolize_keys_recursive.rb", "lib/spruz/hash_union.rb", "lib/spruz/limited.rb", "lib/spruz/memoize.rb", "lib/spruz/minimize.rb", "lib/spruz/module_group.rb", "lib/spruz/null.rb", "lib/spruz/once.rb", "lib/spruz/p.rb", "lib/spruz/partial_application.rb", "lib/spruz/range_plus.rb", "lib/spruz/round.rb", "lib/spruz/shuffle.rb", "lib/spruz/string_camelize.rb", "lib/spruz/string_underscore.rb", "lib/spruz/subhash.rb", "lib/spruz/time_dummy.rb", "lib/spruz/to_proc.rb", "lib/spruz/uniq_by.rb", "lib/spruz/version.rb", "lib/spruz/write.rb", "lib/spruz/xt.rb", "lib/spruz/xt/attempt.rb", "lib/spruz/xt/blank.rb", "lib/spruz/xt/count_by.rb", "lib/spruz/xt/deep_dup.rb", "lib/spruz/xt/full.rb", "lib/spruz/xt/hash_symbolize_keys_recursive.rb", "lib/spruz/xt/hash_union.rb", "lib/spruz/xt/irb.rb", "lib/spruz/xt/named.rb", "lib/spruz/xt/null.rb", "lib/spruz/xt/p.rb", "lib/spruz/xt/partial_application.rb", "lib/spruz/xt/range_plus.rb", "lib/spruz/xt/round.rb", "lib/spruz/xt/shuffle.rb", "lib/spruz/xt/string.rb", "lib/spruz/xt/string_camelize.rb", "lib/spruz/xt/string_underscore.rb", "lib/spruz/xt/subhash.rb", "lib/spruz/xt/symbol_to_proc.rb", "lib/spruz/xt/time_dummy.rb", "lib/spruz/xt/uniq_by.rb", "lib/spruz/xt/write.rb", "spruz.gemspec", "tests/test_spruz.rb", "tests/test_spruz_memoize.rb"]
   s.homepage = %q{http://flori.github.com/spruz}
-  s.rdoc_options = [%q{--title}, %q{Spruz}, %q{--main}, %q{README}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.rdoc_options = ["--title", "Spruz - Useful stuff.", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Useful stuff.}
-  s.test_files = [%q{tests/test_spruz_memoize.rb}, %q{tests/test_spruz.rb}]
+  s.test_files = ["tests/test_spruz_memoize.rb", "tests/test_spruz.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.0.4"])
     else
+      s.add_dependency(%q<gem_hadar>, ["~> 0.0.4"])
     end
   else
+    s.add_dependency(%q<gem_hadar>, ["~> 0.0.4"])
   end
 end

data/tests/test_spruz_memoize.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
-require 'spruz/memoize'
+require 'spruz'
 
 module Spruz
   class TestSpruzMemoize < Test::Unit::TestCase

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spruz
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Florian Frank
@@ -15,9 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 Z
-dependencies: []
-
+date: 2011-07-16 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: gem_hadar
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :development
+  version_requirements: *id001
 description: All the stuff that isn't good/big enough for a real library.
 email: flori@ping.de
 executables: 
@@ -25,13 +41,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
-files: 
-- tests/test_spruz_memoize.rb
-- tests/test_spruz.rb
-- LICENSE
-- Rakefile
-- spruz.gemspec
+- README.rdoc
 - lib/spruz.rb
 - lib/spruz/hash_symbolize_keys_recursive.rb
 - lib/spruz/string_underscore.rb
@@ -84,19 +94,80 @@ files:
 - lib/spruz/range_plus.rb
 - lib/spruz/count_by.rb
 - lib/spruz/uniq_by.rb
-- bin/enum
-- README
+files: 
+- .gitignore
+- .travis.yml
+- Gemfile
+- LICENSE
+- README.rdoc
+- Rakefile
 - VERSION
-- install.rb
+- bin/enum
+- lib/spruz.rb
+- lib/spruz/attempt.rb
+- lib/spruz/bijection.rb
+- lib/spruz/count_by.rb
+- lib/spruz/deep_dup.rb
+- lib/spruz/generator.rb
+- lib/spruz/go.rb
+- lib/spruz/hash_symbolize_keys_recursive.rb
+- lib/spruz/hash_union.rb
+- lib/spruz/limited.rb
+- lib/spruz/memoize.rb
+- lib/spruz/minimize.rb
+- lib/spruz/module_group.rb
+- lib/spruz/null.rb
+- lib/spruz/once.rb
+- lib/spruz/p.rb
+- lib/spruz/partial_application.rb
+- lib/spruz/range_plus.rb
+- lib/spruz/round.rb
+- lib/spruz/shuffle.rb
+- lib/spruz/string_camelize.rb
+- lib/spruz/string_underscore.rb
+- lib/spruz/subhash.rb
+- lib/spruz/time_dummy.rb
+- lib/spruz/to_proc.rb
+- lib/spruz/uniq_by.rb
+- lib/spruz/version.rb
+- lib/spruz/write.rb
+- lib/spruz/xt.rb
+- lib/spruz/xt/attempt.rb
+- lib/spruz/xt/blank.rb
+- lib/spruz/xt/count_by.rb
+- lib/spruz/xt/deep_dup.rb
+- lib/spruz/xt/full.rb
+- lib/spruz/xt/hash_symbolize_keys_recursive.rb
+- lib/spruz/xt/hash_union.rb
+- lib/spruz/xt/irb.rb
+- lib/spruz/xt/named.rb
+- lib/spruz/xt/null.rb
+- lib/spruz/xt/p.rb
+- lib/spruz/xt/partial_application.rb
+- lib/spruz/xt/range_plus.rb
+- lib/spruz/xt/round.rb
+- lib/spruz/xt/shuffle.rb
+- lib/spruz/xt/string.rb
+- lib/spruz/xt/string_camelize.rb
+- lib/spruz/xt/string_underscore.rb
+- lib/spruz/xt/subhash.rb
+- lib/spruz/xt/symbol_to_proc.rb
+- lib/spruz/xt/time_dummy.rb
+- lib/spruz/xt/uniq_by.rb
+- lib/spruz/xt/write.rb
+- spruz.gemspec
+- tests/test_spruz.rb
+- tests/test_spruz_memoize.rb
+has_rdoc: true
 homepage: http://flori.github.com/spruz
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --title
-- Spruz
+- Spruz - Useful stuff.
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -120,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Useful stuff.

data/install.rb

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rbconfig'
-include Config
-require 'fileutils'
-include FileUtils::Verbose
-
-if $DEBUG
-  def install(*a)
-    p [ :install ] + a
-  end
-
-  def mkdir_p(*a)
-    p [ :mkdir_p ] + a
-  end
-end
-
-file = File.join('lib', 'spruz.rb')
-dst = CONFIG["sitelibdir"]
-install file, File.join(dst, File.join('lib/spruz.rb'))
-src = File.join(*%w[lib spruz *.rb])
-dst = File.join(CONFIG["sitelibdir"], 'spruz')
-mkdir_p dst
-for file in Dir[src]
-  install file, File.join(dst, file)
-end
-src = File.join(*%w[lib spruz xt *.rb])
-dst = File.join(CONFIG["sitelibdir"], 'spruz', 'xt')
-mkdir_p dst
-for file in Dir[src]
-  install file, File.join(dst, file)
-end
-install 'bin/enum', File.join(CONFIG['bindir'], 'enum')