applix 0.2.1 → 0.2.2

data/.autotest

@@ -0,0 +1,11 @@
+Autotest.add_hook(:initialize) {|at|
+  at.add_exception %r{^\.git}  # ignore Version Control System
+  at.add_exception %r{^./tmp}  # ignore temp files, lest autotest will run again, and again...
+  #at.clear_mappings         # take out the default (test/test*rb)
+  at.add_mapping(%r{^lib/.*\.rb$}) {|f, _|
+    Dir['spec/**/*_spec.rb']
+  }
+  nil
+}
+
+# vim: set syntax=ruby ft=ruby:

data/.rspec

@@ -0,0 +1 @@
+--color --backtrace --format documentation --debug

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 dirk luesebrink
+Copyright (c) 2009/11 dirk luesebrink
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{README.markdown → README.mkd}

@@ -35,6 +35,6 @@ becomes:
    bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+## Copyright
 
-Copyright (c) 2009 dirk luesebrink. See LICENSE for details.
+Copyright (c) 2009/11 dirk luesebrink. See LICENSE for details.

data/Rakefile

@@ -33,28 +33,34 @@ begin
     gem.email = "dirk@sebrink.de"
     gem.homepage = "http://github.com/crux/applix"
     gem.authors = ["dirk luesebrink"]
-    gem.add_development_dependency "rspec"
+
+    gem.add_development_dependency "rspec", ">= 2.3.0"
+    gem.add_development_dependency "rcov"
+    gem.add_development_dependency "ZenTest", ">= 4.4.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+require "rspec/core/rake_task"
+namespace :test do
+  desc "Run all specs."
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = 'spec/**/*_spec.rb'
+    t.verbose = false
+  end
 
-task :spec => :check_dependencies
+  RSpec::Core::RakeTask.new(:coverage) do |t|
+    t.rcov = true
+    t.rcov_opts =  %q[--exclude "spec"]
+    t.verbose = true
+  end
+end
 
-task :default => :spec
+task :default => :check_dependencies
+task :spec => 'test:spec'
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/applix/oattr.rb

@@ -5,10 +5,11 @@ module OAttr
 
   module ClassMethods
     def oattr *names
-      container = "@options"
-      if names.last.kind_of? Hash
-        container = "@#{(names.pop)[:container]}"
-      end
+      container = if names.last.kind_of? Hash
+                    "@#{(names.pop)[:container]}"
+                  else
+                    "@options"
+                  end
       names.each do |name|
         class_eval "def #{name}; #{container}['#{name}'.to_sym]; end"
       end

data/spec/applix_spec.rb

@@ -4,57 +4,48 @@ describe "Applix" do
   #it "fails" do
   #  fail "hey buddy, you should probably rename this file and start specing for real"
   #end
-end
-
-
-__END__
-
-port this from unit to rspec...
-
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'pp'
-
-#require 'hash_from_argv'
-#H = Hash::FromArgvHelperNamespaceToAvoidPolution
-
-require 'applix-hash'
-H = ApplixHash
-
-class HashFromArgvTest < Test::Unit::TestCase
-
-  def test_applix_hash_parse
+  
+  it "should parse the old unit test..." do
     #   -f                becomes { :f      => true }
     #   --flag            becomes { :flag   => true }
-    assert_equal [:f, true], H.parse("-f")
-    assert_equal [:flag, true], H.parse("--flag")
+    (ApplixHash.parse '-f').should == [:f, true]
+    (ApplixHash.parse '--flag').should == [:flag, true]
     #   --flag:false      becomes { :flag   => false }
-    assert_equal [:flag, false], H.parse("--flag:false")
+    (ApplixHash.parse '--flag:false').should == [:flag, false]
 
     #   --option=value    becomes { :option => "value" }
-    assert_equal [:opt, "val"], H.parse("--opt=val")
+    (ApplixHash.parse '--opt=val').should == [:opt, 'val']
 
     #   --int=1           becomes { :int    => "1" }
+    #   --int:1           becomes { :int    => 1 }
     #   --float=2.3       becomes { :float  => "2.3" }
     #   --float:2.3       becomes { :float  => 2.3 }
     #   -f:1.234          becomes { :f      => 1.234 }
-    assert_equal [:int, "1"], H.parse("--int=1")
-    assert_equal [:float, "2.3"], H.parse("--float=2.3")
-    assert_equal [:float, 2.3], H.parse("--float:2.3")
-    assert_equal [:f, 1.234], H.parse("-f:1.234")
+    (Hash.from_argv ["--int=1"])[:int].should == "1"
+    (Hash.from_argv ["--int:1"])[:int].should == 1
+    (Hash.from_argv ["--float=2.3"])[:float].should == "2.3"
+    (Hash.from_argv ["--float:2.3"])[:float].should == 2.3
+    (Hash.from_argv ["-f:2.345"])[:f].should == 2.345
 
     #   --txt="foo bar"   becomes { :txt    => "foo bar" }
     #   --txt:'"foo bar"' becomes { :txt    => "foo bar" }
     #   --txt:%w{foo bar} becomes { :txt    => ["foo", "bar"] }
-    assert_equal [:txt, "foo bar"], H.parse('--txt="foo bar"')
-    assert_equal [:txt, "foo bar"], H.parse(%q{--txt:'"foo bar"'})
-    assert_equal [:txt, ["foo", "bar"]], H.parse(%q{--txt:'%w{foo bar}'})
+    (Hash.from_argv ['--txt="foo bar"'])[:txt].should == "foo bar"
+    (Hash.from_argv [%q|--txt:'"foo bar"'|])[:txt].should == "foo bar"
+    (Hash.from_argv [%q|--txt:'%w{foo bar}'|])[:txt].should == ["foo", "bar"]
 
     #   --now:Time.now    becomes { :now    => Mon Jul 09 01:30:21 0200 2007 }
-    dt = Time.now - H.parse("--now:Time.now")[1]
-    assert dt < 0.02
+    #dt = Time.now - H.parse("--now:Time.now")[1]
+    (t = (Hash.from_argv ["--now:Time.now"])[:now]).should_not == nil
   end
+end
+
+
+__END__
+
+port this from unit to rspec...
+
+class HashFromArgvTest < Test::Unit::TestCase
 
   # XXX this is hacking the new Hash.from_argv interface into the old
   # dissect signature to make proper reuse of the existing unit tests

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
+require 'rspec'
 require 'applix'
 require 'applix/oattr'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
+Rspec.configure do |config|
+  config.mock_with :rspec
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: applix
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - dirk luesebrink
@@ -9,19 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 +01:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 4
+        - 4
+        - 2
+        version: 4.4.2
+  type: :development
+  version_requirements: *id003
 description: "      ApplixHash#from_argv builds hashes from ARGV like argument vectors\n      according to following examples: \n      \n         '-f'                  --> { :f      => true }\n         '--flag'              --> { :flag   => true }\n         '--flag:false'        --> { :flag   => false }\n         '--flag=false'        --> { :flag   => 'false' }\n         '--option=value'      --> { :option => \"value\" }\n         '--int=1'             --> { :int    => \"1\" }\n         '--float=2.3'         --> { :float  => \"2.3\" }\n         '--float:2.3'         --> { :float  => 2.3 }\n         '--txt=\"foo bar\"'     --> { :txt    => \"foo bar\" }\n         '--txt:'\"foo bar\"'' --> { :txt    => \"foo bar\" }\n         '--txt:%w{foo bar}'   --> { :txt    => [\"foo\", \"bar\"] }\n         '--now:Time.now'      --> { :now    => #<Date: 3588595/2,0,2299161> }\n      \n       remaining arguments(non flag/options) are inserted as [:arguments,\n       args], eg:\n           Hash.from_argv %w(--foo --bar=loo 123 now)\n       becomes  \n           { :foo => true, :bar => 'loo', :arguments => [\"123\", \"now\"] }\n      \n"
 email: dirk@sebrink.de
 executables: []
@@ -30,12 +72,13 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.markdown
+- README.mkd
 files: 
+- .autotest
 - .document
-- .gitignore
+- .rspec
 - LICENSE
-- README.markdown
+- README.mkd
 - Rakefile
 - VERSION
 - lib/applix.rb
@@ -48,26 +91,32 @@ homepage: http://github.com/crux/applix
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: build typed option hashed from command line arguments

data/.gitignore

@@ -1,6 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-applix.gemspec