relisp 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,3 +1,15 @@
+== 1.0.1 / 2009-09-09
+
+* 1 tiny backwards-incompatible enhancement
+  * 'relisp-start-slave' now takes an optional argument for the path
+    to the ruby script, instead of relying on the variable
+    'relisp-ruby-slave-path'.  That was stupid.
+* 1 minor change
+  * Better instructions for installing elisp component.
+* 2 bug fixes
+  * Relisp::Window#shrink
+  * Relisp::Window#enlarge
+
 == 1.0.0 / 2009-05-05
 
 * Works on Windows

data/README

@@ -19,8 +19,12 @@ Then the library is installed, and you can call elisp from ruby.  But
 if you want to call ruby from emacs (and you do, right?) you need to
 go into the +src+ directory and copy <tt>relisp.el</tt> and/or
 <tt>relisp.elc</tt> to your elisp folder (probably <tt>~/.elisp</tt>).
-Then you might want to add the line <tt>(require 'relisp)</tt> to your
-emacs initialization file (probably <tt>~/.emacs'</tt>).
+Then you might want to add the lines
+
+  (autoload 'relisp-start-slave "relisp" nil t)
+  (autoload 'ruby-eval "relisp" nil t)
+
+to your emacs initialization file (probably <tt>~/.emacs'</tt>).
 
 If you don't know where to find the files for this gem, run the
 command <tt>gem env gemdir</tt>.  Or you can download the tarball for
@@ -92,12 +96,11 @@ The ruby slave file should look something like this:
   slave.start
 
 The call to <tt>slave.start</tt> should probably be the last line of
-the file since it starts an infinite loop.  The elisp code just
-needs to specify the ruby slave file before calling
+the file since it starts an infinite loop.  The elisp code just needs
+to specify the path to the ruby slave when calling
 <tt>relisp-start-slave</tt>:
 
-  (setq relisp-ruby-slave-path "ruby_slave")
-  (relisp-start-slave)
+  (relisp-start-slave "ruby_slave")
   (ruby-eval "sample_ruby_method")
 
 For debugging and curiousity, all of the messages between emacs and
@@ -142,10 +145,6 @@ use the <tt>ElispSlave#debugging</tt> method:
     emacs.elisp_eval "(+ 1 2)"    
   end 
 
-== To Do
-
-* fix Windows bug(s)
-
 == Author
 
 <don@ohspite.net>

data/Rakefile

@@ -1,35 +1,30 @@
 begin
   require 'bones'
-  Bones.setup
 rescue LoadError
-  begin
-    load 'tasks/setup.rb'
-  rescue LoadError
-    raise RuntimeError, '### please install the "bones" gem ###'
-  end
+  raise RuntimeError, '### please install the "bones" gem ###'
 end
 
+task :default => 'test:run'
 ensure_in_path 'lib'
 require 'relisp'
 
-task :default => 'test'
-
-PROJ.name           = 'relisp'
-PROJ.authors        = 'Don'
-PROJ.email          = 'don@ohspite.net'
-PROJ.url            = 'relisp.rubyforge.org'
-PROJ.summary        = 'Call ruby from emacs and call elisp from ruby. If you never did you should. These things are fun and fun is good.'
-PROJ.description    = 'Call ruby from emacs and call elisp from ruby. If you never did you should. These things are fun and fun is good.'
-PROJ.version        = Relisp::VERSION
-PROJ.rubyforge.name = 'relisp'
-PROJ.history_file   = 'CHANGELOG'
-PROJ.manifest_file  = 'Manifest'
-PROJ.readme_file    = 'README'
-PROJ.rdoc.main      = 'README'
-PROJ.exclude        = %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ \.bzr/ \.bzrignore ^pkg/)
-PROJ.rdoc.include   = %w(README ^lib/ ^bin/ ^ext/ \.txt$ \.rdoc$)
-
-PROJ.gem.extras[:post_install_message] = <<-MSG
+Bones do 
+  name           'relisp'
+  authors        'Don'
+  email          'don@ohspite.net'
+  url            'https://rubygems.org/gems/relisp'
+  summary        'Call ruby from emacs and call elisp from ruby. If you never did you should. These things are fun and fun is good.'
+  description    'Call ruby from emacs and call elisp from ruby. If you never did you should. These things are fun and fun is good.'
+  version        Relisp::VERSION
+#  rubyforge.name 'relisp'
+  history_file   'CHANGELOG'
+  manifest_file  'Manifest'
+  readme_file    'README'
+  rdoc.main      'README'
+  exclude        %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ \.bzr/ \.bzrignore ^pkg/)
+  rdoc.include   %w(README ^lib/ ^bin/ ^ext/ \.txt$ \.rdoc$)
+  
+  gem.extras[:post_install_message] = <<-MSG
 ---------------------------
 Wait! You're not finished!
 
@@ -37,8 +32,12 @@ The gem is installed, and you can now call elisp from ruby.  But if
 you want to call ruby from emacs (and you do, right?) you need to go
 into the 'src' directory of this gem and copy 'relisp.el' and/or
 'relisp.elc' to your elisp folder (probably '~/.elisp').  Then you
-might want to add the line "(require 'relisp)" to your emacs
-initialization file (probably '~/.emacs').
+might want to add the lines
+
+  (autoload 'relisp-start-slave "relisp" nil t)
+  (autoload 'ruby-eval "relisp" nil t)
+
+to your emacs initialization file (probably '~/.emacs').
 
 If you don't know where to find the files for this gem, run the
 command "gem env gemdir".  Or you can download the tarball for this
@@ -46,5 +45,5 @@ gem and get the files there.
 ---------------------------
 MSG
 
-PROJ.spec.opts << '--color'
-
+#  spec.opts << '--color'
+end

data/examples/elisp_master/elisp_master.el

@@ -1,27 +1,21 @@
 ;; How to specify a file when running the slave.  The next few
 ;; `ruby-eval's call methods defined in the ruby slave file.
 
-(progn
-  (relisp-stop-slave)
-  (setq relisp-ruby-slave-path "ruby_slave")
-  (relisp-start-slave))
+(relisp-start-slave "ruby_slave")
 
 (ruby-eval "sample_ruby_method1")
 (ruby-eval "sample_ruby_method2")
 
-(member "ruby-created-buffer" (mapcar (lambda (a) (buffer-name a)) (buffer-list)))
+(member "ruby-created-buffer" (mapcar 'buffer-name (buffer-list)))
 (ruby-exec "sample_ruby_method3")
-(member "ruby-created-buffer" (mapcar (lambda (a) (buffer-name a)) (buffer-list)))
+(member "ruby-created-buffer" (mapcar 'buffer-name (buffer-list)))
 
 (ruby-exec "sample_ruby_method4")
 
 ;; How to start the ruby slave without a file. The rest of the
 ;; commands will work fine with a slave started either way.
 
-(progn
-  (relisp-stop-slave)
-  (makunbound 'relisp-ruby-slave-path)
-  (relisp-start-slave))
+(relisp-start-slave) ;; stops the old slave first
 
 ;; Basic functionality--note that return values are not strings but
 ;; actual elisp data types:
@@ -35,14 +29,14 @@
 (type-of (ruby-eval (concat (relisp-to-ruby vect) ".reverse")))
 
 (setq list '(3 5 2 6 4 1))
-(ruby-eval (concat (relisp-to-ruby list) ".sort"))
-(type-of (ruby-eval (concat (relisp-to-ruby list) ".sort")))
+(ruby-eval (concat (relisp-to-ruby list) ".class"))
+(ruby-eval (concat (relisp-to-ruby list) ".to_list.class"))
+(ruby-eval (concat (relisp-to-ruby list) ".to_list.sort"))
+(type-of (ruby-eval (concat (relisp-to-ruby list) ".to_list")))
 
 (setq str "a couple of words")
 (ruby-eval (concat (relisp-to-ruby str) ".split"))
 
-(type-of (ruby-eval "{:name => 'john'}"))
-
 ;; Recursive calls:
 (ruby-eval "elisp_eval('(+ 1 2)')")
 (ruby-eval "elisp_eval('(ruby-eval \"1 + 2\")')")

data/lib/relisp/type_conversion/editing_types.rb

@@ -463,13 +463,13 @@ module Relisp
     end
 
     def enlarge(vertical, horizontal=0)
-      eval_in_window "(enlarge-window #{vertical.to_elisp})"
-      eval_in_window "(enlarge-window-horizontally #{horizontal.to_elisp})"
+      eval_in_window "(enlarge-window #{vertical.to_elisp})" unless vertical == 0
+      eval_in_window "(enlarge-window-horizontally #{horizontal.to_elisp})" unless horizontal == 0
     end
 
     def shrink(vertical, horizontal=0)
-      eval_in_window "(shrink-window #{vertical.to_elisp})"
-      eval_in_window "(shrink-window-horizontally #{horizontal.to_elisp})"
+      eval_in_window "(shrink-window #{vertical.to_elisp})" unless vertical == 0
+      eval_in_window "(shrink-window-horizontally #{horizontal.to_elisp})" unless horizontal == 0
     end
 
     def frame

data/lib/relisp/type_conversion/programming_types.rb

@@ -265,7 +265,7 @@ module Relisp
     end
 
     # Translate the cons cell into a Relisp::List, a subclass of
-    # Array.  See list? for when this be done.
+    # Array.  See list? for when this can be done.
     #
     def to_list
       list_array = []

data/lib/relisp.rb

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

data/manual_test/tests.el

@@ -1,7 +1,4 @@
-(progn
-  (relisp-stop-slave)
-  (setq relisp-ruby-slave-path "tests.rb")
-  (relisp-start-slave))
+(relisp-start-slave "tests.rb")
 
 ;; bury current buffer
 (ruby-eval "buffer_bury")
@@ -21,52 +18,3 @@
 
 ;; create some windows and move them horizontally and vertically
 (ruby-eval "window_shrink")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/manual_test/tests.rb

@@ -31,7 +31,6 @@ def window_scroll_down
   selected_window.visible?(1)
 end
 
-
 def window_shrink
   w = selected_window
   w2 = w.split_vertically
@@ -61,6 +60,5 @@ def window_shrink
   w3.delete
 end
 
-
 slave.start
 

data/src/relisp.el

@@ -134,7 +134,7 @@
   "Have ruby evaluate RUBY-CODE without returning the result.
 Reads input from the minibuffer unless an argument is
 given."
-  (interactive "ruby> ")
+  (interactive "Mruby> ")
   (let (message result)
     (if (and relisp-emacs-master-p (not (relisp-slave-alive-p)))
 	(relisp-start-slave))
@@ -155,7 +155,7 @@ given."
 The result is an elisp object equivalent to the ruby result of
 RUBY-CODE.  Reads input from the minibuffer unless an argument is
 given."
-  (interactive "ruby> ")
+  (interactive "Mruby> ")
   (let (message result)
     (if (and relisp-emacs-master-p (not (relisp-slave-alive-p)))
 	(relisp-start-slave))
@@ -254,17 +254,17 @@ relisp-become-slave."
   (setq relisp-error-code        (relisp-get-constant))
   (setq relisp-previous-result   (read (relisp-get-constant))))
 
-(defun relisp-start-slave nil
+(defun relisp-start-slave (&optional slave-path)
   "Start a ruby slave process to do emacs's bidding.
-If `relisp-ruby-slave-path' is bound, then that file is read and
-the Relisp::RubySlave object must be started there.  Otherwise
+If SLAVE-PATH is given, then that Ruby file is read and the
+Relisp::RubySlave object must be started in that file.  Otherwise
 emacs starts a ruby process and starts a RubySlave on its own."
   (interactive)
   (setq relisp-emacs-master-p t)
   (relisp-stop-slave)
   (setq relisp-ruby-output "")
-  (if (and (boundp 'relisp-ruby-slave-path) (file-exists-p relisp-ruby-slave-path))
-      (setq relisp-slave-process (start-process relisp-slave-name nil "ruby" relisp-ruby-slave-path))
+  (if (and slave-path (file-exists-p slave-path))
+      (setq relisp-slave-process (start-process relisp-slave-name nil "ruby" slave-path))
     (setq relisp-slave-process (start-process relisp-slave-name nil
 					      "ruby" 
 					      "-x"))
@@ -303,6 +303,7 @@ emacs starts a ruby process and starts a RubySlave on its own."
 
 (defun relisp-stop-slave nil
   "Kill the ruby slave process."
+  (interactive)
   (if (boundp 'relisp-slave-process)
       (delete-process relisp-slave-process)))
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relisp
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Don
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 -04:00
+date: 2010-12-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.2
-    version: 
+        hash: 27
+        segments: 
+        - 3
+        - 5
+        - 4
+        version: 3.5.4
+  type: :development
+  version_requirements: *id001
 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
 executables: []
@@ -49,24 +61,14 @@ files:
 - manual_test/tests.rb
 - setup.rb
 - src/relisp.el
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
 - test/test_editing_types.rb
 - test/test_elisp_functions.rb
 - test/test_programming_types.rb
 - test/test_slaves.rb
 has_rdoc: true
-homepage: relisp.rubyforge.org
+homepage: https://rubygems.org/gems/relisp
+licenses: []
+
 post_install_message: |
   ---------------------------
   Wait! You're not finished!
@@ -75,8 +77,12 @@ post_install_message: |
   you want to call ruby from emacs (and you do, right?) you need to go
   into the 'src' directory of this gem and copy 'relisp.el' and/or
   'relisp.elc' to your elisp folder (probably '~/.elisp').  Then you
-  might want to add the line "(require 'relisp)" to your emacs
-  initialization file (probably '~/.emacs').
+  might want to add the lines
+  
+    (autoload 'relisp-start-slave "relisp" nil t)
+    (autoload 'ruby-eval "relisp" nil t)
+  
+  to your emacs initialization file (probably '~/.emacs').
   
   If you don't know where to find the files for this gem, run the
   command "gem env gemdir".  Or you can download the tarball for this
@@ -89,26 +95,32 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: relisp
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 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_elisp_functions.rb
-- test/test_programming_types.rb
 - test/test_slaves.rb
+- test/test_programming_types.rb
+- test/test_elisp_functions.rb

data/tasks/ann.rake

@@ -1,80 +0,0 @@
-
-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

@@ -1,20 +0,0 @@
-
-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