argparser 2.0.0.RC1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58593645fe6bb77546efd38e6426d090f297e947
-  data.tar.gz: 09097746fde57e2adfe85f103fa1ae59e3b19cfa
+  metadata.gz: ad223f706456638717baa527d93477d0dba2a98f
+  data.tar.gz: 7521d0a1ddff3586dbe24ba63d88b3a0b59e7bba
 SHA512:
-  metadata.gz: 28adb1c9eca795de1ea6ec51a5f8af9ca1b09851e49645ac458744b46db0f2e223d65c1d184e70cd66ee3f8775870613c8a5096ede50fa74aa08f3befab340d2
-  data.tar.gz: 7f6af691f64f2ecace8d8aec79573a615df41a747f29f1a91748b1352ecbfc137569fcdb698fc6fb35befdd04b202bf7e6f32de81e28cb430083cbc1032ad9d9
+  metadata.gz: 3829a2778d6c4a4b807fb15980e7e6d52030ed2d04c90eb07409ca20ab835b6f78accc13c6dcd2dd1d5adb19371810856a7fd1d2acae25c56e60b4e107bb088d
+  data.tar.gz: 9924ff1ae529bce199fb1c6b0383d1106dda42ac5a98a9391c92859622285ab0e7781eae5f6094fb3ece5c4ac87fc5c45f38cd2fda9647b098b73604e3c47af3

data/HISTORY.md

@@ -1,4 +1,4 @@
-# 2.0.0.RC2
+# 2.0.0
 2015-04-28 Holidays
 
 * All exclamation marks removed from method names
@@ -7,10 +7,6 @@
 * `Option/Argument#value` now is read-only
 * `Option/Argument#value?` now returns true in case of parsed option w/o param
 * Block(name, value) in `#parse`
-
-# 2.0.0.RC1
-2015-04-28 Holidays
-
 * Major version changed due to extensive renamings and removals
 * Whitespace in option names no longer stripped
 * Separate classes for options and arguments

data/Rakefile

@@ -2,16 +2,16 @@
 require 'rake/testtask'
 
 Rake::TestTask.new :test do |t|
-  # t.test_files = FileList['spec/*_spec.rb']
   t.pattern = 'spec/**/*_spec.rb'
   t.libs.push 'spec'
 end
 
 task :build do
   system('gem build argparser.gemspec')
-  # gem push argparser-1.0.0.gem
-  # gem uninstall argparser
-  # gem install argparser-1.0.0.gem
 end
 
-task :default   => :test
+task :lint do
+  system('rubocop -f s')
+end
+
+task :default => :test

data/argparser.gemspec

@@ -15,12 +15,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.bindir        = 'bin'
   s.executables   = `git ls-files -- bin/`.split("\n").map{|f| File.basename(f)}
-  # s.extra_rdoc_files = 'README.md'
-  # s.rdoc_options  << '--title' << 'argparser' <<
-  #                      '--main' << 'README'     <<
-  #                      '--markup' << 'markdown' <<
-  #                      '--line-numbers'
   s.add_development_dependency 'bundler',    '~> 1.7'
   s.add_development_dependency 'rake',       '~> 10.1'
   s.add_development_dependency 'minitest',   '~> 4.7'
+  s.add_development_dependency 'rubocop',    '~> 0.30'
 end

data/lib/argparser/arg_parser.rb

@@ -48,6 +48,7 @@ class ArgParser
     def manifest=(manifest)
       @@manifest = manifest
     end
+
     def manifest
       @@manifest ||= {}
     end
@@ -71,7 +72,7 @@ class ArgParser
   end
 
   def initialize(manifest)
-    hash2vars(manifest = ArgParser.manifest.merge(manifest))
+    hash2vars(ArgParser.manifest.merge(manifest))
     @arguments =
       (@arguments || []).map {|o| o.kind_of?(Argument) ? o : Argument.new(o)}
     @options =
@@ -86,9 +87,8 @@ class ArgParser
     _check_manifest
 
     OPTS_RESERVED.each do |res|
-      name = res[:name]
-      next unless argv.include?("--#{name}") && !get_argument(name)
-      terminate(0, self.send(res[:func]))
+      next if !argv.include?("--#{res[:name]}") || self[res[:name]]
+      terminate(0, send(res[:func]))
     end
 
     args = argv.dup

data/lib/argparser/argument.rb

@@ -5,16 +5,16 @@ class ArgParser
     include Tools
 
     # These attrs are from the manifest that is applied through constructor
-    attr_reader   :name
-    attr_reader   :help     # Help string
-    attr_reader   :validate # Proc(this, parser) to validate a value
-    attr_reader   :default  # Value or proc to set default value
-    attr_reader   :required # Required
-    attr_reader   :multiple # May occur multiple times?
+    attr_reader :name
+    attr_reader :help     # Help string
+    attr_reader :validate # Proc(this, parser) to validate a value
+    attr_reader :default  # Default value
+    attr_reader :required # Required
+    attr_reader :multiple # May occur multiple times?
 
     # These attrs have their meaning after parsing was done
-    attr_reader   :count    # Occucences
-    attr_reader   :value    # Value (Array if multiple)
+    attr_reader :count    # Occucences
+    attr_reader :value    # Value (Array if multiple)
 
     # Just helper
     def names
@@ -25,7 +25,7 @@ class ArgParser
     def initialize(o_manifest)
       hash2vars(o_manifest)
       reset
-      raise ManifestError, ERR_OPTION_NULL if !name or name.strip.empty?
+      raise ManifestError, ERR_OPTION_NULL if !name || name.strip.empty?
     end
 
     def synopsis
@@ -63,20 +63,12 @@ class ArgParser
     end
 
     def printed_help
-      s = help || ''
-      s << "\n\tDefaults to: #{get_default}" if default
-      "%s\n\t%s" % [synopsis, s]
+      "%s\n\t%s" % [synopsis, (help || '')]
     end
 
     # Set value to default one if no value provided
     def set_default
-      return self if !default || value?
-      add_value(get_default)
-    end
-
-    # Get default value
-    def get_default
-      default.respond_to?(:call) ? default.call : default
+      (!default || value?) ? self : add_value(default)
     end
   end
 end

data/lib/argparser/option.rb

@@ -2,7 +2,6 @@
 
 class ArgParser
   class Option < Argument
-
     # These attrs are from the manifest that is applied through constructor
     attr_reader :param  # Parameter name, if any
     # Returns first name as a 'default' one when several names given

data/lib/argparser/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 class ArgParser
-  VERSION = '2.0.0.RC1'
+  VERSION = '2.0.0'
 end

data/spec/argparser_spec.rb

@@ -83,7 +83,6 @@ A Example
 OPTIONS:
 [-m, --mode first|second|third]...
 \tExample mode.
-\tDefaults to: first
 [--help]
 \tPrint this help and exit.
 [--version]
@@ -91,7 +90,6 @@ OPTIONS:
 ARGUMENTS:
 [file]
 \tFilename or - for stdin.
-\tDefaults to: -
 Report bugs to: https://github.com/sinm/argparser
 ArgParser Spec home page: https://github.com/sinm/argparser\n")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argparser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.RC1
+  version: 2.0.0
 platform: ruby
 authors:
 - sinm
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.30'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.30'
 description: "== Yet another ruby command line argument parser library"
 email: sinm.sinm@gmail.com
 executables: []
@@ -95,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2