Clean up Rakefile/platform dependent gem generation.ksubrama/win64

Use the "universal" platform when building the windows gems to let us
simultaneously support 32 and 64 bit windows builds.

1 files changed, 3 insertions, 4 deletions

diff --git a/Rakefile b/Rakefile
index 533b341..754ba4d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,20 +1,19 @@
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
+require 'mixlib/shellout/version'
 
 Dir[File.expand_path("../*gemspec", __FILE__)].reverse.each do |gemspec_path|
   gemspec = eval(IO.read(gemspec_path))
   Gem::PackageTask.new(gemspec).define
 end
 
-require 'mixlib/shellout/version'
-
 desc "Run all specs in spec directory"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = FileList['spec/**/*_spec.rb']
 end
 
 desc "Build it and ship it"
-task :ship => [:clean, :gem] do
+task ship: [:clobber_package, :gem] do
   sh("git tag #{Mixlib::ShellOut::VERSION}")
   sh("git push opscode --tags")
   Dir[File.expand_path("../pkg/*.gem", __FILE__)].reverse.each do |built_gem|
@@ -22,4 +21,4 @@ task :ship => [:clean, :gem] do
   end
 end
 
-task :default => :spec
+task default: :spec