dm-ar-finders 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
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,14 +71,14 @@
71
71
  source 'http://rubygems.org'
72
72
 
73
73
  DATAMAPPER = 'git://github.com/datamapper'
74
- DM_VERSION = '~> 1.0.0'
74
+ DM_VERSION = '~> 1.0.1'
75
75
 
76
76
  group :runtime do # Runtime dependencies (as in the gemspec)
77
77
 
78
78
  if ENV['EXTLIB']
79
- gem 'extlib', '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
79
+ gem 'extlib', '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
80
80
  else
81
- gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
81
+ gem 'activesupport', '~> 3.0.0', :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
82
82
  end
83
83
 
84
84
  gem 'dm-core', DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
@@ -88,7 +88,7 @@ end
88
88
  group(:development) do # Development dependencies (as in the gemspec)
89
89
 
90
90
  gem 'rake', '~> 0.8.7'
91
- gem 'rspec', '~> 1.3'
91
+ gem 'rspec', '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
92
92
  gem 'jeweler', '~> 1.4'
93
93
 
94
94
  end
@@ -107,32 +107,31 @@ end
107
107
  group :datamapper do # We need this because we want to pin these dependencies to their git master sources
108
108
 
109
109
  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
110
- adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
110
+ adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
111
111
 
112
- unless adapters.empty?
112
+ DO_VERSION = '~> 0.10.2'
113
+ DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
113
114
 
114
- DO_VERSION = '~> 0.10.3'
115
- DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
115
+ if (do_adapters = DM_DO_ADAPTERS & adapters).any?
116
+ options = {}
117
+ options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
116
118
 
117
- gem 'data_objects', DO_VERSION, :git => "#{DATAMAPPER}/do.git"
119
+ gem 'data_objects', DO_VERSION, options.dup
118
120
 
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
121
+ do_adapters.each do |adapter|
122
+ adapter = 'sqlite3' if adapter == 'sqlite'
123
+ gem "do_#{adapter}", DO_VERSION, options.dup
124
124
  end
125
125
 
126
126
  gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
127
+ end
127
128
 
128
- adapters.each do |adapter|
129
- gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
130
- end
131
-
129
+ adapters.each do |adapter|
130
+ gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
132
131
  end
133
132
 
134
133
  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
135
- plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
134
+ plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
136
135
 
137
136
  plugins.each do |plugin|
138
137
  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-ar-finders}
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 = ["John W Higgins"]
12
- s.date = %q{2010-06-08}
12
+ s.date = %q{2010-09-07}
13
13
  s.description = %q{DataMapper plugin providing ActiveRecord-style finders}
14
14
  s.email = %q{john [a] wishVPS [d] com}
15
15
  s.extra_rdoc_files = [
@@ -52,14 +52,14 @@ Gem::Specification.new do |s|
52
52
  s.specification_version = 3
53
53
 
54
54
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
55
- s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
55
+ s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.1"])
56
56
  s.add_development_dependency(%q<rspec>, ["~> 1.3"])
57
57
  else
58
- s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
58
+ s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
59
59
  s.add_dependency(%q<rspec>, ["~> 1.3"])
60
60
  end
61
61
  else
62
- s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
62
+ s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
63
63
  s.add_dependency(%q<rspec>, ["~> 1.3"])
64
64
  end
65
65
  end
@@ -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-ar-finders
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
  - John W Higgins
@@ -15,7 +14,7 @@ autorequire:
15
14
  bindir: bin
16
15
  cert_chain: []
17
16
 
18
- date: 2010-06-08 00:00:00 -07:00
17
+ date: 2010-09-07 00:00:00 -07:00
19
18
  default_executable:
20
19
  dependencies:
21
20
  - !ruby/object:Gem::Dependency
@@ -26,12 +25,11 @@ dependencies:
26
25
  requirements:
27
26
  - - ~>
28
27
  - !ruby/object:Gem::Version
29
- hash: 23
30
28
  segments:
31
29
  - 1
32
30
  - 0
33
- - 0
34
- version: 1.0.0
31
+ - 1
32
+ version: 1.0.1
35
33
  type: :runtime
36
34
  version_requirements: *id001
37
35
  - !ruby/object:Gem::Dependency
@@ -42,7 +40,6 @@ dependencies:
42
40
  requirements:
43
41
  - - ~>
44
42
  - !ruby/object:Gem::Version
45
- hash: 9
46
43
  segments:
47
44
  - 1
48
45
  - 3
@@ -91,7 +88,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
91
88
  requirements:
92
89
  - - ">="
93
90
  - !ruby/object:Gem::Version
94
- hash: 3
95
91
  segments:
96
92
  - 0
97
93
  version: "0"
@@ -100,7 +96,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
100
96
  requirements:
101
97
  - - ">="
102
98
  - !ruby/object:Gem::Version
103
- hash: 3
104
99
  segments:
105
100
  - 0
106
101
  version: "0"