Update from upstream

.travis.yml

@@ -17,7 +17,7 @@ before_install:
   - luarocks install moonscript
 
 install:
-  - luarocks make busted-scm-0.rockspec
+  - luarocks make
 
 script: busted
 

README.md

@@ -1,4 +1,4 @@
-Busted
+busted
 ======
 
 [![Join the chat at https://gitter.im/Olivine-Labs/busted](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Olivine-Labs/busted?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

busted-scm-0.rockspec → busted-scm-1.rockspec

@@ -1,5 +1,5 @@
 package = 'busted'
-version = 'scm-0'
+version = 'scm-1'
 source = {
   url = "git://github.com/Olivine-Labs/busted",
   branch = "master"
@@ -19,15 +19,15 @@ description = {
 }
 dependencies = {
   'lua >= 5.1',
-  'lua_cliargs = 3.0-1',
+  'lua_cliargs = 3.0',
   'luafilesystem >= 1.5.0',
-  'luasystem >= 0.2.0-0',
+  'luasystem >= 0.2.0',
   'dkjson >= 2.1.0',
-  'say >= 1.3-0',
-  'luassert >= 1.7.8-0',
-  'lua-term >= 0.1-1',
-  'penlight >= 1.3.2-2',
-  'mediator_lua >= 1.1.1-0',
+  'say >= 1.3',
+  'luassert >= 1.7.8',
+  'lua-term >= 0.1',
+  'penlight >= 1.3.2',
+  'mediator_lua >= 1.1.1',
 }
 
 build = {
@@ -49,6 +49,7 @@ build = {
 
     ['busted.modules.configuration_loader']   = 'busted/modules/configuration_loader.lua',
     ['busted.modules.luacov']                 = 'busted/modules/luacov.lua',
+    ['busted.modules.standalone_loader']      = 'busted/modules/standalone_loader.lua',
     ['busted.modules.test_file_loader']       = 'busted/modules/test_file_loader.lua',
     ['busted.modules.output_handler_loader']  = 'busted/modules/output_handler_loader.lua',
     ['busted.modules.helper_loader']          = 'busted/modules/helper_loader.lua',
@@ -79,6 +80,7 @@ build = {
     ['busted.languages.th']                   = 'busted/languages/th.lua',
     ['busted.languages.ua']                   = 'busted/languages/ua.lua',
     ['busted.languages.zh']                   = 'busted/languages/zh.lua',
+    ['busted.languages.it']                   = 'busted/languages/it.lua',
   },
   install = {
     bin = {

busted/block.lua

@@ -144,11 +144,11 @@ return function(busted)
     end
 
     if busted.safe(descriptor, element.run, element):success() then
-      if randomize then
+      if busted.sort then
+        sort(busted.context.children(element))
+      elseif randomize then
         element.randomseed = randomseed
         shuffle(busted.context.children(element), randomseed)
-      elseif busted.sort then
-        sort(busted.context.children(element))
       end
 
       if block.setup(element) then

busted/compatibility.lua

@@ -33,8 +33,8 @@ return {
   loadstring = loadstring or load,
   unpack = table.unpack or unpack,
 
-  exit = function(code)
-    if code ~= 0 and _VERSION:match('^Lua 5%.[12]$') then
+  exit = function(code, force)
+    if not force and code ~= 0 and _VERSION:match('^Lua 5%.[12]$') then
       error()
     elseif code ~= 0 then
       code = 1

busted/core.lua

@@ -45,7 +45,7 @@ return function()
   local mediator = require 'mediator'()
 
   local busted = {}
-  busted.version = '2.0.rc12-0'
+  busted.version = '2.0.0-0'
 
   local root = require 'busted.context'()
   busted.context = root.ref()

busted/execute.lua

@@ -45,11 +45,11 @@ return function(busted)
         busted.safe_publish('suite', { 'suite', 'reset' }, root, i, runs)
       end
 
-      if options.shuffle then
+      if options.sort then
+        sort(busted.context.children(root))
+      elseif options.shuffle then
         root.randomseed = busted.randomseed
         shuffle(busted.context.children(root), busted.randomseed)
-      elseif options.sort then
-        sort(busted.context.children(root))
       end
 
       local seed = (busted.randomize and busted.randomseed or nil)

busted/languages/en.lua

@@ -26,6 +26,7 @@ s:set('output.success_single', 'success')
 s:set('output.seconds', 'seconds')
 
 s:set('output.no_test_files_match', 'No test files found matching Lua pattern: %s')
+s:set('output.file_not_found', 'Cannot find file or directory: %s')
 
 -- definitions following are not used within the 'say' namespace
 return {

busted/languages/it.lua

@@ -0,0 +1,50 @@
+local s = require('say')
+
+s:set_namespace('it')
+
+-- 'Pending: test.lua @ 12 \n description
+s:set('output.pending', 'In attesa')
+s:set('output.failure', 'Fallimento')
+s:set('output.error', 'Errore')
+s:set('output.success', 'Successo')
+
+s:set('output.pending_plural', 'in attesa')
+s:set('output.failure_plural', 'fallimenti')
+s:set('output.error_plural', 'errori')
+s:set('output.success_plural', 'successi')
+
+s:set('output.pending_zero', 'in attesa')
+s:set('output.failure_zero', 'fallimenti')
+s:set('output.error_zero', 'errori')
+s:set('output.success_zero', 'successi')
+
+s:set('output.pending_single', 'in attesa')
+s:set('output.failure_single', 'fallimento')
+s:set('output.error_single', 'errore')
+s:set('output.success_single', 'successo')
+
+s:set('output.seconds', 'secondi')
+
+s:set('output.no_test_files_match', 'Nessun file di test trovat che corrisponde al pattern Lua: %s')
+s:set('output.file_not_found', 'Nessun file o cartella trovato: %s')
+
+-- definitions following are not used within the 'say' namespace
+return {
+  failure_messages = {
+    "Hai %d specifiche non conformi",
+    "Le tue specifiche non sono conformi",
+    "Il tuo codice fa schifo e dovresti sentirti male per questo",
+    "Il tuo codice è in pericolo",
+    "Strano. Il solo modo per terminare con successo i tuoi test è fare nessun test",
+    "Mia nonna ha scritto migliori specifiche su un 3 86",
+    "Ogni volta che trovi un errore, bevi un'altra birra",
+    "I fallimenti fanno male alla salute"
+  },
+  success_messages = {
+    "Ma andiamo! Specifiche Ok!",
+    "Non importa, avevi le specifiche",
+    "Bella zio",
+    "Gran successo",
+    "Test passato, hai vinto una birra"
+  }
+}

busted/modules/cli.lua

@@ -12,7 +12,7 @@ return function(options)
   local configLoader = require 'busted.modules.configuration_loader'()
 
   -- Default cli arg values
-  local defaultOutput = options.defaultOutput
+  local defaultOutput = options.output or 'utfTerminal'
   local defaultLoaders = 'lua,moonscript'
   local defaultPattern = '_spec'
   local defaultSeed = '/dev/urandom or os.time()'
@@ -124,7 +124,7 @@ return function(options)
   cli:option('-e STATEMENT', 'execute statement STATEMENT', nil, processMultiOption)
   cli:option('-o, --output=LIBRARY', 'output library to load', defaultOutput, processOption)
   cli:option('-C, --directory=DIR', 'change to directory DIR before running tests. If multiple options are specified, each is interpreted relative to the previous one.', './', processDir)
-  cli:option('-f, --config-file=FILE', 'load configuration options from FILE', nil, processOptions)
+  cli:option('-f, --config-file=FILE', 'load configuration options from FILE', nil, processOption)
   cli:option('-t, --tags=TAGS', 'only run tests with these #tags', {}, processList)
   cli:option('--exclude-tags=TAGS', 'do not run tests with these #tags, takes precedence over --tags', {}, processList)
   cli:option('--filter=PATTERN', 'only run test names matching the Lua pattern', {}, processMultiOption)
@@ -168,17 +168,34 @@ return function(options)
     end
 
     -- Load busted config file if available
-    local bustedConfigFilePath = cliArgs.f or path.normpath(path.join(cliArgs.directory, '.busted'))
-    local bustedConfigFile = loadfile(bustedConfigFilePath)
-    if bustedConfigFile then
-      local ok, config = pcall(function()
-        local conf, err = configLoader(bustedConfigFile(), cliArgsParsed, cliArgs)
-        return conf or error(err, 0)
-      end)
-      if not ok then
-        return nil, appName .. ': error: ' .. config
+    local bustedConfigFilePath
+    if cliArgs.f then
+      -- if the file is given, then we require it to exist
+      if not path.isfile(cliArgs.f) then
+        return nil, ("specified config file '%s' not found"):format(cliArgs.f)
+      end
+      bustedConfigFilePath = cliArgs.f
+    else
+      -- try default file
+      bustedConfigFilePath = path.normpath(path.join(cliArgs.directory, '.busted'))
+      if not path.isfile(bustedConfigFilePath) then
+        bustedConfigFilePath = nil  -- clear default file, since it doesn't exist
+      end
+    end
+    if bustedConfigFilePath then
+      local bustedConfigFile, err = loadfile(bustedConfigFilePath)
+      if not bustedConfigFile then
+        return nil, ("failed loading config file `%s`: %s"):format(bustedConfigFilePath, err)
       else
-        cliArgs = config
+        local ok, config = pcall(function()
+          local conf, err = configLoader(bustedConfigFile(), cliArgsParsed, cliArgs)
+          return conf or error(err, 0)
+        end)
+        if not ok then
+          return nil, appName .. ': error: ' .. config
+        else
+          cliArgs = config
+        end
       end
     else
       cliArgs = tablex.merge(cliArgs, cliArgsParsed, true)

busted/modules/configuration_loader.lua

@@ -7,7 +7,7 @@ return function()
       return nil, '.busted file does not return a table.'
     end
 
-    local defaults = defaults or {}
+    defaults = defaults or {}
     local run = config.run or defaults.run
 
     if run and run ~= '' then

busted/modules/filter_loader.lua

@@ -55,11 +55,13 @@ return function()
       return nil, (#options.filter == 0)
     end
 
-    local printNameOnly = function(name, fn, trace)
-      local fullname = getFullName(name)
-      if trace and trace.what == 'Lua' then
-        print(trace.short_src .. ':' .. trace.currentline .. ': ' .. fullname)
-      else
+    local printTestName = function(element, parent, status)
+      if not (options.suppressPending and status == 'pending') then
+        local fullname = getFullName()
+        local trace = element.trace
+        if trace and trace.what == 'Lua' then
+          fullname = trace.short_src .. ':' .. trace.currentline .. ': ' .. fullname
+        end
         print(fullname)
       end
       return nil, false
@@ -69,6 +71,15 @@ return function()
       return nil, false
     end
 
+    local noop = function() end
+    local stubOut = function(descriptor, name, fn, ...)
+      if fn == noop then
+        return nil, true
+      end
+      busted.publish({ 'register', descriptor }, name, noop, ...)
+      return nil, false
+    end
+
     local skipOnError = function()
       return nil, not busted.skipAll
     end
@@ -81,13 +92,28 @@ return function()
       end
     end
 
+    local applyDescFilter = function(descriptors, name, fn)
+      if options[name] and options[name] ~= '' then
+        for _, descriptor in ipairs(descriptors) do
+          local f = function(...) return fn(descriptor, ...) end
+          busted.subscribe({ 'register', descriptor }, f, { priority = 1 })
+        end
+      end
+    end
+
     if options.list then
       busted.subscribe({ 'suite', 'start' }, ignoreAll, { priority = 1 })
       busted.subscribe({ 'suite', 'end' }, ignoreAll, { priority = 1 })
-      applyFilter({ 'setup', 'teardown', 'before_each', 'after_each' }, 'list', ignoreAll)
-      applyFilter({ 'lazy_setup', 'lazy_teardown' }, 'list', ignoreAll)
-      applyFilter({ 'strict_setup', 'strict_teardown' }, 'list', ignoreAll)
-      applyFilter({ 'it', 'pending' }, 'list', printNameOnly)
+      busted.subscribe({ 'file', 'start' }, ignoreAll, { priority = 1 })
+      busted.subscribe({ 'file', 'end' }, ignoreAll, { priority = 1 })
+      busted.subscribe({ 'describe', 'start' }, ignoreAll, { priority = 1 })
+      busted.subscribe({ 'describe', 'end' }, ignoreAll, { priority = 1 })
+      busted.subscribe({ 'test', 'start' }, ignoreAll, { priority = 1 })
+      busted.subscribe({ 'test', 'end' }, printTestName, { priority = 1 })
+      applyDescFilter({ 'setup', 'teardown', 'before_each', 'after_each' }, 'list', stubOut)
+      applyDescFilter({ 'lazy_setup', 'lazy_teardown' }, 'list', stubOut)
+      applyDescFilter({ 'strict_setup', 'strict_teardown' }, 'list', stubOut)
+      applyDescFilter({ 'it', 'pending' }, 'list', stubOut)
     end
 
     applyFilter({ 'lazy_setup', 'lazy_teardown' }, 'nokeepgoing', skipOnError)

busted/modules/helper_loader.lua

@@ -1,11 +1,13 @@
 local path = require 'pl.path'
 local hasMoon, moonscript = pcall(require, 'moonscript')
+local utils = require 'busted.utils'
 
 return function()
   local loadHelper = function(busted, helper, options)
-    local old_arg = arg
+    local old_arg = _G.arg
     local success, err = pcall(function()
-      arg = options.arguments
+      utils.copy_interpreter_args(options.arguments)
+      _G.arg = options.arguments
       if helper:match('%.lua$') then
         dofile(path.normpath(helper))
       elseif hasMoon and helper:match('%.moon$') then

busted/modules/luacov.lua

@@ -4,7 +4,7 @@ return function()
     local result, luacov = pcall(require, 'luacov.runner')
 
     if not result then
-      return print('LuaCov not found on the system, try running without --coverage option, or install LuaCov first')
+      return nil, 'LuaCov not found on the system, try running without --coverage option, or install LuaCov first'
     end
 
     -- call it to start
@@ -16,6 +16,7 @@ return function()
     table.insert(luacov.configuration.exclude, 'luassert%.')
     table.insert(luacov.configuration.exclude, 'say%.')
     table.insert(luacov.configuration.exclude, 'pl%.')
+    return true
   end
 
   return loadLuaCov

busted/modules/output_handler_loader.lua

@@ -1,10 +1,12 @@
 local path = require 'pl.path'
 local hasMoon, moonscript = pcall(require, 'moonscript')
+local utils = require 'busted.utils'
 
 return function()
   local loadOutputHandler = function(busted, output, options)
     local handlers = {}
 
+    utils.copy_interpreter_args(options.arguments)
     local success, err = pcall(function()
       for word in output:gmatch("%a+") do
         if word:match('%.lua$') then

busted/modules/standalone_loader.lua

@@ -0,0 +1,28 @@
+local getTrace = function(filename, info)
+  local index = info.traceback:find('\n%s*%[C]')
+  info.traceback = info.traceback:sub(1, index)
+  return info
+end
+
+return function(busted)
+  local loadCurrentFile = function(info, options)
+    local filename = 'string'
+    if info.source:sub(1,1) == '@' or info.source:sub(1,1) == '=' then
+      filename = info.source:sub(2)
+    end
+
+    -- Setup test file to be compatible with live coding
+    if info.func then
+      local file = setmetatable({
+        getTrace = getTrace,
+        rewriteMessage = nil
+      }, {
+        __call = info.func
+      })
+
+      busted.executors.file(filename, file)
+    end
+  end
+
+  return loadCurrentFile
+end