merb-gen 1.0.6.1 → 1.0.7

Sign up to get free protection for your applications and to get access to all the features.
@@ -16,8 +16,6 @@ src/*
16
16
  .hgignore
17
17
  .hg/*
18
18
  .svn/*
19
- gems/gems/*/
19
+ gems/gems/*
20
20
  gems/specifications/*
21
- !gems/gems/thor*/
22
- !gems/specifications/thor*
23
21
  merb_profile_results
@@ -111,8 +111,9 @@ class ::Gem::Specification
111
111
  specs = self.runtime_dependencies.map do |dep|
112
112
  spec = index.search(dep).last
113
113
  unless spec
114
+ from_name = from.is_a?(::Gem::Specification) ? from.full_name : from.to_s
114
115
  wider_net = index.find_name(dep.name).last
115
- ThorUI.error "Needed #{dep} for #{from.full_name}, but could not find it"
116
+ ThorUI.error "Needed #{dep} for #{from_name}, but could not find it"
116
117
  ThorUI.error "Found #{wider_net.full_name}" if wider_net
117
118
  ::Thor::Tasks::Merb::Gem.rollback_trans
118
119
  end
@@ -21,3 +21,6 @@ dependency "dm-migrations", dm_gems_version
21
21
  dependency "dm-timestamps", dm_gems_version
22
22
  dependency "dm-types", dm_gems_version
23
23
  dependency "dm-validations", dm_gems_version
24
+
25
+ dependency "merb_datamapper", merb_gems_version
26
+ dependency "do_sqlite3" # If using another database, replace this
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-gen
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6.1
4
+ version: 1.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-12-16 00:00:00 -08:00
12
+ date: 2008-12-28 00:00:00 -08:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -20,7 +20,7 @@ dependencies:
20
20
  requirements:
21
21
  - - ">="
22
22
  - !ruby/object:Gem::Version
23
- version: 1.0.6.1
23
+ version: 1.0.7
24
24
  version:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: templater