dm-transactions 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/.gitignore CHANGED
@@ -31,6 +31,7 @@ measurements
31
31
  .bundle
32
32
  Gemfile.local
33
33
  Gemfile.lock
34
+ Gemfile.local.lock
34
35
 
35
36
  ## PROJECT::SPECIFIC
36
37
  spec/db/
data/Gemfile CHANGED
@@ -71,15 +71,15 @@
71
71
  source 'http://rubygems.org'
72
72
 
73
73
  DATAMAPPER = 'git://github.com/datamapper'
74
- DM_VERSION = '~> 1.0.0'
75
- DO_VERSION = '~> 0.10.3'
74
+ DM_VERSION = '~> 1.0.1'
75
+ DO_VERSION = '~> 0.10.2'
76
76
 
77
77
  group :runtime do # Runtime dependencies (as in the gemspec)
78
78
 
79
79
  if ENV['EXTLIB']
80
- gem 'extlib', '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
80
+ gem 'extlib', '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
81
81
  else
82
- gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
82
+ gem 'activesupport', '~> 3.0.0', :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
83
83
  end
84
84
 
85
85
  gem 'dm-core', DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
@@ -89,7 +89,7 @@ end
89
89
  group(:development) do # Development dependencies (as in the gemspec)
90
90
 
91
91
  gem 'rake', '~> 0.8.7'
92
- gem 'rspec', '~> 1.3'
92
+ gem 'rspec', '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
93
93
  gem 'jeweler', '~> 1.4'
94
94
 
95
95
  end
@@ -108,31 +108,31 @@ end
108
108
  group :datamapper do # We need this because we want to pin these dependencies to their git master sources
109
109
 
110
110
  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
111
- adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
111
+ adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
112
112
 
113
- unless adapters.empty?
113
+ DO_VERSION = '~> 0.10.2'
114
+ DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
114
115
 
115
- DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
116
+ if (do_adapters = DM_DO_ADAPTERS & adapters).any?
117
+ options = {}
118
+ options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
116
119
 
117
- gem 'data_objects', DO_VERSION, :git => "#{DATAMAPPER}/do.git"
120
+ gem 'data_objects', DO_VERSION, options.dup
118
121
 
119
- adapters.each do |adapter|
120
- if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/ }
121
- adapter = 'sqlite3' if adapter == 'sqlite'
122
- gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
123
- end
122
+ do_adapters.each do |adapter|
123
+ adapter = 'sqlite3' if adapter == 'sqlite'
124
+ gem "do_#{adapter}", DO_VERSION, options.dup
124
125
  end
125
126
 
126
127
  gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
128
+ end
127
129
 
128
- adapters.each do |adapter|
129
- gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
130
- end
131
-
130
+ adapters.each do |adapter|
131
+ gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
132
132
  end
133
133
 
134
134
  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
135
- plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
135
+ plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
136
136
 
137
137
  plugins.each do |plugin|
138
138
  gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
data/Rakefile CHANGED
@@ -15,7 +15,7 @@ begin
15
15
 
16
16
  gem.rubyforge_project = 'datamapper'
17
17
 
18
- gem.add_dependency 'dm-core', '~> 1.0.0'
18
+ gem.add_dependency 'dm-core', '~> 1.0.1'
19
19
 
20
20
  gem.add_development_dependency 'rspec', '~> 1.3'
21
21
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.0
1
+ 1.0.1
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{dm-transactions}
8
- s.version = "1.0.0"
8
+ s.version = "1.0.1"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Dirkjan Bussink (dbussink)", "Dan Kubb (dkubb)"]
12
- s.date = %q{2010-06-08}
12
+ s.date = %q{2010-09-07}
13
13
  s.description = %q{Makes transaction support available for adapters that support them}
14
14
  s.email = %q{gamsnjaga@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -65,14 +65,14 @@ Gem::Specification.new do |s|
65
65
  s.specification_version = 3
66
66
 
67
67
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
68
- s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
68
+ s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.1"])
69
69
  s.add_development_dependency(%q<rspec>, ["~> 1.3"])
70
70
  else
71
- s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
71
+ s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
72
72
  s.add_dependency(%q<rspec>, ["~> 1.3"])
73
73
  end
74
74
  else
75
- s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
75
+ s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
76
76
  s.add_dependency(%q<rspec>, ["~> 1.3"])
77
77
  end
78
78
  end
@@ -393,7 +393,7 @@ module DataMapper
393
393
  DataMapper.const_get(name).send(:include, const_get(name))
394
394
  end
395
395
  Adapters::AbstractAdapter.descendants.each do |adapter_class|
396
- Adapters.include_transaction_api(ActiveSupport::Inflector.demodulize(adapter_class.name))
396
+ Adapters.include_transaction_api(DataMapper::Inflector.demodulize(adapter_class.name))
397
397
  end
398
398
  end
399
399
 
@@ -1,16 +1,14 @@
1
1
  desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
2
2
  task :local_gemfile do |t|
3
3
 
4
- root = Pathname(__FILE__).dirname.parent
5
- datamapper = root.parent
6
-
7
- source_regex = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
8
- gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
4
+ root = Pathname(__FILE__).dirname.parent
5
+ datamapper = root.parent
9
6
 
10
7
  root.join('Gemfile.local').open('w') do |f|
11
8
  root.join('Gemfile').open.each do |line|
12
- line.sub!(source_regex, "DATAMAPPER = '#{datamapper}'")
13
- line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
9
+ line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
10
+ line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/, ':path => "#{DATAMAPPER}/\1"')
11
+ line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/, 'do_options[:path] = "#{DATAMAPPER}/\1"')
14
12
  f.puts line
15
13
  end
16
14
  end
metadata CHANGED
@@ -1,13 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-transactions
3
3
  version: !ruby/object:Gem::Version
4
- hash: 23
5
4
  prerelease: false
6
5
  segments:
7
6
  - 1
8
7
  - 0
9
- - 0
10
- version: 1.0.0
8
+ - 1
9
+ version: 1.0.1
11
10
  platform: ruby
12
11
  authors:
13
12
  - Dirkjan Bussink (dbussink)
@@ -16,7 +15,7 @@ autorequire:
16
15
  bindir: bin
17
16
  cert_chain: []
18
17
 
19
- date: 2010-06-08 00:00:00 -07:00
18
+ date: 2010-09-07 00:00:00 -07:00
20
19
  default_executable:
21
20
  dependencies:
22
21
  - !ruby/object:Gem::Dependency
@@ -27,12 +26,11 @@ dependencies:
27
26
  requirements:
28
27
  - - ~>
29
28
  - !ruby/object:Gem::Version
30
- hash: 23
31
29
  segments:
32
30
  - 1
33
31
  - 0
34
- - 0
35
- version: 1.0.0
32
+ - 1
33
+ version: 1.0.1
36
34
  type: :runtime
37
35
  version_requirements: *id001
38
36
  - !ruby/object:Gem::Dependency
@@ -43,7 +41,6 @@ dependencies:
43
41
  requirements:
44
42
  - - ~>
45
43
  - !ruby/object:Gem::Version
46
- hash: 9
47
44
  segments:
48
45
  - 1
49
46
  - 3
@@ -102,7 +99,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
102
99
  requirements:
103
100
  - - ">="
104
101
  - !ruby/object:Gem::Version
105
- hash: 3
106
102
  segments:
107
103
  - 0
108
104
  version: "0"
@@ -111,7 +107,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
111
107
  requirements:
112
108
  - - ">="
113
109
  - !ruby/object:Gem::Version
114
- hash: 3
115
110
  segments:
116
111
  - 0
117
112
  version: "0"