ruby-plsql-spec 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 926bc9ee745cd69cd401e19559efaa9aaa8552d1
+  data.tar.gz: 2bcf1b8dccdee59d09314d134f59548aa5b15769
+SHA512:
+  metadata.gz: 3a9bafcfdb0f06cc4ba1ac6e1eee08a0cabf941bb3dde968cacb3aa7fd24fa33cc041c6288dc2caa237bc972bce05f259424bb61724c9a18fc88d93d87c2abe4
+  data.tar.gz: 65645390db2b2bef19893a6307e9bd6f0579c6e83bb4549bfcbb7a667d5d51d45d559fef65d59e611b6f1c9f4a53a5bf011c09d914c229afb326f7bd40f3b588

data/Gemfile

@@ -1,12 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'rspec', '~> 2.0'
-gem 'thor', '~> 0.14.2'
+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 'nokogiri', '~> 1.5.0'
+gem 'nokogiri', '~> 1.6.0'
 
 group :development do
-  gem 'jeweler', '~> 1.8.3'
+  gem 'jeweler', '~> 2.0.1'
 
   # gem 'ruby-oci8', '~> 2.1.0'
   gem 'ruby-oci8', :git => 'git://github.com/kubo/ruby-oci8.git', :platforms => :mri

data/History.txt

@@ -1,3 +1,20 @@
+== 0.4.0 2015-01-30
+
+* Improvements
+  * Use latest latest nokogiri version 1.6, thor 0.19.1 (#18)
+  * Add support for latest rspec 3.x (#13)
+  * Added --capture option to plsql-spec to indicate when to capture the output (#10)
+  * Tested with Ruby version 2.2.0
+  * Tested with ruby-oci8 version 2.1.7
+* Buf fixes
+  * fix for cli diff issue related to color rendering (#14)
+* Internal (development) improvements
+  * Ensure DATABASE\_PORT is Fixnum (#16)
+  * Coverage test fix: compile plsql with optimize level 1 (#13)
+  * Tests: allow fully-qualified service name connection (#12)
+  * Migrate tests to rspec 3.x, using expect syntax (#13)
+  * Use latest jeweler 2.0.1 (#18)
+
 == 0.3.0 2012-04-16
 
 * Changes

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 Raimonds Simanovskis
+Copyright (c) 2009-2015 Raimonds Simanovskis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -22,7 +22,7 @@ Installing
 
 See [Installing on Windows](INSTALL-Windows.md) in separate file.
 
-* Install [Ruby 1.8.7 or Ruby 1.9.3](http://www.ruby-lang.org/en/downloads/) - it is recommended to use latest 1.9.3 version
+* 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 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)
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/plsql/spec/cli.rb

@@ -1,5 +1,7 @@
 require 'thor'
 require 'thor/actions'
+require 'rspec/support'
+RSpec::Support.require_rspec_support 'differ'
 
 # use plsql-spec for showing diff of files
 # by defuault Thor uses diff utility which is not available on Windows
@@ -42,6 +44,10 @@ EOS
           :type => :boolean,
           :default => false,
           :banner => "show DBMS_OUTPUT messages"
+      method_option :capture,
+          :type => :boolean,
+          :default => true,
+          :banner => "hide the output when some exception occur"
       method_option :"html",
           :type => :string,
           :banner => "generate HTML RSpec output to specified file (default is test-results.html)"
@@ -76,10 +82,10 @@ EOS
 
         if files.empty?
           say "Running all specs from spec/", :yellow
-          puts run("#{speccommand} spec", :verbose => false, :capture => true)
+          puts run("#{speccommand} spec", :verbose => false, :capture => options[:capture])
         else
           say "Running specs from #{files.join(', ')}", :yellow
-          puts run("#{speccommand} #{files.join(' ')}", :verbose => false, :capture => true)
+          puts run("#{speccommand} #{files.join(' ')}", :verbose => false, :capture => options[:capture])
         end
 
         if options[:html]
@@ -98,7 +104,7 @@ EOS
 
       desc 'diff [FILE1] [FILE2]', 'show difference between files'
       def diff(file1, file2)
-        differ = RSpec::Expectations::Differ.new
+        differ = RSpec::Support::Differ.new
         say differ.diff_as_string File.read(file2), File.read(file1)
       end
 
@@ -112,4 +118,4 @@ EOS
     end
 
   end
-end
+end

data/ruby-plsql-spec.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: ruby-plsql-spec 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby-plsql-spec"
-  s.version = "0.3.0"
+  s.version = "0.4.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 = "2012-04-16"
+  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"]
@@ -64,34 +66,36 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/rsim/ruby-plsql-spec"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "2.4.5"
   s.summary = "Oracle PL/SQL unit testing framework using Ruby and RSpec"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_runtime_dependency(%q<thor>, ["~> 0.14.2"])
+      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.5.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      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"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_dependency(%q<thor>, ["~> 0.14.2"])
+      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.5.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.6.0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<ruby-oci8>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0"])
-    s.add_dependency(%q<thor>, ["~> 0.14.2"])
+    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.5.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.6.0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<ruby-oci8>, [">= 0"])
   end
 end

data/spec/plsql/coverage_spec.rb

@@ -11,13 +11,19 @@ describe "Coverage" do
     PLSQL::Coverage.reset_cache
 
     plsql.connect! CONNECTION_PARAMS
+    plsql.execute "ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=1"
     drop_profiler_tables
     @source = <<-SQL
 CREATE OR REPLACE FUNCTION test_profiler RETURN VARCHAR2 IS
+
+-- A comment before executed code
 BEGIN
   RETURN 'test_profiler';
+  -- A dummy empty line follows
+
 EXCEPTION
   WHEN OTHERS THEN
+    -- We should never reach here
     RETURN 'others';
 END;
     SQL
@@ -26,10 +32,13 @@ END;
     @coverage_data = {
       DATABASE_USER.upcase => {
         "TEST_PROFILER" => {
-          1=>0,
-          3=>1,
-          6=>0,
-          7=>1
+          1=>1,
+          4=>1,
+          5=>1,
+          8=>0,
+          9=>0,
+          11=>0,
+          12=>1
         }
       }
     }
@@ -49,17 +58,17 @@ END;
     end
 
     it "should start coverage collection" do
-      @start_result.should be_true
+      expect(@start_result).to be_truthy
     end
 
     it "should create profiler tables" do
       %w(plsql_profiler_data plsql_profiler_units plsql_profiler_runs).each do |table_name|
-        plsql.send(table_name).should be_a(PLSQL::Table)
+        expect(plsql.send(table_name)).to be_a(PLSQL::Table)
       end
     end
 
     it "should start collecting profiler data" do
-      plsql.plsql_profiler_runs.all.should_not be_empty
+      expect(plsql.plsql_profiler_runs.all).not_to be_empty
     end
 
   end
@@ -72,11 +81,11 @@ END;
     end
 
     it "should stop coverage collection" do
-      @stop_result.should be_true
+      expect(@stop_result).to be_truthy
     end
 
     it "should populate profiler data table" do
-      plsql.plsql_profiler_data.all.should_not be_empty
+      expect(plsql.plsql_profiler_data.all).not_to be_empty
     end
 
   end
@@ -89,21 +98,21 @@ END;
     end
 
     it "should drop profiler tables" do
-      PLSQL::Coverage.cleanup.should be_true
+      expect(PLSQL::Coverage.cleanup).to be_truthy
       %w(plsql_profiler_data plsql_profiler_units plsql_profiler_runs).each do |table_name|
-        PLSQL::Table.find(plsql, table_name.to_sym).should be_nil
+        expect(PLSQL::Table.find(plsql, table_name.to_sym)).to be_nil
       end
     end
 
     it "should delete profiler table data when profiler tables already were present" do
       # simulate that profiler tables were already present
       PLSQL::Coverage.reset_cache
-      lambda {
+      expect {
         PLSQL::Coverage.start
         plsql.test_profiler
         PLSQL::Coverage.stop
         PLSQL::Coverage.cleanup
-      }.should_not change {
+      }.not_to change {
         [plsql.plsql_profiler_data.all, plsql.plsql_profiler_units.all, plsql.plsql_profiler_runs.all]
       }
     end
@@ -117,19 +126,19 @@ END;
     end
 
     it "should get profiler run results" do
-      PLSQL::Coverage.find.coverage_data.should == @coverage_data
+      expect(PLSQL::Coverage.find.coverage_data).to eq(@coverage_data)
     end
 
     it "should not get ignored schemas" do
-      PLSQL::Coverage.find.coverage_data(:ignore_schemas => [DATABASE_USER]).should be_empty
+      expect(PLSQL::Coverage.find.coverage_data(:ignore_schemas => [DATABASE_USER])).to be_empty
     end
 
     it "should get only objects with like condition" do
-      PLSQL::Coverage.find.coverage_data(:like => "#{DATABASE_USER}.test%").should == @coverage_data
+      expect(PLSQL::Coverage.find.coverage_data(:like => "#{DATABASE_USER}.test%")).to eq(@coverage_data)
     end
 
     it "should not get objects not matching like condition" do
-      PLSQL::Coverage.find.coverage_data(:like => "#{DATABASE_USER}.none%").should be_empty
+      expect(PLSQL::Coverage.find.coverage_data(:like => "#{DATABASE_USER}.none%")).to be_empty
     end
 
   end
@@ -137,7 +146,7 @@ END;
   describe "generate" do
     def adjust_test_coverage
       @test_coverage = @coverage_data[DATABASE_USER.upcase]['TEST_PROFILER'].dup
-      @test_coverage.delete(1) if @test_coverage[1] && @source.split("\n")[0] =~ /^CREATE OR REPLACE (.*)$/
+      @test_coverage.delete(1) if @test_coverage[1] == 0 && @source.split("\n")[0] =~ /^CREATE OR REPLACE (.*)$/
     end
 
     def expected_coverages
@@ -176,26 +185,29 @@ END;
 
           # line should be present
           a = @details_doc.at_css("table.details a[name=\"line#{i+1}\"]")
-          a.should_not be_nil
+          expect(a).not_to be_nil
+
+          doc_line = a.parent.children[1]
+          doc_line_text = doc_line ? doc_line.text : ""
 
           # source text should be present
-          a.parent.children[1].text.should == line
+          expect(doc_line_text).to eq(line)
 
           # table row should have correct class according to coverage data
           tr = a.ancestors('tr')[0]
-          tr.attr('class').should == case @test_coverage[i+1]
+          expect(tr.attr('class')).to eq(case @test_coverage[i+1]
             when nil
               'inferred'
             when 0
               'uncovered'
             else
               'marked'
-            end
+            end)
         end
       end
 
       it "should generate HTML table with coverage percentage" do
-        @details_doc.css("table.report div.percent_graph_legend").map{|div| div.text}.should == expected_coverages
+        expect(@details_doc.css("table.report div.percent_graph_legend").map{|div| div.text}).to eq(expected_coverages)
       end
 
     end
@@ -206,8 +218,8 @@ END;
       end
 
       it "should generate HTML table with coverage percentage" do
-        @index_doc.css("table.report tbody tr:contains('HR.TEST_PROFILER') div.percent_graph_legend").map{|div| div.text}.should == expected_coverages
-        @index_doc.css("table.report tfoot div.percent_graph_legend").map{|div| div.text}.should == expected_coverages
+        expect(@index_doc.css("table.report tbody tr:contains('HR.TEST_PROFILER') div.percent_graph_legend").map{|div| div.text}).to eq(expected_coverages)
+        expect(@index_doc.css("table.report tfoot div.percent_graph_legend").map{|div| div.text}).to eq(expected_coverages)
       end
 
     end
@@ -230,21 +242,21 @@ END;
     end
 
     it "should start collecting profiler data" do
-      plsql(:other).plsql_profiler_runs.all.should_not be_empty
+      expect(plsql(:other).plsql_profiler_runs.all).not_to be_empty
     end
 
     it "should populate profiler data table" do
-      plsql(:other).plsql_profiler_data.all.should_not be_empty
+      expect(plsql(:other).plsql_profiler_data.all).not_to be_empty
     end
 
     it "should get profiler run results" do
-      PLSQL::Coverage.find(:other).coverage_data.should == @coverage_data
+      expect(PLSQL::Coverage.find(:other).coverage_data).to eq(@coverage_data)
     end
 
     it "should generate reports" do
       PLSQL::Coverage.report :other, :directory => File.join(@directory, 'other')
-      File.file?(File.join(@directory, 'other/index.html')).should be_true
+      expect(File.file?(File.join(@directory, 'other/index.html'))).to be_truthy
     end
   end
 
-end
+end

data/spec/plsql/spec/cli_spec.rb

@@ -24,7 +24,7 @@ describe "plsql-spec" do
     content = "default:\n" <<
     "  username: #{DATABASE_USER}\n" <<
     "  password: #{DATABASE_PASSWORD}\n" <<
-    "  database: #{DATABASE_NAME}\n"
+    "  database: #{DATABASE_SERVICE_NAME}\n"
     content << "  host:     #{DATABASE_HOST}\n" if defined?(DATABASE_HOST)
     content << "  port:     #{DATABASE_PORT}\n" if defined?(DATABASE_PORT)
     File.open(File.join(@root_dir, 'spec/database.yml'), 'w') do |file|
@@ -72,23 +72,23 @@ EOS
     end
 
     it "should create spec subdirectory" do
-      File.directory?(@root_dir + '/spec').should be_true
+      expect(File.directory?(@root_dir + '/spec')).to be_truthy
     end
 
     it "should create spec_helper.rb" do
-      File.file?(@root_dir + '/spec/spec_helper.rb').should be_true
+      expect(File.file?(@root_dir + '/spec/spec_helper.rb')).to be_truthy
     end
 
     it "should create database.yml" do
-      File.file?(@root_dir + '/spec/database.yml').should be_true
+      expect(File.file?(@root_dir + '/spec/database.yml')).to be_truthy
     end
 
     it "should create helpers/inspect_helpers.rb" do
-      File.file?(@root_dir + '/spec/helpers/inspect_helpers.rb').should be_true
+      expect(File.file?(@root_dir + '/spec/helpers/inspect_helpers.rb')).to be_truthy
     end
 
     it "should create factories subdirectory" do
-      File.directory?(@root_dir + '/spec/factories').should be_true
+      expect(File.directory?(@root_dir + '/spec/factories')).to be_truthy
     end
 
   end
@@ -103,41 +103,41 @@ EOS
     describe "successful tests" do
       before(:all) do
         create_test 'SYSDATE should not be NULL',
-          'plsql.sysdate.should_not == NULL'
+          'expect(plsql.sysdate).not_to eq(NULL)'
         run_cli('run')
       end
 
       it "should report zero failures" do
-        @stdout.should =~ / 0 failures/
+        expect(@stdout).to match(/ 0 failures/)
       end
 
       it "should not return failing exit status" do
-        @exit_status.should be_nil
+        expect(@exit_status).to be_nil
       end
     end
 
     describe "failing tests" do
       before(:all) do
         create_test 'SYSDATE should be NULL',
-          'plsql.sysdate.should == NULL'
+          'expect(plsql.sysdate).to eq(NULL)'
         run_cli('run')
       end
 
       it "should report failures" do
-        @stdout.should =~ / 1 failure/
+        expect(@stdout).to match(/ 1 failure/)
       end
 
       it "should return failing exit status" do
-        @exit_status.should == 1
+        expect(@exit_status).to eq(1)
       end
     end
 
     describe "specified files" do
       before(:all) do
         create_test 'SYSDATE should not be NULL',
-          'plsql.sysdate.should_not == NULL'
+          'expect(plsql.sysdate).not_to eq(NULL)'
         create_test 'SYSDATE should be NULL',
-          'plsql.sysdate.should == NULL',
+          'expect(plsql.sysdate).to eq(NULL)',
           :file_name => 'test2_spec.rb'
       end
 
@@ -147,12 +147,12 @@ EOS
 
       it "should report one file examples" do
         run_cli('run', 'spec/test_spec.rb')
-        @stdout.should =~ /1 example/
+        expect(@stdout).to match(/1 example/)
       end
 
       it "should report two files examples" do
         run_cli('run', 'spec/test_spec.rb', 'spec/test2_spec.rb')
-        @stdout.should =~ /2 examples/
+        expect(@stdout).to match(/2 examples/)
       end
     end
 
@@ -169,7 +169,7 @@ EOS
           END;
         SQL
         create_test 'shoud test coverage',
-          'plsql.test_profiler.should == "test_profiler"'
+          'expect(plsql.test_profiler).to eq("test_profiler")'
         @index_file = File.join(@root_dir, 'coverage/index.html')
         @details_file = File.join(@root_dir, "coverage/#{DATABASE_USER.upcase}-TEST_PROFILER.html")
       end
@@ -190,34 +190,34 @@ EOS
 
       it "should report zero failures" do
         run_cli('run', '--coverage')
-        @stdout.should =~ / 0 failures/
+        expect(@stdout).to match(/ 0 failures/)
       end
 
       it "should generate coverage reports" do
         run_cli('run', '--coverage')
-        File.file?(@index_file).should be_true
-        File.file?(@details_file).should be_true
+        expect(File.file?(@index_file)).to be_truthy
+        expect(File.file?(@details_file)).to be_truthy
       end
 
       it "should generate coverage reports in specified directory" do
         run_cli('run', '--coverage', 'plsql_coverage')
-        File.file?(@index_file.gsub('coverage', 'plsql_coverage')).should be_true
-        File.file?(@details_file.gsub('coverage', 'plsql_coverage')).should be_true
+        expect(File.file?(@index_file.gsub('coverage', 'plsql_coverage'))).to be_truthy
+        expect(File.file?(@details_file.gsub('coverage', 'plsql_coverage'))).to be_truthy
       end
 
       it "should not generate coverage report for ignored schema" do
         run_cli('run', '--coverage', '--ignore_schemas', DATABASE_USER)
-        File.file?(@details_file).should be_false
+        expect(File.file?(@details_file)).to be_falsey
       end
 
       it "should generate coverage report for objects matching like condition" do
         run_cli('run', '--coverage', '--like', "#{DATABASE_USER}.%")
-        File.file?(@details_file).should be_true
+        expect(File.file?(@details_file)).to be_truthy
       end
 
       it "should not generate coverage report for objects not matching like condition" do
         run_cli('run', '--coverage', '--like', "#{DATABASE_USER}.aaa%")
-        File.file?(@details_file).should be_false
+        expect(File.file?(@details_file)).to be_falsey
       end
 
     end
@@ -232,7 +232,7 @@ EOS
           END;
         SQL
         create_test 'shoud test dbms_output',
-          'plsql.test_dbms_output.should be_nil'
+          'expect(plsql.test_dbms_output).to be_nil'
       end
 
       after(:all) do
@@ -245,12 +245,12 @@ EOS
 
       it "should show DBMS_OUTPUT in standard output" do
         run_cli('run', '--dbms_output')
-        @stdout.should =~ /DBMS_OUTPUT: test_dbms_output/
+        expect(@stdout).to match(/DBMS_OUTPUT: test_dbms_output/)
       end
 
       it "should not show DBMS_OUTPUT without specifying option" do
         run_cli('run')
-        @stdout.should_not =~ /DBMS_OUTPUT: test_dbms_output/
+        expect(@stdout).not_to match(/DBMS_OUTPUT: test_dbms_output/)
       end
 
     end
@@ -258,7 +258,7 @@ EOS
     describe "with html output" do
       before(:all) do
         create_test 'SYSDATE should not be NULL',
-          'plsql.sysdate.should_not == NULL'
+          'expect(plsql.sysdate).not_to eq(NULL)'
         @default_html_file = File.join(@root_dir, 'test-results.html')
         @custom_file_name = 'custom-results.html'
         @custom_html_file = File.join(@root_dir, @custom_file_name)
@@ -279,12 +279,12 @@ EOS
 
       it "should create default report file" do
         run_cli('run', '--html')
-        File.read(@default_html_file).should =~ / 0 failures/
+        expect(File.read(@default_html_file)).to match(/ 0 failures/)
       end
 
       it "should create specified report file" do
         run_cli('run', '--html', @custom_file_name)
-        File.read(@custom_html_file).should =~ / 0 failures/
+        expect(File.read(@custom_html_file)).to match(/ 0 failures/)
       end
 
     end
@@ -297,15 +297,15 @@ EOS
     end
 
     it "should show ruby-plsql-spec version" do
-      @stdout.should =~ /ruby-plsql-spec\s+#{PLSQL::Spec::VERSION.gsub('.','\.')}/
+      expect(@stdout).to match(/ruby-plsql-spec\s+#{PLSQL::Spec::VERSION.gsub('.','\.')}/)
     end
 
     it "should show ruby-plsql version" do
-      @stdout.should =~ /ruby-plsql\s+#{PLSQL::VERSION.gsub('.','\.')}/
+      expect(@stdout).to match(/ruby-plsql\s+#{PLSQL::VERSION.gsub('.','\.')}/)
     end
 
     it "should show rspec version" do
-      @stdout.should =~ /rspec\s+#{::RSpec::Version::STRING.gsub('.','\.')}/
+      expect(@stdout).to match(/rspec\s+#{::RSpec::Version::STRING.gsub('.','\.')}/)
     end
 
   end
@@ -329,8 +329,8 @@ EOS
     end
 
     it "should show diff" do
-      @stdout.should =~ /^\-#{@test_strings[0]}$/
-      @stdout.should =~ /^\+#{@test_strings[1]}$/
+      expect(@stdout).to match(/^\-#{@test_strings[0]}$/)
+      expect(@stdout).to match(/^\+#{@test_strings[1]}$/)
     end
   end
 

data/spec/spec_helper.rb

@@ -10,15 +10,17 @@ require 'nokogiri'
 require 'ruby-plsql-spec'
 
 DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
+DATABASE_SERVICE_NAME = (defined?(JRUBY_VERSION) ? "/" : "") +
+                        (ENV['DATABASE_SERVICE_NAME'] || DATABASE_NAME)
 DATABASE_HOST = ENV['DATABASE_HOST'] || 'localhost'
-DATABASE_PORT = ENV['DATABASE_PORT'] || 1521
+DATABASE_PORT = (ENV['DATABASE_PORT'] || 1521).to_i
 DATABASE_USER = ENV['DATABASE_USER'] || 'hr'
 DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'hr'
 
 CONNECTION_PARAMS = {
   :username => DATABASE_USER,
   :password => DATABASE_PASSWORD,
-  :database => DATABASE_NAME
+  :database => DATABASE_SERVICE_NAME
 }
 CONNECTION_PARAMS[:host] = DATABASE_HOST if defined?(DATABASE_HOST)
 CONNECTION_PARAMS[:port] = DATABASE_PORT if defined?(DATABASE_PORT)

metadata

@@ -1,86 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: ruby-plsql-spec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152658840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152658840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152657940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.19.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152657940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
-  requirement: &2152653980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152653980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152653280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152653280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152652320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *2152652320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: ruby-oci8
-  requirement: &2152650640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152650640
-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.
-
-'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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.
 email: raimonds.simanovskis@gmail.com
 executables:
 - plsql-spec
@@ -88,7 +129,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .rspec
+- ".rspec"
 - Gemfile
 - History.txt
 - INSTALL-Windows.md
@@ -135,29 +176,25 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/rsim/ruby-plsql-spec
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1549635846164205319
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Oracle PL/SQL unit testing framework using Ruby and RSpec
 test_files: []