Release v34-2

Author: gvvaughan

GNUmakefile

@@ -22,7 +22,8 @@ specl_verbose_1 = --verbose --formatter=report
 
 include Makefile
 
-MKROCKSPECS = $(ROCKSPEC_ENV) $(LUA) $(srcdir)/mkrockspecs.lua
+ROCKSPEC_ENV	  = $(LUA_ENV)
+MKROCKSPECS 	  = $(ROCKSPEC_ENV) $(LUA) $(srcdir)/mkrockspecs.lua
 ROCKSPEC_TEMPLATE = $(srcdir)/$(PACKAGE)-rockspec.lua
 
 luarocks-config.lua:
@@ -41,7 +42,7 @@ GIT ?= git
 
 tag-release:
 	$(GIT) diff --exit-code && \
-	$(GIT) tag -f -a -m "Release tag" v$(VERSION)
+	$(GIT) tag -f -a -m "Release tag" v$(VERSION)-2
 
 define unpack-distcheck-release
 	rm -rf $(PACKAGE)-$(VERSION)/ && \
@@ -58,24 +59,24 @@ check-in-release: distcheck
 	cd ../$(PACKAGE)-release && \
 	$(unpack-distcheck-release) && \
 	$(GIT) add . && \
-	$(GIT) commit -a -m "Release v$(VERSION)" && \
-	$(GIT) tag -f -a -m "Full source release tag" release-v$(VERSION)
+	$(GIT) commit -a -m "Release v$(VERSION)-2" && \
+	$(GIT) tag -f -a -m "Full source release tag" release-v$(VERSION)-2
 
 
 ## To test the release process without publishing upstream, use:
 ##   make release WOGER=: GIT_PUBLISH=:
 GIT_PUBLISH ?= $(GIT)
 WOGER ?= woger
 
-WOGER_ENV = LUA_INIT= LUA_PATH='$(abs_srcdir)/?-git-1.rockspec'
+WOGER_ENV = LUA_INIT= LUA_PATH='$(abs_srcdir)/?-git-2.rockspec'
 WOGER_OUT = $(WOGER_ENV) $(LUA) -l$(PACKAGE) -e
 
 release: rockspecs
 	$(MAKE) tag-release && \
 	$(MAKE) check-in-release && \
 	$(GIT_PUBLISH) push && $(GIT_PUBLISH) push --tags && \
 	LUAROCKS_CONFIG=$(abs_srcdir)/luarocks-config.lua luarocks \
-	  --tree=$(abs_srcdir)/luarocks build $(PACKAGE)-$(VERSION)-1.rockspec && \
+	  --tree=$(abs_srcdir)/luarocks build $(PACKAGE)-$(VERSION)-2.rockspec && \
 	$(WOGER) lua \
 	  package=$(PACKAGE) \
 	  package_name=$(PACKAGE_NAME) \

Makefile

@@ -160,7 +160,7 @@ AM_DEFAULT_VERBOSITY = 0
 AUTOCONF = ${SHELL} /Users/gary/Devo/stdlib-release/build-aux/missing autoconf
 AUTOHEADER = ${SHELL} /Users/gary/Devo/stdlib-release/build-aux/missing autoheader
 AUTOMAKE = ${SHELL} /Users/gary/Devo/stdlib-release/build-aux/missing automake-1.13
-AWK = gawk
+AWK = awk
 CYGPATH_W = echo
 DEFS = -DPACKAGE_NAME=\"stdlib\" -DPACKAGE_TARNAME=\"stdlib\" -DPACKAGE_VERSION=\"34\" -DPACKAGE_STRING=\"stdlib\ 34\" -DPACKAGE_BUGREPORT=\"rrt@sc3d.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"stdlib\" -DVERSION=\"34\"
 ECHO_C = \c

mkrockspecs.lua

@@ -32,7 +32,7 @@ end
 
 for f, spec in pairs (loadfile ("rockspecs.lua") ()) do
   if f ~= "default" then
-    local specfile = package_name.."-"..(f ~= "" and f:lower ().."-" or "")..version.."-1.rockspec"
+    local specfile = package_name.."-"..(f ~= "" and f:lower ().."-" or "")..version.."-2.rockspec"
     h = io.open (specfile, "w")
     assert (h)
     flavour = f -- a global, visible in loadfile

rockspecs.lua

@@ -10,7 +10,7 @@ local version_dashed = version:gsub ("%.", "-")
 
 local default = {
   package = package_name,
-  version = version.."-1",
+  version = version.."-2",
   source = {
     url = "git://github.com/rrthomas/lua-stdlib.git",
   },

specs/getopt_spec.yaml

@@ -12,8 +12,8 @@ specify getopt:
                   }
       }
 
-      function test (cmdLine, undefined_opts)
-        local nonOpts, opts, errors = getopt.getOpt (cmdLine, prog.options, undefined_opts)
+      function test (cmdLine, stop_at_nonopt)
+        local nonOpts, opts, errors = getopt.getOpt (cmdLine, prog.options, stop_at_nonopt)
         if #errors == 0 then
           return { options = opts, args = nonOpts }
         else
@@ -35,9 +35,9 @@ specify getopt:
             args = {} })
   - it diagnoses unrecognized options:
       expect (test {"-foo"}).should_contain "unrecognized option `-foo'"
-  - it allows unrecognized options if told to:
-      expect (test ({"-foo"}, true)).should_equal (
-          { options = { foo = {1}}, args = {} })
+  - it stops option parsing at the first non-option if told to:
+      expect (test ({"foo", "-bar"}, true)).should_equal (
+          { options = {}, args = {"foo", "-bar"} })
 
 - "describe getopt.usageInfo":
   - context when specifying options:

src/files/getopt.html

@@ -172,7 +172,7 @@ <h2>Functions</h2>
 <table class="function_list">
 
 	<tr>
-	<td class="name" nowrap><a href="#getOpt">getOpt</a>&nbsp;(argIn, options, undefined_options)</td>
+	<td class="name" nowrap><a href="#getOpt">getOpt</a>&nbsp;(argIn, options, stop_at_nonopt)</td>
 	<td class="summary">Perform argument processing </td>
 	</tr>
 
@@ -182,7 +182,7 @@ <h2>Functions</h2>
 	</tr>
 
 	<tr>
-	<td class="name" nowrap><a href="#processArgs">processArgs</a>&nbsp;(prog, undefined_opts)</td>
+	<td class="name" nowrap><a href="#processArgs">processArgs</a>&nbsp;(prog, ...)</td>
 	<td class="summary">Simple getOpt wrapper.</td>
 	</tr>
 
@@ -214,7 +214,7 @@ <h2><a name="functions"></a>Functions</h2>
 
 
 
-<dt><a name="getOpt"></a><strong>getOpt</strong>&nbsp;(argIn, options, undefined_options)</dt>
+<dt><a name="getOpt"></a><strong>getOpt</strong>&nbsp;(argIn, options, stop_at_nonopt)</dt>
 <dd>
 Perform argument processing
 
@@ -231,7 +231,7 @@ <h3>Parameters</h3>
 	</li>
 
 	<li>
-	  undefined_options: if true, allow and collect undefined options
+	  stop_at_nonopt: if true, stop option processing at first non-option
 	</li>
 
 </ul>
@@ -285,7 +285,7 @@ <h3>Parameters</h3>
 
 
 
-<dt><a name="processArgs"></a><strong>processArgs</strong>&nbsp;(prog, undefined_opts)</dt>
+<dt><a name="processArgs"></a><strong>processArgs</strong>&nbsp;(prog, ...)</dt>
 <dd>
 Simple getOpt wrapper. If the caller didn't supply their own already, adds <code>--version</code>/<code>-V</code> and <code>--help</code>/<code>-h</code> options automatically; stops program if there was an error, or if <code>--help</code> or <code>--version</code> was used.
 
@@ -298,7 +298,7 @@ <h3>Parameters</h3>
 	</li>
 
 	<li>
-	  undefined_opts: if true, allow and collect undefined options
+	  ...: extra arguments for getOpt
 	</li>
 
 </ul>

src/getopt.lua

@@ -44,11 +44,11 @@ local M = {
 --- Perform argument processing
 -- @param argIn list of command-line args
 -- @param options options table
--- @param undefined_options if true, allow and collect undefined options
+-- @param stop_at_nonopt if true, stop option processing at first non-option
 -- @return table of remaining non-options
 -- @return table of option key-value list pairs
 -- @return table of error messages
-local function getOpt (argIn, options, undefined_options)
+local function getOpt (argIn, options, stop_at_nonopt)
   local noProcess = nil
   local argOut, optOut, errors = {[0] = argIn[0]}, {}, {}
   -- get an argument for option opt
@@ -74,7 +74,7 @@ local function getOpt (argIn, options, undefined_options)
 
   local function parseOpt (opt, arg)
     local o = options.name[opt]
-    if undefined_options or o ~= nil then
+    if o ~= nil then
       o = o or {name = {opt}}
       optOut[o.name[1]] = optOut[o.name[1]] or {}
       table.insert (optOut[o.name[1]], getArg (o, opt, arg, optOut[o.name[1]]))
@@ -87,9 +87,12 @@ local function getOpt (argIn, options, undefined_options)
     table.remove (argIn, 1)
     local _, _, dash, opt = string.find (v, "^(%-%-?)([^=-][^=]*)")
     local _, _, arg = string.find (v, "=(.*)$")
+    if not dash and stop_at_nonopt then
+      noProcess = true
+    end
     if v == "--" then
-      noProcess = 1
-    elseif dash == nil or noProcess then -- non-option
+      noProcess = true
+    elseif not dash or noProcess then -- non-option
       table.insert (argOut, v)
     else -- option
       parseOpt (opt, arg)
@@ -242,12 +245,12 @@ end
 -- stops program if there was an error, or if <code>--help</code> or
 -- <code>--version</code> was used.
 -- @param prog table of named parameters
--- @param undefined_opts if true, allow and collect undefined options
-local function processArgs (prog, undefined_opts)
-  local totArgs = #arg
+-- @param ... extra arguments for getOpt
+local function processArgs (prog, ...)
+  local totArgs = #_G.arg
   local errors
   prog.options = makeOptions (prog.options)
-  _G.arg, M.opt, errors = getOpt (arg, prog.options, undefined_opts)
+  _G.arg, M.opt, errors = getOpt (_G.arg, prog.options, ...)
   local opt = M.opt
   if (opt.version or opt.help) and prog.banner then
     io.writelines (prog.banner)

stdlib-34-1.rockspec renamed to stdlib-34-2.rockspec

@@ -1,4 +1,4 @@
-version = "34-1"
+version = "34-2"
 source = {
   branch = "release-v34",
   url = "git://github.com/rrthomas/lua-stdlib.git",

stdlib-git-1.rockspec renamed to stdlib-git-2.rockspec

@@ -1,4 +1,4 @@
-version = "git-1"
+version = "git-2"
 source = {
   url = "git://github.com/rrthomas/lua-stdlib.git",
 }

stdlib.rockspec.in

@@ -1,5 +1,5 @@
 package="stdlib"
-version="@VERSION@-1"
+version="@VERSION@-2"
 source = {
   url = "git://github.com/rrthomas/lua-stdlib.git",
   branch = "release-v@VERSION@",