data_objects 0.10.0 → 0.10.1

data/spec/reader_spec.rb

@@ -9,10 +9,13 @@ describe DataObjects::Reader do
 
     reader = command.execute_reader
 
-    reader.should respond_to(:close)
-    reader.should respond_to(:next!)
-    reader.should respond_to(:values)
-    reader.should respond_to(:fields)
+    reader.should.be.kind_of(Enumerable)
+
+    reader.should.respond_to(:close)
+    reader.should.respond_to(:next!)
+    reader.should.respond_to(:values)
+    reader.should.respond_to(:fields)
+    reader.should.respond_to(:each)
 
     connection.close
   end

data/spec/result_spec.rb

@@ -10,11 +10,11 @@ describe DataObjects::Result do
     result = command.execute_non_query
 
     # Affected Rows:
-    result.should respond_to(:to_i)
+    result.should.respond_to(:to_i)
     result.to_i.should == 0
 
     # The id of the inserted row.
-    result.should respond_to(:insert_id)
+    result.should.respond_to(:insert_id)
     connection.close
   end
 

data/spec/spec_helper.rb

@@ -1,9 +1,30 @@
 require 'rubygems'
-require 'spec'
-
-dir = File.dirname(__FILE__)
-lib_path = File.expand_path("#{dir}/../lib")
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 require 'data_objects'
+require 'data_objects/spec/bacon'
+require 'mocha/api'
+require 'mocha/object'
+require 'win32console' if RUBY_PLATFORM =~ /mingw|mswin/
+
+module DataObjects::Pooling
+  class << self
+    remove_method :scavenger_interval if instance_methods(false).any? { |m| m.to_sym == :scavenger_interval }
+    def scavenger_interval
+      0.5
+    end
+  end
+end
+
+# see http://gnufied.org/2008/06/12/making-ruby-bacon-play-with-mocha/
+class Bacon::Context
+  include Mocha::API
+  alias_method :old_it,:it
+  def it description,&block
+    mocha_setup
+    old_it(description,&block)
+    mocha_verify
+    mocha_teardown
+  end
+end
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'do_mock'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'do_mock2'))

data/spec/transaction_spec.rb

@@ -2,14 +2,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe DataObjects::Transaction do
 
-  before :each do
+  before do
     @connection = mock("connection")
-    DataObjects::Connection.should_receive(:new).with("mock://mock/mock").once.and_return(@connection)
+    DataObjects::Connection.expects(:new).with("mock://mock/mock").once.returns(@connection)
     @transaction = DataObjects::Transaction.new("mock://mock/mock")
   end
 
   it "should have a HOST constant" do
-    DataObjects::Transaction::HOST.should_not == nil?
+    DataObjects::Transaction::HOST.should.not == nil?
   end
 
   describe "#initialize" do
@@ -17,22 +17,24 @@ describe DataObjects::Transaction do
       @transaction.connection.should == @connection
     end
     it "should provide an id" do
-      @transaction.id.should_not == nil
+      @transaction.id.should.not == nil
     end
     it "should provide a unique id" do
-      DataObjects::Connection.should_receive(:new).with("mock://mock/mock2").once.and_return(@connection)
-      @transaction.id.should_not == DataObjects::Transaction.new("mock://mock/mock2").id
+      DataObjects::Connection.expects(:new).with("mock://mock/mock2").once.returns(@connection)
+      @transaction.id.should.not == DataObjects::Transaction.new("mock://mock/mock2").id
     end
   end
+
   describe "#close" do
     it "should close its connection" do
-      @connection.should_receive(:close).once
-      @transaction.close
+      @connection.expects(:close).once
+      should.not.raise(DataObjects::TransactionError) { @transaction.close }
     end
   end
+
   [:prepare, :commit_prepared, :rollback_prepared].each do |meth|
     it "should raise NotImplementedError on #{meth}" do
-      lambda do @transaction.send(meth) end.should raise_error(NotImplementedError)
+      should.raise(NotImplementedError) { @transaction.send(meth) }
     end
   end
 

data/tasks/metrics.rake

@@ -0,0 +1,36 @@
+begin
+  require 'metric_fu'
+rescue LoadError
+  namespace :metrics do
+    task :all do
+      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
+    end
+  end
+end
+
+begin
+  require 'reek/adapters/rake_task'
+
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose       = false
+    t.source_files  = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort 'Reek is not available. In order to run reek, you must: gem install reek'
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
+  end
+end

data/tasks/release.rake

@@ -1,74 +1,14 @@
-begin
-  gem 'rubyforge', '~> 1.0.1'
-  require 'rubyforge'
-rescue Exception
-  nil
+desc 'Builds all gems (native, binaries for JRuby and Windows)'
+task :build_all do
+  `rake clean`
+  `rake build`
 end
 
-if defined?(RubyForge) then
-  if defined?(GEM_SPEC) then
-    desc 'Package and upload to RubyForge'
-    task :release => [:clobber, :package] do |t|
-      ver = ENV['VERSION'] or fail "Must supply VERSION (rake release VERSION=x.y.z)."
-
-      # compare versions to avoid mistakes
-      unless ver == GEM_SPEC.version.to_s then
-        fail "Version mismatch (supplied and specification versions differ)."
-      end
-
-      # no rubyforge project? no release for you!
-      if GEM_SPEC.rubyforge_project == 'TODO' or GEM_SPEC.rubyforge_project.nil? then
-        fail "Must define rubyforge_project in your gem specification."
-      end
-
-      # instantiate a RubyForge object
-      rf = RubyForge.new
-
-      # read project info and overview
-      notes = begin
-                r = File.read("README.markdown")
-                r.split(/^(.*\n\-+)/)[1..4].join.strip
-              rescue
-                warn "Missing README.markdown"
-                ''
-              end
-
-      # read changes
-      changes = begin
-                  h = File.read("HISTORY.markdown")
-                  h.split(/^(##+ .*)/)[1..2].join.strip
-                rescue
-                  warn "Missing HISTORY.markdown"
-                  ''
-                end
-
-      # build the configuration for the release
-      config = Hash.new
-      config["release_notes"] = notes
-      config["release_changes"] = changes
-      config["preformatted"] = true
-
-      # prepare configuration
-      rf.configure config
-
-      files = FileList["pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version}*.*"].to_a
-      fail "No files found for the release." if files.empty?
-
-      puts "Logging in RubyForge..."
-      rf.login
-
-      puts "Files to upload:"
-      files.each do |f|
-        puts "  * #{f}"
-      end
-
-      puts "Releasing #{GEM_SPEC.name} version #{GEM_SPEC.version}..."
-      rf.add_release GEM_SPEC.rubyforge_project, GEM_SPEC.name, GEM_SPEC.version, *files
-      puts "Done."
-    end
-  else
-    warn "no GEM_SPEC is found or defined. 'release' task cannot work without it."
+desc 'Release all gems (native, binaries for JRuby and Windows)'
+task :release_all => :build_all do
+  Dir["pkg/data_objects-#{DataObjects::VERSION}*.gem"].each do |gem_path|
+    command = "gem push #{gem_path}"
+    puts "Executing #{command.inspect}:"
+    sh command
   end
-else
-  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
 end

data/tasks/spec.rake

@@ -1,19 +1,21 @@
 # Specs
-require 'spec/rake/spectask'
 
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << '--options' << ROOT + 'spec/spec.opts'
-  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb').map { |f| f.to_s }
-  t.libs << 'lib'
+require 'rake/testtask'
+Rake::TestTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.verbose = true
+end
 
-  begin
-    # RCov is run by default, except on the JRuby platform
-    t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |spec|
+    spec.libs << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
   end
 end

data/tasks/yard.rake

@@ -0,0 +1,9 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yard do
+    abort 'YARD is not available. In order to run yard, you must: gem install yard'
+  end
+end

data/tasks/yardstick.rake

@@ -0,0 +1,19 @@
+begin
+  require 'pathname'
+  require 'yardstick/rake/measurement'
+  require 'yardstick/rake/verify'
+
+  # yardstick_measure task
+  Yardstick::Rake::Measurement.new
+
+  # verify_measurements task
+  Yardstick::Rake::Verify.new do |verify|
+    verify.threshold = 100
+  end
+rescue LoadError
+  %w[ yardstick_measure verify_measurements ].each do |name|
+    task name.to_s do
+      abort "Yardstick is not available. In order to run #{name}, you must: gem install yardstick"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_objects
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +02:00
+date: 2010-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,27 +20,37 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: "2.1"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
+  name: bacon
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: "0.9"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yard
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: "0.5"
     version: 
 description: Provide a standard and simplified API for communicating with RDBMS from Ruby
 email: d.bussink@gmail.com
@@ -48,25 +58,36 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
 files: 
+- ChangeLog.markdown
+- LICENSE
+- README.markdown
+- Rakefile
+- lib/data_objects.rb
+- lib/data_objects/byte_array.rb
 - lib/data_objects/command.rb
 - lib/data_objects/connection.rb
+- lib/data_objects/error.rb
 - lib/data_objects/error/connection_error.rb
 - lib/data_objects/error/data_error.rb
 - lib/data_objects/error/integrity_error.rb
 - lib/data_objects/error/sql_error.rb
 - lib/data_objects/error/syntax_error.rb
 - lib/data_objects/error/transaction_error.rb
-- lib/data_objects/error.rb
 - lib/data_objects/logger.rb
+- lib/data_objects/pooling.rb
 - lib/data_objects/quoting.rb
 - lib/data_objects/reader.rb
 - lib/data_objects/result.rb
+- lib/data_objects/spec/bacon.rb
 - lib/data_objects/spec/command_spec.rb
 - lib/data_objects/spec/connection_spec.rb
 - lib/data_objects/spec/encoding_spec.rb
+- lib/data_objects/spec/helpers/immediate_red_green_output.rb
+- lib/data_objects/spec/helpers/pending.rb
+- lib/data_objects/spec/helpers/ssl.rb
 - lib/data_objects/spec/quoting_spec.rb
 - lib/data_objects/spec/reader_spec.rb
 - lib/data_objects/spec/result_spec.rb
@@ -81,40 +102,36 @@ files:
 - lib/data_objects/spec/typecast/integer_spec.rb
 - lib/data_objects/spec/typecast/ipaddr_spec.rb
 - lib/data_objects/spec/typecast/nil_spec.rb
+- lib/data_objects/spec/typecast/other_spec.rb
 - lib/data_objects/spec/typecast/range_spec.rb
 - lib/data_objects/spec/typecast/string_spec.rb
 - lib/data_objects/spec/typecast/time_spec.rb
 - lib/data_objects/transaction.rb
 - lib/data_objects/uri.rb
+- lib/data_objects/utilities.rb
 - lib/data_objects/version.rb
-- lib/data_objects.rb
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/do_mock.rb
-- spec/lib/pending_helpers.rb
-- spec/lib/rspec_immediate_feedback_formatter.rb
-- spec/lib/ssl_helpers.rb
+- spec/do_mock2.rb
+- spec/pooling_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
 - spec/transaction_spec.rb
 - spec/uri_spec.rb
-- tasks/gem.rake
-- tasks/install.rake
+- tasks/metrics.rake
 - tasks/release.rake
 - tasks/spec.rake
-- LICENSE
-- Rakefile
-- HISTORY.markdown
-- README.markdown
-- Manifest.txt
+- tasks/yard.rake
+- tasks/yardstick.rake
 has_rdoc: true
 homepage: http://github.com/datamapper/do
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -132,9 +149,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: DataObjects basic API and shared driver specifications
-test_files: []
-
+test_files: 
+- spec/command_spec.rb
+- spec/connection_spec.rb
+- spec/do_mock.rb
+- spec/do_mock2.rb
+- spec/pooling_spec.rb
+- spec/reader_spec.rb
+- spec/result_spec.rb
+- spec/spec_helper.rb
+- spec/transaction_spec.rb
+- spec/uri_spec.rb