Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into rails

Conflicts:
	config/dep.rb
  • Loading branch information...
commit fac79aebf19ee26f3e3c6e5981bf2db7c64e8498 2 parents 1e416d7 + b0fbe33
@winton winton authored
Showing with 32 additions and 29 deletions.
  1. +6 −0 config/database.yml
  2. +26 −29 config/dep.rb
View
6 config/database.yml
@@ -0,0 +1,6 @@
+development:
+ adapter: mysql
+ database: gem_template
+ username: root
+ password:
+ host: localhost
View
55 config/dep.rb
@@ -1,40 +1,37 @@
require 'rubygems'
require 'dep'
-Dep.gem do
-
- dep '=0.1.1'
- rake '=0.8.7', :require => %w(rake)
- rspec '=1.3.0'
-end
-
-Dep.gemspec do
-
- author 'Winton Welsh'
- email 'mail@wintoni.us'
- name 'gem_template'
- homepage "http://github.com/winton/#{name}"
- root File.expand_path("#{File.dirname(__FILE__)}/../")
- summary ""
- version '0.1.0'
-end
-
-Dep.profile do
-
- bin :require => %w(lib/gem_template)
+Dep do
+ gem :dep, '=0.1.2'
+ gem(:rake, '=0.8.7') { require 'rake' }
+ gem :rspec '=1.3.0'
gemspec do
- dep
+ author 'Winton Welsh'
+ dependencies do
+ gem :dep
+ end
+ email 'mail@wintoni.us'
+ name 'gem_template'
+ homepage "http://github.com/winton/#{name}"
+ root File.expand_path("#{File.dirname(__FILE__)}/../")
+ summary ""
+ version '0.1.0'
end
- lib :require => %w(lib/gem_template/gem_template)
-
- rails_init :require => %w(lib/gem_template)
+ bin { require 'lib/gem_template' }
+ lib { require 'lib/gem_template/gem_template' }
+ rails_init { require 'lib/gem_template' }
- rakefile :require => %w(dep/tasks) do
- rake :require => %w(rake/gempackagetask)
- rspec :require => %w(spec/rake/spectask)
+ rakefile do
+ rake { require 'rake/gempackagetask' }
+ rspec { require 'spec/rake/spectask' }
+ require 'dep/tasks'
end
- spec_helper :require => %w(dep/spec_helper rails/init pp)
+ spec_helper do
+ require 'dep/spec_helper'
+ require 'rails/init'
+ require 'pp'
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.