cyclops 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0e5695fc7b7b274971d1c42b8ae2c7266fa948
-  data.tar.gz: cd55963cf675f1aab5237350891107d765b2a873
+  metadata.gz: 9c7bfa77550e65e5f43540c3eb45b68c39d8699e
+  data.tar.gz: 778b46e92d8b22c33eea63f03177459608a4615f
 SHA512:
-  metadata.gz: 21b58077fff8522f9e282c48e09c1033ceae6d10d9c461fd5970292fe402ca37055bc143393e3e90561f11df383007a2248378f303524e3ae68da1dd6a76bb44
-  data.tar.gz: 19a3144344c714b3a5b44851bb61b5127f37d1c69483002fd3677ecd40e252575aa2dbc34ab9d2616239fd751c04365c620ff7f091d90ee7f97f5fbc6c5556f8
+  metadata.gz: 66d0e27a997554bb1bfbaab940b3c7a84f6709f5d7e337a6c5b22679b33e5af4fb51d47951a60d45d697c36a9935dbaf312b8a1aa2643cf0731d2fac27dc87c8
+  data.tar.gz: ed78fac887806de5c77d631d8aa1099569a50a353756794b454656fcc3cd908e5cfe9cae0a6a374ed6571a0926dbdb069574cd373a2a23901b77a22cae5676c5

data/ChangeLog

@@ -2,6 +2,10 @@
 
 = Revision history for cyclops
 
+== 0.0.3 [2014-04-14]
+
+* Always set symbol key in options hash.
+
 == 0.0.2 [2014-04-12]
 
 * Prevent Cyclops::VERSION from clobbering Subclass::VERSION.

data/README

@@ -2,12 +2,13 @@
 
 == VERSION
 
-This documentation refers to cyclops version 0.0.2
+This documentation refers to cyclops version 0.0.3
 
 
 == DESCRIPTION
 
-As if there weren't enough CLI libraries already...
+Provides a convenient interface around optparse. As if there weren't
+enough CLI libraries already...
 
 
 == LINKS

data/Rakefile

@@ -7,7 +7,8 @@ begin
     gem: {
       name:         %q{cyclops},
       version:      Cyclops::VERSION,
-      summary:      %q{A command-line option parser.},
+      summary:      %q{A command-line option parser based on optparse.},
+      description:  %q{Provides a convenient interface around optparse.},
       author:       %q{Jens Wille},
       email:        %q{jens.wille@gmail.com},
       license:      %q{AGPL-3.0},

data/lib/cyclops/option_parser_extension.rb

@@ -40,48 +40,62 @@ class Cyclops
       super
     end
 
+    # Delegates to #on with some convenience shortcuts.
+    #
+    # If +name+ is a Symbol, installs both long and short options.
+    # If the first element of +args+ is a Symbol, this is installed
+    # as the short option, otherwise the first character of +name+ is
+    # installed as the short option.
+    #
+    # If +name+ is a String, installs only the long option.
+    #
+    # If +name+ contains an argument name, separated by double underscore,
+    # additionally sets the CLI's +name+ option (as a Symbol) to the
+    # provided value and calls the optional block with that value. If
+    # the argument name ends with a question mark, the value is marked
+    # as optional.
     def option(name, *args, &block)
       if name =~ /(\w+)__(\w+)(\?)?\z/
         sym = name.is_a?(Symbol)
 
         name, arg, opt = $1, $2, !!$3
-        name = name.to_sym if sym
-
-        args = __on_opts(name, *args)
+        __on_opts(name, args, sym)
 
         arg = "[#{arg}]" if opt
         args.grep(/\A--/).first << " #{arg}"
 
         on(*args) { |value|
-          cli.options[name] = value
+          cli.options[name.to_sym] = value
           yield value if block_given?
         }
       else
-        on(*__on_opts(name, *args), &block)
+        on(*__on_opts(name, args), &block)
       end
     end
 
+    # Delegates to #on with some convenience shortcuts.
+    #
+    # If +name+ is a Symbol, installs both long and short options.
+    # If the first element of +args+ is a Symbol, this is installed
+    # as the short option, otherwise the first character of +name+ is
+    # installed as the short option.
+    #
+    # If +name+ is a String, installs only the long option.
+    #
+    # Sets the CLI's +name+ option (as a Symbol) to +true+ and calls
+    # the optional block (with no argument).
     def switch(name, *args)
-      on(*__on_opts(name, *args)) {
-        cli.options[name] = true
+      on(*__on_opts(name, args)) {
+        cli.options[name.to_sym] = true
         yield if block_given?
       }
     end
 
     private
 
-    def __on_opts(name, *args)
-      case name
-        when Symbol
-          long = "--#{name.to_s.tr('_', '-')}"
-
-          args.unshift(args.first.is_a?(Symbol) ?
-            "-#{args.shift}" : long[1, 2], long)
-        when String
-          args.unshift("--#{name}")
-        else
-          args.unshift(name)
-      end
+    def __on_opts(name, args, sym = name.is_a?(Symbol))
+      args.insert(0, "-#{args[0].is_a?(Symbol) ? args.shift : name[0]}") if sym
+      args.insert(sym ? 1 : 0, "--#{name.to_s.tr('_', '-')}")
     end
 
   end

data/lib/cyclops/version.rb

@@ -4,7 +4,7 @@ class Cyclops
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     class << self
 

metadata

@@ -1,35 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclops
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQswCQYDVQQDDAJ3dzEb
-  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
-  HhcNMTMwMTMxMDkyMjIyWhcNMTQwMTMxMDkyMjIyWjA+MQswCQYDVQQDDAJ3dzEb
-  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVXmfa6rbTwKOvtuGoROc1
-  I4qZjgLX0BA4WecYB97PjwLJmJ1hRvf9JulVCJYYmt5ZEPPXbgi9xLbcp6ofGmnC
-  i68/kbhcz20/fRUtIJ2phU3ypQTEd2pFddpL7SR2FxLkzvvg5E6nslGn7o2erDpO
-  8sm610A3xsgT/eNIr9QA7k4pHh18X1KvZKmmQR4/AjVyKmKawzauKUoHHepjvjVs
-  s0pVoM7UmOmrS4SafQ3OwUo37f19CVdN2/FW7z3e5+iYhKxdIFdhniX9iDWtA3Jn
-  7oUOtiolhCRK4P/c30UjTCDkRkOldsWciFUasROJ5VAV2SVv7FtGHoQLDZ/++tRr
-  AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFIAPWU4BEoYUe82hY/0EkoGd
-  Oo/WMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAf2YnB0mj42of22dA
-  MimgJCAEgB3H5aHbZ6B5WVnFvrC2UUnhP+/kLj/6UgOfqcasy4Xh62NVGuNrf7rF
-  7NMN87XwexGuU2GCpIMUd6VCTA7zMP2OWuXEcba7jT5OtiI55buO0J4CRtyeX1XF
-  qwlGgx4ItcGhMTlDFXj3IkpeVtjD8O7yWE21bHf9lLURmqK/r9KjoxrrVi7+cESJ
-  H19TDW3R9p594jCl1ykPs3dz/0Bk+r1HTd35Yw+yBbyprSJb4S7OcRRHCryuo09l
-  NBGyZvOBuqUp0xostWSk0dfxyn/YQ7eqvQRGBhK1VGa7Tg/KYqnemDE57+VOXrua
-  59wzaA==
-  -----END CERTIFICATE-----
-date: 2014-04-12 00:00:00.000000000 Z
+cert_chain: []
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -87,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A command-line option parser.
+description: Provides a convenient interface around optparse.
 email: jens.wille@gmail.com
 executables: []
 extensions: []
@@ -109,14 +88,13 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  cyclops-0.0.2 [2014-04-12]:
+  cyclops-0.0.3 [2014-04-14]:
 
-  * Prevent Cyclops::VERSION from clobbering Subclass::VERSION.
-  * Fixed error in OptionParser convenience methods.
+  * Always set symbol key in options hash.
 
 rdoc_options:
 - "--title"
-- cyclops Application documentation (v0.0.2)
+- cyclops Application documentation (v0.0.3)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -140,5 +118,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A command-line option parser.
+summary: A command-line option parser based on optparse.
 test_files: []