core_ex 0.1.1 → 0.1.2

data/SPEC.dyn.yml

@@ -1,9 +1,10 @@
 --- !ruby/object:OpenStruct 
 table: 
-  :date: "Wed, 01 Jun 2005"
+  :date: "Fri, 03 Jun 2005"
   :version: !ruby/object:Version 
-    build: 1
+    build: 2
     major: 0
     minor: 1
-    revision: 264
+    revision: 276
   :version_id: ''
+  :url: svn://svn.feydakins.org/ruby_ex/trunk/core_ex

data/SPEC.gem.yml

@@ -0,0 +1,111 @@
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.8.10
+specification_version: 1
+name: core_ex
+version: !ruby/object:Gem::Version 
+  version: 0.1.2
+date: 2005-06-03
+summary: CoreEx is a proposal for a standard library extension.
+require_paths: 
+  - lib
+email: 
+  - nicolas.despres@gmail.com
+  - ertai@feydakins.org
+homepage: http://api.feydakins.org/core_ex
+rubyforge_project: core_ex
+description: "CoreEx  is  designed  to provides a simple but quite useful extension of the
+  standard  library  of  Ruby. So some classes and modules like Pathname, Time,
+  Enumerable,  Exception,  FileUtils,  String,  and YAML are extended. There is
+  also   some   new   features   like   attr_once,  DTime,  TempPath,  Version,
+  embedded_tests,  filelist  (almost  from  rake),  a  common  Rakefile, and an
+  extension of the require system."
+autorequire: 
+default_executable: 
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+    - 
+      - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+  version: 
+platform: ruby
+authors: 
+  - 
+    - Nicolas Despr�s
+    - Nicolas Pouillard
+files: 
+  - lib/core_ex.rb
+  - lib/core_ex/attr_once.rb
+  - lib/core_ex/dtime.rb
+  - lib/core_ex/embedded_tests.rb
+  - lib/core_ex/enumerable.rb
+  - lib/core_ex/exception.rb
+  - lib/core_ex/filelist.rb
+  - lib/core_ex/fileutils.rb
+  - lib/core_ex/pathname.rb
+  - lib/core_ex/rakefile_base.rf
+  - lib/core_ex/require.rb
+  - lib/core_ex/string.rb
+  - lib/core_ex/temp_path.rb
+  - lib/core_ex/time.rb
+  - lib/core_ex/version.rb
+  - lib/core_ex/yaml.rb
+  - lib/core_ex/test/unit/ui/yaml/testrunner.rb
+  - test/check-core_ex.yml
+  - test/check-pkg-core_ex.yml
+  - test/resources
+  - test/sanity
+  - test/sanity-suite.yml
+  - test/test-unit-setup.rb
+  - test/unit-suite.yml
+  - test/resources/require
+  - test/resources/use-from-gems.rb
+  - test/resources/yaml_testrunner
+  - test/resources/require/test_require
+  - test/resources/require/test_require_rb.rb
+  - test/resources/require/test_require_so.so
+  - test/resources/yaml_testrunner/unit_test.rb
+  - test/sanity/multiple-requires.yml
+  - test/sanity/single-requires.yml
+  - AUTHORS
+  - NEWS
+  - Rakefile
+  - README
+  - SPEC.dyn.yml
+  - SPEC.gem.yml
+  - SPEC.yml
+test_files: []
+rdoc_options: 
+  - "--inline-source"
+  - "--main"
+  - README
+  - "--title"
+  - "CoreEx -- A proposal for a standard library extension."
+  - "-T"
+  - html
+extra_rdoc_files: 
+  - README
+  - AUTHORS
+  - NEWS
+  - lib/core_ex.rb
+  - lib/core_ex/attr_once.rb
+  - lib/core_ex/dtime.rb
+  - lib/core_ex/embedded_tests.rb
+  - lib/core_ex/enumerable.rb
+  - lib/core_ex/exception.rb
+  - lib/core_ex/filelist.rb
+  - lib/core_ex/fileutils.rb
+  - lib/core_ex/pathname.rb
+  - lib/core_ex/require.rb
+  - lib/core_ex/string.rb
+  - lib/core_ex/temp_path.rb
+  - lib/core_ex/time.rb
+  - lib/core_ex/version.rb
+  - lib/core_ex/yaml.rb
+  - lib/core_ex/test/unit/ui/yaml/testrunner.rb
+executables: []
+extensions: []
+requirements: []
+dependencies: []

data/SPEC.yml

@@ -16,10 +16,14 @@ description: >
   extension of the require system.
 homepage: http://api.feydakins.org/core_ex
 rubyforge_project: ttk
+rubyforge_sub_package_name: core_ex
 
 root_test_suite: test/check-pkg-core_ex.yml
 rdoc_dir: doc/html
-tags_dir: ../../tags
+tags_url: svn://svn.feydakins.org/ruby_ex/tags
+
+commit_command: rxci
+commit_dir: ..
 
 rdoc_files: !filelist
   - README

data/lib/core_ex/pathname.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: pathname.rb 252 2005-05-31 23:41:42Z ertai $
+# $Id: pathname.rb 272 2005-06-02 23:47:29Z ertai $
 
 
 require 'pathname'
@@ -32,6 +32,10 @@ class Pathname
     FileUtils.cp self.to_s, aPath.to_s
   end
 
+  def mv ( aPath )
+    FileUtils.mv self.to_s, aPath.to_s
+  end
+
   def cp_r ( aPath )
     FileUtils.cp_r self.to_s, aPath.to_s
   end

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 262 2005-06-01 02:58:29Z ertai $
+# Revision::  $Id: rakefile_base.rf 276 2005-06-03 00:53:59Z ertai $
 
 require 'core_ex'
 require 'ostruct'
@@ -139,6 +139,7 @@ def update_dyn_spec
     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
@@ -231,12 +232,13 @@ file GEM_SPEC.to_s => [ :spec, :dyn_spec, :rdoc_spec ] do
     end
 
     s.has_rdoc = true
-    s.extra_rdoc_files = SPEC.rdoc.rdoc_files
-    s.rdoc_options = SPEC.rdoc.option_list.map { |x| x.sub(/^'?(.*?)'?$/, '\1') }
+    s.extra_rdoc_files = SPEC.rdoc.rdoc_files.to_a
+    s.rdoc_options = SPEC.rdoc.option_list.map { |x| x[/^'?(.*?)'?$/, 1] }
 
     authors_file = YAML::load(AUTHORS.read).values.first
     list = authors_file.map { |x| /^(.*?)\s*<(.*)>/.match(x.keys.first)[1..2] }
     s.authors = list.map { |x| x.first }
+    s.author = s.authors
     s.email = list.map { |x| x.last }
     s.homepage = SPEC.homepage
     s.rubyforge_project = s.name
@@ -275,13 +277,34 @@ end
 
 
 
-# desc 'Make an Svn tag'
+desc 'Commit with Vcs'
+task :commit => [ :spec ] do
+  subject = ask('Commit subject: ') do |q|
+    q.confirm = true
+    q.validate = /^[^a-z].*\.$/
+  end
+  pos = ARGV.index('--')
+  args = (pos.nil?)? [] : ARGV[pos .. -1]
+  cmd = SPEC.commit_command || 'commit' 
+  Dir.chdir(SPEC.commit_dir || '.') do
+    sh 'vcs-svn', cmd, "'#{subject}'", *args
+  end
+end
+
+
+
+desc 'Make an Svn tag'
 task :tag => [ :spec, :dyn_spec ] do
   tag_name = (SPEC.release)? SPEC.release : "#{SPEC.name}-#{SPEC.dyn.version}"
-  tags = (SPEC.tags_dir || '../tags').to_path.expand_path.cleanpath
-  if agree "Make the SVN tag (#{tags/tag_name}) (y/n)", true
-    svn.copy(Pathname.pwd, tags/tag_name)
-    svn.commit(Pathname.pwd, tags, '-m', "'Releasing #{tag_name}'")
+  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
 end
 
@@ -289,14 +312,21 @@ end
 
 desc 'Publish to RubyForge'
 task :publish_doc => [ :spec ] do
-  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
+  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
 end
 
 
@@ -309,6 +339,7 @@ task :common_release =>
     :doc,
     :package,
     :distcheck,
+    :commit,
     :tag,
     :publish_doc,
     :publish_package
@@ -332,19 +363,25 @@ end
     SPEC.dyn.version.send(name)
     q = 'Specify an identifier for this version (or press return): '
     SPEC.dyn.version_id = ask(q)
-    SPEC_DYN_YML.open('w') do |out|
-      out.puts(SPEC.dyn.to_yaml)
-    end
-    begin
-      sh 'rake', 'clobber'
-      sh 'rake', 'common_release'
-    rescue
-      SPEC_DYN_YML.unlink
+    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)
+      end
+      begin
+        sh 'rake', 'clobber'
+        sh 'rake', 'common_release'
+      rescue
+        bak.mv(SPEC_DYN_YML)
+      end
     end
   end
 end
 
 
+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
@@ -412,8 +449,13 @@ task :publish_package => [ :spec, :package ] do
 
   release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
   release_data = open(release_uri, headers) { |data| data.read }
-  package_id = release_data[/[?&]package_id=(\d+)/, 1]
-  raise "Couldn't get package id" unless package_id
+  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 = ''
@@ -433,18 +475,15 @@ task :publish_package => [ :spec, :package ] do
       boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
 
       if first_file then
-        release = {
-          :notes   => ',release_notes'.to_path,
-          :changes => ',release_changes'.to_path
-        }
+        release = { :notes => release_notes, :changes => release_changes }
         [:notes, :changes].each do |x|
           while not release[x].exist?
             say "No release #{x} (editing...)"
             edit release[x]
-            say "Publish these release #{x}:"
-            say release[x].read
-            exit unless agree 'Agree? (y/n)  ', true
           end
+          say "Publish these release #{x}:"
+          say release[x].read
+          exit unless agree 'Agree? (y/n)  ', true
         end
         query_hash = {
           'group_id' => group_id,
@@ -491,6 +530,7 @@ task :publish_package => [ :spec, :package ] do
     end
 
     if first_file then
+      puts release_response.body
       release_id = release_response.body[/release_id=(\d+)/, 1]
       raise("Couldn't get release id") unless release_id
     end
@@ -498,3 +538,9 @@ task :publish_package => [ :spec, :package ] do
     first_file = false
   end
 end
+
+clean_task :publish_package do
+  [release_notes, release_changes].each do |x|
+    x.rm_f
+  end
+end

data/lib/core_ex/temp_path.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: temp_path.rb 252 2005-05-31 23:41:42Z ertai $
+# $Id: temp_path.rb 271 2005-06-02 23:46:36Z ertai $
 
 require 'core_ex'
 require 'tempfile'
@@ -58,7 +58,7 @@ class TempPath < Pathname
   # which follow this format:
   #   => 'base.pid.uniq.ext
   #
-  def initialize ( base=@@progname, ext='', &block )
+  def initialize ( base=@@progname, ext='' )
     if base.to_s =~ /\//
       raise ArgumentError, "bad basename, you give me a pathname #{base}"
     end
@@ -74,12 +74,15 @@ class TempPath < Pathname
       super(res)
       @@tmps << self
     end
-    if block_given?
-      begin
-        block[self.dup]
-      ensure
-        clean
-      end
+  end
+
+  def self.new ( *a, &block )
+    tmp = super(*a)
+    return tmp unless block_given?
+    begin
+      return block[tmp.dup]
+    ensure
+      clean
     end
   end
 
@@ -153,7 +156,7 @@ end # class Pathname
 
 test_section __FILE__ do
 
-  class MkTempTest < Test::Unit::TestCase
+  class TempPathTest < Test::Unit::TestCase
 
     def setup
       assert_nothing_raised { @foo = TempPath.new('foo') }
@@ -189,6 +192,13 @@ test_section __FILE__ do
       end
     end
 
+    def test_block_return
+      assert_nothing_raised do
+        @x = TempPath.new { |tmp| 42 }
+      end
+      assert_equal(42, @x)
+    end
+
   end # class MkTempTest
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: core_ex
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2005-06-01
+  version: 0.1.2
+date: 2005-06-03
 summary: CoreEx is a proposal for a standard library extension.
 require_paths: 
   - lib
@@ -32,8 +32,9 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
   version: 
 platform: ruby
 authors: 
-  - Nicolas Despr�s
-  - Nicolas Pouillard
+  - 
+    - Nicolas Despr�s
+    - Nicolas Pouillard
 files: 
   - lib/core_ex.rb
   - lib/core_ex/attr_once.rb
@@ -59,14 +60,9 @@ files:
   - test/sanity-suite.yml
   - test/test-unit-setup.rb
   - test/unit-suite.yml
-  - test/resources/autoload_tree
   - test/resources/require
   - test/resources/use-from-gems.rb
   - test/resources/yaml_testrunner
-  - test/resources/autoload_tree/A.rb
-  - test/resources/autoload_tree/B.rb
-  - test/resources/autoload_tree/foo
-  - test/resources/autoload_tree/foo/C.rb
   - test/resources/require/test_require
   - test/resources/require/test_require_rb.rb
   - test/resources/require/test_require_so.so
@@ -78,6 +74,7 @@ files:
   - Rakefile
   - README
   - SPEC.dyn.yml
+  - SPEC.gem.yml
   - SPEC.yml
 test_files: []
 rdoc_options: 

data/test/resources/autoload_tree/A.rb

@@ -1,11 +0,0 @@
-
-
-module AutoloadTree
-
-  class A
-
-  end
-
-end
-
-

data/test/resources/autoload_tree/B.rb

@@ -1,10 +0,0 @@
-
-require 'A'
-
-module AutoloadTree
-
-  class B < A
-
-  end
-
-end

data/test/resources/autoload_tree/foo/C.rb

@@ -1,18 +0,0 @@
-
-
-require 'A'
-
-module AutoloadTree
-
-  module Foo
-
-    class C < A
-
-    end
-
-  end
-
-end
-
-
-