relisp 0.9.2 → 1.0.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 1.0.0 / 2009-05-05
+
+* Works on Windows
+* Stable!
+* Cinco de Mayo!
+
 == 0.9.2 / 2009-03-09
 
 * 3 minor enhancements

data/lib/relisp/slaves.rb

@@ -324,9 +324,9 @@ module Relisp
                         "emacs --batch "
                       end
       emacs_command << cli_options
-      emacs_command << " -l #{elisp_path}"
+      emacs_command << " -l \"#{elisp_path}\""
       load_files.each do |file|
-        emacs_command << " -l #{file}"
+        emacs_command << " -l \"#{file}\""
       end
       emacs_command << " --eval '(relisp-become-slave)'"
       # In batch mode, emacs sends its normal output to stderr for

data/lib/relisp.rb

@@ -19,7 +19,7 @@
 #++
 
 module Relisp
-  VERSION = '0.9.2'
+  VERSION = '1.0.0'
 
   class ElispError < RuntimeError; end
 end

data/tasks/post_load.rake

@@ -2,8 +2,8 @@
 # This file does not define any rake tasks. It is used to load some project
 # settings if they are not defined by the user.
 
-PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
 PROJ.exclude << ["^#{Regexp.escape(PROJ.ann.file)}$",
+                 "^#{Regexp.escape(PROJ.ignore_file)}$",
                  "^#{Regexp.escape(PROJ.rdoc.dir)}/",
                  "^#{Regexp.escape(PROJ.rcov.dir)}/"]
 
@@ -25,12 +25,7 @@ PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n")
 
 PROJ.summary ||= PROJ.description.split('.').first
 
-PROJ.gem.files ||=
-  if test(?f, PROJ.manifest_file)
-    files = File.readlines(PROJ.manifest_file).map {|fn| fn.chomp.strip}
-    files.delete ''
-    files
-  else [] end
+PROJ.gem.files ||= manifest
 
 PROJ.gem.executables ||= PROJ.gem.files.find_all {|fn| fn =~ %r/^bin/}
 

data/tasks/rdoc.rake

@@ -19,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/tasks/setup.rb

@@ -4,8 +4,9 @@ require 'rake'
 require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
+require 'find'
 
-class OpenStruct; undef :gem; end
+class OpenStruct; undef :gem if defined? :gem; end 
 
 # TODO: make my own openstruct type object that includes descriptions
 # TODO: use the descriptions to output help on the available bones options
@@ -27,8 +28,8 @@ PROJ = OpenStruct.new(
   :ruby_opts => %w(-w),
   :libs => [],
   :history_file => 'History.txt',
-  :manifest_file => 'Manifest.txt',
   :readme_file => 'README.txt',
+  :ignore_file => '.bnsignore',
 
   # Announce
   :ann => OpenStruct.new(
@@ -123,9 +124,7 @@ import(*rakefiles)
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
 
 def quiet( &block )
   io = [STDOUT.dup, STDERR.dup]
@@ -138,21 +137,15 @@ ensure
   $stdout, $stderr = STDOUT, STDERR
 end
 
-DIFF = if WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
+DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
+       else 'diff' end unless defined? DIFF
 
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       end
+SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
+       else '' end unless defined? SUDO
 
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
+RCOV = "#{RUBY} -S rcov"
+RDOC = "#{RUBY} -S rdoc"
+GEM  = "#{RUBY} -S gem"
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
   begin
@@ -254,9 +247,29 @@ end
 # Scans the current working directory and creates a list of files that are
 # candidates to be in the manifest.
 #
-def manifest_files
+def manifest
   files = []
-  exclude = Regexp.new(PROJ.exclude.join('|'))
+  exclude = PROJ.exclude.dup
+  comment = %r/^\s*#/
+ 
+  # process the ignore file and add the items there to the exclude list
+  if test(?f, PROJ.ignore_file)
+    ary = []
+    File.readlines(PROJ.ignore_file).each do |line|
+      next if line =~ comment
+      line.chomp!
+      line.strip!
+      next if line.nil? or line.empty?
+
+      glob = line =~ %r/\*\./ ? File.join('**', line) : line
+      Dir.glob(glob).each {|fn| ary << "^#{Regexp.escape(fn)}"}
+    end
+    exclude.concat ary
+  end
+
+  # generate a regular expression from the exclude list
+  exclude = Regexp.new(exclude.join('|'))
+
   Find.find '.' do |path|
     path.sub! %r/^(\.\/|\/)/o, ''
     next unless test ?f, path

data/test/test_editing_types.rb

@@ -423,9 +423,11 @@ module TestRelisp
       w1.delete_others
       b = Relisp::Buffer.new(@emacs)
       w1.buffer=b
+      assert_equal 1, w1.point
       b.insert "12345"
       w2 = w1.split
       w2.select
+      w1.point = 1 # w1 point moves because of insert
       @emacs.goto_char(@emacs.point_max)
       assert_equal 6, @emacs.point
       assert_equal 1, w1.point
@@ -494,19 +496,21 @@ module TestRelisp
     end
     
     def test_initialize
-      new_frame = Relisp::Frame.new
-      assert_kind_of Relisp::Frame, new_frame
-      assert_equal :frame,  @emacs.elisp_eval( "(type-of #{new_frame.to_elisp})")
-      new_frame = Relisp::Frame.new({:width => 30, :height => 20})
-      assert_kind_of Relisp::Frame, new_frame
-      assert_equal :frame,  @emacs.elisp_eval( "(type-of #{new_frame.to_elisp})")
+      # TODO: causes "unknown terminal type" when run in non-window mode      
+      # new_frame = Relisp::Frame.new
+      # assert_kind_of Relisp::Frame, new_frame
+      # assert_equal :frame,  @emacs.elisp_eval( "(type-of #{new_frame.to_elisp})")
+      # new_frame = Relisp::Frame.new({:width => 30, :height => 20})
+      # assert_kind_of Relisp::Frame, new_frame
+      # assert_equal :frame,  @emacs.elisp_eval( "(type-of #{new_frame.to_elisp})")
     end
 
     def test_alive_eh
-      f = Relisp::Frame.new
-      assert f.alive?
-      f.delete
-      assert ! f.alive?
+      # TODO: causes "unknown terminal type" when run in non-window mode
+      # f = Relisp::Frame.new
+      # assert f.alive?
+      # f.delete
+      # assert ! f.alive?
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: relisp
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Don
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-10 00:00:00 -04:00
+date: 2009-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: 2.4.2
     version: 
 description: Call ruby from emacs and call elisp from ruby. If you never did you should. These things are fun and fun is good.
 email: don@ohspite.net
@@ -49,12 +49,10 @@ files:
 - manual_test/tests.rb
 - setup.rb
 - src/relisp.el
-- src/relisp.elc
 - tasks/ann.rake
 - tasks/bones.rake
 - tasks/gem.rake
 - tasks/git.rake
-- tasks/manifest.rake
 - tasks/notes.rake
 - tasks/post_load.rake
 - tasks/rdoc.rake
@@ -111,6 +109,6 @@ specification_version: 2
 summary: Call ruby from emacs and call elisp from ruby. If you never did you should. These things are fun and fun is good.
 test_files: 
 - test/test_editing_types.rb
-- test/test_programming_types.rb
 - test/test_elisp_functions.rb
+- test/test_programming_types.rb
 - test/test_slaves.rb

data/tasks/manifest.rake

@@ -1,48 +0,0 @@
-
-require 'find'
-
-namespace :manifest do
-
-  desc 'Verify the manifest'
-  task :check do
-    fn = PROJ.manifest_file + '.tmp'
-    files = manifest_files
-
-    File.open(fn, 'w') {|fp| fp.puts files}
-    lines = %x(#{DIFF} -du #{PROJ.manifest_file} #{fn}).split("\n")
-    if HAVE_FACETS_ANSICODE and ENV.has_key?('TERM')
-      lines.map! do |line|
-        case line
-        when %r/^(-{3}|\+{3})/; nil
-        when %r/^@/; ANSICode.blue line
-        when %r/^\+/; ANSICode.green line
-        when %r/^\-/; ANSICode.red line
-        else line end
-      end
-    end
-    puts lines.compact
-    rm fn rescue nil
-  end
-
-  desc 'Create a new manifest'
-  task :create do
-    files = manifest_files
-    unless test(?f, PROJ.manifest_file)
-      files << PROJ.manifest_file
-      files.sort!
-    end
-    File.open(PROJ.manifest_file, 'w') {|fp| fp.puts files}
-  end
-
-  task :assert do
-    files = manifest_files
-    manifest = File.read(PROJ.manifest_file).split($/)
-    raise "ERROR: #{PROJ.manifest_file} is out of date" unless files == manifest
-  end
-
-end  # namespace :manifest
-
-desc 'Alias to manifest:check'
-task :manifest => 'manifest:check'
-
-# EOF