diff -Nru r-cran-getopt-1.19.1/COPYING r-cran-getopt-1.20.0/COPYING --- r-cran-getopt-1.19.1/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-getopt-1.20.0/COPYING 2013-08-24 02:03:29.000000000 +0000 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Nru r-cran-getopt-1.19.1/DESCRIPTION r-cran-getopt-1.20.0/DESCRIPTION --- r-cran-getopt-1.19.1/DESCRIPTION 2013-03-04 06:40:03.000000000 +0000 +++ r-cran-getopt-1.20.0/DESCRIPTION 2013-08-30 08:36:29.000000000 +0000 @@ -1,21 +1,21 @@ Package: getopt Type: Package Title: C-like getopt behavior. -Version: 1.19.1 -Author: Allen Day Contributions from Trevor L Davis +Version: 1.20.0 +Author: Allen Day. + Contributions from Trevor L Davis. Maintainer: Trevor L Davis -Description: Package designed to be used with Rscript to write ``#!'' - shebang scripts that accept short and long flags/options. Many - users will prefer using instead the package optparse which adds - extra features (automatically generated help option and usage, - support for default values, basic positional argument support). +URL: https://github.com/trevorld/getopt +BugReports: https://github.com/trevorld/getopt/issues +Description: Package designed to be used with Rscript to write + ``#!'' shebang scripts that accept short and long flags/options. + Many users will prefer using instead the packages optparse or argparse + which add extra features like automatically generated help option and usage, + support for default values, positional argument support, etc. License: GPL (>= 2) Suggests: testthat -Collate: 'getopt.R' -Repository: CRAN -Repository/R-Forge/Project: optparse -Repository/R-Forge/Revision: 116 -Repository/R-Forge/DateTimeStamp: 2013-03-01 22:49:51 -Date/Publication: 2013-03-04 07:40:03 -Packaged: 2013-03-01 23:15:17 UTC; rforge +Collate: 'getopt.R' 'utils.R' +Packaged: 2013-08-30 07:02:26 UTC; trevorld NeedsCompilation: no +Repository: CRAN +Date/Publication: 2013-08-30 10:36:29 diff -Nru r-cran-getopt-1.19.1/MD5 r-cran-getopt-1.20.0/MD5 --- r-cran-getopt-1.19.1/MD5 2013-03-04 06:40:04.000000000 +0000 +++ r-cran-getopt-1.20.0/MD5 2013-08-30 08:36:29.000000000 +0000 @@ -1,8 +1,11 @@ -bf4ef0ccdbd56ea20320566ce81af357 *DESCRIPTION -aebacd1e62ffaff4ccc2243969fd06b0 *NAMESPACE -96424b4d8b4cc2bdeb2031a954658e77 *NEWS -30b673c833af7a333dab2354bba1ca38 *R/getopt.R -7118628e7508f453e19082f20ed4991e *inst/tests/test-getopt.R +b234ee4d69f5fce4486a80fdaf4a4263 *COPYING +08656e23fb8bd07c69f68e7d5443f05a *DESCRIPTION +dd396c987d24860d37a42fc7541e77b5 *NAMESPACE +f651db85028ffd75fd6e59b496a413fe *NEWS +244e1fed9d7aaaffaf66976576c06f9d *R/getopt.R +e374b85f40f7549cbdb66c9065c1f1ec *R/utils.R +252fbb7071cd1cc555ca81c8f537a6b9 *inst/tests/test-getopt.R f692f19f2e09013c3d075f6d322473c0 *man/get_Rscript_filename.Rd -7476469866359a385df8551bf79b1cce *man/getopt.Rd +7edc52e347b20c53819d16cef5ff8086 *man/getopt.Rd +21469f658334a9ef307e44fcd49a1710 *man/sort_list.Rd 71912d95683c1891b4523acbc554da5e *tests/run-all.R diff -Nru r-cran-getopt-1.19.1/NAMESPACE r-cran-getopt-1.20.0/NAMESPACE --- r-cran-getopt-1.19.1/NAMESPACE 2012-11-12 21:52:48.000000000 +0000 +++ r-cran-getopt-1.20.0/NAMESPACE 2013-08-30 04:54:38.000000000 +0000 @@ -1,2 +1,3 @@ export(get_Rscript_filename) export(getopt) +export(sort_list) diff -Nru r-cran-getopt-1.19.1/NEWS r-cran-getopt-1.20.0/NEWS --- r-cran-getopt-1.19.1/NEWS 2013-03-01 22:49:51.000000000 +0000 +++ r-cran-getopt-1.20.0/NEWS 2013-08-30 06:57:03.000000000 +0000 @@ -1,3 +1,11 @@ +getopt 1.20.0 +============= +* Type of "numeric" in spec automatically cast to "double". + Previously users might have had an error passing negative numbers if they + accidentally specified "numeric" instead of "double". +* Project website moved to https://github.com/trevorld/getopt +* Exports new function ``sort_list``. + getopt 1.19.1 ============= * If a passed in option matches multiple options in the getopt specification but matches one exactly diff -Nru r-cran-getopt-1.19.1/R/getopt.R r-cran-getopt-1.20.0/R/getopt.R --- r-cran-getopt-1.19.1/R/getopt.R 2013-03-01 03:02:27.000000000 +0000 +++ r-cran-getopt-1.20.0/R/getopt.R 2013-08-30 06:46:28.000000000 +0000 @@ -1,3 +1,19 @@ +# Copyright (c) 2008-2010 Allen Day +# Copyright (c) 2011-2013 Trevor L. Davis +# +# This file is free software: you may copy, redistribute and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 2 of the License, or (at your +# option) any later version. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + #' C-like getopt behavior #' #' getopt is primarily intended to be used with ``\link{Rscript}''. It @@ -33,13 +49,14 @@ #' sharing a single leading ``-'', but only the final \emph{short flag} is able #' to have a corresponding \emph{argument}. #' -#' Many users wonder whether they should use the getopt package or optparse package +#' Many users wonder whether they should use the getopt package, optparse package, +#' or argparse package. #' Here is some of the major differences: #' #' Features available in \code{getopt} unavailable in \code{optparse} #' #' 1. As well as allowing one to specify options that take either -#' no argument or a required argument, +#' no argument or a required argument like \code{optparse}, #' \code{getopt} also allows one to specify option with an optional argument. #' #' Some features implemented in \code{optparse} package unavailable in \code{getopt} @@ -52,9 +69,9 @@ #' 3. Option to specify default arguments for options as well the #' variable name to store option values #' -#' There is also new package \code{argparse} which contains all the features -#' of both getopt and optparse but which has a dependency on Python (>= 2.7) -#' and has not been used in production for a few years +#' There is also new package \code{argparse} introduced in 2012 which contains +#' all the features of both getopt and optparse but which has a dependency on +#' Python 2.7 or 3.2+ and has not been used in production since 2008 or 2009 #' like the getopt and optparse packages. #' #' Some Features unlikely to be implemented in \code{getopt}: @@ -99,6 +116,7 @@ #' \link{storage.mode}. A multi-\link{character} string. This only considered #' for same-row Column 3 values of 1,2. Possible values: \link{logical}, #' \link{integer}, \link{double}, \link{complex}, \link{character}. +#' If \link{numeric} is encountered then it will be converted to double. #' #' Column 5 (optional): A brief description of the purpose of the option. #' @@ -216,6 +234,8 @@ if ( length(na.omit(unique(spec[,col.short.name]))) != length(na.omit(spec[,col.short.name])) ) { stop(paste('redundant short names for flags (column ',col.short.name,').',sep='')); } + # convert numeric type to double type + spec[,4] <- gsub("numeric", "double", spec[,4]) # if usage=TRUE, don't process opt, but generate a usage string from the data in spec if ( usage ) { @@ -446,18 +466,3 @@ } return(result); } - -#' Returns file name of calling Rscript -#' -#' \code{get_Rscript_filename} returns the file name of calling Rscript -#' @return A string with the filename of the calling script. -#' If not found (i.e. you are in a interactive session) returns NA. -#' -#' @export -get_Rscript_filename <- function() { - prog <- sub("--file=", "", grep("--file=", commandArgs(), value=TRUE)[1]) - if( .Platform$OS.type == "windows") { - prog <- gsub("\\\\", "\\\\\\\\", prog) - } - prog -} diff -Nru r-cran-getopt-1.19.1/R/utils.R r-cran-getopt-1.20.0/R/utils.R --- r-cran-getopt-1.19.1/R/utils.R 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-getopt-1.20.0/R/utils.R 2013-08-30 06:45:28.000000000 +0000 @@ -0,0 +1,44 @@ +# Copyright (c) 2011-2013 Trevor L. Davis +# +# This file is free software: you may copy, redistribute and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 2 of the License, or (at your +# option) any later version. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +#' Returns file name of calling Rscript +#' +#' \code{get_Rscript_filename} returns the file name of calling Rscript +#' @return A string with the filename of the calling script. +#' If not found (i.e. you are in a interactive session) returns NA. +#' +#' @export +get_Rscript_filename <- function() { + prog <- sub("--file=", "", grep("--file=", commandArgs(), value=TRUE)[1]) + if( .Platform$OS.type == "windows") { + prog <- gsub("\\\\", "\\\\\\\\", prog) + } + prog +} + +#' Recursively sorts a list +#' +#' \code{sort_list} returns a sorted list +#' @param unsorted_list A list. +#' @return A sorted list. +#' @export +sort_list <- function(unsorted_list) { + for(ii in seq(along=unsorted_list)) { + if(is.list(unsorted_list[[ii]])) { + unsorted_list[[ii]] <- sort_list(unsorted_list[[ii]]) + } + } + unsorted_list[sort(names(unsorted_list))] +} diff -Nru r-cran-getopt-1.19.1/debian/changelog r-cran-getopt-1.20.0/debian/changelog --- r-cran-getopt-1.19.1/debian/changelog 2013-10-24 12:24:18.000000000 +0000 +++ r-cran-getopt-1.20.0/debian/changelog 2013-10-24 12:24:18.000000000 +0000 @@ -1,3 +1,11 @@ +r-cran-getopt (1.20.0-1) unstable; urgency=low + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + + -- Dirk Eddelbuettel Fri, 30 Aug 2013 07:26:29 -0500 + r-cran-getopt (1.19.1-2) unstable; urgency=low * debian/control: Set Build-Depends: to current R version diff -Nru r-cran-getopt-1.19.1/debian/control r-cran-getopt-1.20.0/debian/control --- r-cran-getopt-1.19.1/debian/control 2013-10-24 12:24:18.000000000 +0000 +++ r-cran-getopt-1.20.0/debian/control 2013-10-24 12:24:18.000000000 +0000 @@ -2,7 +2,7 @@ Section: gnu-r Priority: optional Maintainer: Dirk Eddelbuettel -Build-Depends: debhelper (>= 7.0.0), r-base-dev (>= 3.0.0~20130327), cdbs +Build-Depends: debhelper (>= 7.0.0), r-base-dev (>= 3.0.1), cdbs Standards-Version: 3.9.4 Package: r-cran-getopt diff -Nru r-cran-getopt-1.19.1/inst/tests/test-getopt.R r-cran-getopt-1.20.0/inst/tests/test-getopt.R --- r-cran-getopt-1.19.1/inst/tests/test-getopt.R 2013-03-01 03:02:27.000000000 +0000 +++ r-cran-getopt-1.20.0/inst/tests/test-getopt.R 2013-08-30 05:11:43.000000000 +0000 @@ -1,14 +1,3 @@ -library("testthat") -library("getopt") -sort_list <- function(unsorted_list) { - for(ii in seq(along=unsorted_list)) { - if(is.list(unsorted_list[[ii]])) { - unsorted_list[[ii]] <- sort_list(unsorted_list[[ii]]) - } - } - unsorted_list[sort(names(unsorted_list))] -} - context("Testing getopt") test_that("getopt works as expected", { spec = matrix(c( @@ -51,6 +40,7 @@ sort_list(list(ARGS=character(0), verbose=1, mean=5, sd=5))); expect_equal(sort_list(getopt(spec, c('--verbose', '--mean=5', '--sd', '5'))), sort_list(getopt(spec, c('--mean=5', '--sd', '5', '--verbose')))); + spec = c( 'date' , 'd', 1, "character", 'help' , 'h', 0, "logical", @@ -58,27 +48,41 @@ 'market' , 'm', 1, "character", 'threshold', 't', 1, "double" ); + spec2 <- matrix(spec, ncol=4, byrow=TRUE) # should give warning is spec is not matrix expect_that(getopt(spec, c('--date','20080421','--market','YM','--getdata')), gives_warning()); - expect_equal(sort_list(getopt(spec, c('--date','20080421','--market','YM','--getdata'))), + expect_equal(sort_list(getopt(spec2, c('--date','20080421','--market','YM','--getdata'))), sort_list(list(ARGS=character(0), date='20080421', market='YM', getdata=TRUE))) - expect_equal(sort_list(getopt(spec, c('--date','20080421','--market','YM','--getdata'))), - sort_list(getopt(spec, c('--date','20080421','--getdata','--market','YM')))); - expect_that(getopt(spec, c('--date','20080421','--getdata','--market','YM'),debug=TRUE), + expect_equal(sort_list(getopt(spec2, c('--date','20080421','--market','YM','--getdata'))), + sort_list(getopt(spec2, c('--date','20080421','--getdata','--market','YM')))); + expect_that(getopt(spec2, c('--date','20080421','--getdata','--market','YM'),debug=TRUE), prints_text("processing ")); - expect_that(print(getopt(spec, c('--date','20080421','--getdata','--market','YM'),usage=TRUE)), + expect_that(print(getopt(spec2, c('--date','20080421','--getdata','--market','YM'),usage=TRUE)), prints_text("Usage: ")); }) +test_that("numeric is cast to double", { + # Feature reported upstream (optparse) by Miroslav Posta + spec = matrix(c("count", "c", 1, "integer"), ncol=4, byrow=TRUE) + getopt(spec, c("-c", "-55")) + spec = matrix(c("count", "c", 1, "numeric"), ncol=4, byrow=TRUE) + getopt(spec, c("-c", "-55.0")) +}) + test_that("don't throw error if multiple matches match one argument fully", { # test if partial name matches fully, # still throw error if multiple matches and doesn't match both fully # feature request from Jonas Zimmermann - spec = c( + spec = matrix(c( 'foo' , 'f', 0, "logical", 'foobar' , 'b', 0, "logical", 'biz' , 'z', 0, "logical" - ) + ), ncol=4, byrow=TRUE) expect_that(getopt(spec, c('--fo')), throws_error()) expect_equal(getopt(spec, c('--foo')), sort_list(list(ARGS=character(0), foo=TRUE))) }) +context("Test sort_list") +test_that("sort_list works as expected", { + expect_equal(sort_list(list(a = 3, b = 2)), sort_list(list(b = 2, a = 3))) + expect_false(identical(sort_list(list(b = 3, a = 2)), list(b = 3, a = 2))) +}) diff -Nru r-cran-getopt-1.19.1/man/getopt.Rd r-cran-getopt-1.20.0/man/getopt.Rd --- r-cran-getopt-1.19.1/man/getopt.Rd 2012-11-12 21:52:48.000000000 +0000 +++ r-cran-getopt-1.20.0/man/getopt.Rd 2013-08-30 05:21:50.000000000 +0000 @@ -30,7 +30,8 @@ multi-\link{character} string. This only considered for same-row Column 3 values of 1,2. Possible values: \link{logical}, \link{integer}, \link{double}, - \link{complex}, \link{character}. + \link{complex}, \link{character}. If \link{numeric} is + encountered then it will be converted to double. Column 5 (optional): A brief description of the purpose of the option. @@ -107,16 +108,16 @@ \emph{argument}. Many users wonder whether they should use the getopt - package or optparse package Here is some of the major - differences: + package, optparse package, or argparse package. Here is + some of the major differences: Features available in \code{getopt} unavailable in \code{optparse} 1. As well as allowing one to specify options that take - either no argument or a required argument, \code{getopt} - also allows one to specify option with an optional - argument. + either no argument or a required argument like + \code{optparse}, \code{getopt} also allows one to specify + option with an optional argument. Some features implemented in \code{optparse} package unavailable in \code{getopt} @@ -132,11 +133,11 @@ 3. Option to specify default arguments for options as well the variable name to store option values - There is also new package \code{argparse} which contains - all the features of both getopt and optparse but which - has a dependency on Python (>= 2.7) and has not been used - in production for a few years like the getopt and - optparse packages. + There is also new package \code{argparse} introduced in + 2012 which contains all the features of both getopt and + optparse but which has a dependency on Python 2.7 or 3.2+ + and has not been used in production since 2008 or 2009 + like the getopt and optparse packages. Some Features unlikely to be implemented in \code{getopt}: diff -Nru r-cran-getopt-1.19.1/man/sort_list.Rd r-cran-getopt-1.20.0/man/sort_list.Rd --- r-cran-getopt-1.19.1/man/sort_list.Rd 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-getopt-1.20.0/man/sort_list.Rd 2013-08-30 04:54:38.000000000 +0000 @@ -0,0 +1,16 @@ +\name{sort_list} +\alias{sort_list} +\title{Recursively sorts a list} +\usage{ + sort_list(unsorted_list) +} +\arguments{ + \item{unsorted_list}{A list.} +} +\value{ + A sorted list. +} +\description{ + \code{sort_list} returns a sorted list +} +