nio 0.2.2 → 0.2.3

data/History.txt

@@ -1,24 +1,30 @@
-== 0.2.2 2008-03-04
-
-* Minor enhancements
-  - show_plus can be passed a string (e.g. ' ') that is used as the plus sign;
-    added new show_exp_plus to control the sign display of the exponent in 
-    scientific notation.
-
-== 0.2.1 2007-12-15
-
-* Minor enhancements
-  - The RepDec maximum number of digits can now be changed, and the default
-    value has been incremented to 5000 digits (was 2048). With the new value
-    the minimum value of a IEEE 754 extended number can now be shown as
-    different from zero.
-  - Performance optimizations in RepDec#setQ
-* Bug corrections
-  - Fixed a problem in the formatted output of BigDecimals which affected large numbers.
-  - Fix minor problem with nextfloat
-
-== 0.2.0 2007-09-22
-
-* Initial release
-  - The Nio library has been extracted from and old project
-    and packaged as a Gem.
+== 0.2.3 2008-12-23
+
+* Minor enhancements
+  - Compatibility with Ruby 1.9.1.
+  - Mr. Bones is used instead of Hoe/newgem for development tasks.
+
+== 0.2.2 2008-03-04
+
+* Minor enhancements
+  - show_plus can be passed a string (e.g. ' ') that is used as the plus sign;
+    added new show_exp_plus to control the sign display of the exponent in
+    scientific notation.
+
+== 0.2.1 2007-12-15
+
+* Minor enhancements
+  - The RepDec maximum number of digits can now be changed, and the default
+    value has been incremented to 5000 digits (was 2048). With the new value
+    the minimum value of a IEEE 754 extended number can now be shown as
+    different from zero.
+  - Performance optimizations in RepDec#setQ
+* Bug corrections
+  - Fixed a problem in the formatted output of BigDecimals which affected large numbers.
+  - Fix minor problem with nextfloat
+
+== 0.2.0 2007-09-22
+
+* Initial release
+  - The Nio library has been extracted from and old project
+    and packaged as a Gem.

data/Manifest.txt

@@ -4,8 +4,6 @@ Manifest.txt
 README.txt
 SOURCE.txt
 Rakefile
-config/hoe.rb
-config/requirements.rb
 lib/nio.rb
 lib/nio/version.rb
 lib/nio/repdec.rb
@@ -14,17 +12,8 @@ lib/nio/tools.rb
 lib/nio/rtnlzr.rb
 lib/nio/fmt.rb
 lib/nio/sugar.rb
-script/destroy
-script/destroy.cmd
-script/generate
-script/generate.cmd
-script/txt2html
-script/txt2html.cmd
 setup.rb
 tasks/nuweb.rake
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
 test/data.yaml
 test/test_helper.rb
 test/test_tools.rb

data/Rakefile

@@ -1,4 +1,34 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+# Look in the tasks/setup.rb file for the various options that can be
+# configured in this Rakefile. The .rake files in the tasks directory
+# are where the options are used.
+
+begin
+  require 'bones'
+  Bones.setup
+rescue LoadError
+  load 'tasks/setup.rb'
+end
+
+ensure_in_path 'lib'
+#require 'nio'
+require File.join(File.dirname(__FILE__),'source/lib/nio/version')
+
+task :default => 'spec:run'
+
+
+PROJ.name = 'nio'
+PROJ.description = "Numeric input/output"
+PROJ.authors = 'Javier Goizueta'
+PROJ.email = 'javier@goizueta.info'
+PROJ.version = Nio::VERSION::STRING
+PROJ.rubyforge.name = 'nio'
+PROJ.url = "http://#{PROJ.rubyforge.name}.rubyforge.org"
+PROJ.rdoc.opts = [
+  "--main", "README.txt",
+  '--title', 'Nio Documentation',
+  "--opname", "index.html",
+  "--line-numbers",
+  "--inline-source"
+  ]
+
+# EOF

data/SOURCE.txt

@@ -1,31 +1,31 @@
-=Notes on the source code
-
-The Ruby code in this project is generated from the source code
-in the directory "source" by the Rake task *tangle*.
-
-You can get the updated source code from the SVN repository
-at Rubyforge (svn://rubyforge.org/var/svn/nio/trunk)
-or from the "nio-source" package releases from the project.
-
-The nuweb source files have extension .w
-
-There's also a rake task named *weave* which generates
-a documented form of the source code in PDF format,
-which is saved to the directory source/pdf.
-
-This tasks requires the program nuweb which converts
-the nuweb sources (files with extension .w) in
-directory source to either ruby files or
-LaTeX files for the documentated source.
-For the weave task latex and dvipdfm are also necessary.
-
-You can get the PDF files corresponding to each realese
-in the "nio-source-pdf" packages.
- 
-The necessary nuweb tool is available here for windows:
-  http://perso.wanadoo.es/jgoizueta/dev/tools/nuweb-win32.zip
-
-For other systems the source code and an necessary patch
-can be obtained here:
-  http://www.goizueta.info/javier/index.html?pg=dev/req.en.html
-
+=Notes on the source code
+
+The Ruby code in this project is generated from the source code
+in the directory "source" by the Rake task *nuweb:tangle*.
+
+You can get the updated source code from the SVN repository
+at Rubyforge (svn://rubyforge.org/var/svn/nio/trunk)
+or from the "nio-source" package releases from the project.
+
+The nuweb source files have extension .w
+
+There's also a rake task named *nuweb:weave* which generates
+a documented form of the source code in PDF format,
+which is saved to the directory source/pdf.
+
+This tasks requires the program nuweb which converts
+the nuweb sources (files with extension .w) in
+directory source to either ruby files or
+LaTeX files for the documentated source.
+For the weave task latex and dvipdfm are also necessary.
+
+You can get the PDF files corresponding to each realese
+in the "nio-source-pdf" packages.
+
+The necessary nuweb tool is available here for windows:
+  http://perso.wanadoo.es/jgoizueta/dev/tools/nuweb-win32.zip
+
+For other systems the source code and an necessary patch
+can be obtained here:
+  http://www.goizueta.info/javier/index.html?pg=dev/req.en.html
+

data/lib/nio/flttol.rb

@@ -295,7 +295,7 @@ module Nio
     # and returns it as an object of the specified class (by default, Integer)
     def apprx_i(x,result=Integer)
       r = x.round
-      return equals?(x,r) ? r.prec(result) : x
+      return equals?(x,r) ? Nio.numeric_cast(r,result) : x
     end
       
     
@@ -510,7 +510,7 @@ module Nio
     # and returns it as an object of the specified class (by default, Integer)
     def apprx_i(x,result=Integer)
       r = x.round
-      return equals?(x,r) ? r.prec(result) : x
+      return equals?(x,r) ? Nio.numeric_cast(r,result) : x
     end
       
     
@@ -654,4 +654,16 @@ module Nio
       x
     end  
   
+     def numeric_cast(value, type)
+       if value.respond_to?(:prec)
+         value.prec(type)
+        else
+          if type.kind_of?(BigDecimal)
+            BigDec(value)
+          else
+            Object.send type.to_s, value
+          end
+        end
+     end
+  
 end

data/lib/nio/fmt.rb

@@ -1849,7 +1849,10 @@ class BigDecimal
       end
       if !converted 
         if fmt.get_base==10 
-          txt = x.to_s
+          # Don't use x.to_s because of bugs in BigDecimal in Ruby 1.9 revisions 20359-20797
+          # x.to_s('F') is not affected by that problem, but produces innecesary long strings
+          sgn,ds,b,e = x.split
+          txt = "#{sgn<0 ? '-' : ''}0.#{ds}E#{e}"
           
           sign = '+'    
           if txt[0,1]=='-'

data/lib/nio/rtnlzr.rb

@@ -342,7 +342,7 @@ module Nio
     num_class ||= f.class
     return mth.ip(f),1 if mth.fp(f)==0
 
-    one = 1.prec(num_class)
+    one = Nio.numeric_cast(1, num_class)
     
       sign = f<0
       f = -f if sign
@@ -359,7 +359,7 @@ module Nio
       end
       
 
-      f1,f2 = [a,b].collect{|x| mth.abs(mth.rnd(x*f)/x.prec(num_class)-f)}
+      f1,f2 = [a,b].collect{|x| mth.abs(mth.rnd(x*f)/Nio.numeric_cast(x, num_class)-f)}
 
       a = f1>f2 ? b : a
 

data/lib/nio/version.rb

@@ -2,7 +2,7 @@ module Nio #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/tasks/ann.rake

@@ -0,0 +1,80 @@
+
+begin
+  require 'bones/smtp_tls'
+rescue LoadError
+  require 'net/smtp'
+end
+require 'time'
+
+namespace :ann do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  file PROJ.ann.file do
+    ann = PROJ.ann
+    puts "Generating #{ann.file}"
+    File.open(ann.file,'w') do |fd|
+      fd.puts("#{PROJ.name} version #{PROJ.version}")
+      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
+      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
+      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
+      fd.puts
+      fd.puts("== DESCRIPTION")
+      fd.puts
+      fd.puts(PROJ.description)
+      fd.puts
+      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
+      fd.puts
+      ann.paragraphs.each do |p|
+        fd.puts "== #{p.upcase}"
+        fd.puts
+        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
+        fd.puts
+      end
+      fd.puts ann.text if ann.text
+    end
+  end
+
+  desc "Create an announcement file"
+  task :announcement => ['ann:prereqs', PROJ.ann.file]
+
+  desc "Send an email announcement"
+  task :email => ['ann:prereqs', PROJ.ann.file] do
+    ann = PROJ.ann
+    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
+    to   = Array(ann.email[:to])
+
+    ### build a mail header for RFC 822
+    rfc822msg =  "From: #{from}\n"
+    rfc822msg << "To: #{to.join(',')}\n"
+    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
+    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
+    rfc822msg << "\n"
+    rfc822msg << "Date: #{Time.new.rfc822}\n"
+    rfc822msg << "Message-Id: "
+    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
+    rfc822msg << File.read(ann.file)
+
+    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
+      ann.email[key]
+    end
+
+    params[3] = PROJ.email if params[3].nil?
+
+    if params[4].nil?
+      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
+      params[4] = STDIN.gets.chomp
+    end
+
+    ### send email
+    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
+  end
+end  # namespace :ann
+
+desc 'Alias to ann:announcement'
+task :ann => 'ann:announcement'
+
+CLOBBER << PROJ.ann.file
+
+# EOF

data/tasks/bones.rake

@@ -0,0 +1,20 @@
+
+if HAVE_BONES
+
+namespace :bones do
+
+  desc 'Show the PROJ open struct'
+  task :debug do |t|
+    atr = if t.application.top_level_tasks.length == 2
+      t.application.top_level_tasks.pop
+    end
+
+    if atr then Bones::Debug.show_attr(PROJ, atr)
+    else Bones::Debug.show PROJ end
+  end
+
+end  # namespace :bones
+
+end  # HAVE_BONES
+
+# EOF

data/tasks/gem.rake

@@ -0,0 +1,192 @@
+
+require 'find'
+require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
+
+module Bones
+class GemPackageTask < Rake::PackageTask
+  # Ruby GEM spec containing the metadata for this package.  The
+  # name, version and package_files are automatically determined
+  # from the GEM spec and don't need to be explicitly provided.
+  #
+  attr_accessor :gem_spec
+
+  # Tasks from the Bones gem directory
+  attr_reader :bones_files
+
+  # Create a GEM Package task library.  Automatically define the gem
+  # if a block is given.  If no block is supplied, then +define+
+  # needs to be called to define the task.
+  #
+  def initialize(gem_spec)
+    init(gem_spec)
+    yield self if block_given?
+    define if block_given?
+  end
+
+  # Initialization tasks without the "yield self" or define
+  # operations.
+  #
+  def init(gem)
+    super(gem.name, gem.version)
+    @gem_spec = gem
+    @package_files += gem_spec.files if gem_spec.files
+    @bones_files = []
+
+    local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
+    if !test(?e, local_setup)
+      Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
+      gem_spec.files = (gem_spec.files +
+          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
+    end
+  end
+
+  # Create the Rake tasks and actions specified by this
+  # GemPackageTask.  (+define+ is automatically called if a block is
+  # given to +new+).
+  #
+  def define
+    super
+    task :prereqs
+    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
+    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
+      when_writing("Creating GEM") {
+        chdir(package_dir_path) do
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, "../#{gem_file}"
+          }
+        end
+      }
+    end
+
+    file package_dir_path => bones_files do
+      mkdir_p package_dir rescue nil
+      bones_files.each do |fn|
+        base_fn = File.join('tasks', File.basename(fn))
+        f = File.join(package_dir_path, base_fn)
+        fdir = File.dirname(f)
+        mkdir_p(fdir) if !File.exist?(fdir)
+        if File.directory?(fn)
+          mkdir_p(f)
+        else
+          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
+          safe_ln(fn, f)
+        end
+      end
+    end
+  end
+  
+  def gem_file
+    if @gem_spec.platform == Gem::Platform::RUBY
+      "#{package_name}.gem"
+    else
+      "#{package_name}-#{@gem_spec.platform}.gem"
+    end
+  end
+end  # class GemPackageTask
+end  # module Bones
+
+namespace :gem do
+
+  PROJ.gem._spec = Gem::Specification.new do |s|
+    s.name = PROJ.name
+    s.version = PROJ.version
+    s.summary = PROJ.summary
+    s.authors = Array(PROJ.authors)
+    s.email = PROJ.email
+    s.homepage = Array(PROJ.url).first
+    s.rubyforge_project = PROJ.rubyforge.name
+
+    s.description = PROJ.description
+
+    PROJ.gem.dependencies.each do |dep|
+      s.add_dependency(*dep)
+    end
+
+    PROJ.gem.development_dependencies.each do |dep|
+      s.add_development_dependency(*dep)
+    end
+
+    s.files = PROJ.gem.files
+    s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
+    s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
+
+    s.bindir = 'bin'
+    dirs = Dir["{#{PROJ.libs.join(',')}}"]
+    s.require_paths = dirs unless dirs.empty?
+
+    incl = Regexp.new(PROJ.rdoc.include.join('|'))
+    excl = PROJ.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
+    excl = Regexp.new(excl.join('|'))
+    rdoc_files = PROJ.gem.files.find_all do |fn|
+                   case fn
+                   when excl; false
+                   when incl; true
+                   else false end
+                 end
+    s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
+    s.extra_rdoc_files = rdoc_files
+    s.has_rdoc = true
+
+    if test ?f, PROJ.test.file
+      s.test_file = PROJ.test.file
+    else
+      s.test_files = PROJ.test.files.to_a
+    end
+
+    # Do any extra stuff the user wants
+    PROJ.gem.extras.each do |msg, val|
+      case val
+      when Proc
+        val.call(s.send(msg))
+      else
+        s.send "#{msg}=", val
+      end
+    end
+  end  # Gem::Specification.new
+
+  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
+    pkg.need_tar = PROJ.gem.need_tar
+    pkg.need_zip = PROJ.gem.need_zip
+  end
+
+  desc 'Show information about the gem'
+  task :debug => 'gem:prereqs' do
+    puts PROJ.gem._spec.to_ruby
+  end
+
+  desc 'Install the gem'
+  task :install => [:clobber, 'gem:package'] do
+    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
+
+    # use this version of the command for rubygems > 1.0.0
+    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
+  end
+
+  desc 'Uninstall the gem'
+  task :uninstall do
+    installed_list = Gem.source_index.find_name(PROJ.name)
+    if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
+      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
+    end
+  end
+
+  desc 'Reinstall the gem'
+  task :reinstall => [:uninstall, :install]
+
+  desc 'Cleanup the gem'
+  task :cleanup do
+    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
+  end
+end  # namespace :gem
+
+
+desc 'Alias to gem:package'
+task :gem => 'gem:package'
+
+task :clobber => 'gem:clobber_package'
+remove_desc_for_task 'gem:clobber_package'
+
+# EOF