Merge branch 'master' into spec-framework

Conflicts: Gemfile Gemfile.lock
winton · Oct 8, 2011 · 5d657f1 · 5d657f1
2 parents 6de2df7 + 5e2dd99
commit 5d657f1
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 .DS_Store
 *.gem
+.bundle
+Gemfile.lock
 pkg
 spec/fixtures/builds
 spec/fixtures/builds/*

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,3 @@
 source "http://rubygems.org"
 
-gem 'rake', '>=0.8.7', :group => :rakefile
+gemspec
-gem 'rspec', '~>1.0', :group => [ :rakefile, :spec ]
-
-gem 'framework_fixture', '=0.1.3', :group => :spec
-gem 'rack-test', '=0.6.1', :group => :spec
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Rakefile b/Rakefile
@@ -1,64 +1,4 @@
-require 'rubygems'
+require 'bundler/gem_tasks'
-require 'bundler'
-
-Bundler.require(:rakefile)
-
-require 'rake'
-
-begin
-  require 'spec/rake/spectask'
-rescue Exception => e
-end
-
-def gemspec
-  @gemspec ||= begin
-    file = File.expand_path('../gem_template.gemspec', __FILE__)
-    eval(File.read(file), binding, file)
-  end
-end
-
-if defined?(Spec::Rake::SpecTask)
-  desc "Run specs"
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = %w(-fs --color)
-    t.warning = true
-  end
-  task :spec
-  task :default => :spec
-end
-
-desc "Build gem(s)"
-task :gem do
-  root = File.expand_path('../', __FILE__)
-  pkg = "#{root}/pkg"
-  system "rm -Rf #{pkg}"
-  system "cd #{root} && gem build gem_template.gemspec"
-  system "mkdir -p #{pkg} && mv *.gem pkg"
-end
-
-namespace :gem do
-  desc "Install gem(s)"
-  task :install do
-    Rake::Task['gem'].invoke
-    Dir["#{File.dirname(__FILE__)}/pkg/*.gem"].each do |pkg|
-      system "gem install #{pkg} --no-ri --no-rdoc"
-    end
-  end
-
-  desc "Push gem(s)"
-  task :push do
-    Rake::Task['gem'].invoke
-    Dir["#{File.dirname(__FILE__)}/pkg/*.gem"].each do |pkg|
-      system "gem push #{pkg}"
-    end
-  end
-end
-
-desc "Validate the gemspec"
-task :gemspec do
-  gemspec.validate
-end
 
 # DELETE AFTER USING
 desc "Rename project"

diff --git a/gem_template.gemspec b/gem_template.gemspec
@@ -18,4 +18,8 @@ Gem::Specification.new do |s|
   s.files = `cd #{root} && git ls-files`.split("\n")
   s.require_paths = %w(lib)
   s.test_files = `cd #{root} && git ls-files -- {features,test,spec}/*`.split("\n")
+
+  s.add_development_dependency "framework_fixture", "= 0.1.3"
+  s.add_development_dependency "rack-test",         "= 0.6.1"
+  s.add_development_dependency "rspec",             "~> 1.0"
 end
diff --git a/lib/gem_template.rb b/lib/gem_template.rb
@@ -1,8 +1,3 @@
-require "rubygems"
-require "bundler"
-
-Bundler.require(:default)
-
 $:.unshift File.dirname(__FILE__)
 
 module GemTemplate

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,7 @@
 require "pp"
 require "bundler"
 
-Bundler.require(:spec)
+Bundler.require(:development)
 
 $root = File.expand_path('../../', __FILE__)