core_ex 0.2.0 → 0.3.1

data/lib/core_ex/proc.rb

@@ -0,0 +1,77 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: proc.rb 334 2005-09-04 14:29:40Z ertai $
+
+
+module CoreEx
+
+  module Proc
+
+    setup do
+      have YamlExtension
+    end
+
+    def source_file
+      to_s[/#<#{self.class}:.*@(.*):\d*>/, 1]
+    end
+
+    def source_line
+      to_s[/#<#{self.class}:.*@.*:(\d*)>/, 1].to_i
+    end
+
+    def source_location
+      to_s[/#<#{self.class}:.*@(.*:\d*)>/, 1]
+    end
+
+    def to_yaml_string
+      to_s
+    end
+
+    module ClassMethods
+      def yaml_load ( val )
+        DumpableProc.new(val.to_s)
+      end
+    end # module ClassMethods
+
+  end # module Proc
+
+  test_section __FILE__ do
+
+    class TestProc < ::Test::Unit::TestCase
+      include YamlExtension::Assertions
+
+      def setup
+        @procs = {
+          proc {} => __LINE__,
+          method(:teardown).to_proc => __LINE__,
+          TestProc.instance_method(:setup).bind(self).to_proc => __LINE__
+        }
+      end
+
+      def teardown
+      end
+
+      def test_simple
+        assert_nothing_raised do
+          @procs.each do |block, __line__|
+            assert_equal __FILE__, block.source_file, 'bad source_file'
+            assert_equal __line__, block.source_line, 'bad source_line'
+            assert_equal "#{__FILE__}:#{__line__}",
+                         block.source_location,
+                         'bad source_location'
+          end
+        end
+      end
+
+      def test_yaml
+        assert_yaml_load "--- !proc 3 + 7", Proc
+        assert_yaml_dump @val, @ref
+        assert_equal(10, @val[])
+      end
+
+    end # class TestProc
+
+  end
+
+end # module CoreEx

data/lib/core_ex/rakefile_base.rf

@@ -1,7 +1,7 @@
 # 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 301 2005-06-23 20:57:05Z ertai $
+# Revision::  $Id: rakefile_base.rf 352 2005-09-15 01:43:03Z ertai $
 
 require 'core_ex'
 require 'ostruct'
@@ -12,15 +12,17 @@ require 'rake/packagetask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
-require 'rubygems'
-require_gem 'highline'
-require 'highline/import'
+suppress(NoMethodError) { require_gem 'highline' }
+suppress(LoadError) { require 'highline/import' }
+
+PathList.import!
 
 
 AUTHORS      = Pathname.new('AUTHORS')
 SPEC_YML     = Pathname.new('SPEC.yml')
 SPEC_DYN_YML = Pathname.new('SPEC.dyn.yml')
-GEM_SPEC     = Pathname.new("SPEC.gemspec")
+GEM_SPEC     = Pathname.new('SPEC.gemspec')
+VENDOR       = Pathname.new('vendor')
 RakefileBase = __FILE__
 EDITOR       = ENV['EDITOR'] || 'vi'
 
@@ -42,13 +44,16 @@ svn = MiniSvn.new
 
 def clean_task ( arg, &block )
   if arg.is_a? Hash
-    name = :"clobber_#{arg.keys.first}"
-    task(name => arg.values.first, &block)
+    name, deps = arg.to_a.first
   else
-    name = :"clobber_#{arg}"
-    task(name, &block)
+    name, deps = arg, []
+  end
+  clobber_name = :"clobber_#{name}"
+  task clobber_name => deps do
+    Task[name].instance_eval { @already_invoked = false }
+    block[] unless block.nil?
   end
-  task :clobber => name
+  task :clobber => clobber_name
 end
 
 
@@ -72,12 +77,17 @@ task :default => [ :check ]
 
 
 
+task :ruby_ex => [ :spec ] do
+  require_gem('ruby_ex', SPEC.ruby_ex_version || '~> 0.2.0')
+  require 'ruby_ex'
+end
+
+
 # desc 'Setup the ttk command'
-task :ttk => [ :spec ] do
-  alias highline_ask ask
-  require_gem 'ttk', SPEC.ttk_version
-  alias ruby_ex_ask ask
-  alias ask highline_ask
+task :ttk => [ :spec, :ruby_ex ] do
+  require_gem('ttk', SPEC.ttk_version || '~> 0.3.0')
+  require 'ttk'
+  Commands.import!
   def ttk ( *a, &b )
     cmd = TTK.bin[*a]
     cmd.input = b[] if b
@@ -91,11 +101,11 @@ end
 
 desc 'Launch all test suites'
 task :check => [ :ttk, :spec, :dyn_spec ] do
-  ttk '-l', 'check-log.yml', '-S', 'url: file://<<pwd>>', '-C',
+  ttk '-l', 'check-log', '-S', 'url: file://<<pwd>>', '-C',
       SPEC.root_test_suite
 end
 clean_task :check do
-  'check-log.yml'.to_path.rm_f
+  PathList['check-log.*'].each { |x| x.rm_f }
 end
 
 
@@ -107,7 +117,7 @@ task :distcheck => [ :ttk, :package ] do
     next unless path.file?
     urls << "file://#{path.expand_path}"
   end
-  ttk '-l', 'distcheck-log.yml' do %Q[
+  ttk '-l', 'distcheck-log' do %Q[
     Check generated packages:
       strategy: Iterate
       over    : #{urls.inspect}
@@ -121,7 +131,7 @@ task :distcheck => [ :ttk, :package ] do
   end
 end
 clean_task :distcheck do
-  'distcheck-log.yml'.to_path.rm_f
+  PathList['distcheck-log.*'].each { |x| x.rm_f }
 end
 
 
@@ -129,7 +139,9 @@ 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
 end
+task :spec_pkg_files
 
 
 
@@ -172,26 +184,38 @@ end
 
 desc 'Generate the full documentation'
 task :doc => [ :rdoc_spec, :rdoc_real ]
+
 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|
+    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       => [ :gem_spec, :gem ]
-clean_task :package => [ :gem_spec ]
 
+desc 'Generate all packages'
+task :package       => [ :tarballs, :gem_spec, :gem ]
 
+clean_task :package => [ :spec, :clobber_vendor, :clobber_gem_spec ]
 
 desc 'Re-generate all packages'
-task :repackage     => [ :gem_spec ]
+task :repackage => [ :clobber_package, :package ]
 
 
 
 desc 'Generate a GEM package'
 task :gem           => [ :gem_spec ]
 
-
+# desc 'Remove the GEM package file'
+clean_task :gem => [ :gem_spec ] do
+  $gem.rm_f
+end
 
 desc 'Re-generate a GEM package'
 task :regem         => [ :clobber_gem, :gem ]
@@ -207,14 +231,14 @@ task :rdoc_spec => [ :spec ] do
     rdoc.main = SPEC.rdoc_files.first
     tail = SPEC.rdoc_tail_files || []
     fl = SPEC.rdoc_files - tail + tail
-    rdoc.rdoc_files.include(fl.to_strings)
+    rdoc.rdoc_files.include(fl.stringify)
   end
 end
 
 
 
 # desc 'Update the Gem specification'
-file GEM_SPEC.to_s => [ :spec, :dyn_spec, :rdoc_spec ] do
+file GEM_SPEC.to_s => [ :spec, :spec_pkg_files, :dyn_spec, :rdoc_spec ] do
   spec = Gem::Specification.new do |s|
     s.platform = Gem::Platform::RUBY
     s.name = SPEC.name
@@ -226,13 +250,13 @@ file GEM_SPEC.to_s => [ :spec, :dyn_spec, :rdoc_spec ] do
     s.executables = Pathname.glob(bin + '*').select do |path|
       path.executable? and not path.directory?
     end.map { |path| path.basename.to_s }
-    s.files = SPEC.pkg_files.to_strings
+    s.files = SPEC.pkg_files.stringify
     s.require_path = 'lib'
     s.autorequire = SPEC.autorequire if SPEC.autorequire
 
     if SPEC.dependencies
       SPEC.dependencies.each do |name, version|
-        s.add_dependency(name, version)
+        s.add_dependency(name, (version.is_a? Array)? version.first : version)
       end
     end
 
@@ -255,46 +279,32 @@ end
 
 
 
-# desc "Remove the #{GEM_SPEC} file"
-clean_task :gem_spec do
-  GEM_SPEC.rm_f
-end
-
-
-
-# desc 'Load the GEM spec and create tasks for packages'
 task :gem_spec => [ GEM_SPEC.to_s ] do
   spec = eval(GEM_SPEC.read)
 
   gtask = Rake::GemPackageTask.new(spec) do |p|
     p.gem_spec = spec
-    p.need_tar_gz = true
-    p.need_tar_bz2 = true
     p.package_files = SPEC.pkg_files.map { |x| x.to_s }
   end
   gtask.instance_eval { $gem = 'pkg'.to_path + gem_file }
 end
+clean_task :gem_spec do
+  GEM_SPEC.rm_f
+end
 
 
-
-# desc 'Remove the GEM package file'
-clean_task :gem => [ :gem_spec ] do
-  $gem.rm_f
+task :vcs do
+  require_gem('vcs', SPEC.vcs_version || '~> 0.3.0')
 end
 
 
-
 desc 'Commit with Vcs'
-task :commit => [ :spec ] do
-  subject = ask('Commit subject: ') do |q|
-    q.confirm = true
-    q.validate = /^[^a-z].*\.$/
-  end
+task :commit => [ :vcs ] do
   pos = ARGV.index('--')
   args = (pos.nil?)? [] : ARGV[pos .. -1]
-  cmd = SPEC.commit_command || 'commit' 
+  cmd = SPEC.commit_command || 'commit'
   Dir.chdir(SPEC.commit_dir || '.') do
-    sh 'vcs-svn', cmd, "'#{subject}'", *args
+    sh 'vcs-svn', cmd, *args
   end
 end
 
@@ -341,6 +351,9 @@ end
 # desc 'Common tasks for a release'
 task :common_release =>
   [
+    :ttk,
+    :vcs,
+
     :release_confirm,
     :check,
     :doc,
@@ -460,7 +473,7 @@ task :publish_package => [ :spec, :package ] do
   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
 
@@ -550,3 +563,32 @@ clean_task :publish_package do
     x.rm_f
   end
 end
+
+
+
+task :vendor => [ :spec, :ruby_ex ] do
+  unless VENDOR.directory?
+    say "Creating the vendor directory..."
+    VENDOR.mkpath
+    require 'uri_ex'
+    if SPEC.dependencies
+      SPEC.dependencies.each do |name, version|
+        next unless version.is_a? Array
+        url = version.last
+        if url =~ /^\d+\/[^\/]+$/
+          url = "http://rubyforge.org/frs/download.php/#{url}"
+        end
+        url = URI.parse(url)
+        dest = VENDOR + url.pathname.basename.ext.to_s.sub(/\.tar$/, '').to_path
+        STDERR.puts "#{url} => #{dest}"
+        FileType.guess(url.checkout).extract.path.mv(dest)
+      end
+    end
+  end
+end
+
+clean_task :vendor do
+  VENDOR.rm_rf
+end
+
+task :revendor => [:clobber_vendor, :vendor]