sequence 0.2.2 → 0.2.3

data/History.txt

@@ -1,10 +1,18 @@
-=== 0.2.2 / 2009-08-05
+=== 0.2.3 / 21dec2009
+* 3 Minor Bugfixes:
+  * use Array#join instead of Array#to_s for 1.9 compatibility
+  * set thread's last_match in #index and #rindex
+  * set last_match to nil on #match or #matchback failure
+* 1 Minor Enhancements:
+  * reworked build scripts slightly
+
+=== 0.2.2 / 5aug2009
 * 3 Minor Enhancements:
   * mostly works in ruby 1.9, but still some bizarre unit test failures
   * should now work in windows without a problem
   * replaced (no longer working) Hoe/Rakefile with Makefile/gemspec
 
-=== 0.2.1 / 2009-01-07
+=== 0.2.1 / 7jan2009
 * 1 Minor Enhancement:
   * WeakRefSet now conforms to Set's api and tests more closely.
 
@@ -12,7 +20,7 @@
   * fixed errors in MatchData when matching against a Regexp with an 
     optional capture that didn't capture anything .
 
-=== 0.2.0 / 2008-08-28
+=== 0.2.0 / 28aug2008
 
 * 2 Major Enhancements:
   * all tests now pass
@@ -24,7 +32,7 @@
   * more List test data created by wrapping existing data in List(s)
   * enabled some tests which had been failing
 
-=== 0.1.0 / 2006-10-05
+=== 0.1.0 / 5oct2006
 
 * 1 major enhancement
 

data/Makefile

@@ -1,3 +1,12 @@
+name=Sequence
+lname=sequence
+gemname=sequence
+
+#everything after this line is generic
+
+version=$(shell ruby -r ./lib/$(lname)/version.rb -e "puts $(name)::VERSION")
+filelist=$(shell git ls-files)
+
 .PHONY: all test docs gem tar pkg email
 all: test
 
@@ -10,23 +19,25 @@ docs:
 pkg: gem tar
 
 gem:
-	gem build sequence.gemspec
+	gem build $(lname).gemspec
 
 tar:
-	tar czf sequence-`ruby -r ./lib/sequence/version.rb -e 'puts Sequence::VERSION'`.tar.gz `git ls-files`
+	tar cf - $(filelist) | ( mkdir $(gemname)-$(version); cd $(gemname)-$(version); tar xf - )
+	tar czf $(gemname)-$(version).tar.gz $(gemname)-$(version)
+	rm -rf $(gemname)-$(version)
 
 email: README.txt History.txt
 	ruby -e ' \
   require "rubygems"; \
-  load "./sequence.gemspec"; \
-  spec= Gem::Specification.list.find{|x| x.name=="sequence"}; \
+  load "./$(lname).gemspec"; \
+  spec= Gem::Specification.list.find{|x| x.name=="$(gemname)"}; \
   puts "\
-Subject: [ANN] Sequence #{spec.version} Released \
-\n\nSequence version #{spec.version} has been released! \n\n\
+Subject: [ANN] $(name) #{spec.version} Released \
+\n\n$(name) version #{spec.version} has been released! \n\n\
 #{Array(spec.homepage).map{|url| " * #{url}\n" }} \
  \n\
-#{Sequence::Description} \
+#{$(name)::Description} \
 \n\nChanges:\n\n \
-#{Sequence::Latest_changes} \
+#{$(name)::Latest_changes} \
 "\
 '

data/lib/sequence/stringlike.rb

@@ -64,7 +64,7 @@ class Sequence
           end
           blocks<<block
        end
-       return blocks.to_s
+       return blocks.join
     end
    
 
@@ -101,8 +101,11 @@ class Sequence
       matchdata=match_fast(newrex,true,len)
       #fail if any  ^ or \A matched at begin of buffer, 
       #but buffer isn't begin of file
-      return if !matchdata or #not actually a match
+      if !matchdata or #not actually a match
         addedgroups.find{|i| matchdata.end(i)==0 } && !nearbegin
+          self.last_match=Thread.current[:last_match]=nil
+          return
+      end
 
       matchpos=pos-len
       matchpos>=0 or matchpos=0
@@ -129,9 +132,12 @@ class Sequence
       newrex=nearend(len)? rex : group_anchors(rex,false,false).first
 
       #do the match against what input we have
-      matchdata=match_fast(newrex,false,len) or return
+      matchdata=match_fast(newrex,false,len)
 
-      anchored and matchdata.begin(0).nonzero? and return
+      if !matchdata or anchored && matchdata.begin(0).nonzero?
+        self.last_match=Thread.current[:last_match]=nil
+        return
+      end
       posi=position;posi.move matchdata.end(0)
       result=fixup_match_result(matchdata,[],pos,:post) { posi.subseq(posi.pos..-1) }
           #note: post_match is a SubSeq
@@ -426,7 +432,7 @@ class Sequence
               range=0...m.begin(0)
               pre=subseq(range)
               m.set_pre_match_body { pre } 
-              self.last_match=m
+              self.last_match=Thread.current[:last_match]=m
               return m.begin(0) #return match and what preceded it
             end
             posi.move until_step_len
@@ -459,7 +465,7 @@ class Sequence
               range=m.end(0)+1..-1
               post=subseq(range)
               m.set_post_match_body { post } 
-              self.last_match=m
+              self.last_match=Thread.current[:last_match]=m
               posi.close
               return m.begin(0) #return match and what preceded it
             end

data/lib/sequence/version.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2006,2008  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 class Sequence
-  VERSION='0.2.2'
+  VERSION='0.2.3'
 end

data/sequence.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require './lib/sequence/version'
+require "#{File.dirname(__FILE__)}/lib/sequence/version"
 Sequence::Description=open("README.txt"){|f| f.read[/^==+ ?description[^\n]*?\n *\n?(.*?\n *\n.*?)\n *\n/im,1] }
 Sequence::Latest_changes="###"+open("History.txt"){|f| f.read[/\A===(.*?)(?====)/m,1] }
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split
   s.has_rdoc = true
   s.homepage = %{http://github.com/coatl/sequence}
-  s.rdoc_options = %w[--inline-source --main README.txt]
+  s.rdoc_options = %w[--main README.txt]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{sequence}
   s.rubygems_version = %q{1.3.0}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequence
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Caleb Clausen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-05 00:00:00 -07:00
+date: 2010-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - Makefile
 - Manifest.txt
 - README.txt
-- Rakefile
 - lib/assert.rb
 - lib/sequence.rb
 - lib/sequence/arraylike.rb
@@ -67,7 +66,6 @@ has_rdoc: true
 homepage: http://github.com/coatl/sequence
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --main
 - README.txt
 require_paths: 

data/Rakefile

@@ -1,41 +0,0 @@
-# Copyright (C) 2006  Caleb Clausen
-# Distributed under the terms of Ruby's license.
-require 'rubygems'
-require 'hoe'
-require './lib/sequence/version.rb'
-require 'test/unit'
- 
- if $*==["test"]
-  gem 'test-unit'
-  require 'test/unit'
-  #hack to get 'rake test' to stay in one process
-  #which keeps netbeans happy
-  $:<<"lib"
-  require "./test/test_all.rb"
-  Test::Unit::AutoRunner.run
-  exit
-end
- 
-   Hoe.new("sequence", Sequence::VERSION) do |_|
-
-     _.author = "Caleb Clausen"
-     _.email = "sequence-owner @at@ inforadical .dot. net"
-     _.url = [ "http://sequence.rubyforge.org/", "http://rubyforge.org/projects/sequence"]
-     _.summary = "A single api for reading and writing sequential data types."
-     _.description = <<-END
-A unified wrapper api for accessing data in Strings, Arrays, Files, IOs, 
-and Enumerations. Each sequence encapsulates some data and a current position 
-within it. There are methods for moving the position, reading and writing data
-(with or without moving the position) forward or backward from the current
-position (or anywhere at all), scanning for patterns (like StringScanner, but 
-it works in Files too, among others), and saving a position that will remain
-valid even after data is deleted or inserted elsewhere within the sequence. 
-
-There are also some utility classes for making sequences reversed or
-circular, turning one-way sequences into two-way, buffering, and making
-sequences that are subsets or aggregations of existing sequences. 
-     END
-   end
-
-   # add other tasks here
-