ruby-plsql-spec 0.1.0 → 0.2.1

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--backtrace

data/Gemfile

@@ -1,9 +1,9 @@
 source 'http://rubygems.org'
 
 gem 'jeweler'
-gem 'rspec', '~> 1.3.0'
+gem 'rspec', '~> 2.0.1'
 gem 'thor', '~> 0.14.2'
-gem 'ruby-plsql', '~> 0.4.3'
+gem 'ruby-plsql', '~> 0.4.4'
 gem 'nokogiri', '>= 1.4.3'
 
 platforms :ruby do

data/History.txt

@@ -1,3 +1,14 @@
+== 0.2.1 2010-10-22
+
+* Changes
+  * Use latest ruby-plsql version 0.4.4
+
+== 0.2.0 2010-10-22
+
+* Changes
+  * Upgraded to use RSpec 2.0
+  * Added --html option for plsql-spec run
+
 == 0.1.0 2010-10-01
 
 * Initial release

data/README.markdown

@@ -65,6 +65,15 @@ You can get additional help about `plsql-spec` command line utility with
 
         plsql-spec help
 
+Generating HTML RSpec output
+----------------------------
+
+If you would like to see a colour HTML report about the test results, just run the tests with --html option:
+
+        plsql-spec run --html [filename]
+
+HTML report will be generated to [filename] file. If you don't specify filename, then it will generated to test-results.html. You can open it in your browser.
+
 Code coverage reporting
 -----------------------
 
@@ -84,8 +93,30 @@ Read blog post about [Oracle PL/SQL unit testing with Ruby](http://blog.rayapps.
 If you are not familiar with Ruby I recommend to start with [Ruby in Twenty Minutes](http://www.ruby-lang.org/en/documentation/quickstart/) tutorial. Then you can take a look on some [RSpec examples](http://rspec.info/documentation/) how to write and structure tests. And then you can take a look at [ruby-plsql own tests](http://github.com/rsim/ruby-plsql/blob/master/spec/plsql/procedure_spec.rb) to see how to pass parameters and verify results for different PL/SQL data types.
 
 How to customize ruby-plsql-spec for my project?
---------------------------------------------
+------------------------------------------------
 
 * Review spec/spec_helper.rb file and modify if needed directories where you will store additional required files (helper files, factory files, source files).
 * Review and or create new helper files in `spec\helpers` directory.
 * Create new factory methods for test data creation in `factories` directory (see example in `examples/spec/factories`).
+
+How to upgrade ruby-plsql-spec to latest version
+------------------------------------------------
+
+You can see current ruby-plsql-spec version with
+
+        plsql-spec -v
+
+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
+
+        plsql-spec init
+
+which will check which current files are different from the latest templates. You need to update just spec_helper.rb file. When you will be prompted to overwrite spec_helper.rb file then at first you can enter `d` to see differences between current file and new template. If you have not changed original spec_helper.rb file then you will see just one difference
+
+        - Spec::Runner.configure do |config|
+        + RSpec.configure do |config|
+
+You can then answer `y` and this file will be updated. When you will be prompted to overwrite other files then you can review the changes in the same way and decide if you want them to be overwritten or not.

data/Rakefile

@@ -12,26 +12,24 @@ EOS
     gem.email = "raimonds.simanovskis@gmail.com"
     gem.homepage = "http://github.com/rsim/ruby-plsql-spec"
     gem.authors = ["Raimonds Simanovskis"]
-    gem.add_dependency "ruby-plsql", ">= 0.4.3"
+    gem.add_dependency "ruby-plsql", ">= 0.4.4"
     gem.add_dependency "thor", ">= 0.14.2"
-    gem.add_dependency "rspec", "~> 1.3.0"
+    gem.add_dependency "rspec", ">= 2.0.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/plsql/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/plsql/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/plsql/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts = ['--exclude', '/Library,spec/']
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.rcov = true
+  t.rcov_opts =  ['--exclude', '/Library,spec/']
+  t.pattern = 'spec/plsql/**/*_spec.rb'
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/examples/spec/spec_helper.rb

@@ -47,7 +47,7 @@ at_exit do
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:each) do
     database_connections.each do |name|
       plsql(name).savepoint "before_each"

data/lib/plsql/spec.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'rspec'
 require 'ruby-plsql'
 require 'plsql/coverage'
 require 'plsql/spec/cli'

data/lib/plsql/spec/cli.rb

@@ -1,6 +1,10 @@
 require 'thor'
 require 'thor/actions'
 
+# use plsql-spec for showing diff of files
+# by defuault Thor uses diff utility which is not available on Windows
+ENV['THOR_DIFF'] = 'plsql-spec diff'
+
 module PLSQL
   module Spec
     class CLI < ::Thor
@@ -29,6 +33,7 @@ Create tests in spec/ directory (or in subdirectories of it) in *_spec.rb files.
 
 Run created tests with "plsql-spec run".
 Run tests with "plsql-spec run --coverage" to generate code coverage report in coverage/ directory.
+Run tests with "plsql-spec run --html" to generate RSpec report to test-results.html file.
 EOS
       end
 
@@ -37,6 +42,9 @@ EOS
           :type => :boolean,
           :default => false,
           :banner => "show DBMS_OUTPUT messages"
+      method_option :"html",
+          :type => :string,
+          :banner => "generate HTML RSpec output to specified file (default is test-results.html)"
       method_option :coverage,
           :type => :string,
           :banner => "generate code coverage report in specified directory (defaults to coverage/)"
@@ -52,27 +60,53 @@ EOS
           exit 1
         end
         ENV['PLSQL_DBMS_OUTPUT'] = 'true' if options[:"dbms-output"]
+        ENV['PLSQL_HTML'] = options[:html] if options[:html]
         ENV['PLSQL_COVERAGE'] = options[:coverage] if options[:coverage]
         ENV['PLSQL_COVERAGE_IGNORE_SCHEMAS'] = options[:"ignore-schemas"].join(',') if options[:"ignore-schemas"]
         ENV['PLSQL_COVERAGE_LIKE'] = options[:like].join(',') if options[:like]
+
+        if options[:html]
+          # if there is no filename given, the options[:html] == "html"
+          spec_output_filename = options[:html] == 'html' ? 'test-results.html' : options[:html]
+
+          speccommand = "rspec --format html --out #{spec_output_filename}"
+        else
+          speccommand = "rspec"
+        end
+
         if files.empty?
           say "Running all specs from spec/", :yellow
-          puts run('spec spec', :verbose => false)
+          puts run("#{speccommand} spec", :verbose => false)
         else
           say "Running specs from #{files.join(', ')}", :yellow
-          puts run("spec #{files.join(' ')}", :verbose => false)
+          puts run("#{speccommand} #{files.join(' ')}", :verbose => false)
         end
+
+        if options[:html]
+          say "Test results in #{spec_output_filename}"
+        end
+
+        if options[:coverage]
+          say "Coverage report in #{options[:coverage]}/index.html"
+        end
+
         unless $?.exitstatus == 0
           say "Failing tests!", :red
           exit 1
         end
       end
 
+      desc 'diff [FILE1] [FILE2]', 'show difference between files'
+      def diff(file1, file2)
+        differ = RSpec::Expectations::Differ.new
+        say differ.diff_as_string File.read(file2), File.read(file1)
+      end
+
       desc '-v', 'show ruby-plsql-spec and ruby-plsql version'
       def version
         say "ruby-plsql-spec #{PLSQL::Spec::VERSION}"
         say "ruby-plsql      #{PLSQL::VERSION}"
-        say "rspec           #{::Spec::VERSION::STRING}"
+        say "rspec           #{::RSpec::Version::STRING}"
       end
 
     end

data/lib/plsql/spec/templates/spec_helper.rb

@@ -47,7 +47,7 @@ at_exit do
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:each) do
     database_connections.each do |name|
       plsql(name).savepoint "before_each"

data/ruby-plsql-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-plsql-spec}
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Raimonds Simanovskis"]
-  s.date = %q{2010-10-05}
+  s.date = %q{2010-10-22}
   s.default_executable = %q{plsql-spec}
   s.description = %q{ruby-plsql-spec is Oracle PL/SQL unit testing framework which is built using Ruby programming language, ruby-plsql library and RSpec testing framework.
 }
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".rspec",
      "Gemfile",
      "History.txt",
      "INSTALL-Windows.markdown",
@@ -63,7 +64,6 @@ Gem::Specification.new do |s|
      "ruby-plsql-spec.gemspec",
      "spec/plsql/coverage_spec.rb",
      "spec/plsql/spec/cli_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/rsim/ruby-plsql-spec}
@@ -96,18 +96,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby-plsql>, [">= 0.4.3"])
+      s.add_runtime_dependency(%q<ruby-plsql>, [">= 0.4.4"])
       s.add_runtime_dependency(%q<thor>, [">= 0.14.2"])
-      s.add_runtime_dependency(%q<rspec>, ["~> 1.3.0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0.1"])
     else
-      s.add_dependency(%q<ruby-plsql>, [">= 0.4.3"])
+      s.add_dependency(%q<ruby-plsql>, [">= 0.4.4"])
       s.add_dependency(%q<thor>, [">= 0.14.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.1"])
     end
   else
-    s.add_dependency(%q<ruby-plsql>, [">= 0.4.3"])
+    s.add_dependency(%q<ruby-plsql>, [">= 0.4.4"])
     s.add_dependency(%q<thor>, [">= 0.14.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.1"])
   end
 end
 

data/spec/plsql/coverage_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Coverage" do
   def drop_profiler_tables
@@ -158,6 +158,10 @@ END;
       adjust_test_coverage
     end
 
+    after(:all) do
+      PLSQL::Coverage.cleanup
+    end
+
     describe "details report" do
       before(:all) do
         @details_doc = Nokogiri::HTML(File.read(File.join(@directory, "#{DATABASE_USER.upcase}-TEST_PROFILER.html")))
@@ -196,13 +200,13 @@ END;
 
     end
 
-    describe "index repot" do
+    describe "index report" do
       before(:all) do
         @index_doc = Nokogiri::HTML(File.read(File.join(@directory, "index.html")))
       end
 
       it "should generate HTML table with coverage percentage" do
-        @index_doc.css("table.report tbody div.percent_graph_legend").map{|div| div.text}.should == expected_coverages
+        @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
       end
 

data/spec/plsql/spec/cli_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "plsql-spec" do
 
@@ -241,6 +241,40 @@ EOS
 
     end
 
+    describe "with html output" do
+      before(:all) do
+        create_test 'SYSDATE should not be NULL',
+          'plsql.sysdate.should_not == 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)
+      end
+
+      def delete_html_output_files
+        FileUtils.rm_rf @default_html_file
+        FileUtils.rm_rf @custom_html_file
+      end
+
+      before(:each) do
+        delete_html_output_files
+      end
+
+      after(:all) do
+        delete_html_output_files
+      end
+
+      it "should create default report file" do
+        run_cli('run', '--html')
+        File.read(@default_html_file).should =~ / 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/
+      end
+
+    end
+
   end
 
   describe "version" do
@@ -257,8 +291,33 @@ EOS
     end
 
     it "should show rspec version" do
-      @stdout.should =~ /rspec\s+#{::Spec::VERSION::STRING.gsub('.','\.')}/
+      @stdout.should =~ /rspec\s+#{::RSpec::Version::STRING.gsub('.','\.')}/
+    end
+
+  end
+
+  describe "diff" do
+    before(:all) do
+      @test_strings = %w(test1 test2)
+      @test_files = %w(test1.txt test2.txt)
+      @test_strings.each_with_index do |string, i|
+        File.open(File.join(@root_dir, @test_files[i]), 'w') do |file|
+          file.write(string)
+        end
+      end
+      run_cli('diff', *@test_files.map{|file| File.join(@root_dir, file)})
+    end
+
+    after(:all) do
+      @test_files.each do |file|
+        FileUtils.rm_f(File.join(@root_dir, file))
+      end
     end
 
+    it "should show diff" do
+      @stdout.should =~ /^\-#{@test_strings[0]}$/
+      @stdout.should =~ /^\+#{@test_strings[1]}$/
+    end
   end
+
 end

data/spec/spec_helper.rb

@@ -1,20 +1,10 @@
 require "rubygems"
-
-# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+require "bundler"
+Bundler.setup(:default)
 
 $:.unshift(File.expand_path('../../lib', __FILE__))
 
-require 'spec'
+require 'rspec'
 require 'nokogiri'
 
 require 'ruby-plsql-spec'
@@ -33,7 +23,7 @@ CONNECTION_PARAMS = {
 CONNECTION_PARAMS[:host] = DATABASE_HOST if defined?(DATABASE_HOST)
 CONNECTION_PARAMS[:port] = DATABASE_PORT if defined?(DATABASE_PORT)
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   # taken from thor specs
   def capture(stream)
     begin
@@ -57,5 +47,9 @@ Spec::Runner.configure do |config|
     File.join(File.dirname(__FILE__), 'sandbox')
   end
 
-
 end
+
+# set default time zone in TZ environment variable
+# which will be used to set session time zone
+ENV['TZ'] ||= 'Europe/Riga'
+# ENV['TZ'] ||= 'UTC'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-plsql-spec
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 21
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +03:00
+date: 2010-10-22 00:00:00 +03:00
 default_executable: plsql-spec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 0
         - 4
-        - 3
-        version: 0.4.3
+        - 4
+        version: 0.4.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -56,14 +56,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 13
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        - 1
+        version: 2.0.1
   type: :runtime
   version_requirements: *id003
 description: |
@@ -78,6 +78,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - History.txt
 - INSTALL-Windows.markdown
@@ -121,7 +122,6 @@ files:
 - ruby-plsql-spec.gemspec
 - spec/plsql/coverage_spec.rb
 - spec/plsql/spec/cli_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/rsim/ruby-plsql-spec

data/spec/spec.opts

@@ -1,6 +0,0 @@
---colour
---format
-progress
---loadby
-mtime
---reverse