do_sqlite3 0.10.3-java → 0.10.4-java

Sign up to get free protection for your applications and to get access to all the features.
data/spec/spec_helper.rb CHANGED
@@ -2,6 +2,7 @@ $TESTING=true
2
2
  JRUBY = RUBY_PLATFORM =~ /java/
3
3
 
4
4
  require 'rubygems'
5
+ require 'rspec'
5
6
  require 'date'
6
7
  require 'ostruct'
7
8
  require 'fileutils'
@@ -19,19 +20,18 @@ repo_root = File.expand_path('../../..', __FILE__)
19
20
  end
20
21
 
21
22
  require 'data_objects'
22
- require 'data_objects/spec/bacon'
23
+ require 'data_objects/spec/setup'
24
+ require 'data_objects/spec/lib/pending_helpers'
23
25
  require 'do_sqlite3'
24
26
 
25
- DataObjects::Sqlite3.logger = DataObjects::Logger.new(STDOUT, :off)
26
- at_exit { DataObjects.logger.flush }
27
27
 
28
- CONFIG = OpenStruct.new
29
- CONFIG.scheme = 'sqlite3'
30
- CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || ":memory:"
31
-
32
- CONFIG.uri = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}:#{CONFIG.database}"
33
- CONFIG.jdbc_driver = 'org.sqlite.JDBC'
34
- CONFIG.jdbc_uri = CONFIG.uri.sub(/sqlite3/,"jdbc:sqlite")
28
+ CONFIG = OpenStruct.new
29
+ CONFIG.scheme = 'sqlite3'
30
+ CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || ":memory:"
31
+ CONFIG.uri = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}:#{CONFIG.database}"
32
+ CONFIG.driver = 'sqlite3'
33
+ CONFIG.jdbc_driver = DataObjects::Sqlite3.const_get('JDBC_DRIVER') rescue nil
34
+ CONFIG.jdbc_uri = CONFIG.uri.sub(/sqlite3/,"jdbc:sqlite")
35
35
 
36
36
  module DataObjectsSpecHelpers
37
37
 
@@ -140,4 +140,7 @@ module DataObjectsSpecHelpers
140
140
 
141
141
  end
142
142
 
143
- include DataObjectsSpecHelpers
143
+ RSpec.configure do |config|
144
+ config.include(DataObjectsSpecHelpers)
145
+ config.include(DataObjects::Spec::PendingHelpers)
146
+ end
@@ -1,8 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/array_spec'
4
+ require 'data_objects/spec/shared/typecast/array_spec'
5
5
 
6
6
  describe 'DataObjects::Sqlite3 with Array' do
7
- behaves_like 'supporting Array'
7
+ it_should_behave_like 'supporting Array'
8
8
  end
@@ -1,11 +1,11 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/bigdecimal_spec'
4
+ require 'data_objects/spec/shared/typecast/bigdecimal_spec'
5
5
 
6
6
  # Sqlite3 doesn't support decimals natively, so autocasting is not available:
7
7
  # http://www.sqlite.org/datatype3.html
8
8
 
9
9
  describe 'DataObjects::Sqlite3 with BigDecimal' do
10
- behaves_like 'supporting BigDecimal'
10
+ it_should_behave_like 'supporting BigDecimal'
11
11
  end
@@ -1,11 +1,11 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/boolean_spec'
4
+ require 'data_objects/spec/shared/typecast/boolean_spec'
5
5
 
6
6
  # Sqlite3 doesn't support booleans natively, so autocasting is not available:
7
7
  # http://www.sqlite.org/datatype3.html
8
8
 
9
9
  describe 'DataObjects::Sqlite3 with Boolean' do
10
- behaves_like 'supporting Boolean'
10
+ it_should_behave_like 'supporting Boolean'
11
11
  end
@@ -1,8 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/byte_array_spec'
4
+ require 'data_objects/spec/shared/typecast/byte_array_spec'
5
5
 
6
6
  describe 'DataObjects::Sqlite3 with ByteArray' do
7
- behaves_like 'supporting ByteArray'
7
+ it_should_behave_like 'supporting ByteArray'
8
8
  end
@@ -1,8 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/class_spec'
4
+ require 'data_objects/spec/shared/typecast/class_spec'
5
5
 
6
6
  describe 'DataObjects::Sqlite3 with Class' do
7
- behaves_like 'supporting Class'
7
+ it_should_behave_like 'supporting Class'
8
8
  end
@@ -1,11 +1,11 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/date_spec'
4
+ require 'data_objects/spec/shared/typecast/date_spec'
5
5
 
6
6
  # Sqlite3 doesn't support dates natively, so autocasting is not available:
7
7
  # http://www.sqlite.org/datatype3.html
8
8
 
9
9
  describe 'DataObjects::Sqlite3 with Date' do
10
- behaves_like 'supporting Date'
10
+ it_should_behave_like 'supporting Date'
11
11
  end
@@ -1,11 +1,11 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/datetime_spec'
4
+ require 'data_objects/spec/shared/typecast/datetime_spec'
5
5
 
6
6
  # Sqlite3 doesn't support datetimes natively, so autocasting is not available:
7
7
  # http://www.sqlite.org/datatype3.html
8
8
 
9
9
  describe 'DataObjects::Sqlite3 with DateTime' do
10
- behaves_like 'supporting DateTime'
10
+ it_should_behave_like 'supporting DateTime'
11
11
  end
@@ -1,12 +1,12 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/float_spec'
4
+ require 'data_objects/spec/shared/typecast/float_spec'
5
5
 
6
6
  describe 'DataObjects::Sqlite3 with Float' do
7
- behaves_like 'supporting Float'
7
+ it_should_behave_like 'supporting Float'
8
8
  end
9
9
 
10
10
  describe 'DataObjects::Sqlite3 with Float' do
11
- behaves_like 'supporting Float autocasting'
11
+ it_should_behave_like 'supporting Float autocasting'
12
12
  end
@@ -1,8 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/integer_spec'
4
+ require 'data_objects/spec/shared/typecast/integer_spec'
5
5
 
6
6
  describe 'DataObjects::Sqlite3 with Integer' do
7
- behaves_like 'supporting Integer'
7
+ it_should_behave_like 'supporting Integer'
8
8
  end
@@ -1,20 +1,20 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/nil_spec'
4
+ require 'data_objects/spec/shared/typecast/nil_spec'
5
5
 
6
6
  # splitting the descibe into two separate declaration avoids
7
- # concurrent execution of the "behaves_like ....." calls
7
+ # concurrent execution of the "it_should_behave_like ....." calls
8
8
  # which would lock the database
9
9
 
10
10
  describe 'DataObjects::Sqlite3 with Nil' do
11
- behaves_like 'supporting Nil'
11
+ it_should_behave_like 'supporting Nil'
12
12
  end
13
13
 
14
14
  describe 'DataObjects::Sqlite3 with Nil' do
15
- behaves_like 'supporting writing an Nil'
15
+ it_should_behave_like 'supporting writing an Nil'
16
16
  end
17
17
 
18
18
  describe 'DataObjects::Sqlite3 with Nil' do
19
- behaves_like 'supporting Nil autocasting'
19
+ it_should_behave_like 'supporting Nil autocasting'
20
20
  end
@@ -1,8 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/other_spec'
4
+ require 'data_objects/spec/shared/typecast/other_spec'
5
5
 
6
6
  describe 'DataObjects::H2 with other (unknown) type' do
7
- behaves_like 'supporting other (unknown) type'
7
+ it_should_behave_like 'supporting other (unknown) type'
8
8
  end
@@ -1,8 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/range_spec'
4
+ require 'data_objects/spec/shared/typecast/range_spec'
5
5
 
6
6
  describe 'DataObjects::Sqlite3 with Range' do
7
- behaves_like 'supporting Range'
7
+ it_should_behave_like 'supporting Range'
8
8
  end
@@ -1,8 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/string_spec'
4
+ require 'data_objects/spec/shared/typecast/string_spec'
5
5
 
6
6
  describe 'DataObjects::Sqlite3 with String' do
7
- behaves_like 'supporting String'
7
+ it_should_behave_like 'supporting String'
8
8
  end
@@ -1,8 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
4
- require 'data_objects/spec/typecast/time_spec'
4
+ require 'data_objects/spec/shared/typecast/time_spec'
5
5
 
6
6
  describe 'DataObjects::Sqlite3 with Time' do
7
- behaves_like 'supporting Time'
7
+ it_should_behave_like 'supporting Time'
8
8
  end
data/tasks/compile.rake CHANGED
@@ -3,50 +3,49 @@ begin
3
3
  require 'rake/extensiontask'
4
4
  require 'rake/javaextensiontask'
5
5
 
6
- # Hack to avoid "allocator undefined for Proc" issue when unpacking Gems:
7
- # gemspec provided by Jeweler uses Rake::FileList for files, test_files and
8
- # extra_rdoc_files, and procs cannot be marshalled.
9
6
  def gemspec
10
- @clean_gemspec ||= eval("#{Rake.application.jeweler.gemspec.to_ruby}") # $SAFE = 3\n
7
+ @clean_gemspec ||= Gem::Specification::load(File.expand_path('../../do_sqlite3.gemspec', __FILE__))
11
8
  end
12
9
 
13
- Rake::ExtensionTask.new('do_sqlite3', gemspec) do |ext|
10
+ unless JRUBY
11
+ Rake::ExtensionTask.new('do_sqlite3', gemspec) do |ext|
14
12
 
15
- sqlite3_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'sqlite3'))
13
+ sqlite3_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'sqlite3'))
16
14
 
17
- ext.lib_dir = "lib/#{gemspec.name}"
15
+ ext.lib_dir = "lib/#{gemspec.name}"
18
16
 
19
- ext.cross_compile = true
20
- ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
21
- ext.cross_config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
17
+ ext.cross_compile = true
18
+ ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
19
+ ext.cross_config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
22
20
 
23
- ext.cross_compiling do |gemspec|
24
- gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
21
+ ext.cross_compiling do |gemspec|
22
+ gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
25
23
 
26
- =============================================================================
24
+ =============================================================================
27
25
 
28
- You've installed the binary version of #{gemspec.name}.
29
- It was built using Sqlite3 version #{BINARY_VERSION}.
30
- It's recommended to use the exact same version to avoid potential issues.
26
+ You've installed the binary version of #{gemspec.name}.
27
+ It was built using Sqlite3 version #{BINARY_VERSION}.
28
+ It's recommended to use the exact same version to avoid potential issues.
31
29
 
32
- At the time of building this gem, the necessary DLL files where available
33
- in the following download:
30
+ At the time of building this gem, the necessary DLL files where available
31
+ in the following download:
34
32
 
35
- http://www.sqlite.org/sqlitedll-#{BINARY_VERSION}.zip
33
+ http://www.sqlite.org/sqlitedll-#{BINARY_VERSION}.zip
36
34
 
37
- You can put the sqlite3.dll available in this package in your Ruby bin
38
- directory, for example C:\\Ruby\\bin
35
+ You can put the sqlite3.dll available in this package in your Ruby bin
36
+ directory, for example C:\\Ruby\\bin
39
37
 
40
- =============================================================================
38
+ =============================================================================
41
39
 
42
- POST_INSTALL_MESSAGE
43
- end
40
+ POST_INSTALL_MESSAGE
41
+ end
44
42
 
45
- # automatically add build options to avoid need of manual input
46
- if RUBY_PLATFORM =~ /mswin|mingw/ then
47
- ext.config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
48
- end
43
+ # automatically add build options to avoid need of manual input
44
+ if RUBY_PLATFORM =~ /mswin|mingw/ then
45
+ ext.config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
46
+ end
49
47
 
48
+ end
50
49
  end
51
50
 
52
51
  Rake::JavaExtensionTask.new('do_sqlite3', gemspec) do |ext|
@@ -56,7 +55,7 @@ begin
56
55
  ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
57
56
  ext.java_compiling do |gem|
58
57
  gem.add_dependency 'jdbc-sqlite3', '>=3.5.8'
59
- gem.add_dependency 'do_jdbc', '0.10.3'
58
+ gem.add_dependency 'do_jdbc', '0.10.4'
60
59
  end
61
60
  end
62
61
  rescue LoadError
data/tasks/spec.rake CHANGED
@@ -1,23 +1,12 @@
1
- require 'rake/testtask'
1
+ require 'rspec/core/rake_task'
2
2
 
3
- spec_defaults = lambda do |spec|
4
- spec.libs << 'lib' << 'spec'
5
- spec.pattern = 'spec/**/*_spec.rb'
6
- spec.verbose = true
3
+ RSpec::Core::RakeTask.new(:spec => [:clean, :compile]) do |spec|
4
+ spec.pattern = './spec/**/*_spec.rb'
5
+ spec.skip_bundler = true
7
6
  end
8
7
 
9
- Rake::TestTask.new(:spec => [ :clean, :compile ], &spec_defaults)
10
- Rake::TestTask.new(:spec_no_compile, &spec_defaults)
11
-
12
- begin
13
- require 'rcov/rcovtask'
14
- Rcov::RcovTask.new do |spec|
15
- spec.libs << 'spec'
16
- spec.pattern = 'spec/**/*_spec.rb'
17
- spec.verbose = true
18
- end
19
- rescue LoadError
20
- task :rcov do
21
- abort 'RCov is not available. In order to run rcov, you must: gem install rcov'
22
- end
8
+ RSpec::Core::RakeTask.new(:rcov => [:clean, :compile]) do |rcov|
9
+ rcov.pattern = "./spec/**/*_spec.rb"
10
+ rcov.rcov = true
11
+ rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
23
12
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: do_sqlite3
3
3
  version: !ruby/object:Gem::Version
4
- hash: 49
4
+ hash: 63
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 10
9
- - 3
10
- version: 0.10.3
9
+ - 4
10
+ version: 0.10.4
11
11
  platform: java
12
12
  authors:
13
13
  - Dirkjan Bussink
@@ -15,59 +15,56 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-01-30 00:00:00 +01:00
18
+ date: 2011-03-29 00:00:00 +02:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- name: data_objects
23
- prerelease: false
24
22
  requirement: &id001 !ruby/object:Gem::Requirement
25
23
  none: false
26
24
  requirements:
27
25
  - - "="
28
26
  - !ruby/object:Gem::Version
29
- hash: 49
27
+ hash: 63
30
28
  segments:
31
29
  - 0
32
30
  - 10
33
- - 3
34
- version: 0.10.3
31
+ - 4
32
+ version: 0.10.4
35
33
  type: :runtime
34
+ name: data_objects
35
+ prerelease: false
36
36
  version_requirements: *id001
37
37
  - !ruby/object:Gem::Dependency
38
- name: bacon
39
- prerelease: false
40
38
  requirement: &id002 !ruby/object:Gem::Requirement
41
39
  none: false
42
40
  requirements:
43
41
  - - ~>
44
42
  - !ruby/object:Gem::Version
45
- hash: 13
43
+ hash: 9
46
44
  segments:
47
- - 1
48
- - 1
49
- version: "1.1"
45
+ - 2
46
+ - 5
47
+ version: "2.5"
50
48
  type: :development
49
+ name: rspec
50
+ prerelease: false
51
51
  version_requirements: *id002
52
52
  - !ruby/object:Gem::Dependency
53
- name: rake-compiler
54
- prerelease: false
55
53
  requirement: &id003 !ruby/object:Gem::Requirement
56
54
  none: false
57
55
  requirements:
58
- - - "="
56
+ - - ~>
59
57
  - !ruby/object:Gem::Version
60
- hash: 3
58
+ hash: 5
61
59
  segments:
62
60
  - 0
63
61
  - 7
64
- - 0
65
- version: 0.7.0
62
+ version: "0.7"
66
63
  type: :development
64
+ name: rake-compiler
65
+ prerelease: false
67
66
  version_requirements: *id003
68
67
  - !ruby/object:Gem::Dependency
69
- name: jdbc-sqlite3
70
- prerelease: false
71
68
  requirement: &id004 !ruby/object:Gem::Requirement
72
69
  none: false
73
70
  requirements:
@@ -80,22 +77,24 @@ dependencies:
80
77
  - 8
81
78
  version: 3.5.8
82
79
  type: :runtime
80
+ name: jdbc-sqlite3
81
+ prerelease: false
83
82
  version_requirements: *id004
84
83
  - !ruby/object:Gem::Dependency
85
- name: do_jdbc
86
- prerelease: false
87
84
  requirement: &id005 !ruby/object:Gem::Requirement
88
85
  none: false
89
86
  requirements:
90
87
  - - "="
91
88
  - !ruby/object:Gem::Version
92
- hash: 49
89
+ hash: 63
93
90
  segments:
94
91
  - 0
95
92
  - 10
96
- - 3
97
- version: 0.10.3
93
+ - 4
94
+ version: 0.10.4
98
95
  type: :runtime
96
+ name: do_jdbc
97
+ prerelease: false
99
98
  version_requirements: *id005
100
99
  description: Implements the DataObjects API for Sqlite3
101
100
  email: d.bussink@gmail.com
@@ -104,13 +103,25 @@ executables: []
104
103
  extensions: []
105
104
 
106
105
  extra_rdoc_files:
107
- - README.markdown
108
106
  - ChangeLog.markdown
109
107
  - LICENSE
108
+ - README.markdown
110
109
  files:
110
+ - ChangeLog.markdown
111
+ - LICENSE
112
+ - README.markdown
113
+ - Rakefile
114
+ - ext/do_sqlite3/compat.h
115
+ - ext/do_sqlite3/do_common.c
116
+ - ext/do_sqlite3/do_common.h
117
+ - ext/do_sqlite3/do_sqlite3.c
118
+ - ext/do_sqlite3/do_sqlite3.h
119
+ - ext/do_sqlite3/do_sqlite3_extension.c
120
+ - ext/do_sqlite3/error.h
121
+ - ext/do_sqlite3/extconf.rb
122
+ - lib/do_sqlite3.rb
111
123
  - lib/do_sqlite3/transaction.rb
112
124
  - lib/do_sqlite3/version.rb
113
- - lib/do_sqlite3.rb
114
125
  - spec/command_spec.rb
115
126
  - spec/connection_spec.rb
116
127
  - spec/encoding_spec.rb
@@ -136,24 +147,14 @@ files:
136
147
  - tasks/release.rake
137
148
  - tasks/retrieve.rake
138
149
  - tasks/spec.rake
139
- - ext/do_sqlite3/extconf.rb
140
- - ext/do_sqlite3/do_sqlite3.c
141
- - ext/do_sqlite3/do_sqlite3_extension.c
142
- - ext/do_sqlite3/compat.h
143
- - ext/do_sqlite3/do_sqlite3.h
144
- - ext/do_sqlite3/error.h
145
- - LICENSE
146
- - Rakefile
147
- - ChangeLog.markdown
148
- - README.markdown
149
150
  - lib/do_sqlite3/do_sqlite3.jar
150
- has_rdoc: false
151
+ has_rdoc: true
151
152
  homepage:
152
153
  licenses: []
153
154
 
154
155
  post_install_message:
155
- rdoc_options:
156
- - --charset=UTF-8
156
+ rdoc_options: []
157
+
157
158
  require_paths:
158
159
  - lib
159
160
  required_ruby_version: !ruby/object:Gem::Requirement