Rakefile in configliere-0.4.13 vs Rakefile in configliere-0.4.14

@@ -1,64 +1,45 @@
 require 'rubygems' unless defined?(Gem)
-require 'bundler'
-begin
-  Bundler.setup(:default, :development, :support)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/setup'
+Bundler.setup(:default, :development)
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name        = "configliere"
-    gem.homepage    = "http://infochimps.com/tools"
-    gem.license     = "Apache"
-    gem.summary     = %Q{Wise, discreet configuration management}
-    gem.email       = "[e-mail]"
-    gem.authors     = ["infochimps", "mrflip"]
-    gem.executables = []
-    gem.description = %Q{ You've got a script. It's got some settings. Some settings are for this module, some are for that module. Most of them don't change. Except on your laptop, where the paths are different.  Or when you're in production mode. Or when you're testing from the command line.
+task :default => :rspec
 
-   "" So, Consigliere of mine, I think you should tell your Don what everyone knows. "" -- Don Corleone
-
-Configliere manage settings from many sources: static constants, simple config files, environment variables, commandline options, straight ruby. You don't have to predefine anything, but you can ask configliere to type-convert, require, document or password-obscure any of its fields. Modules can define config settings independently of each other and the main program.
-} #'
-  end
-  Jeweler::RubygemsDotOrgTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: bundle install"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:rspec) do |spec|
+  Bundler.setup(:default, :development, :test)
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-begin
-  require 'rspec/core'
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
-  end
-
-  # if rcov shits the bed with ruby 1.9, see
-  #   https://github.com/relevance/rcov/issues/31
-  RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
-    spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary]
-  end
-rescue LoadError
-  task(:rspec){ abort "Rspec is not available. In order to run spec, you must: bundle install" }
-  task(:rcov ){ abort "Rspec is not available. In order to run coverage, you must: bundle install" }
+desc "Run RSpec with code coverage"
+task :cov do
+  ENV['CONFIGLIERE_COV'] = "yep"
+  Rake::Task[:rspec].execute
 end
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do
-    Bundler.setup(:default, :development, :doc)
-  end
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: bundle install"
-  end
+require 'yard'
+YARD::Rake::YardocTask.new do
+  Bundler.setup(:default, :development, :docs)
 end
 
-task :default => :spec
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  Bundler.setup(:default, :development, :test)
+  gem.name        = 'configliere'
+  gem.homepage    = 'https://github.com/infochimps-labs/configliere'
+  gem.license     = 'Apache 2.0'
+  gem.email       = '[e-mail]'
+  gem.authors     = ['Infochimps']
+
+  gem.summary     = %Q{Wise, discreet configuration management}
+  gem.description = <<-EOF
+You\'ve got a script. It\'s got some settings. Some settings are for this module, some are for that module. Most of them don\'t change. Except on your laptop, where the paths are different.  Or when you're in production mode. Or when you\'re testing from the command line.
+
+   "" So, Consigliere of mine, I think you should tell your Don what everyone knows. "" -- Don Corleone
+
+Configliere manage settings from many sources: static constants, simple config files, environment variables, commandline options, straight ruby. You don't have to predefine anything, but you can ask configliere to type-convert, require, document or password-obscure any of its fields. Modules can define config settings independently of each other and the main program.
+EOF
+
+  gem.executables = []
+end
+Jeweler::RubygemsDotOrgTasks.new