do_mysql 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.
@@ -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::Mysql 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::Mysql 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::Mysql with Time' do
7
- behaves_like 'supporting Time'
7
+ it_should_behave_like 'supporting Time'
8
8
  end
data/tasks/compile.rake CHANGED
@@ -3,51 +3,50 @@ 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_mysql.gemspec', __FILE__))
11
8
  end
12
9
 
13
- Rake::ExtensionTask.new('do_mysql', gemspec) do |ext|
14
- ext.lib_dir = "lib/#{gemspec.name}"
15
- mysql_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-#{BINARY_VERSION}-win32"))
10
+ unless JRUBY
11
+ Rake::ExtensionTask.new('do_mysql', gemspec) do |ext|
12
+ ext.lib_dir = "lib/#{gemspec.name}"
13
+ mysql_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-#{BINARY_VERSION}-win32"))
16
14
 
17
- # automatically add build options to avoid need of manual input
18
- if RUBY_PLATFORM =~ /mswin|mingw/ then
19
- ext.config_options << "--with-mysql-include=#{mysql_lib}/include"
20
- ext.config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
21
- else
22
- ext.cross_compile = true
23
- ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
24
- ext.cross_config_options << "--with-mysql-include=#{mysql_lib}/include"
25
- ext.cross_config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
15
+ # automatically add build options to avoid need of manual input
16
+ if RUBY_PLATFORM =~ /mswin|mingw/ then
17
+ ext.config_options << "--with-mysql-include=#{mysql_lib}/include"
18
+ ext.config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
19
+ else
20
+ ext.cross_compile = true
21
+ ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
22
+ ext.cross_config_options << "--with-mysql-include=#{mysql_lib}/include"
23
+ ext.cross_config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
26
24
 
27
- ext.cross_compiling do |gemspec|
28
- gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
25
+ ext.cross_compiling do |gemspec|
26
+ gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
29
27
 
30
- ======================================================================================================
28
+ ======================================================================================================
31
29
 
32
- You've installed the binary version of #{gemspec.name}.
33
- It was built using MySQL version #{BINARY_VERSION}.
34
- It's recommended to use the exact same version to avoid potential issues.
30
+ You've installed the binary version of #{gemspec.name}.
31
+ It was built using MySQL version #{BINARY_VERSION}.
32
+ It's recommended to use the exact same version to avoid potential issues.
35
33
 
36
- At the time of building this gem, the necessary DLL files where available
37
- in the following download:
34
+ At the time of building this gem, the necessary DLL files where available
35
+ in the following download:
38
36
 
39
- http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-#{BINARY_VERSION}-win32.zip/from/pick
37
+ http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-#{BINARY_VERSION}-win32.zip/from/pick
40
38
 
41
- You can put the lib\\opt\\libmysql.dll available in this package in your Ruby bin
42
- directory, for example C:\\Ruby\\bin
39
+ You can put the lib\\opt\\libmysql.dll available in this package in your Ruby bin
40
+ directory, for example C:\\Ruby\\bin
43
41
 
44
- ======================================================================================================
42
+ ======================================================================================================
43
+
44
+ POST_INSTALL_MESSAGE
45
+ end
45
46
 
46
- POST_INSTALL_MESSAGE
47
47
  end
48
48
 
49
49
  end
50
-
51
50
  end
52
51
 
53
52
  Rake::JavaExtensionTask.new('do_mysql', gemspec) do |ext|
@@ -57,7 +56,7 @@ begin
57
56
  ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
58
57
  ext.java_compiling do |gem|
59
58
  gem.add_dependency 'jdbc-mysql', '>=5.0.4'
60
- gem.add_dependency 'do_jdbc', '0.10.3'
59
+ gem.add_dependency 'do_jdbc', '0.10.4'
61
60
  end
62
61
  end
63
62
  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_mysql
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-mysql
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
  - 4
81
78
  version: 5.0.4
82
79
  type: :runtime
80
+ name: jdbc-mysql
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 MySQL
101
100
  email: d.bussink@gmail.com
@@ -104,14 +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_mysql/compat.h
115
+ - ext/do_mysql/do_common.c
116
+ - ext/do_mysql/do_common.h
117
+ - ext/do_mysql/do_mysql.c
118
+ - ext/do_mysql/error.h
119
+ - ext/do_mysql/extconf.rb
120
+ - ext/do_mysql/mysql_compat.h
121
+ - lib/do_mysql.rb
111
122
  - lib/do_mysql/encoding.rb
112
123
  - lib/do_mysql/transaction.rb
113
124
  - lib/do_mysql/version.rb
114
- - lib/do_mysql.rb
115
125
  - spec/command_spec.rb
116
126
  - spec/connection_spec.rb
117
127
  - spec/encoding_spec.rb
@@ -138,23 +148,14 @@ files:
138
148
  - tasks/retrieve.rake
139
149
  - tasks/spec.rake
140
150
  - tasks/ssl.rake
141
- - ext/do_mysql/extconf.rb
142
- - ext/do_mysql/do_mysql.c
143
- - ext/do_mysql/compat.h
144
- - ext/do_mysql/error.h
145
- - ext/do_mysql/mysql_compat.h
146
- - LICENSE
147
- - Rakefile
148
- - ChangeLog.markdown
149
- - README.markdown
150
151
  - lib/do_mysql/do_mysql.jar
151
- has_rdoc: false
152
+ has_rdoc: true
152
153
  homepage:
153
154
  licenses: []
154
155
 
155
156
  post_install_message:
156
- rdoc_options:
157
- - --charset=UTF-8
157
+ rdoc_options: []
158
+
158
159
  require_paths:
159
160
  - lib
160
161
  required_ruby_version: !ruby/object:Gem::Requirement