do_mysql 0.10.3-x86-mingw32 → 0.10.4.rc1-x86-mingw32

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.rc1'
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,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: do_mysql
3
3
  version: !ruby/object:Gem::Version
4
- hash: 49
5
- prerelease: false
4
+ hash: 977940494
5
+ prerelease: true
6
6
  segments:
7
7
  - 0
8
8
  - 10
9
- - 3
10
- version: 0.10.3
9
+ - 4
10
+ - rc1
11
+ version: 0.10.4.rc1
11
12
  platform: x86-mingw32
12
13
  authors:
13
14
  - Dirkjan Bussink
@@ -15,55 +16,55 @@ autorequire:
15
16
  bindir: bin
16
17
  cert_chain: []
17
18
 
18
- date: 2011-01-30 00:00:00 +01:00
19
+ date: 2011-03-29 00:00:00 +02:00
19
20
  default_executable:
20
21
  dependencies:
21
22
  - !ruby/object:Gem::Dependency
22
- name: data_objects
23
- prerelease: false
24
23
  requirement: &id001 !ruby/object:Gem::Requirement
25
24
  none: false
26
25
  requirements:
27
26
  - - "="
28
27
  - !ruby/object:Gem::Version
29
- hash: 49
28
+ hash: 977940494
30
29
  segments:
31
30
  - 0
32
31
  - 10
33
- - 3
34
- version: 0.10.3
32
+ - 4
33
+ - rc1
34
+ version: 0.10.4.rc1
35
35
  type: :runtime
36
+ name: data_objects
37
+ prerelease: false
36
38
  version_requirements: *id001
37
39
  - !ruby/object:Gem::Dependency
38
- name: bacon
39
- prerelease: false
40
40
  requirement: &id002 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- hash: 13
45
+ hash: 9
46
46
  segments:
47
- - 1
48
- - 1
49
- version: "1.1"
47
+ - 2
48
+ - 5
49
+ version: "2.5"
50
50
  type: :development
51
+ name: rspec
52
+ prerelease: false
51
53
  version_requirements: *id002
52
54
  - !ruby/object:Gem::Dependency
53
- name: rake-compiler
54
- prerelease: false
55
55
  requirement: &id003 !ruby/object:Gem::Requirement
56
56
  none: false
57
57
  requirements:
58
- - - "="
58
+ - - ~>
59
59
  - !ruby/object:Gem::Version
60
- hash: 3
60
+ hash: 5
61
61
  segments:
62
62
  - 0
63
63
  - 7
64
- - 0
65
- version: 0.7.0
64
+ version: "0.7"
66
65
  type: :development
66
+ name: rake-compiler
67
+ prerelease: false
67
68
  version_requirements: *id003
68
69
  description: Implements the DataObjects API for MySQL
69
70
  email: d.bussink@gmail.com
@@ -72,14 +73,25 @@ executables: []
72
73
  extensions: []
73
74
 
74
75
  extra_rdoc_files:
75
- - README.markdown
76
76
  - ChangeLog.markdown
77
77
  - LICENSE
78
+ - README.markdown
78
79
  files:
80
+ - ChangeLog.markdown
81
+ - LICENSE
82
+ - README.markdown
83
+ - Rakefile
84
+ - ext/do_mysql/compat.h
85
+ - ext/do_mysql/do_common.c
86
+ - ext/do_mysql/do_common.h
87
+ - ext/do_mysql/do_mysql.c
88
+ - ext/do_mysql/error.h
89
+ - ext/do_mysql/extconf.rb
90
+ - ext/do_mysql/mysql_compat.h
91
+ - lib/do_mysql.rb
79
92
  - lib/do_mysql/encoding.rb
80
93
  - lib/do_mysql/transaction.rb
81
94
  - lib/do_mysql/version.rb
82
- - lib/do_mysql.rb
83
95
  - spec/command_spec.rb
84
96
  - spec/connection_spec.rb
85
97
  - spec/encoding_spec.rb
@@ -106,41 +118,32 @@ files:
106
118
  - tasks/retrieve.rake
107
119
  - tasks/spec.rake
108
120
  - tasks/ssl.rake
109
- - ext/do_mysql/extconf.rb
110
- - ext/do_mysql/do_mysql.c
111
- - ext/do_mysql/compat.h
112
- - ext/do_mysql/error.h
113
- - ext/do_mysql/mysql_compat.h
114
- - LICENSE
115
- - Rakefile
116
- - ChangeLog.markdown
117
- - README.markdown
118
121
  - lib/do_mysql/1.8/do_mysql.so
119
122
  - lib/do_mysql/1.9/do_mysql.so
120
- has_rdoc: false
123
+ has_rdoc: true
121
124
  homepage:
122
125
  licenses: []
123
126
 
124
127
  post_install_message: |+
125
128
 
126
- ======================================================================================================
129
+ ======================================================================================================
127
130
 
128
- You've installed the binary version of do_mysql.
129
- It was built using MySQL version 5.1.54.
130
- It's recommended to use the exact same version to avoid potential issues.
131
+ You've installed the binary version of do_mysql.
132
+ It was built using MySQL version 5.1.56.
133
+ It's recommended to use the exact same version to avoid potential issues.
131
134
 
132
- At the time of building this gem, the necessary DLL files where available
133
- in the following download:
135
+ At the time of building this gem, the necessary DLL files where available
136
+ in the following download:
134
137
 
135
- http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-5.1.54-win32.zip/from/pick
138
+ http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-5.1.56-win32.zip/from/pick
136
139
 
137
- You can put the lib\opt\libmysql.dll available in this package in your Ruby bin
138
- directory, for example C:\Ruby\bin
140
+ You can put the lib\opt\libmysql.dll available in this package in your Ruby bin
141
+ directory, for example C:\Ruby\bin
139
142
 
140
- ======================================================================================================
143
+ ======================================================================================================
141
144
 
142
- rdoc_options:
143
- - --charset=UTF-8
145
+ rdoc_options: []
146
+
144
147
  require_paths:
145
148
  - lib
146
149
  required_ruby_version: !ruby/object:Gem::Requirement