core_ex 0.4.0 → 0.5.1.1

data/lib/core_ex/rakefile_base.rf

@@ -1,9 +1,15 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: rakefile_base.rf 386 2005-10-03 00:02:16Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/core_ex/lib/core_ex/rakefile_base.rf 22216 2006-02-24T09:02:54.402257Z pouillar  $
+
+DEFAULT_RUBY_EX_VERSION = ENV['DEFAULT_RUBY_EX_VERSION'] || '~> 0.3'
+DEFAULT_UTTK_VERSION    = ENV['DEFAULT_UTTK_VERSION']    || '~> 0.3'
+
+raise "Need a rake version >= 0.6.2" if RAKEVERSION < '0.6.2'
 
 require 'core_ex'
+require 'version'
 require 'ostruct'
 require 'date'
 require 'rbconfig'
@@ -17,12 +23,12 @@ suppress(LoadError) { require 'highline/import' }
 
 PathList.import!
 
-
+HOME         = Pathname.new(ENV['HOME'])
 AUTHORS      = Pathname.new('AUTHORS')
 SPEC_YML     = Pathname.new('SPEC.yml')
-SPEC_DYN_YML = Pathname.new('SPEC.dyn.yml')
 GEM_SPEC     = Pathname.new('SPEC.gemspec')
 VENDOR       = Pathname.new('vendor')
+PKG          = Pathname.new('pkg')
 RakefileBase = __FILE__
 EDITOR       = ENV['EDITOR'] || 'vi'
 
@@ -31,16 +37,8 @@ EDITOR       = ENV['EDITOR'] || 'vi'
 #
 
 def edit ( aPathname )
-  sh EDITOR, aPathname.to_s
-end
-
-class MiniSvn
-  def method_missing ( meth, *args )
-    sh 'svn', meth.to_s, *args
-  end
+  sh EDITOR, '--', aPathname.to_s
 end
-svn = MiniSvn.new
-
 
 def clean_task ( arg, &block )
   if arg.is_a? Hash
@@ -50,19 +48,22 @@ def clean_task ( arg, &block )
   end
   clobber_name = :"clobber_#{name}"
   task clobber_name => deps do
-    Task[name].instance_eval { @already_invoked = false }
+    say "Clobber #{name}"
+    Rake::Task[name].instance_eval { @already_invoked = false }
     block[] unless block.nil?
   end
   task :clobber => clobber_name
 end
 
 
-class Task
-  alias enhance_old enhance
-  def enhance(deps=nil, &block)
-    deps.each { |dep| @prerequisites << dep } if deps
-    @actions << block if block_given?
-    self
+module Rake
+  class Task
+    alias enhance_old enhance
+    def enhance(deps=nil, &block)
+      deps.each { |dep| @prerequisites << dep } if deps
+      @actions << block if block_given?
+      self
+    end
   end
 end
 
@@ -72,13 +73,14 @@ end
 #
 
 
-desc 'Default Task (check)'
-task :default => [ :check ]
-
+desc 'Default task'
+task :default do
+  say 'Default task: use rake -T to see all tasks'
+end
 
 
 task :ruby_ex => [ :spec ] do
-  require_gem('ruby_ex', SPEC.ruby_ex_version || '~> 0.2.0')
+  require_gem('ruby_ex', SPEC.ruby_ex_version || DEFAULT_RUBY_EX_VERSION)
   require 'ruby_ex'
   Commands.import!
   $runner = Commands::Runners::System.new
@@ -89,21 +91,21 @@ end
 
 # desc 'Setup the uttk command'
 task :uttk => [ :spec, :ruby_ex ] do
-  require_gem('uttk', SPEC.uttk_version || '~> 0.3.0')
+  require_gem('uttk', SPEC.uttk_version || DEFAULT_UTTK_VERSION)
   require 'uttk'
   def uttk ( *a, &b )
     cmd = Uttk.bin[*a]
     cmd.input = b[] if b
     cmd.output = STDOUT
     cmd.error = STDERR
-    raise unless cmd.system.status == 0
+    raise unless cmd.system(:v).status == 0
   end
 end
 
 
 
 desc 'Launch all test suites'
-task :check => [ :uttk, :spec, :dyn_spec ] do
+task :check => [ :uttk, :spec ] do
   uttk '-l', 'check-log', '-S', 'url: file://<<pwd>>', '-C',
       SPEC.root_test_suite
 end
@@ -116,7 +118,7 @@ end
 desc 'Check generated packages'
 task :distcheck => [ :uttk, :package ] do
   urls = []
-  Pathname.glob('pkg/*') do |path|
+  Pathname.glob(PKG + '*') do |path|
     next unless path.file?
     urls << "file://#{path.expand_path}"
   end
@@ -136,53 +138,17 @@ clean_task :distcheck do
 end
 
 
-
 # desc "Load the #{SPEC_YML} file"
 task :spec => [ SPEC_YML.to_s ] do
   Kernel.const_set(:SPEC, OpenStruct.new(YAML.load(SPEC_YML.read)))
-  task :spec_pkg_files => SPEC.pkg_files
+  pkg_files = SPEC.pkg_files.dup
+  pkg_files.delete_if { |x| x.basename.to_s =~ /SPEC/ }
+  task :spec_pkg_files => pkg_files
 end
 task :spec_pkg_files
 
 
 
-def update_dyn_spec
-  svn_info = YAML::load(`svn info`)
-  revision = svn_info['Revision']
-  if SPEC_DYN_YML.exist?
-    SPEC.dyn = YAML::load(SPEC_DYN_YML.read)
-    SPEC.dyn.version.revision = revision
-  else
-    SPEC.dyn = OpenStruct.new('version' => Version.new(0, 0, 0, revision))
-  end
-  SPEC.dyn.date = /\((.*)\)/.match(svn_info['Last Changed Date'])[1]
-  SPEC.dyn.url = svn_info['URL']
-  SPEC_DYN_YML.open('w') do |out|
-    out.puts(SPEC.dyn.to_yaml)
-  end
-end
-
-
-
-# desc "Update the #{SPEC_DYN_YML} file"
-file SPEC_DYN_YML.to_s => [ :spec ] do
-  update_dyn_spec
-end
-
-
-
-task :update_dyn_spec => [ SPEC_DYN_YML.to_s ] do
-  update_dyn_spec
-end
-
-
-
-task :dyn_spec => [ SPEC_DYN_YML.to_s ] do
-  SPEC.dyn = YAML::load(SPEC_DYN_YML.read)
-end
-
-
-
 desc 'Generate the full documentation'
 task :doc => [ :rdoc_spec, :rdoc_real ]
 
@@ -191,26 +157,28 @@ clean_task :doc => [ :rdoc_spec, :clobber_rdoc_real ]
 task :redoc => [ :clobber_doc, :doc ]
 
 
-task :tarballs => [ :dyn_spec, :vendor ] do
-  Rake::PackageTask.new(SPEC.name, SPEC.dyn.version.to_s) do |p|
+task :tarballs => [ :spec, :vendor ] do
+  Rake::PackageTask.new(SPEC.version.short_string, :noversion) do |p|
     p.need_tar_gz = true
     p.need_tar_bz2 = true
     p.package_files = (SPEC.pkg_files + PathList['vendor/**/*']).map { |x| x.to_s }
   end
 end
 
-
 desc 'Generate all packages'
 task :package       => [ :tarballs, :gem_spec, :gem ]
 
-clean_task :package => [ :spec, :clobber_vendor, :clobber_gem_spec ]
+clean_task :package => [ :spec, :clobber_vendor, :clobber_gem_spec ] do
+  say "rm -Rf #{PKG}"
+  PKG.rm_rf
+end
 
 desc 'Re-generate all packages'
 task :repackage => [ :clobber_package, :package ]
 
 
 
-desc 'Generate a GEM package'
+desc 'Generate the GEM package'
 task :gem           => [ :gem_spec ]
 
 # desc 'Remove the GEM package file'
@@ -218,9 +186,13 @@ clean_task :gem => [ :gem_spec ] do
   $gem.rm_f
 end
 
-desc 'Re-generate a GEM package'
-task :regem         => [ :clobber_gem, :gem ]
+desc 'Re-generate the GEM package'
+task :regem => [ :clobber_gem, :gem ]
 
+desc 'Install the GEM package'
+task :gemi => [ :gem ] do
+  sh "sudo gem i #$gem"
+end
 
 
 task :rdoc_spec => [ :spec ] do
@@ -239,11 +211,11 @@ end
 
 
 # desc 'Update the Gem specification'
-file GEM_SPEC.to_s => [ :spec, :spec_pkg_files, :dyn_spec, :rdoc_spec ] do
+file GEM_SPEC.to_s => [ :spec, :spec_pkg_files, :rdoc_spec ] do
   spec = Gem::Specification.new do |s|
     s.platform = Gem::Platform::RUBY
-    s.name = SPEC.name
-    s.version = SPEC.dyn.version.to_s
+    s.name = SPEC.version.name
+    s.version = SPEC.version.to_rubygems_version_string
     s.summary = SPEC.summary
     s.description = SPEC.description
     bin = 'bin'.to_path
@@ -271,7 +243,7 @@ file GEM_SPEC.to_s => [ :spec, :spec_pkg_files, :dyn_spec, :rdoc_spec ] do
       s.rdoc_options = SPEC.rdoc.option_list.map { |x| x[/^'?(.*?)'?$/, 1] }
     end
 
-    authors_file = YAML::load(AUTHORS.read).values.first
+    authors_file = YAML.load(AUTHORS.read).values.first
     list = authors_file.map { |x| /^(.*?)\s*<(.*)>/.match(x.keys.first)[1..2] }
     s.author = s.authors
     s.authors = list.map { |x| x.first }
@@ -284,6 +256,14 @@ end
 
 
 
+module Rake
+  class GemPackageTask < PackageTask
+    def package_name
+      "#{SPEC.version.name}-#{SPEC.version.to_rubygems_version_string}"
+    end
+  end
+end
+
 task :gem_spec => [ GEM_SPEC.to_s ] do
   spec = eval(GEM_SPEC.read)
 
@@ -291,157 +271,145 @@ task :gem_spec => [ GEM_SPEC.to_s ] do
     p.gem_spec = spec
     p.package_files = SPEC.pkg_files.map { |x| x.to_s }
   end
-  gtask.instance_eval { $gem = 'pkg'.to_path + gem_file }
+  if false # gem files must have a specific name
+    the_gem_file = nil
+    gtask.instance_eval { the_gem_file = PKG + gem_file }
+    $gem = PKG + "#{SPEC.version.short_string}.gem"
+    file $gem => [ the_gem_file ] do
+      verbose(true) {
+        mv the_gem_file.to_s, $gem.to_s
+      }
+    end
+  else
+    gtask.instance_eval { $gem = PKG + gem_file }
+  end
+  task :gem => [ $gem ]
 end
 clean_task :gem_spec do
   GEM_SPEC.rm_f
 end
 
 
-task :vcs do
-  require_gem('vcs', SPEC.vcs_version || '~> 0.3.0')
-end
-
-
-desc 'Commit with Vcs'
-task :commit => [ :vcs ] do
-  pos = ARGV.index('--')
-  args = (pos.nil?)? [] : ARGV[pos .. -1]
-  cmd = SPEC.commit_command || 'commit'
-  Dir.chdir(SPEC.commit_dir || '.') do
-    sh 'vcs-svn', cmd, *args
-  end
+task :commit do
+  default = "svn commit -m 'Bump to #{SPEC.version}'"
+  $commit_cmd ||= ask "Type the command that you use to commit,
+by default it\'s svn so you can just hit enter.
+If you must commit from another directory, type
+something like \"cd .. && svn ci\". [#{default}]: "
+  $commit_cmd = default if $commit_cmd =~ /^\s*$/
+  sh $commit_cmd
 end
 
 
 
-desc 'Make an Svn tag'
-task :tag => [ :spec, :dyn_spec ] do
-  tag_name = (SPEC.release)? SPEC.release : "#{SPEC.name}-#{SPEC.dyn.version}"
+desc 'Make a SVN tag'
+task :tag => [ :spec ] do
+  tag_name = SPEC.version.short_string
   tags = SPEC.tags_url.to_s + "/#{tag_name}"
-  trunk = SPEC.trunk_url || SPEC.dyn.url
-  while agree "Make the SVN tag (#{trunk} -> #{tags}) (y/n)", true
-    begin
-      svn.copy(trunk.to_s, tags, '-m', "'Releasing #{tag_name}'")
-      break
-    rescue RuntimeError => ex
-      STDERR.puts ex
-    end
-  end
+  trunk = SPEC.trunk_url || SPEC.vcs_url
+  say "Make the SVN tag (#{trunk} -> #{tags})"
+  sh 'svn', 'copy', trunk.to_s, tags.to_s, '-m', "'Releasing #{tag_name}'"
 end
 
 
 
-desc 'Publish to RubyForge'
+desc 'Publish the documentation'
 task :publish_doc => [ :spec ] do
-  while agree 'Publish the documentation?  ', true
-    begin
-      user = SPEC.user || ENV['USER']
-      Rake::SshDirPublisher.new(
-        # "#{user}@rubyforge.org",
-        # "/var/www/gforge-projects/#{SPEC.name}/test",
-        "#{user}@ssh.feydakins.org",
-        "/var/www/api.feydakins.org/public/#{SPEC.name}/",
-        SPEC.rdoc_dir
-      ).upload
-      break
-    rescue Exception => ex
-      STDERR.puts ex
-    end
-  end
+  user = SPEC.user || ENV['USER']
+  Rake::SshDirPublisher.new(
+    # "#{user}@rubyforge.org",
+    # "/var/www/gforge-projects/#{SPEC.version.name}/test",
+    "#{user}@ssh.feydakins.org",
+    "/var/www/api.feydakins.org/public/#{SPEC.version.name}/",
+    SPEC.rdoc_dir
+  ).upload
 end
 
 
 
-# desc 'Common tasks for a release'
-task :common_release =>
-  [
-    :uttk,
-    :vcs,
-
-    :release_confirm,
-    :check,
-    :doc,
-    :package,
-    :distcheck,
-    :commit,
-    :tag,
-    :publish_doc,
-    :publish_package
-  ]
-
-
-
-task :release_confirm => [ :spec, :dyn_spec ] do
-  SPEC.release = SPEC.name + '-' + SPEC.dyn.version.to_s
-  SPEC.release += '-' + SPEC.dyn.version_id unless SPEC.dyn.version_id.empty?
-  say "Release that: #{SPEC.release}."
-  exit unless agree 'Are you sure? (y/n)', true
-end
-
-
+module Rake
+  class ReleaseTask < TaskLib
+    def initialize(name, &block)
+      @name = name
+      block[self] unless block.nil?
+      define unless name.nil?
+    end
 
-[:major, :minor, :build].each do |release_mode|
-  name = :"#{release_mode}_release"
-  desc "Make a new #{release_mode} release"
-  task name => [ :update_dyn_spec ] do
-    SPEC.dyn.version.send(name)
-    q = 'Specify an identifier for this version (or press return): '
-    SPEC.dyn.version_id = ask(q)
-    TempPath.new('SPEC.dyn.yml.bak') do |bak|
-      SPEC_DYN_YML.mv(bak)
-      SPEC_DYN_YML.open('w') do |out|
-        out.puts(SPEC.dyn.to_yaml)
+    def define
+      descr = "Make a new: #{@name.to_s.humanize}"
+      desc descr
+      task @name => [ :spec ] do
+        SPEC.version = SPEC.version.send @name
+        q = 'Specify an identifier for this version (or press return): '
+        SPEC.version.release_name = ask(q)
+        say "Releasing that: #{SPEC.version}"
+        TempPath.new('SPEC.yml.bak') do |bak|
+          contents = SPEC_YML.read.gsub(/^(version\s*:\s+)(.*)\s*$/) { $1 + SPEC.version.to_yaml.gsub(/^---\s*/, '') }
+          SPEC_YML.mv(bak)
+          SPEC_YML.overwrite(contents)
+          begin
+            task_loop :clobber, :check, :doc, :package, :distcheck, :commit
+          rescue Exception => ex
+            bak.mv(SPEC_YML)
+            raise ex
+          end
+          bak.rm_f
+          task_loop :"after_commit_#@name"
+        end
       end
-      begin
-        sh 'rake', 'clobber'
-        sh 'rake', 'common_release'
-      rescue
-        bak.mv(SPEC_DYN_YML)
+      task :"after_commit_#@name" => [ :spec ] do
+        task_loop :tag, :publish_doc, :publish_package
+      end
+    end
+
+    def task_loop ( *tasks )
+      until tasks.empty? do
+        begin
+          if agree("Shall we do that task: #{tasks.first}? (y/n)  ")
+            Rake::Task[tasks.first].invoke
+          end
+          tasks.shift
+        rescue Exception => ex
+          STDERR.puts ex
+          choose do |menu|
+            menu.prompt = 'Retry, skip, or abort?  '
+
+            menu.choice :retry do end
+            menu.choice :skip  do tasks.shift end
+            menu.choice :abort do tasks.clear end
+          end
+          raise ex
+        end
       end
     end
   end
 end
 
+releases = [ :major_release,
+             :minor_release,
+             :patch_level_release,
+             :release_candidate,
+             :alpha_release,
+             :beta_release,
+             :pre_release ]
+
+for release in releases do
+  Rake::ReleaseTask.new release
+end
 
-release_notes = ',release_notes'.to_path
-release_changes = ',release_changes'.to_path
+
+release_notes = '+release_notes'.to_path
+release_changes = '+release_changes'.to_path
 
 
 desc "Publish the release files to RubyForge."
 task :publish_package => [ :spec, :package ] do
-  type_map = {
-    '.deb'    => 1000,
-    '.rpm'    => 2000,
-    '.zip'    => 3000,
-    '.bz2'    => 3100,
-    '.tbz2'   => 3100,
-    '.gz'     => 3110,
-    '.tgz'    => 3110,
-    '.jpg'    => 8000,
-    '.text'   => 8100,
-    '.html'   => 8200,
-    '.pdf'    => 8300,
-    '.ebuild' => 1300,
-    '.exe'    => 1100,
-    '.dmg'    => 1200,
-    '.gem'    => 1400,
-    '.sig'    => 8150,
-    # 'Source .zip' => 5000,
-    # 'Source .bz2' => 5010,
-    # 'Source .gz'  => 5020,
-    # 'Source .rpm' => 5100,
-    # 'Other Source File' => 5900,
-  }
-  type_map.default = 9999
-
-  pkg = 'pkg'.to_path
-  files = PathList[pkg/"*{#{type_map.keys.join(',')}}"]
+
+  files = PathList[PKG/"*{gem,tar.*,tgz}"]
 
   rubyforge_user = SPEC.rubyforge_user || SPEC.user || ENV['USER']
-  rubyforge_project = SPEC.rubyforge_project || SPEC.name
-  default = (SPEC.release)? SPEC.release : "#{SPEC.name}-#{SPEC.dyn.version}"
-  release_name = ask("Release name:  ") { |q| q.default = default }
+  rubyforge_project = SPEC.rubyforge_project || SPEC.version.name
+  release_name = SPEC.version.short_string
 
   require 'net/http'
   require 'open-uri'
@@ -450,116 +418,43 @@ task :publish_package => [ :spec, :package ] do
   project_data = open(project_uri) { |data| data.read }
   group_id = project_data[/[?&]group_id=(\d+)/, 1]
   raise "Couldn't get group id" unless group_id
-
-  if ENV['RUBY_FORGE_PASSWORD']
-    password = ENV['RUBY_FORGE_PASSWORD']
-  else
-    password = ask("#{rubyforge_user}@rubyforge.org's password: ") do |q|
-      q.echo = false
-    end
-  end
-
-  login_response = Net::HTTP.start('rubyforge.org', 80) do |http|
-    data = [
-      'login=1',
-      "form_loginname=#{rubyforge_user}",
-      "form_pw=#{password}"
-    ].join('&')
-    http.post('/account/login.php', data)
-  end
-
-  cookie = login_response['set-cookie']
-  raise 'Login failed' unless cookie
-  headers = { 'Cookie' => cookie }
-
-  release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
-  release_data = open(release_uri, headers) { |data| data.read }
-  ids, names = [], []
-  release_data.gsub(/name="package_id" value="(\d+)"/) { ids << $1 ; nil }
-  release_data.gsub(/name="package_name" value="([^"]+)"/) { names << $1 ; nil }
-  package_name = SPEC.rubyforge_sub_package_name || SPEC.name
-
-  package_id = names.zip(ids).find { |name, id| name == package_name }.last
-  raise "Couldn't get package id or package name" unless package_id
-
-  first_file = true
-  release_id = ''
-
+  package_name = SPEC.rubyforge_sub_package_name || SPEC.version.name
+
+  # if ENV['RUBY_FORGE_PASSWORD']
+    # password = ENV['RUBY_FORGE_PASSWORD']
+  # else
+    # password = ask("#{rubyforge_user}@rubyforge.org's password: ") do |q|
+      # q.echo = false
+    # end
+  # end
+
+  system "rubyforge login"
+  release_id = nil
   files.each do |path|
-    path = path.to_path # FIXME
-    basename  = path.basename
-    file_ext  = path.extname
-    file_data = path.read
-
-    say "Releasing #{basename}..."
+    say "Releasing #{path.basename}..."
     next unless agree 'Agree?  (y/n)', true
 
-    release_response = Net::HTTP.start('rubyforge.org', 80) do |http|
-      release_date = Time.now.strftime('%Y-%m-%d %H:%M')
-      type = type_map[file_ext].to_s
-      boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
-
-      if first_file then
-        release = { :notes => release_notes, :changes => release_changes }
-        [:notes, :changes].each do |x|
-          while not release[x].exist?
+    unless release_id then
+      release = { :notes => release_notes, :changes => release_changes }
+      [:notes, :changes].each do |x|
+        loop do
+          loop do
             say "No release #{x} (editing...)"
             edit release[x]
+            break if release[x].exist?
           end
           say "Publish these release #{x}:"
           say release[x].read
-          exit unless agree 'Agree? (y/n)  ', true
+          break if agree 'Agree? (y/n)  ', true
         end
-        query_hash = {
-          'group_id' => group_id,
-          'package_id' => package_id,
-          'release_name' => release_name,
-          'release_date' => release_date,
-          'type_id' => type,
-          'processor_id' => '8000', # Any
-          'release_notes' => release[:notes].read,
-          'release_changes' => release[:changes].read,
-          'preformatted' => '1',
-          'submit' => '1'
-        }
-      else
-        query_hash = {
-          'group_id' => group_id,
-          'release_id' => release_id,
-          'package_id' => package_id,
-          'step2' => '1',
-          'type_id' => type,
-          'processor_id' => '8000', # Any
-          'submit' => 'Add This File'
-        }
       end
-
-      query = "?" + query_hash.map do |name, value|
-        [name, URI.encode(value)].join("=")
-      end.join("&")
-
-      data = [
-        '--' + boundary,
-        "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
-        'Content-Type: application/octet-stream',
-        'Content-Transfer-Encoding: binary',
-        '', file_data, ''
-        ].join("\x0D\x0A")
-
-      release_headers = headers.merge(
-        'Content-Type' => "multipart/form-data; boundary=#{boundary}"
-      )
-
-      target = first_file ? '/frs/admin/qrs.php' : '/frs/admin/editrelease.php'
-      http.post(target + query, data, release_headers)
-    end
-
-    if first_file then
-      release_id = release_response.body[/release_id=(\d+)/, 1]
-      raise("Couldn't get release id") unless release_id
+      res = `rubyforge add_release #{group_id} #{package_name} #{release_name} #{path} -n #{release_notes} -a #{release_changes} -f`
+      release_id = res[/release_id: (\d+)/, 1]
+      puts "release_id: #{release_id}"
+    else
+      system "rubyforge add_release #{group_id} #{package_name} #{release_name} #{path} -R #{release_id} -n #{release_notes} -a #{release_changes} -f"
     end
 
-    first_file = false
   end
 end
 
@@ -576,15 +471,16 @@ task :vendor => [ :spec, :ruby_ex ] do
   unless VENDOR.directory?
     say "Creating the #{(dev)? 'developpement ' : ''}vendor directory..."
     VENDOR.mkpath
-    require 'uri_ex'
+    URI::GenericEx.import!
     if SPEC.dependencies
       SPEC.dependencies.each do |name, version|
-        url = nil
+        url, vcs = nil, false
         case version
           when Array then url = version.last
           when Hash
             if dev and version['vcs']
               url = version['vcs']
+              vcs = true
             else
               url = version['tarball']
             end
@@ -600,8 +496,8 @@ task :vendor => [ :spec, :ruby_ex ] do
         out = FileType.guess(url.checkout.first)
         out = out.extract if out.extractable?
         out.path.mv(dest)
-        if dev and version['vcs'] and (dest + 'SPEC.yml').exist?
-          cmd = $0.to_cmd['vendor_dev'] > [STDOUT, STDERR]
+        if dev and vcs and (dest + 'SPEC.yml').exist?
+          cmd = $0.to_cmd['revendor_dev'] > [STDOUT, STDERR]
           cmd.dir = dest
           data = cmd.run($runner)
         end