ruby-plsql-spec 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 926bc9ee745cd69cd401e19559efaa9aaa8552d1
-  data.tar.gz: 2bcf1b8dccdee59d09314d134f59548aa5b15769
+  metadata.gz: eb057d0e12aaf9194746fbb62601ae2f987b709d
+  data.tar.gz: 6058606e45a1678505269b28d1c8faa5e85b69fc
 SHA512:
-  metadata.gz: 3a9bafcfdb0f06cc4ba1ac6e1eee08a0cabf941bb3dde968cacb3aa7fd24fa33cc041c6288dc2caa237bc972bce05f259424bb61724c9a18fc88d93d87c2abe4
-  data.tar.gz: 65645390db2b2bef19893a6307e9bd6f0579c6e83bb4549bfcbb7a667d5d51d45d559fef65d59e611b6f1c9f4a53a5bf011c09d914c229afb326f7bd40f3b588
+  metadata.gz: 5fca2fda487b606d324b1b504d73c98170614da3c112a2b176b824199849469ce55985db4d121966d81f665df65d2a9dbf25c3023d267c7dbf47f19048947bd9
+  data.tar.gz: beac1a3e4474a804043360ec3252975f9fe11e7816ccdac7e0bc6a14038e3a68bd8ea341f558f54ab78a17222a8b4c753f85cccc37fb89e1428e3ac3516767dd

data/.travis.yml

@@ -0,0 +1,38 @@
+sudo: required
+
+env:
+  global:
+    - ORACLE_COOKIE=sqldev
+    - ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
+    - ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
+    - NLS_LANG=AMERICAN_AMERICA.AL32UTF8
+    - ORACLE_BASE=/u01/app/oracle
+    - LD_LIBRARY_PATH=$ORACLE_HOME/lib
+    - PATH=$PATH:$ORACLE_HOME/jdbc/lib
+    - DATABASE_VERSION=11.2.0.2
+    - ORACLE_SID=XE
+    - DATABASE_NAME=XE
+#    - JRUBY_OPTS='--ng'
+    - ORA_SDTZ='Europe/London' #Needed as a client parameter
+    - TZ='Europe/London'       #Needed as a DB Server parameter
+
+before_install:
+  - chmod +x .travis/oracle/download.sh
+  - chmod +x .travis/oracle/install.sh
+  - chmod +x .travis/setup_accounts.sh
+
+install:
+  - .travis/oracle/download.sh
+  - .travis/oracle/install.sh
+  - .travis/setup_accounts.sh
+  - bundle install --without=development
+
+language: ruby
+rvm:
+  - 2.3.1
+  - 2.3.0
+  - 2.2.4
+  - 1.9.3
+  - jruby-1.7.9
+  - jruby-9.0.5.0
+  - jruby-9.1.0.0

data/.travis/oracle/LICENSE

@@ -0,0 +1,5 @@
+Copyright (c) 2013, Christopher Bandy
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

data/.travis/oracle/README.md

@@ -0,0 +1,64 @@
+[![Build](https://travis-ci.org/cbandy/travis-oracle.svg?branch=master)](https://travis-ci.org/cbandy/travis-oracle)
+
+Use [Oracle Database Express Edition][] in your builds on [Travis CI][].
+
+[Oracle Database Express Edition]: http://www.oracle.com/technetwork/database/database-technologies/express-edition/overview/index.html
+[Travis CI]: https://travis-ci.org/
+
+
+Usage
+-----
+
+To use this tool, you must have an Oracle account with which you have accepted
+the current license agreement for [Oracle Database Express Edition][].
+
+1. Add your Oracle username and password to your build [environment variables][],
+   either as hidden repository settings or encrypted variables:
+
+   | Variable Name              | Value         |
+   | -------------------------- | ------------- |
+   | `ORACLE_LOGIN_ssousername` | your username |
+   | `ORACLE_LOGIN_password`    | your password |
+
+2. Add the version information to your build environment variables:
+
+   ```yaml
+   - ORACLE_COOKIE=sqldev
+   - ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
+   - ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
+   - ORACLE_SID=XE
+   ```
+
+3. Download and extract the [latest release][] into your project. For example,
+
+   ```shell
+   wget 'https://github.com/cbandy/travis-oracle/archive/v2.0.0.tar.gz'
+   mkdir -p .travis/oracle
+   tar xz --strip-components 1 -C .travis/oracle -f v2.0.0.tar.gz
+   ```
+
+4. Enable [`sudo`](https://docs.travis-ci.com/user/workers/standard-infrastructure/):
+
+   ```yaml
+   sudo: required
+   ```
+
+5. Finally, execute the extracted scripts as part of your build, usually
+   during [`before_install`](https://docs.travis-ci.com/user/customizing-the-build/#The-Build-Lifecycle):
+
+   ```yaml
+   - .travis/oracle/download.sh
+   - .travis/oracle/install.sh
+   ```
+
+[SQL\*Plus][] is installed to `$ORACLE_HOME/bin/sqlplus`, and the current user
+has both normal and DBA access without a password, i.e. `/` and `/ AS SYSDBA`.
+
+[OCI][] and [OCCI][] libraries and header files are in `$ORACLE_HOME/lib` and
+`$ORACLE_HOME/rdbms/public`, respectively.
+
+[environment variables]: https://docs.travis-ci.com/user/environment-variables/
+[latest release]: https://github.com/cbandy/travis-oracle/releases/latest
+[OCCI]: http://www.oracle.com/pls/topic/lookup?ctx=xe112&id=LNCPP
+[OCI]: http://www.oracle.com/pls/topic/lookup?ctx=xe112&id=LNOCI
+[SQL\*Plus]: http://www.oracle.com/pls/topic/lookup?ctx=xe112&id=SQPUG

data/.travis/oracle/download.js

@@ -0,0 +1,100 @@
+// vim: set et sw=2 ts=2:
+"use strict";
+var env = process.env;
+var Promise = require('bluebird');
+var Phantom = Promise.promisifyAll(require('node-phantom-simple'));
+var PhantomError = require('node-phantom-simple/headless_error');
+
+Phantom.createAsync({ parameters: { 'ssl-protocol': 'tlsv1' } }).then(function (browser) {
+  browser = Promise.promisifyAll(browser, { suffix: 'Promise' });
+
+  // Configure the browser, open a tab
+  return browser
+  .addCookiePromise({'name': 'oraclelicense', 'value': "accept-" + env['ORACLE_COOKIE'] + "-cookie", 'domain': '.oracle.com' })
+  .then(function () {
+    return browser.createPagePromise();
+  })
+  .then(function (page) {
+    page = Promise.promisifyAll(page, { suffix: 'Promise' });
+
+    // Configure the tab
+    page.onResourceError = console.error.bind(console);
+    return page
+    .setPromise('settings.userAgent', env['USER_AGENT']) // PhantomJS configures the UA per tab
+
+    // Request the file, wait for the login page
+    .then(function () {
+      return page.openPromise("https://edelivery.oracle.com/akam/otn/linux/" + env['ORACLE_FILE']).then(function (status) {
+        if (status != 'success') throw "Unable to connect to oracle.com";
+        return page.waitForSelectorPromise('input[type=password]', 5000);
+      })
+      .catch(PhantomError, function (err) {
+        return page.getPromise('plainText').then(function (text) {
+          console.error("Unable to load login page. Last response was:\n" + text);
+          throw err;
+        });
+      });
+    })
+
+    // Export cookies for cURL
+    .then(function () {
+      return page.getPromise('cookies').then(function (cookies) {
+        var data = "";
+        for (var i = 0; i < cookies.length; ++i) {
+          var cookie = cookies[i];
+          data += cookie.domain + "\tTRUE\t" + cookie.path + "\t"
+            + (cookie.secure ? "TRUE" : "FALSE") + "\t0\t"
+            + cookie.name + "\t" + cookie.value + "\n";
+        }
+        return Promise.promisifyAll(require('fs')).writeFileAsync(env['COOKIES'], data);
+      });
+    })
+
+    // Submit the login form using cURL
+    .then(function () {
+      return page.evaluatePromise(function () {
+        var $form = jQuery(document.forms[0]);
+        return {
+          action: $form.prop('action'),
+          data: $form.serialize()
+        };
+      })
+      .then(function (form) {
+        return browser.exitPromise().then(function () {
+          for (var key in env) {
+            if (key.indexOf('ORACLE_LOGIN_') == 0 && env.hasOwnProperty(key)) {
+              var name = key.substr(13) + '=';
+              form.data = form.data.replace(name, name + env[key]);
+            }
+          }
+
+          var cmd = ['curl', [
+            '--cookie', env['COOKIES'],
+            '--cookie-jar', env['COOKIES'],
+            '--data', '@-',
+            '--location',
+            '--output', require('path').basename(env['ORACLE_FILE']),
+            '--user-agent', env['USER_AGENT'],
+            form.action
+          ]];
+
+          console.info("Executing %j", cmd);
+
+          var child_process = require('child_process');
+          var child = child_process.spawn.apply(child_process, cmd.concat({ stdio: ['pipe', 1, 2] }));
+          child.on('exit', process.exit);
+          child.stdin.end(form.data);
+        });
+      });
+    })
+    .catch(function (err) {
+      console.error(err);
+      browser.on('exit', function () { process.exit(1); });
+      browser.exit();
+    });
+  });
+})
+.catch(function (err) {
+  console.error(err);
+  process.exit(1);
+});

data/.travis/oracle/download.sh

@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+[ -n "$ORACLE_COOKIE" ] || { echo "Missing ORACLE_COOKIE environment variable!"; exit 1; }
+[ -n "$ORACLE_FILE" ] || { echo "Missing ORACLE_FILE environment variable!"; exit 1; }
+
+cd "$(dirname "$(readlink -f "$0")")"
+
+npm install bluebird node-phantom-simple
+
+export COOKIES='cookies.txt'
+export USER_AGENT='Mozilla/5.0'
+
+echo > "$COOKIES"
+chmod 600 "$COOKIES"
+
+exec node download.js

data/.travis/oracle/install.sh

@@ -0,0 +1,32 @@
+#!/bin/sh -e
+
+[ -n "$ORACLE_FILE" ] || { echo "Missing ORACLE_FILE environment variable!"; exit 1; }
+[ -n "$ORACLE_HOME" ] || { echo "Missing ORACLE_HOME environment variable!"; exit 1; }
+
+ORACLE_RPM="$(basename $ORACLE_FILE .zip)"
+
+cd "$(dirname "$(readlink -f "$0")")"
+
+sudo apt-get -qq update
+sudo apt-get --no-install-recommends -qq install bc libaio1 rpm unzip
+
+df -B1 /dev/shm | awk 'END { if ($1 != "shmfs" && $1 != "tmpfs" || $2 < 2147483648) exit 1 }' ||
+  ( sudo rm -r /dev/shm && sudo mkdir /dev/shm && sudo mount -t tmpfs shmfs -o size=2G /dev/shm )
+
+test -f /sbin/chkconfig ||
+  ( echo '#!/bin/sh' | sudo tee /sbin/chkconfig > /dev/null && sudo chmod u+x /sbin/chkconfig )
+
+test -d /var/lock/subsys || sudo mkdir /var/lock/subsys
+
+unzip -j "$(basename $ORACLE_FILE)" "*/$ORACLE_RPM"
+sudo rpm --install --nodeps --nopre "$ORACLE_RPM"
+
+echo 'OS_AUTHENT_PREFIX=""' | sudo tee -a "$ORACLE_HOME/config/scripts/init.ora" > /dev/null
+sudo usermod -aG dba $USER
+
+( echo ; echo ; echo travis ; echo travis ; echo n ) | sudo AWK='/usr/bin/awk' /etc/init.d/oracle-xe configure
+
+"$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
+CREATE USER $USER IDENTIFIED EXTERNALLY;
+GRANT CONNECT, RESOURCE TO $USER;
+SQL

data/.travis/setup_accounts.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ev
+
+"$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
+@@spec/support/unlock_and_setup_hr_user.sql
+SQL

data/Gemfile

@@ -3,12 +3,18 @@ source 'http://rubygems.org'
 gem 'rspec', '>= 2.0', '< 4.0'
 gem 'rspec-support', '>= 3.1', '< 4.0'
 gem 'thor', '~> 0.19.1'
-gem 'ruby-plsql', '~> 0.5.0'
+gem 'ruby-plsql', '~> 0.5'
 gem 'nokogiri', '~> 1.6.0'
 
 group :development do
-  gem 'jeweler', '~> 2.0.1'
+  gem 'juwelier', '~> 2.0'
+  gem 'rspec_junit_formatter'
+end
+
+group :test, :development do
+  gem 'rake', '>= 10.0'
 
-  # gem 'ruby-oci8', '~> 2.1.0'
-  gem 'ruby-oci8', :git => 'git://github.com/kubo/ruby-oci8.git', :platforms => :mri
+  platforms :ruby, :mswin, :mingw do
+    gem 'ruby-oci8', '~> 2.1'
+  end
 end

data/History.txt

@@ -1,3 +1,18 @@
+== 0.5.0 2016-05-13
+
+* Improvements
+  * Tested with ruby 2.3.0, 2.3.1
+  * Support for higher ruby-plsql versions - 0.6+ (#38)
+  * `require 'spec_helper'` is no longer needed in each spec file (#26)
+  * Update examples to use the "expect" RSpec syntax (#23)
+* Bug fixes
+  * Fix profiler: was only working with UPCASE procedure and function name (#30)
+  * Fix disposal of connections when using multiple ones (#22)
+* Internal (development) improvements
+  * Migrate from jeweler to juwelier (#37)
+  * Setup CI build on travis-ci.org (#36)
+  * Allow reporting of Unit Tests on Jenkins CI with "RspecJunitFormatter" (#31)
+
 == 0.4.0 2015-01-30
 
 * Improvements

data/INSTALL-Windows.md

@@ -6,7 +6,7 @@ Ruby installation on Windows is a little bit different than installation on Mac
 Install Ruby
 ------------
 
-Download and install Ruby 1.9.3 from [Ruby Installer for Windows](http://www.rubyinstaller.org/).
+Download and install Ruby from [Ruby Installer for Windows](http://www.rubyinstaller.org/).
 
 When installing then select checkbox to add Ruby to your PATH.
 
@@ -32,7 +32,7 @@ Install ruby-oci8
 
     gem install ruby-oci8
 
-If you are behind firewall with proxy server then specify proxy server use -p option, e.g.: 
+If you are behind firewall with proxy server then specify proxy server use -p option, e.g.:
 
     gem install ruby-oci8 -p http://proxy.example.com:8080
 

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2015 Raimonds Simanovskis
+Copyright (c) 2009-2016 Raimonds Simanovskis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/rsim/ruby-plsql-spec.svg?branch=master)](https://travis-ci.org/rsim/ruby-plsql-spec)
+
 ruby-plsql-spec
 ===============
 PL/SQL unit testing with Ruby
@@ -22,7 +24,7 @@ Installing
 
 See [Installing on Windows](INSTALL-Windows.md) in separate file.
 
-* Install [Ruby 1.8.7, 1.9.3 or 2.2.x](http://www.ruby-lang.org/en/downloads/) - it is recommended to use latest version
+* Install [Ruby 1.8.7, 1.9.3 or 2.x](http://www.ruby-lang.org/en/downloads/) - it is recommended to use latest version
 * Install Oracle client, e.g. [Oracle Instant Client](http://www.oracle.com/technology/tech/oci/instantclient/index.html)
 * Install ruby-oci8 and ruby-plsql-spec (prefix with sudo if necessary)
 
@@ -110,7 +112,7 @@ If you want to upgrade ruby-plsql-spec to latest version then just do
 
         gem install ruby-plsql-spec
 
-If you have upgrade from ruby-plsql-spec version 0.1.0 to 0.2.0 then you need to update your spec_helper.rb file to use rspec 2.0. You can do it by running one more time
+If you have upgraded from ruby-plsql-spec version 0.1.0 to 0.2.0 then you need to update your spec_helper.rb file to use rspec 2.0. You can do it by running one more time
 
         plsql-spec init
 

data/Rakefile

@@ -10,18 +10,22 @@ end
 
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "ruby-plsql-spec"
-  gem.summary = "Oracle PL/SQL unit testing framework using Ruby and RSpec"
-  gem.description = <<-EOS
+begin
+  require 'juwelier'
+  Juwelier::Tasks.new do |gem|
+    gem.name = "ruby-plsql-spec"
+    gem.summary = "Oracle PL/SQL unit testing framework using Ruby and RSpec"
+    gem.description = <<-EOS
 ruby-plsql-spec is Oracle PL/SQL unit testing framework which is built using Ruby programming language, ruby-plsql library and RSpec testing framework.
-EOS
-  gem.email = "raimonds.simanovskis@gmail.com"
-  gem.homepage = "http://github.com/rsim/ruby-plsql-spec"
-  gem.authors = ["Raimonds Simanovskis"]
+  EOS
+    gem.email = "raimonds.simanovskis@gmail.com"
+    gem.homepage = "http://github.com/rsim/ruby-plsql-spec"
+    gem.authors = ["Raimonds Simanovskis"]
+  end
+  Juwelier::RubygemsDotOrgTasks.new
+rescue LoadError
+  # juwelier not installed
 end
-Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
@@ -35,6 +39,7 @@ RSpec::Core::RakeTask.new(:rcov) do |t|
 end
 
 task :default => :spec
+task :test => :spec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/examples/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/examples/spec/award_bonus_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 # load 'award_bonus' procedure into the database
 require 'award_bonus'
 
@@ -16,7 +14,7 @@ describe "Award bonus" do
         :salary => salary
       )
       plsql.award_bonus(employee[:employee_id], sales_amt)
-      get_employee(employee[:employee_id])[:salary].should == result
+      expect(get_employee(employee[:employee_id])[:salary]).to eq result
     end
   end
 

data/examples/spec/betwnstr_spec.rb

@@ -1,23 +1,21 @@
-require 'spec_helper'
-
 # load 'betwnstr' procedure into the database
 require "betwnstr"
 
 describe "Between string" do
   it "should be correct in normal case" do
-    plsql.betwnstr('abcdefg', 2, 5).should == 'bcde'
+    expect(plsql.betwnstr('abcdefg', 2, 5)).to eq 'bcde'
   end
 
   it "should be correct with zero start value" do
-    plsql.betwnstr('abcdefg', 0, 5).should == 'abcde'
+    expect(plsql.betwnstr('abcdefg', 0, 5)).to eq 'abcde'
   end
 
   it "should be correct with way big end value" do
-    plsql.betwnstr('abcdefg', 5, 500).should == 'efg'
+    expect(plsql.betwnstr('abcdefg', 5, 500)).to eq 'efg'
   end
 
   it "should be correct with NULL string" do
-    plsql.betwnstr(NULL, 5, 500).should == NULL
+    expect(plsql.betwnstr(NULL, 5, 500)).to eq NULL
   end
 
 end

data/examples/spec/oracle_ebs_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Oracle E-Business Suite" do
   before(:all) do
     # @old_connection = plsql.connection
@@ -47,15 +45,15 @@ describe "Oracle E-Business Suite" do
       end
 
       it "should return user name" do
-        plsql.fnd_global.user_name.should == @user_name
+        expect(plsql.fnd_global.user_name).to eq @user_name
       end
 
       it "should return responsibility name" do
-        plsql.fnd_global.resp_name.should == @responsibility_name
+        expect(plsql.fnd_global.resp_name).to eq @responsibility_name
       end
 
     end
 
   end
 
-end
+end

data/examples/spec/remove_rooms_by_name_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 require 'remove_rooms_by_name'
 
 describe "Remove rooms by name" do
@@ -29,7 +27,7 @@ describe "Remove rooms by name" do
   it "should remove a room without furniture" do
     rooms_without_b = plsql.rooms.all("WHERE name NOT LIKE 'B%'")
     plsql.remove_rooms_by_name('B%')
-    plsql.rooms.all.should == rooms_without_b
+    expect(plsql.rooms.all).to eq rooms_without_b
   end
 
   it "should not remove a room with furniture" do

data/examples/spec/spec_helper.rb

@@ -8,9 +8,8 @@ database_config = YAML.load(File.read(database_config_file))
 database_config = {} unless database_config.is_a?(Hash)
 database_connections = database_config.keys.map{|k| k.to_sym}
 
-database_config.each do |name, params|
-  # change all keys to symbols
-  name = name.to_sym
+database_connections.each do |name|
+  params = database_config[name.to_s]
   symbol_params = Hash[*params.map{|k,v| [k.to_sym, v]}.flatten]
 
   plsql(name).connect! symbol_params
@@ -33,7 +32,7 @@ end
 # Do logoff when exiting to ensure that session temporary tables
 # (used when calling procedures with table types defined in packages)
 at_exit do
-  database_connections.each do |name|
+  database_connections.reverse_each do |name|
     if ENV['PLSQL_COVERAGE']
       PLSQL::Coverage.stop(name)
       coverage_directory = name == :default ? ENV['PLSQL_COVERAGE'] : "#{ENV['PLSQL_COVERAGE']}/#{name}"
@@ -55,13 +54,13 @@ RSpec.configure do |config|
   end
   config.after(:each) do
     # Always perform rollback to savepoint after each test
-    database_connections.each do |name|
+    database_connections.reverse_each do |name|
       plsql(name).rollback_to "before_each"
     end
   end
   config.after(:all) do
     # Always perform rollback after each describe block
-    database_connections.each do |name|
+    database_connections.reverse_each do |name|
       plsql(name).rollback
     end
   end

data/examples/spec/what_is_profiled_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 require 'what_is_profiled'
 
 describe "what is profiled" do

data/lib/plsql/coverage.rb

@@ -207,7 +207,7 @@ module PLSQL
 
       # sometimes first PROCEDURE or FUNCTION line is reported as not executed, force ignoring it
       source.each do |line, text|
-        if text =~ /^\s*(PROCEDURE|FUNCTION)/ && coverage[line] == 0
+        if text =~ /^\s*(PROCEDURE|FUNCTION)/i && coverage[line] == 0
           coverage.delete(line)
         end
       end

data/lib/plsql/spec/cli.rb

@@ -21,12 +21,9 @@ module PLSQL
 
       desc 'init', 'initialize spec subdirectory with default ruby-plsql-spec files'
       def init
-        empty_directory 'spec'
-        %w(spec_helper.rb database.yml).each do |file|
-          copy_file file, "spec/#{file}"
-        end
-        directory 'helpers', 'spec/helpers'
         empty_directory 'spec/factories'
+        copy_file '.rspec', '.rspec'
+        directory 'spec', 'spec'
         say <<-EOS, :red
 
 Please update spec/database.yml file and specify your database connection parameters.

data/lib/plsql/spec/templates/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/lib/plsql/spec/templates/{spec_helper.rb → spec/spec_helper.rb}

@@ -8,9 +8,8 @@ database_config = YAML.load(File.read(database_config_file))
 database_config = {} unless database_config.is_a?(Hash)
 database_connections = database_config.keys.map{|k| k.to_sym}
 
-database_config.each do |name, params|
-  # change all keys to symbols
-  name = name.to_sym
+database_connections.each do |name|
+  params = database_config[name.to_s]
   symbol_params = Hash[*params.map{|k,v| [k.to_sym, v]}.flatten]
 
   plsql(name).connect! symbol_params
@@ -33,7 +32,7 @@ end
 # Do logoff when exiting to ensure that session temporary tables
 # (used when calling procedures with table types defined in packages)
 at_exit do
-  database_connections.each do |name|
+  database_connections.reverse_each do |name|
     if ENV['PLSQL_COVERAGE']
       PLSQL::Coverage.stop(name)
       coverage_directory = name == :default ? ENV['PLSQL_COVERAGE'] : "#{ENV['PLSQL_COVERAGE']}/#{name}"
@@ -55,13 +54,13 @@ RSpec.configure do |config|
   end
   config.after(:each) do
     # Always perform rollback to savepoint after each test
-    database_connections.each do |name|
+    database_connections.reverse_each do |name|
       plsql(name).rollback_to "before_each"
     end
   end
   config.after(:all) do
     # Always perform rollback after each describe block
-    database_connections.each do |name|
+    database_connections.reverse_each do |name|
       plsql(name).rollback
     end
   end

data/ruby-plsql-spec.gemspec

@@ -1,25 +1,32 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ruby-plsql-spec 0.4.0 ruby lib
+# stub: ruby-plsql-spec 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "ruby-plsql-spec"
-  s.version = "0.4.0"
+  s.name = "ruby-plsql-spec".freeze
+  s.version = "0.5.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Raimonds Simanovskis"]
-  s.date = "2015-01-30"
-  s.description = "ruby-plsql-spec is Oracle PL/SQL unit testing framework which is built using Ruby programming language, ruby-plsql library and RSpec testing framework.\n"
-  s.email = "raimonds.simanovskis@gmail.com"
-  s.executables = ["plsql-spec"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Raimonds Simanovskis".freeze]
+  s.date = "2016-05-13"
+  s.description = "ruby-plsql-spec is Oracle PL/SQL unit testing framework which is built using Ruby programming language, ruby-plsql library and RSpec testing framework.\n".freeze
+  s.email = "raimonds.simanovskis@gmail.com".freeze
+  s.executables = ["plsql-spec".freeze]
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
     ".rspec",
+    ".travis.yml",
+    ".travis/oracle/LICENSE",
+    ".travis/oracle/README.md",
+    ".travis/oracle/download.js",
+    ".travis/oracle/download.sh",
+    ".travis/oracle/install.sh",
+    ".travis/setup_accounts.sh",
     "Gemfile",
     "History.txt",
     "INSTALL-Windows.md",
@@ -28,6 +35,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/plsql-spec",
+    "examples/.rspec",
     "examples/source/award_bonus.rb",
     "examples/source/betwnstr.rb",
     "examples/source/remove_rooms_by_name.rb",
@@ -54,49 +62,57 @@ Gem::Specification.new do |s|
     "lib/plsql/coverage/table_line.html.erb",
     "lib/plsql/spec.rb",
     "lib/plsql/spec/cli.rb",
-    "lib/plsql/spec/templates/database.yml",
-    "lib/plsql/spec/templates/helpers/inspect_helpers.rb",
-    "lib/plsql/spec/templates/helpers/time_helpers.rb",
-    "lib/plsql/spec/templates/spec_helper.rb",
+    "lib/plsql/spec/templates/.rspec",
+    "lib/plsql/spec/templates/spec/database.yml",
+    "lib/plsql/spec/templates/spec/helpers/inspect_helpers.rb",
+    "lib/plsql/spec/templates/spec/helpers/time_helpers.rb",
+    "lib/plsql/spec/templates/spec/spec_helper.rb",
     "lib/plsql/spec/version.rb",
     "lib/ruby-plsql-spec.rb",
     "ruby-plsql-spec.gemspec",
     "spec/plsql/coverage_spec.rb",
     "spec/plsql/spec/cli_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/unlock_and_setup_hr_user.sql"
   ]
-  s.homepage = "http://github.com/rsim/ruby-plsql-spec"
-  s.rubygems_version = "2.4.5"
-  s.summary = "Oracle PL/SQL unit testing framework using Ruby and RSpec"
+  s.homepage = "http://github.com/rsim/ruby-plsql-spec".freeze
+  s.rubygems_version = "2.6.4".freeze
+  s.summary = "Oracle PL/SQL unit testing framework using Ruby and RSpec".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["< 4.0", ">= 2.0"])
-      s.add_runtime_dependency(%q<rspec-support>, ["< 4.0", ">= 3.1"])
-      s.add_runtime_dependency(%q<thor>, ["~> 0.19.1"])
-      s.add_runtime_dependency(%q<ruby-plsql>, ["~> 0.5.0"])
-      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<ruby-oci8>, [">= 0"])
+      s.add_runtime_dependency(%q<rspec>.freeze, ["< 4.0", ">= 2.0"])
+      s.add_runtime_dependency(%q<rspec-support>.freeze, ["< 4.0", ">= 3.1"])
+      s.add_runtime_dependency(%q<thor>.freeze, ["~> 0.19.1"])
+      s.add_runtime_dependency(%q<ruby-plsql>.freeze, ["~> 0.5"])
+      s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.6.0"])
+      s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.0"])
+      s.add_development_dependency(%q<rspec_junit_formatter>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 10.0"])
+      s.add_development_dependency(%q<ruby-oci8>.freeze, ["~> 2.1"])
     else
-      s.add_dependency(%q<rspec>, ["< 4.0", ">= 2.0"])
-      s.add_dependency(%q<rspec-support>, ["< 4.0", ">= 3.1"])
-      s.add_dependency(%q<thor>, ["~> 0.19.1"])
-      s.add_dependency(%q<ruby-plsql>, ["~> 0.5.0"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.6.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<ruby-oci8>, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, ["< 4.0", ">= 2.0"])
+      s.add_dependency(%q<rspec-support>.freeze, ["< 4.0", ">= 3.1"])
+      s.add_dependency(%q<thor>.freeze, ["~> 0.19.1"])
+      s.add_dependency(%q<ruby-plsql>.freeze, ["~> 0.5"])
+      s.add_dependency(%q<nokogiri>.freeze, ["~> 1.6.0"])
+      s.add_dependency(%q<juwelier>.freeze, ["~> 2.0"])
+      s.add_dependency(%q<rspec_junit_formatter>.freeze, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 10.0"])
+      s.add_dependency(%q<ruby-oci8>.freeze, ["~> 2.1"])
     end
   else
-    s.add_dependency(%q<rspec>, ["< 4.0", ">= 2.0"])
-    s.add_dependency(%q<rspec-support>, ["< 4.0", ">= 3.1"])
-    s.add_dependency(%q<thor>, ["~> 0.19.1"])
-    s.add_dependency(%q<ruby-plsql>, ["~> 0.5.0"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.6.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<ruby-oci8>, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["< 4.0", ">= 2.0"])
+    s.add_dependency(%q<rspec-support>.freeze, ["< 4.0", ">= 3.1"])
+    s.add_dependency(%q<thor>.freeze, ["~> 0.19.1"])
+    s.add_dependency(%q<ruby-plsql>.freeze, ["~> 0.5"])
+    s.add_dependency(%q<nokogiri>.freeze, ["~> 1.6.0"])
+    s.add_dependency(%q<juwelier>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<rspec_junit_formatter>.freeze, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, [">= 10.0"])
+    s.add_dependency(%q<ruby-oci8>.freeze, ["~> 2.1"])
   end
 end
 

data/spec/plsql/spec/cli_spec.rb

@@ -44,7 +44,7 @@ describe "plsql-spec" do
 
   def create_test(name, string, options = {})
     file_content = <<-EOS
-require 'spec_helper'
+require_relative './spec_helper'
 
 describe "test" do
   it #{name.inspect} do
@@ -91,6 +91,10 @@ EOS
       expect(File.directory?(@root_dir + '/spec/factories')).to be_truthy
     end
 
+    it "should create .rspec" do
+      expect(File.file?(@root_dir + '/.rspec')).to be_truthy
+    end
+
   end
 
   describe "run" do

data/spec/support/unlock_and_setup_hr_user.sql

@@ -0,0 +1,2 @@
+alter user hr identified by hr account unlock;
+grant execute on dbms_lock to hr;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-plsql-spec
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -93,21 +93,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ruby-oci8
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -120,8 +120,38 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  ruby-plsql-spec is Oracle PL/SQL unit testing framework which is built using Ruby programming language, ruby-plsql library and RSpec testing framework.
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-oci8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+description: 'ruby-plsql-spec is Oracle PL/SQL unit testing framework which is built
+  using Ruby programming language, ruby-plsql library and RSpec testing framework.
+
+'
 email: raimonds.simanovskis@gmail.com
 executables:
 - plsql-spec
@@ -130,6 +160,13 @@ extra_rdoc_files:
 - README.md
 files:
 - ".rspec"
+- ".travis.yml"
+- ".travis/oracle/LICENSE"
+- ".travis/oracle/README.md"
+- ".travis/oracle/download.js"
+- ".travis/oracle/download.sh"
+- ".travis/oracle/install.sh"
+- ".travis/setup_accounts.sh"
 - Gemfile
 - History.txt
 - INSTALL-Windows.md
@@ -138,6 +175,7 @@ files:
 - Rakefile
 - VERSION
 - bin/plsql-spec
+- examples/.rspec
 - examples/source/award_bonus.rb
 - examples/source/betwnstr.rb
 - examples/source/remove_rooms_by_name.rb
@@ -164,16 +202,18 @@ files:
 - lib/plsql/coverage/table_line.html.erb
 - lib/plsql/spec.rb
 - lib/plsql/spec/cli.rb
-- lib/plsql/spec/templates/database.yml
-- lib/plsql/spec/templates/helpers/inspect_helpers.rb
-- lib/plsql/spec/templates/helpers/time_helpers.rb
-- lib/plsql/spec/templates/spec_helper.rb
+- lib/plsql/spec/templates/.rspec
+- lib/plsql/spec/templates/spec/database.yml
+- lib/plsql/spec/templates/spec/helpers/inspect_helpers.rb
+- lib/plsql/spec/templates/spec/helpers/time_helpers.rb
+- lib/plsql/spec/templates/spec/spec_helper.rb
 - lib/plsql/spec/version.rb
 - lib/ruby-plsql-spec.rb
 - ruby-plsql-spec.gemspec
 - spec/plsql/coverage_spec.rb
 - spec/plsql/spec/cli_spec.rb
 - spec/spec_helper.rb
+- spec/support/unlock_and_setup_hr_user.sql
 homepage: http://github.com/rsim/ruby-plsql-spec
 licenses: []
 metadata: {}
@@ -193,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Oracle PL/SQL unit testing framework using Ruby and RSpec