Merge e96ab86 into 539b2a6

.gitignore

@@ -10,3 +10,5 @@ build
 # Testing
 rethinkdb_data/
 t/servroot/
+here
+ENV

.luacheckrc

@@ -1,4 +1,24 @@
+stds.reql = {
+  read_globals = {
+    string = {
+       read_only = true,
+       fields = {
+          pack = {read_only = true},
+          unpack = {read_only = true}
+       }
+    },
+    table = {
+       read_only = true,
+       fields = {
+          unpack = {read_only = true}
+       }
+    }
+  }
+}
 std = 'min'
 exclude_files = {'here'}
-files['spec'] = {std = '+busted'}
-max_line_length = 140
+files['spec'] = {
+  max_line_length = false,
+  std = '+busted'
+}
+files['src'] = {std = '+reql'}

.luacov

@@ -1,7 +1,6 @@
 return {
   exclude = {
     'src/rethinkdb/internal/protodef',
-    'src/rethinkdb/internal/semver',
   },
   include = {'src'},
 }

.travis.yml

@@ -32,12 +32,13 @@ before_install:
   - hererocks here/$LUA_PATH -r^ --$LUA
   - source here/$LUA_PATH/bin/activate
   - luarocks install luacheck
-  - luacheck src
+  - luacheck .
   # Fix from https://github.com/leafo/lapis/issues/6
   - luarocks install https://gist.githubusercontent.com/starius/b20d3e63929ae678c857/raw/4b4499f442337b6f577422364358590bd00c9d48/luacrypto-0.3.2-2.rockspec
 
 install:
-  - luarocks build --only-deps lua-reql-1.0.3-0.rockspec
+  - luarocks build --only-deps lua-reql-1.0.4-0.rockspec
+  - luarocks build reql-1.0.4-0.rockspec
 
 before_script:
   - wget https://download.rethinkdb.com/apt/pool/precise/main/r/rethinkdb/rethinkdb_${RDB_VER}precise_amd64.deb

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.4
+
+- Change source to https://github.com/RebirthDB/rebirthdb-lua
+
 # 1.0.3
 
 - Fix connection callbacks ignored on errors

LICENSE

@@ -1,8 +1,8 @@
-RethinkDB Lua Driver
+RebirthDB Lua Driver
 
 Copyright 2010-2012 RethinkDB
 
-Copyright 2014-2016 Adam Grandquist
+Copyright 2014-2018 Adam Grandquist
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this product except in compliance with the License.

README.md

@@ -1,14 +1,14 @@
-# Lua-ReQL
+# RebirthDB-Lua
 
-Rethinkdb driver in Lua
-[![Build Status](https://travis-ci.org/grandquista/Lua-ReQL.svg?branch=master)](https://travis-ci.org/grandquista/Lua-ReQL)
-[![Coverage Status](https://coveralls.io/repos/github/grandquista/Lua-ReQL/badge.svg?branch=master)](https://coveralls.io/github/grandquista/Lua-ReQL?branch=master)
+RebirthDB driver in Lua
+[![Build Status](https://travis-ci.org/RebirthDB/rebirthdb-lua.svg?branch=master)](https://travis-ci.org/RebirthDB/rebirthdb-lua)
+[![Coverage Status](https://coveralls.io/repos/github/RebirthDB/rebirthdb-lua/badge.svg?branch=master)](https://coveralls.io/github/RebirthDB/rebirthdb-lua?branch=master)
 
 ## Installing
 - _IF USING LUA 5.1_ `luarocks install luabitop`
-- `luarocks install lua-reql`
+- `luarocks install reql`
 
-See [Wiki](https://github.com/grandquista/Lua-ReQL/wiki) for documentation.
+See [Wiki](https://github.com/RebirthDB/rebirthdb-lua/wiki) for documentation.
 
 ## Dev Dependencies
 - Lua >= 5.1
@@ -17,7 +17,7 @@ See [Wiki](https://github.com/grandquista/Lua-ReQL/wiki) for documentation.
   - luacheck
   - luacov
   - _IF USING LUA 5.1_ luabitop
-- RethinkDB
+- RebirthDB
 
 ## Testing
 - `luacheck .`

config.ld

@@ -1,12 +1,11 @@
-project = 'Lua-ReQL'
+project = 'RebirthDB-Lua'
 title = 'Lua-ReQL documentation'
-description = 'A Lua driver for RethinkDB.'
+description = 'A Lua driver for RebirthDB.'
 
 file = {
   'src',
   exclude = {
     'src/rethinkdb/internal/protodef.lua',
-    'src/rethinkdb/internal/semver.lua',
   }
 }
 format = 'discount'

lua-reql-1.0.3-0.rockspec → lua-reql-1.0.4-0.rockspec

@@ -1,13 +1,13 @@
 rockspec_format = '1.1'
 package = 'lua-reql'
-version = '1.0.3-0'
+version = '1.0.4-0'
 source = {
-  url = 'git://github.com/grandquista/Lua-ReQL',
-  branch = 'v1.0.3',
+  url = 'git://github.com/RebirthDB/rebirthdb-lua',
+  branch = 'v1.0.4',
 }
 description = {
   summary = 'A Lua driver for RethinkDB.',
-  detailed = [[
+  detailed = [===[
 # Lua-ReQL
 
 Rethinkdb driver in Lua
@@ -33,19 +33,20 @@ Rethinkdb driver in Lua
 ## Installing from source
 - `luarocks make`
 
-[![Build Status](https://travis-ci.org/grandquista/Lua-ReQL.svg?branch=master)](https://travis-ci.org/grandquista/Lua-ReQL)
+[![Build Status](https://travis-ci.org/RebirthDB/rebirthdb-lua.svg?branch=master)](https://travis-ci.org/RebirthDB/rebirthdb-lua)
 
-[![Coverage Status](https://coveralls.io/repos/github/grandquista/Lua-ReQL/badge.svg?branch=master)](https://coveralls.io/github/grandquista/Lua-ReQL?branch=master)
-  ]],
-  homepage = 'https://github.com/grandquista/Lua-ReQL/wiki',
+[![Coverage Status](https://coveralls.io/repos/github/RebirthDB/rebirthdb-lua/badge.svg?branch=master)](https://coveralls.io/github/RebirthDB/rebirthdb-lua?branch=master)
+  ]===],
+  homepage = 'https://github.com/RebirthDB/rebirthdb-lua/wiki',
   license = 'Apache',
 }
 dependencies = {
   'lua >= 5.1, < 5.4',
   'luacrypto ~> 0.3',
-  'luasocket ~> 3.0',
-  'luasec ~> 0.6',
   'luajson ~> 1.3',
+  'luasec ~> 0.6',
+  'luasocket ~> 3.0',
+  'semver ~> 1.2',
 }
 build = {
   type = 'builtin',
@@ -69,7 +70,6 @@ build = {
     ['rethinkdb.internal.protect'] = 'src/rethinkdb/internal/protect.lua',
     ['rethinkdb.internal.protocol'] = 'src/rethinkdb/internal/protocol.lua',
     ['rethinkdb.internal.protodef'] = 'src/rethinkdb/internal/protodef.lua',
-    ['rethinkdb.internal.semver'] = 'src/rethinkdb/internal/semver.lua',
     ['rethinkdb.internal.socket'] = 'src/rethinkdb/internal/socket.lua',
     ['rethinkdb.internal.utilities'] = 'src/rethinkdb/internal/utilities.lua',
   }

reql-1.0.4-0.rockspec

@@ -0,0 +1,76 @@
+rockspec_format = '1.1'
+package = 'reql'
+version = '1.0.4-0'
+source = {
+  url = 'git://github.com/RebirthDB/rebirthdb-lua',
+  branch = 'v1.0.4',
+}
+description = {
+  summary = 'A Lua driver for RebirthDB.',
+  detailed = [===[
+# RebirthDB-Lua
+
+RebirthDB driver in Lua
+
+## Installing
+- _IF USING LUA 5.1_ `luarocks install luabitop`
+- `luarocks install lua-reql`
+
+## Dev Dependencies
+- Lua >= 5.1
+- Luarocks
+  - busted
+  - luacheck
+  - luacov
+  - _IF USING LUA 5.1_ luabitop
+- RebirthDB
+
+## Testing
+- `luacheck .`
+- `busted -c`
+- `luacov`
+
+## Installing from source
+- `luarocks make`
+
+[![Build Status](https://travis-ci.org/RebirthDB/rebirthdb-lua.svg?branch=master)](https://travis-ci.org/RebirthDB/rebirthdb-lua)
+
+[![Coverage Status](https://coveralls.io/repos/github/RebirthDB/rebirthdb-lua/badge.svg?branch=master)](https://coveralls.io/github/RebirthDB/rebirthdb-lua?branch=master)
+  ]===],
+  homepage = 'https://github.com/RebirthDB/rebirthdb-lua/wiki',
+  license = 'Apache',
+}
+dependencies = {
+  'lua >= 5.1, < 5.4',
+  'luacrypto ~> 0.3',
+  'luajson ~> 1.3',
+  'luasec ~> 0.6',
+  'luasocket ~> 3.0',
+  'semver ~> 1.2',
+}
+build = {
+  type = 'builtin',
+  modules = {
+    reql = 'src/rethinkdb.lua',
+    ['reql.connection_instance'] = 'src/rethinkdb/connection_instance.lua',
+    ['reql.connection'] = 'src/rethinkdb/connection.lua',
+    ['reql.connector'] = 'src/rethinkdb/connector.lua',
+    ['reql.cursor'] = 'src/rethinkdb/cursor.lua',
+    ['reql.depreciate'] = 'src/rethinkdb/depreciate.lua',
+    ['reql.errors'] = 'src/rethinkdb/errors.lua',
+    ['reql.reql'] = 'src/rethinkdb/reql.lua',
+    ['reql.rtype'] = 'src/rethinkdb/rtype.lua',
+    ['reql.internal.bits51'] = 'src/rethinkdb/internal/bits51.lua',
+    ['reql.internal.bits53'] = 'src/rethinkdb/internal/bits53.lua',
+    ['reql.internal.bytes_to_int'] = 'src/rethinkdb/internal/bytes_to_int.lua',
+    ['reql.internal.convert_pseudotype'] = 'src/rethinkdb/internal/convert_pseudotype.lua',
+    ['reql.internal.current_handshake'] = 'src/rethinkdb/internal/current_handshake.lua',
+    ['reql.internal.int_to_bytes'] = 'src/rethinkdb/internal/int_to_bytes.lua',
+    ['reql.internal.pbkdf'] = 'src/rethinkdb/internal/pbkdf.lua',
+    ['reql.internal.protect'] = 'src/rethinkdb/internal/protect.lua',
+    ['reql.internal.protocol'] = 'src/rethinkdb/internal/protocol.lua',
+    ['reql.internal.protodef'] = 'src/rethinkdb/internal/protodef.lua',
+    ['reql.internal.socket'] = 'src/rethinkdb/internal/socket.lua',
+    ['reql.internal.utilities'] = 'src/rethinkdb/internal/utilities.lua',
+  }
+}

spec/control_spec.lua

@@ -5,7 +5,7 @@ local function reql_error_formatter(err)
   end
 end
 
-local version = require('rethinkdb.internal.semver')(string.match(_VERSION, '%d+%.%d+'))
+local version = require('semver')(string.match(_VERSION, '%d+%.%d+'))
 
 describe('control', function()
   local r

spec/json_parser_spec.lua

@@ -5,7 +5,7 @@ local function reql_error_formatter(err)
   end
 end
 
-local version = require('rethinkdb.internal.semver')(string.match(_VERSION, '%d+%.%d+'))
+local version = require('semver')(string.match(_VERSION, '%d+%.%d+'))
 
 describe('control dkjson', function()
   local r

src/rethinkdb.lua

@@ -19,7 +19,7 @@ local utilities = require'rethinkdb.internal.utilities'
 local reql = require'rethinkdb.reql'
 local rtype = require'rethinkdb.rtype'
 
-local v = require('rethinkdb.internal.semver')
+local v = require('semver')
 
 --- Creates an independent driver instance with the passed options.
 local function new(driver_options)
@@ -35,7 +35,7 @@ local function new(driver_options)
   r.proto_V1_0 = current_handshake
 
   --- The loaded luarocks version string as a semver.
-  r.version = v'1.0.3'
+  r.version = v'1.0.4'
   r._VERSION = r.version
 
   connection.init(r)