Skip to content
Browse files

Merge branch 'master' into rails

Conflicts:
	require.rb
  • Loading branch information...
2 parents c22ab7a + 99edd7a commit ed0f5072594a27448726f1d84146e1edf922f437 @winton committed Jan 28, 2010
Showing with 14 additions and 15 deletions.
  1. +2 −2 Rakefile
  2. +2 −2 bin/gem_template
  3. +2 −2 lib/gem_template.rb
  4. +6 −7 config/dep.rb → require.rb
  5. +2 −2 spec/spec_helper.rb
View
4 Rakefile
@@ -1,5 +1,5 @@
-require "#{File.dirname(__FILE__)}/config/dep"
-Dep.rakefile!
+require "#{File.dirname(__FILE__)}/require"
+Require.rakefile!
# You can delete this after you use it
desc "Rename project"
View
4 bin/gem_template 100644 → 100755
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.push File.expand_path("#{File.dirname(__FILE__)}/../config/dep")
-Dep.bin!
+require File.expand_path("#{File.dirname(__FILE__)}/../require")
+Require.bin!
View
4 lib/gem_template.rb
@@ -1,2 +1,2 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../config/dep")
-Dep.lib!
+require File.expand_path("#{File.dirname(__FILE__)}/../require")
+Require.lib!
View
13 config/dep.rb → require.rb
@@ -1,20 +1,19 @@
require 'rubygems'
-require 'dep'
+require 'require'
-Dep do
- gem :dep, '=0.1.2'
+Require File.dirname(__FILE__) do
+ gem :require, '=0.1.5'
gem(:rake, '=0.8.7') { require 'rake' }
gem :rspec, '=1.3.0'
gemspec do
author 'Winton Welsh'
dependencies do
- gem :dep
+ gem :require
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
@@ -26,11 +25,11 @@
rakefile do
gem(:rake) { require 'rake/gempackagetask' }
gem(:rspec) { require 'spec/rake/spectask' }
- require 'dep/tasks'
+ require 'require/tasks'
end
spec_helper do
- require 'dep/spec_helper'
+ require 'require/spec_helper'
require 'rails/init'
require 'pp'
end
View
4 spec/spec_helper.rb
@@ -1,5 +1,5 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../config/dep")
-Dep.spec_helper!
+require File.expand_path("#{File.dirname(__FILE__)}/../require")
+Require.spec_helper!
Spec::Runner.configure do |config|
end

0 comments on commit ed0f507

Please sign in to comment.
Something went wrong with that request. Please try again.