rbridge 0.1 → 0.1.2

data/Authors.txt

@@ -0,0 +1,8 @@
+Original Creator:
+  Toshiyuki Hirooka <toshi.hirooka@gmail.com
+  
+Additional Patches and English Translation by:
+  Chuck Vose <vosechu@gmail.com>
+  
+Additional Patches and Windows Testing by:
+ Sean Steiger-McRae <larreh@gmail.com>

data/History.txt

@@ -1,3 +1,16 @@
+== 0.1.2 / 2008-01-10 (vosechu)
+* major enhancements
+  * Runs headless by using the rulang command or via the command-line using the
+    -noshell switch to erl. 
+  
+* bugs / limitations
+  * rulang command isn't ready for prime time at all
+
+== 0.1.1 / 2008-01-07 (vosechu)
+* 2 minor enhancements
+  * auto-detect whether someone has put a period at the end of a set of exprs
+  * updated specs catch a few more edge cases
+
 == 0.1 / 2008-01-04 (vosechu)
 
 * 1 major enhancement

data/Manifest.txt

@@ -1,12 +1,14 @@
-FORK.txt
+.DS_Store
+Authors.txt
 GPL.txt
 History.txt
 Manifest.txt
 README.txt
 Rakefile
+bin/rulang
 lib/erlang_adapter.rb
 lib/rbridge.rb
-lib/rulang.beam
-lib/rulang.erl
+lib/vosetools.rb
+rulang_server/rulang
 spec/rulang_spec.rb
 spec/spec_helper.rb

data/README.txt

@@ -1,28 +1,23 @@
 rbridge
-    by Chuck Vose (adapted from Toshi Hirooka's RulangBridge)
-    ruby-mnesia.rubyforge.com (originally http://code.google.com/p/rulangbridge/)
+ruby-mnesia.rubyforge.com
+by Toshiyuki Hirooka, Chuck Vose, Sean Steiger-McRae
 
 == DESCRIPTION:
-  
+
 RBridge allows the use of Erlang code within a Ruby program. Optionally allowing
 asynchronous access and ruby-like syntax or by using Erlang code directly when
 more expressive or complex code is needed.
 
 == FEATURES/PROBLEMS:
-  
+
 * Allows use of Erlang code within Ruby
 * Doesn't yet allow Ruby code within Erlang
-* Can't be started headless. Sockets are always closed.
 
 == SYNOPSIS:
 
-  1. Open an Erlang shell from the command line
-  $ erl
+  1. Start an instance of the rulang server by using bin/rulang
 
-  2. Start the RBridge server on some port (9900 is what the examples use)
-  1> rulang:start_server(9900).
-
-  3. Execute your ruby code by connecting (as shown below) to either the RBridge class if you want
+  2. Execute your ruby code by connecting (as shown below) to either the RBridge class if you want
   asynchronous access and ruby style code access, or by connecting to the Erlang
   class if you need more complicated code evaluation.
 
@@ -46,7 +41,7 @@ more expressive or complex code is needed.
 * Erlang (erlang.org) -
   There are current windows binaries as well as source for other oses. Installing
   on OS X should just need: ./configure --prefix=/opt/local && make && sudo make install.
-  
+
 * Ruby (ruby-lang.org) -
   On the downloads page if you skip past the source downloads there are a lot
   of one-click installers for various oses. If you go with source you at least
@@ -54,14 +49,13 @@ more expressive or complex code is needed.
 
 == INSTALL:
 
-* sudo gem install rulang
+* sudo gem install rbridge
 
 == LICENSE:
 
 RBridge - A Ruby to Erlang bridge allowing the use of Erlang commands within 
 normal Ruby code.
-Copyright (C) 2007 Toshi Hirooka
-Copyright (C) 2008 Chuck Vose <vosechu@gmail.com>
+Copyright (C) 2008 Toshiyuki Hirooka <toshi.hirooka@gmail.com>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -75,4 +69,4 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

data/Rakefile

@@ -6,14 +6,12 @@ require './lib/rbridge.rb'
 
 Hoe.new('rbridge', RBridge::VERSION) do |p|
   p.rubyforge_name = 'ruby-mnesia'
-  p.author = 'Chuck Vose'
+  p.author = ['Chuck Vose', 'Toshiyuki Hirooka', 'Sean Steiger-McRae']
   p.email = 'vosechu@gmail.com'
   p.summary = 'RBridge allows the use of Erlang code within the Ruby environment'
-  p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
+  p.description = p.paragraphs_of('README.txt', 1..4).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.remote_rdoc_dir = '' # Release to root
-  p.rsync_args << ' --exclude=statsvn/'
 end
 
 # vim: syntax=Ruby

data/bin/rulang

@@ -0,0 +1,4 @@
+#!/usr/local/bin/ruby -ws
+
+server_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "rulang_server"))
+exec "escript #{File.join(server_path, "rulang")}"

data/lib/erlang_adapter.rb

@@ -1,6 +1,6 @@
 # RBridge - A Ruby to Erlang bridge allowing the use of Erlang commands within 
 # normal Ruby code.
-# Copyright (C) 2008 Chuck Vose <vosechu@gmail.com>
+# Copyright (C) 2008 Toshiyuki Hirooka <toshi.hirooka@gmail.com>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -36,7 +36,8 @@ class ErlangAdapter
 		
     # There has to be a trailing space at the end of a command for erl_scan:tokens
     # to process the string.
-		command << " " if command[-1] != " "
+    command << '.' if command.scan(/\.\w*/).empty?
+		command << " "
 		socket.write(command)
 		socket.read # ...?
 	end

data/lib/rbridge.rb

@@ -1,6 +1,6 @@
 # RBridge - A Ruby to Erlang bridge allowing the use of Erlang commands within 
 # normal Ruby code.
-# Copyright (C) 2008 Chuck Vose <vosechu@gmail.com>
+# Copyright (C) 2008 Toshiyuki Hirooka <toshi.hirooka@gmail.com>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,13 +17,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require "socket"
-require "erlang_adapter"
+require "lib/erlang_adapter"
 
 #
 # Erlang サーバの関数を Ruby のメソッドのように扱えるようにするクラス
 #
 class RBridge
-  VERSION = "0.1"
+  VERSION = "0.1.2"
   
   # [Mod]
   # Erlang module to use when using ruby-style access (the default is "erlang")
@@ -77,4 +77,4 @@ class RBridge
 			raise "[Error]=>#{res}"
 		end
   end
-end
+end

data/lib/vosetools.rb

@@ -0,0 +1,144 @@
+# # These files may not be used in this project but are merely notes collected
+# # and inserted into all of Chuck Vose's projects. Please disregard them 
+# # unless they help you.
+
+# # PLUGINS:
+# # Autotest with UnitRecord
+# # By default, running autotest in the Rails directory will run the unit tests. 
+# # To run the functional tests, do: AUTOTEST='functional' autotest
+# ruby script/plugin install http://svn.soniciq.com/public/rails/plugins/iq_autotest
+# # Query Analyzer to see what we're doing under the surface
+# # Courtesy of Bob Silva at http://agilewebdevelopment.com/plugins/query_analyzer
+# ruby script/plugin install http://svn.nfectio.us/plugins/query_analyzer
+# # Dev mode performance cacher by Josh Goebel
+# # Caches dev code after file changes to make refreshes happen in the background
+# ruby script/plugin install http://svn.techno-weenie.net/projects/plugins/dev_mode_performance_fixes/
+# # Rspec for running BDD
+# ruby script/plugin install svn://rubyforge.org/var/svn/rspec/tags/CURRENT/rspec
+# ruby script/plugin install svn://rubyforge.org/var/svn/rspec/tags/CURRENT/rspec_on_rails
+
+# # GEMS:
+# # UnitRecord disconnects tests from the database and restructures tests into
+# # Proper unit/functional tests. (Unit == no database, no externals). Run 
+# # rake vose:convert_to_unitrecord[_and_commit] after installing.
+# sudo gem install unit_record
+# # Zentest provides test generation and autotest for hands free testing
+# # RSpec ~/.autotest file from http://reinh.com/2007/9/6/rspec-autotest-and-growl-oh-my
+# # Test::Unit ~/.autotest file from 
+# sudo gem install zentest
+# # Dust provides some handy helper methods to testing
+# sudo gem install dust
+# # Mocha allows cross unit tests by mocking and stubbing functions
+# sudo gem install mocha
+
+require 'rubygems'
+# require 'mocha'
+# require 'stubba'
+# require 'dust'
+
+# require 'factory'
+
+module Vosetools
+  def log_p(message)
+    require 'pp'
+    
+    p "*********************"
+    pp message
+    p "*********************"
+    
+    # if !message.is_a?(Array)
+    #   `growlnotify -m "#{message}"`
+    # end
+  end
+  
+  def profile
+    require 'ruby-prof'
+    
+    result = RubyProf.profile do
+      yield
+    end
+    
+    # Print a flat profile to text
+    printer = RubyProf::FlatPrinter.new(result)
+    printer.print(STDOUT, 5)
+  end
+  
+  # def has_a(obj)
+  #   class_eval do
+  #     define_method(:method_missing) do |*values|
+  #       if obj.methods.include?(values[0])
+  #         log_p values
+  #         obj.send!(:values[0], values[1..(values.length-1)])
+  #       end
+  #     end
+  #   end
+  # end
+end
+
+# # Adapted from http://sami.samhuri.net/2007/4/11/activerecord-base-find_or_create-and-find_or_initialize
+# # Originally created by sjs
+# module ActiveRecordExtensions
+#   def self.included(base)
+#     base.extend(ClassMethods)
+#   end
+#   
+#   module ClassMethods
+#     def find_or_create(params)
+#       begin
+#         return self.find(params[:id])
+#       rescue ActiveRecord::RecordNotFound => e
+#         attrs = {}
+#         
+#         # search for valid attributes in params
+#         self.column_names.map(&:to_sym).each do |attrib|
+#           # skip unknown columns, and the id field
+#           next if params[attrib].nil? || attrib == :id
+# 
+#           attrs[attrib] = params[attrib]
+#         end
+# 
+#         # call the appropriate ActiveRecord finder method
+#         found = self.send("find_by_#{attrs.keys.join('_and_')}", *attrs.values) if !attrs.empty?
+#         
+#         if found && !found.nil?
+#           return found
+#         else
+#           return self.create(params)
+#         end
+#       end
+#     end
+#     alias create_or_find find_or_create
+#   end
+# end
+# 
+# ActiveRecord::Base.send(:include, ActiveRecordExtensions)
+
+# Copyright: Jay Philips
+# jicksta.com/articles/2007/08/04/the-methodphitamine
+module Kernel
+  protected
+  def it() It.new end
+  alias its it
+end
+
+class It
+
+  undef_method(*(instance_methods - %w*__id__ __send__*))
+
+  def initialize
+    @methods = []
+  end
+
+  def method_missing(*args, &block)
+    @methods << [args, block] unless args == [:respond_to?, :to_proc]
+    self
+  end
+
+  def to_proc
+    lambda do |obj|
+      @methods.inject(obj) do |current,(args,block)|
+        current.send(*args, &block)
+      end
+    end
+  end
+end

data/{lib/rulang.erl → rulang_server/rulang}

@@ -1,6 +1,8 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
 % RBridge - A Ruby to Erlang bridge allowing the use of Erlang commands within 
 % normal Ruby code.
-% Copyright (C) 2008 Chuck Vose <vosechu@gmail.com>
+% Copyright (C) 2008 Toshiyuki Hirooka <toshi.hirooka@gmail.com>
 % 
 % This program is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License
@@ -16,15 +18,28 @@
 % along with this program; if not, write to the Free Software
 % Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
--module(rulang).
 -export([start_server/1, stop_server/0, loop/1, handle_connection/1]).
 
+main([String]) ->
+  try
+    N = list_to_integer(String),
+    start_server(N)
+  catch
+    _:_ ->
+      usage()
+  end;
+main(_) ->
+  start_server(9900).
+  
+usage() ->
+  io:format("./rulang [port number]").
+
 % Start a server and connect to the port specified by the bound variable Port.
 % If all goes according to plan start the rulang loop and display a happy message.
 start_server(Port) ->
 	{ok, ListenSocket} = gen_tcp:listen(Port, [binary, {packet, 0}, {active, false}]),
 	io:format("[RBridge Server Started]~n"),
-	spawn(rulang, loop, [ListenSocket]).
+	loop(ListenSocket).
 	
 
 % Just kill the parent thread.
@@ -40,15 +55,11 @@ loop(ListenSocket) ->
 	  
     % If the connection is valid read the commands and attempt to eval them.
 	  {ok, Socket} -> 
-	    spawn_link(rulang, handle_connection, [Socket]),
+	    spawn(fun() ->
+	      handle_connection(Socket)
+      end),
       % Continue the loop
-	    loop(ListenSocket);
-	    
-    % The connection is broken so we should display the error to the console
-    % and drop the server so the heartbeat process can try to restart it.
-	  {error, Reason} -> 
-	    error_logger:error_report(Reason),
-	    stop_server()
+	    loop(ListenSocket)
   end.
 	
 % Wrapper that catches errors and closes the socket after we're done with it.
@@ -96,5 +107,4 @@ to_ruby(Expression) when is_integer(Expression) ->
 to_ruby(Expression) when is_float(Expression) ->
 	Expression;
 to_ruby(Expression) when is_atom(Expression) ->
-	atom_to_list(Expression).
-
+	atom_to_list(Expression).

data/spec/rulang_spec.rb

@@ -1,6 +1,6 @@
 # RBridge - A Ruby to Erlang bridge allowing the use of Erlang commands within 
 # normal Ruby code.
-# Copyright (C) 2008 Chuck Vose <vosechu@gmail.com>
+# Copyright (C) 2008 tosik <toshi.hirooka@gmail.com>, Chuck Vose <vosechu@gmail.com>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+# require 'rubygems'
+# require 'rbridge'
 require 'spec/spec_helper'
 
 describe "RBridge (erlang module)" do
@@ -82,4 +84,12 @@ describe "Direct Erlang code" do
   it "should evaluate mathematical expressions" do
     @e_raw.erl("10*10.").should eql(100)
   end
+  
+  it "should evaluate multiple expressions seperated by commas" do
+    @e_raw.erl("QH = [1,2,3,4,5], erlang:length(QH).").should eql(5)
+  end
+  
+  it "should add a period if there isn't one at the end of an expression" do
+    @e_raw.erl("QH = [1,2,3,4,5], erlang:length(QH)").should eql(5)
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Chuck Vose <vosechu@gmail.com>
+# Copyright (C) 2008 tosik <toshi.hirooka@gmail.com>, Chuck Vose <vosechu@gmail.com>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14,6 +14,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'lib/vosetools'
+include Vosetools
+
 exclude = ['spec/spec_helper.rb', 'lib/rulang.erl', 'lib/rulang.beam']
 
 Dir.glob('lib/*').each do |file|
@@ -22,9 +25,9 @@ Dir.glob('lib/*').each do |file|
   end
 end
 
-Dir.glob('spec/*').each do |file|
-  unless exclude.include?(file)
-    require file
-    # log_p "requiring #{file}"
-  end
-end
+# Dir.glob('spec/*').each do |file|
+#   unless exclude.include?(file)
+#     require file
+#     # log_p "requiring #{file}"
+#   end
+# end

metadata

@@ -1,15 +1,38 @@
 --- !ruby/object:Gem::Specification 
 name: rbridge
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.2
 platform: ""
 authors: 
 - Chuck Vose
+- Toshiyuki Hirooka
+- Sean Steiger-McRae
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MRAwDgYDVQQDDAd2b3Nl
+  Y2h1MRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
+  HhcNMDgwMTA1MDE1OTQ3WhcNMDkwMTA0MDE1OTQ3WjA+MRAwDgYDVQQDDAd2b3Nl
+  Y2h1MRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtLL4OIhOk2DAMsf4Momug
+  NIyRD7C/IaKgCPLjTYxEJYlhdYdKlYWiC6wDMPbuCYGTlvYLlK/BztIWIrge+8kt
+  5F9AMZGDO9uJM9pSAxXKsKPo7jCnoU3SGdDxeyY6EdG7iGiQZ+s9ZNX7KarOxwk8
+  3CtEbF/cf7u6aYFOeitMKY/OO+Zjn7vKoiqgyrtRZVdcTUZlPNYIzicrH+N7/OTe
+  hjK45a2lok5OLaeYQ09epV8aZB5ir6HtL4wNAhlH0AP3OlUEjpqTa9vRixlvnCgh
+  lO2w9e+T5z9kBfpo3RHIjvIvcVFcSOiwdDY6/1RZNSa+2/NIMXM3XdDSFdNqNJdj
+  AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBS9Lm6+
+  psxyrN9kHQ0AAqh3LyRdFDANBgkqhkiG9w0BAQUFAAOCAQEAPZlaZipuNWuki23P
+  nxr5j7sJuO9+zo0gGFmvB5XlMlmOaFQA3CIVh3xlDS7XIPxF62YK4VFRT/qHWGVb
+  LT9XUkGLoNi9rDV7ruC0ewMJuc3e2XL6V6/chAoYLOfM3DcfQDMYcE7wUoLxhWON
+  tzJDcZLhnOmxrLpGEDnbSyeAxKwGv6MYXSa6hdaOYwHMCBbSV8w6PTCmciWks1Vh
+  3lRJ8zVBx4TbMaQOZ4ctz0MKMOKveMH6kEZBoxYX8y/lxIb3jBR76KFUxbFvPO35
+  bWgAmoAm9dDQ0mKTmXgN5fLc5mzwX9vuVRjhNB6Co2bTcHt7J9E6uFZ43QkzPXMn
+  6uVjBw==
+  -----END CERTIFICATE-----
 
-date: 2008-01-04 00:00:00 -08:00
+date: 2008-03-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,33 +44,35 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.0
     version: 
-description: "== FEATURES/PROBLEMS:  * Allows use of Erlang code within Ruby * Doesn't yet allow Ruby code within Erlang * Can't be started headless. Sockets are always closed.  == SYNOPSIS:  1. Open an Erlang shell from the command line $ erl  2. Start the RBridge server on some port (9900 is what the examples use) 1> rulang:start_server(9900)."
+description: "== DESCRIPTION:  RBridge allows the use of Erlang code within a Ruby program. Optionally allowing asynchronous access and ruby-like syntax or by using Erlang code directly when more expressive or complex code is needed.  == FEATURES/PROBLEMS:  * Allows use of Erlang code within Ruby * Doesn't yet allow Ruby code within Erlang"
 email: vosechu@gmail.com
-executables: []
-
+executables: 
+- rulang
 extensions: []
 
 extra_rdoc_files: 
-- FORK.txt
+- Authors.txt
 - GPL.txt
 - History.txt
 - Manifest.txt
 - README.txt
 files: 
-- FORK.txt
+- .DS_Store
+- Authors.txt
 - GPL.txt
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
+- bin/rulang
 - lib/erlang_adapter.rb
 - lib/rbridge.rb
-- lib/rulang.beam
-- lib/rulang.erl
+- lib/vosetools.rb
+- rulang_server/rulang
 - spec/rulang_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: "    by Chuck Vose (adapted from Toshi Hirooka's RulangBridge)"
+homepage: ruby-mnesia.rubyforge.com
 post_install_message: 
 rdoc_options: 
 - --main

metadata.gz.sig

@@ -0,0 +1 @@
+*�aMW�ώ�C�S�!(��b�p�ħH6�86�:�����e&��r�B0�����-}3���`�^FYG����78�G�f���[����ɔ�)m��-�a��j�^�W�M݁E`X~����Ŭ55*jdɶ>�Jzi��H�Z�2�?���ͱ ���3����9!������֩[�wY�Г���%"�F*�[�6��Q8b"����ͺr7%�7=����e�o/��A���t�o7s��JX���N|��Jh�

data/FORK.txt

@@ -1,13 +0,0 @@
-This project is a fork of the project originally called RulangBridge by Toshi
-Hirooka (?) aka tosik. I have done my best to contact the original author but
-have received no response. I have also contacted the ruby-talk list to help me
-find the original owner but again to no avail. 
-
-Therefore, in the interest of continuing this project I've renamed it and made
-my changes. I hope that at some point the original author will find this file
-and understand the position I was in. 
-
-Thanks should go out to the original author if they can be found. Until that 
-time I hope that this new project can fulfill the same goals. 
-
--Chuck Vose, Jan 4 2008