Rakefile in spontaneous-0.2.0.beta1 vs Rakefile in spontaneous-0.2.0.beta2

@@ -1,66 +1,22 @@
 Encoding.default_internal = Encoding.default_external = Encoding::UTF_8 if defined?(Encoding)
 
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'spontaneous/version'
+
 require 'rubygems'
 require 'rake'
-require 'date'
 
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
 def name
   "spontaneous"
 end
 
 def version
-  line = File.read("lib/#{name}/version.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+  Spontaneous::VERSION
 end
 
-def date
-  Date.today.to_s
-end
-
-def rubyforge_project
-  name
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_gemspec_file
-  "#{name}.tmp.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-def generate_gemspec(spec, files)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-  #comment this out if your rubyforge_project has a different name
-  filelist = files.sort.
-      map { |file| "    #{file}" }.
-      join("\n")
-  replace_header(head, :rubyforge_project)
-  manifest = "  s.files = %w[\n#{filelist}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  spec
-end
-
 #############################################################################
 #
 # Standard tasks
 #
 #############################################################################
@@ -136,140 +92,42 @@
   sh "rm -fr coverage"
   sh "rcov test/test_*.rb"
   sh "open coverage/index.html"
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end
-
 #############################################################################
 #
-# Custom tasks (add your own tasks here)
-#
-#############################################################################
-
-
-
-#############################################################################
-#
 # Packaging tasks
 #
 #############################################################################
 
-require 'tmpdir'
-@project_dir = Dir.pwd
+def gemspec_file
+  "#{name}.gemspec"
+end
 
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
 namespace :gem do
   desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
   task :release => :build do
-    Dir.chdir(@project_dir)
     unless `git branch` =~ /^\* master$/
       puts "You must be on the master branch to release!"
       exit!
     end
     sh "git commit --allow-empty -a -m 'Release #{version}'"
     sh "git tag v#{version}"
     sh "git push origin master"
     sh "git push origin v#{version}"
-    sh "gem push #{@build_dir}/pkg/#{name}-#{version}.gem"
+    sh "gem push pkg/#{gem_file}"
   end
 
   desc "Build #{gem_file} into the pkg directory"
-  task :build => :gemspec do
+  task :build do
+    sh "gem build #{gemspec_file}"
     sh "mkdir -p pkg"
-    sh "gem build #{gem_gemspec_file}"
-    sh "mkdir -p #{@project_dir}/pkg"
-    sh "cp #{gem_file} #{@project_dir}/pkg"
     sh "mv #{gem_file} pkg"
-  end
-
-
-  desc "Generate #{gemspec_file}"
-  task :gemspec => :working_copy do
-    # read spec file and split out manifest section
-    spec = File.read(gemspec_file)
-    # head, manifest, tail = spec.split("  # = MANIFEST =\\n")
-    # # replace name version and date
-    # replace_header(head, :name)
-    # replace_header(head, :version)
-    # replace_header(head, :date)
-    # #comment this out if your rubyforge_project has a different name
-    # replace_header(head, :rubyforge_project)
-
-    # determine file list from git ls-files
-    files = `git ls-files`.
-      split("\n").
-      reject { |file| file =~ /^\./ }.
-      reject { |file| file =~ /^(rdoc|pkg)/ }
-
-    File.open(gemspec_file, 'w') { |io| io.write(generate_gemspec(spec, files)) }
-
-    compressed_assets = Dir["application/{css,js}/min/*.*"]
-
-    File.open(gem_gemspec_file, 'w') { |io| io.write(generate_gemspec(spec, files.concat(compressed_assets))) }
-
-    # piece file back together and write
-    # manifest = "  s.files = %w[\\n#{files}\\n  ]\\n"
-    # spec = [head, manifest, tail].join("  # = MANIFEST =\\n")
-    # File.open(gemspec_file, 'w') { |io| io.write(spec) }
-    puts "Updated #{gemspec_file}"
-    FileUtils.cp(gemspec_file, @project_dir)
-  end
-
-  task :working_copy => :validate do
-    # @working_dir = Dir.mktmpdir
-  end
-
-  desc "Validate #{gemspec_file}"
-  task :validate => :generate do
-    libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
-    unless libfiles.empty?
-      puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-      # exit!
-    end
-    unless Dir['VERSION*'].empty?
-      puts "A `VERSION` file at root level violates Gem best practices."
-      # exit!
-    end
-  end
-
-  desc "Generate the gemspec file from a template"
-  task :generate => :setup do
-    # template = File.read('spontaneous.gemspec.tmpl')
-    # require 'bundler'
-
-    # File.open('spontaneous.gemspec', 'w') do |gemspec|
-      # bundler = Bundler.load
-      # dependencies = bundler.dependencies_for(:default, :runtime).map do |dependency|
-      #   %{s.add_dependency('#{dependency.name}', [#{dependency.requirement.as_list.map { |d| d.inspect }.join(', ')}])}
-      # end
-      # development_dependencies = bundler.dependencies_for(:development).map do |dependency|
-      #   %{s.add_development_dependency('#{dependency.name}', [#{dependency.requirement.as_list.map { |d| d.inspect }.join(', ')}])}
-      # end
-    #   gemspec.write(template)
-    # end
-  end
-
-
-  task :setup do
-    @build_dir = Dir.tmpdir + "/spontaneous"
-    FileUtils.rm_r(@build_dir) if File.directory?(@build_dir)
-    FileUtils.mkdir_p(@build_dir)
-    FileUtils.cp_r(@project_dir+"/.", @build_dir)
-    Dir.chdir(@build_dir)
-    $:.unshift(@build_dir + "/lib")
-    # require File.expand_path(@build_dir + '/lib/spontaneous')
   end
 end
 
 namespace :asset do
   desc "Fingerprints a file"