Ready for 3.2.1 release

+ Updated to test against LuaJit 2.0.5 + Updated to test against Lua 5.3.5 + Updated to recognize that it’s 2018
telemachus · Jul 20, 2018 · 1aa0cd4 · 1aa0cd4
1 parent 3338515
commit 1aa0cd4
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 
 env:
   global:
-    - LUAROCKS=2.3.0
+    - LUAROCKS=2.4.4
   matrix:
     - LUA=lua5.1
     - LUA=lua5.2
@@ -16,6 +16,7 @@ env:
 branches:
   only:
     - travis
+    - bump-versions
     - master
 
 before_install:

diff --git a/.travis/setup_lua.sh b/.travis/setup_lua.sh
@@ -2,13 +2,13 @@
 
 # A script for setting up environment for travis-ci testing.
 # Sets up Lua and Luarocks.
-# LUA must be "lua5.1", "lua5.2" or "luajit".
+# LUA must be "lua5.1", "lua5.2," "lua5.3," or "luajit".
 # luajit2.0 - master v2.0
 # luajit2.1 - master v2.1
 
 set -eufo pipefail
 
-LUAJIT_VERSION="2.0.4"
+LUAJIT_VERSION="2.0.5"
 LUAJIT_BASE="LuaJIT-$LUAJIT_VERSION"
 
 source .travis/platform.sh
@@ -67,8 +67,8 @@ else
     curl http://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz
     cd lua-5.2.4;
   elif [ "$LUA" == "lua5.3" ]; then
-    curl http://www.lua.org/ftp/lua-5.3.4.tar.gz | tar xz
-    cd lua-5.3.4;
+    curl http://www.lua.org/ftp/lua-5.3.5.tar.gz | tar xz
+    cd lua-5.3.5;
   fi
 
   # Build Lua without backwards compatibility for testing

diff --git a/CHANGES.md b/CHANGES.md
@@ -55,12 +55,18 @@
 + The repo is now housed on [Github](https://github.com/telemachus/split)
 + CI is now provided by [Travis.ci](https://travis-ci.org/telemachus/split)
 
+## *3.2.1-1* (July 19, 2018)
+
++ Updated to test against LuaJit 2.0.5
++ Updated to test against Lua 5.3.5
++ Updated to recognize that it’s 2018
+
 Would you rather view the [documentation][d]?
 
 [d]: /README.md
 ---
 
-(c) 2012-2017 Peter Aronoff. BSD 3-Clause license; see [LICENSE.md][l] for
+(c) 2012-2018 Peter Aronoff. BSD 3-Clause license; see [LICENSE.md][l] for
 details.
 
 [l]: /LICENSE.md
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2017, Peter Aronoff All rights reserved.
+Copyright (c) 2012-2018, Peter Aronoff All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ useful, and [many people have written a version for Lua][wiki].
 The module provides four informational functions that return strings. They
 should be self-explanatory.
 
-+ `version() -- 3.2.0`
++ `version() -- 3.2.1`
 
 + `author() -- Peter Aronoff`
 
@@ -151,7 +151,7 @@ All mistakes are mine. See [version history][c] for release details.
 
 ---
 
-(c) 2012-2017 Peter Aronoff. BSD 3-Clause license; see [LICENSE.md][li] for
+(c) 2012-2018 Peter Aronoff. BSD 3-Clause license; see [LICENSE.md][li] for
 details.
 
 [li]: /LICENSE.md
diff --git a/doc/changes.html b/doc/changes.html
@@ -82,11 +82,20 @@ <h2><em>3.2.0-1</em> (February 11, 2017)</h2>
 </ul>
 
 
+<h2><em>3.2.1-1</em> (July 19, 2018)</h2>
+
+<ul>
+<li>Updated to test against LuaJit 2.0.5</li>
+<li>Updated to test against Lua 5.3.5</li>
+<li>Updated to recognize that it’s 2018</li>
+</ul>
+
+
 <p>Would you rather view the <a href="index.html">documentation</a>?</p>
 
 <hr />
 
-<p>&copy; 2012-2017 Peter Aronoff. BSD 3-Clause license; see <a href="license.html">the license</a> for
+<p>&copy; 2012-2018 Peter Aronoff. BSD 3-Clause license; see <a href="license.html">the license</a> for
 details.</p>
 </body>
 </html>
diff --git a/doc/index.html b/doc/index.html
@@ -145,7 +145,7 @@ <h2>Varia</h2>
 should be self-explanatory.</p>
 
 <ul>
-<li><p><code>version() -- 3.2.0</code></p></li>
+<li><p><code>version() -- 3.2.1</code></p></li>
 <li><p><code>author() -- Peter Aronoff</code></p></li>
 <li><p><code>url() -- https://github.com/telemachus/split</code></p></li>
 <li><p><code>license() -- BSD 3-Clause</code></p></li>
@@ -164,7 +164,7 @@ <h2>Credits</h2>
 
 <hr />
 
-<p>&copy; 2012-2017 Peter Aronoff. BSD 3-Clause license; see <a href="license.html">the license</a> for
+<p>&copy; 2012-2018 Peter Aronoff. BSD 3-Clause license; see <a href="license.html">the license</a> for
 details.</p>
 </body>
 </html>
diff --git a/doc/license.html b/doc/license.html
@@ -8,7 +8,7 @@
 <link rel="stylesheet" href="screen.css" media="screen,projection">
 </head>
 <body>
-<p>Copyright &copy; 2012-2017, Peter Aronoff All rights reserved.</p>
+<p>Copyright &copy; 2012-2018, Peter Aronoff All rights reserved.</p>
 
 <p>Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:</p>

diff --git a/split-3.2.1-1.rockspec b/split-3.2.1-1.rockspec
@@ -0,0 +1,25 @@
+package = 'split'
+version = '3.2.1-1'
+source = {
+  url = 'git://github.com/telemachus/split.git',
+  branch = 'master',
+  tag = 'v3.2.1-1'
+}
+description = {
+    summary = 'String split function and iterator for Lua',
+    detailed = [[
+        A string split function and iterator for Lua since the string standard
+        library doesn't come with one.
+    ]],
+    homepage = 'https://github.com/telemachus/split',
+    license = 'BSD 3-Clause',
+    maintainer = 'Peter Aronoff <[email protected]>'
+}
+dependencies = { 'lua >= 5.1' }
+build = {
+    type = 'builtin',
+    modules = {
+        split = 'src/split.lua',
+    },
+    copy_directories = { 'doc' }
+}
diff --git a/src/split.lua b/src/split.lua
@@ -2,7 +2,7 @@
 --
 -- Peter Aronoff
 -- BSD 3-Clause License
--- 2012-2016
+-- 2012-2018
 --
 -- There are many split functions for Lua. This is mine. Though, actually,
 -- I took lots of ideas and probably some code from the implementations on
@@ -127,7 +127,7 @@ local first_and_rest = function(str, delimiter)
 end
 
 local version = function ()
-  return '3.2.0'
+  return '3.2.1'
 end
 
 local author = function ()

diff --git a/test/test-information-fields.lua b/test/test-information-fields.lua
@@ -3,7 +3,7 @@ local t = require 'tapered'
 package.path = '../src/?.lua;' .. package.path
 local split = require 'split'
 
-t.is(split.version(), '3.2.0', "version() returns '3.2.0'.")
+t.is(split.version(), '3.2.1', "version() returns '3.2.1'.")
 t.is(split.author(), 'Peter Aronoff', "author() returns 'Peter Aronoff'.")
 t.is(split.url(), 'https://github.com/telemachus/split',
      "url() returns 'https://github.com/telemachus/split'.")