yaop 0.1.0 → 0.2.0

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-   gem "hash-utils", ">= 0.1.0"
+   gem "hash-utils", ">= 2.0.0"
    gem "types", ">= 0.1.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler2", ">= 2.0.0"
 end

data/Gemfile.lock

@@ -3,13 +3,13 @@ GEM
   specs:
     abstract (1.0.0)
     git (1.2.5)
-    hash-utils (0.15.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    hash-utils (2.0.0)
+      ruby-version
+    jeweler2 (2.0.9)
       git (>= 1.2.5)
-      rake
-    multitype-introspection (0.1.2)
-    rake (0.9.0)
+    multitype-introspection (0.2.0)
+      hash-utils (>= 0.16.0)
+    ruby-version (0.3.1)
     types (0.1.3)
       abstract (>= 1.0.0)
       multitype-introspection (>= 0.1.0)
@@ -18,7 +18,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  hash-utils (>= 0.1.0)
-  jeweler (~> 1.5.2)
+  bundler (>= 1.0.0)
+  hash-utils (>= 2.0.0)
+  jeweler2 (>= 2.0.0)
   types (>= 0.1.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+Copyright (c) 2011-2012 Martin Kozák (martinkozak@martinkozak.net)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -9,8 +9,7 @@ declarative approach. See example:
     require "yaop"
     
     options = YAOP::get do
-        option "--strip"
-        type Boolean, false       # simple presency is enough
+        option "--strip"          # simple presency is enough
         
         options "-l", "--level"   # both of them
         type Integer, 7           # first part, default value 7
@@ -43,7 +42,7 @@ Contributing
 Copyright
 ---------
 
-Copyright © 2011 [Martin Kozák][3]. See `LICENSE.txt` for
+Copyright © 2011-2012 [Martin Kozák][3]. See `LICENSE.txt` for
 further details.
 
 [2]: http://github.com/martinkozak/yaop/issues

data/Rakefile

@@ -12,7 +12,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler'
+require 'jeweler2'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "yaop"
   gem.homepage = "https://github.com/martinkozak/yaop"
   gem.license = "MIT"
-  gem.summary = "Yet another options parser. Parses the command-line arguments and parameters. Simple, lightweight with nice declarative approach."
+  gem.summary = "Yet another options parser. Parses the command-line arguments and parameters. Simple, lightweight with nice DSL declarative approach."
   gem.email = "martinkozak@martinkozak.net"
   gem.authors = ["Martin Kozák"]
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/yaop.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2012 Martin Kozák (martinkozak@martinkozak.net)
 
 require "types"
 require "hash-utils/hash"    # >= 0.1.0
@@ -119,11 +119,19 @@ class YAOP
                 params << arg
             end
         end
-
+        
         # Converts datatypes
         result = Hash::new { |dict, key| dict[key] = [ ] }
 
         index.each_pair do |opt, spec|
+        
+            # If no types defines, sets true as symbol of presency
+            if spec.types.empty?
+                result[opt] = spec.present
+                next
+            end
+        
+            # If types defined, takes them
             spec.types.each_index do |i|
                 type, default = spec.types[i]
                 value = nil
@@ -141,15 +149,16 @@ class YAOP
                     result[opt] << value
                 end
             end
+            
         end
-
+        
         # Converts single value arguments to single-ones
         result.each_pair do |opt, values|
             if index[opt].types.length == 1
                 result[opt] = values.first
             end
         end
-        
+
         # Takes parameters from last argument
         if not last.nil?
             parameters = index[last].values[index[last].types.length..-1]

data/test.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+$:.push(".")
+require "./lib/yaop"
+
+options = YAOP::get do
+    option "--strip"
+
+    options "-l", "--level"   # both of them
+    type Integer, 7           # first part, default value 7
+    type Integer, 8           # second part, default value 8
+    type Integer, 9           # third part, default value 9
+end
+
+p options

data/yaop.gemspec

@@ -0,0 +1,57 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "yaop"
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Martin Koz\u{e1}k"]
+  s.date = "2012-08-05"
+  s.email = "martinkozak@martinkozak.net"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/yaop.rb",
+    "test.rb",
+    "yaop.gemspec"
+  ]
+  s.homepage = "https://github.com/martinkozak/yaop"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Yet another options parser. Parses the command-line arguments and parameters. Simple, lightweight with nice DSL declarative approach."
+
+  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_runtime_dependency(%q<hash-utils>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<types>, [">= 0.1.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler2>, [">= 2.0.0"])
+    else
+      s.add_dependency(%q<hash-utils>, [">= 2.0.0"])
+      s.add_dependency(%q<types>, [">= 0.1.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
+    end
+  else
+    s.add_dependency(%q<hash-utils>, [">= 2.0.0"])
+    s.add_dependency(%q<types>, [">= 0.1.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
+  end
+end
+

metadata

@@ -1,71 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yaop
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
-- "Martin Koz\xC3\xA1k"
+authors:
+- Martin Kozák
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hash-utils
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
   name: types
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: 
 email: martinkozak@martinkozak.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -74,35 +91,35 @@ files:
 - Rakefile
 - VERSION
 - lib/yaop.rb
+- test.rb
+- yaop.gemspec
 homepage: https://github.com/martinkozak/yaop
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1846092196582087239
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1815022339456278642
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Yet another options parser. Parses the command-line arguments and parameters. Simple, lightweight with nice declarative approach.
+summary: Yet another options parser. Parses the command-line arguments and parameters.
+  Simple, lightweight with nice DSL declarative approach.
 test_files: []
-