rbridge 0.1.2 → 0.2.0

data/Authors.txt

@@ -2,7 +2,4 @@ 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>
+  Chuck Vose <vosechu@gmail.com>

data/History.txt

@@ -1,3 +1,12 @@
+== 0.2.0 / 2008-04-24 (vosechu)
+* 1 major enhancement
+  * Actually runs headless via the rulang command. 
+  
+* 3 minor enhancements
+  * Uses optparse for clearer command-line options.
+  * Option to specify port, compile directory, mnesia directory, sname, and location of server file.
+  * Some error checking, and debug output added. Checks to see if server is already running on specified port.
+
 == 0.1.2 / 2008-01-10 (vosechu)
 * major enhancements
   * Runs headless by using the rulang command or via the command-line using the

data/Manifest.txt

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

data/README.txt

@@ -1,6 +1,6 @@
 rbridge
 ruby-mnesia.rubyforge.com
-by Toshiyuki Hirooka, Chuck Vose, Sean Steiger-McRae
+by Toshiyuki Hirooka, Chuck Vose
 
 == DESCRIPTION:
 
@@ -55,7 +55,7 @@ more expressive or complex code is needed.
 
 RBridge - A Ruby to Erlang bridge allowing the use of Erlang commands within 
 normal Ruby code.
-Copyright (C) 2008 Toshiyuki Hirooka <toshi.hirooka@gmail.com>
+Copyright (C) 2008 Toshiyuki Hirooka <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

data/Rakefile

@@ -6,7 +6,7 @@ require './lib/rbridge.rb'
 
 Hoe.new('rbridge', RBridge::VERSION) do |p|
   p.rubyforge_name = 'ruby-mnesia'
-  p.author = ['Chuck Vose', 'Toshiyuki Hirooka', 'Sean Steiger-McRae']
+  p.author = ['Chuck Vose', 'Toshiyuki Hirooka']
   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', 1..4).join("\n\n")

data/Todo.txt

@@ -0,0 +1,6 @@
+- Get the erlang adaptor to handle hashes
+- Add error checking to the rulang server for things like servers already running on a port. 
+- Build more tests, specifically the standard CRUD and a few join queries.
+- database.yml should say where beam/mnesia live
+- make record files importable (via rr command)
+- make sure when we start mnesia it's not just running over an old mnesia instance.

data/bin/rulang

@@ -1,4 +1,68 @@
-#!/usr/local/bin/ruby -ws
+#!/usr/local/bin/ruby -w
 
-server_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "rulang_server"))
-exec "escript #{File.join(server_path, "rulang")}"
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: rulang [options]"
+  
+  # Default of port 9900 and compiling the beam in the same folder as the erlang file.
+  options[:port] = 9900
+  options[:server_path] = File.expand_path(File.join(File.dirname(__FILE__), "..", "rulang_server"))
+  options[:beam_path] = options[:server_path]
+
+  opts.on("-v", "--verbose", "Run verbosely") do |v|
+    options[:verbose] = v
+  end
+  opts.on("-q", "--quiet", "Run quietly") do |q|
+    options[:quiet] = q
+  end
+  opts.on("-p", "--port Port", "Port Number to Connect To") do |p|
+    options[:port] = p
+  end
+  opts.on("-o", "--beam-path Path", "Path to Compile To") do |o|
+    options[:beam_path] = File.expand_path(o)
+  end
+  opts.on("-m", "--mnesia-path Path", "Path to Mnesia Directory") do |m|
+    options[:mnesia_path] = m
+  end
+  opts.on("-s", "--sname", "Node Name for Clustering") do |s|
+    options[:sname] = s
+  end
+  opts.on("--server-path", "Path to rulang.erl") do |sp|
+    options[:server_path] = sp
+  end
+  
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+  
+  opts.on_tail("--version", "Show version") do
+    puts OptionParser::Version.join('.')
+    exit
+  end
+end.parse!
+
+# Find out if there's already a beam file on this port
+pid = `ps ax | grep beam | grep -v grep | grep 'rulang:main(\\\[#{options[:port]}\\\])'`
+if pid && !pid.empty?
+  puts "Server already running on #{options[:port]}"
+  exit
+end
+
+# Commands to execute
+compile = "erlc -o #{options[:beam_path]} #{File.join(options[:server_path], "rulang.erl")}"
+start = "cd #{options[:beam_path]}; erl #{"-sname #{options[:sname]}" if options[:sname]} -detached -mnesia #{"dir '\"#{options[:mnesia_path]}\"'" if options[:mnesia_path]} -eval 'rulang:main([#{options[:port]}])'"
+
+# Debug output
+puts "Commands", compile, start if ENV['DEBUG'] == 'true'
+
+puts "[Rulang Server]\n" unless options[:quiet]
+puts "Compiling rulang beam...\n" if options[:verbose]
+`#{compile}`
+puts "Starting rulang server...\n" if options[:verbose]
+`#{start}`
+puts "Compile path: '#{options[:beam_path]}'\n" if options[:verbose]
+puts "Mnesia path: '#{File.expand_path(options[:mnesia_path])}'\n" if options[:mnesia_path] && options[:verbose]
+puts "PID: " + `ps ax | grep beam | grep -v grep | tail -n1 | cut -f 2 -d " "` if options[:verbose]

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 Toshiyuki Hirooka <toshi.hirooka@gmail.com>
+# Copyright (C) 2008 Toshiyuki Hirooka <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
@@ -31,9 +31,9 @@ class ErlangAdapter
 
 	# Send commands to the Erlang server to be evaluated. Must have trailing 
   # whitespace to differentiate between floats and EOL.
-	def eval(command)
+	def eval(command)		
 		socket = TCPSocket.new(@host, @port)
-		
+				
     # There has to be a trailing space at the end of a command for erl_scan:tokens
     # to process the string.
     command << '.' if command.scan(/\.\w*/).empty?

data/lib/mnesia_adapter.rb

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'ruby-debug'
+require 'rbridge'
+
+class MnesiaAdapter
+  attr_reader :connection, :path
+  
+  def initialize
+    @connection = RBridge.new(nil, 'localhost', 9900)
+    
+    @connection.erl("mnesia:start().")
+    @connection.erl("mnesia:create_schema([node()]).")
+    
+    debugger
+    
+    
+    @connection.erl("rr('tables.hrl').")
+        
+    puts "here"
+  end
+end
+
+MnesiaAdapter.new

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 Toshiyuki Hirooka <toshi.hirooka@gmail.com>
+# Copyright (C) 2008 Toshiyuki Hirooka <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
@@ -17,13 +17,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require "socket"
-require "lib/erlang_adapter"
+require "erlang_adapter"
 
 #
 # Erlang サーバの関数を Ruby のメソッドのように扱えるようにするクラス
 #
 class RBridge
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
   
   # [Mod]
   # Erlang module to use when using ruby-style access (the default is "erlang")
@@ -56,25 +56,46 @@ class RBridge
 		erl(command, block)
 	end
 	
+  # def sql_erl(command, block=nil)
+  #   res = command.scan(/[^\ ]+/)
+  #   case res[0]
+  #     when /select/i
+  #       erl_command = "Q = qlc:q([X || X <- mnesia:table(#{res[3]})]),
+  #                      F = fun() -> qlc:e(Q) end, 
+  #                      {atomic, Val} = mnesia:transaction(F), 
+  #                      Val."
+  #     else
+  #       erl_command = nil
+  #     end
+  #   
+  #   puts erl_command
+  #   erl(erl_command, block)
+  #   end
+	
   # Send commands to Erlang to be processed.
-	def erl(command, block=nil)
-		begin
-			if @async == true then
-				# If we're asynchronous generate a thread around the call then pass 
-        # the results back to a block to display.
-				Thread.new do
-					res = @erlang.eval(command)
-					raise res if @erlang.is_error(res)
-					block.call(eval(res))
-				end
-			elsif @async == false then
-				# Blocking mode should just eval and wait for data to come back.
-				res = @erlang.eval(command)
-				raise res if @erlang.is_error(res)
-				eval res
-			end
-		rescue => res
-			raise "[Error]=>#{res}"
-		end
+  def erl(command, block=nil)
+    # log_p command   
+    begin
+      if @async == true then
+        # If we're asynchronous generate a thread around the call then pass 
+          # the results back to a block to display.
+        Thread.new do
+          res = @erlang.eval(command)
+          raise res if @erlang.is_error(res)
+          block.call(eval(res))
+        end
+      elsif @async == false then
+        # Blocking mode should just eval and wait for data to come back.
+        res = @erlang.eval(command)
+        raise res if @erlang.is_error(res)
+        eval res
+      end
+    rescue => res
+      raise "[Error]=>#{res}"
+    end
   end
+  
+  # def tv
+  #   erl("tv:start().")
+  # end
 end

data/rulang_server/{rulang → rulang.erl}

@@ -1,8 +1,7 @@
-#!/usr/bin/env escript
 %% -*- erlang -*-
 % RBridge - A Ruby to Erlang bridge allowing the use of Erlang commands within 
 % normal Ruby code.
-% Copyright (C) 2008 Toshiyuki Hirooka <toshi.hirooka@gmail.com>
+% Copyright (C) 2008 Toshiyuki Hirooka <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
@@ -17,19 +16,19 @@
 % 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.
+-module(rulang).
+-export([start_server/1, stop_server/0, loop/1, handle_connection/1, main/1, usage/0]).
 
--export([start_server/1, stop_server/0, loop/1, handle_connection/1]).
-
-main([String]) ->
+main([Port]) ->
   try
-    N = list_to_integer(String),
-    start_server(N)
+    start_server(Port)
   catch
     _:_ ->
+    % TODO: This should report the error as well as the usage
       usage()
   end;
 main(_) ->
-  start_server(9900).
+  usage().
   
 usage() ->
   io:format("./rulang [port number]").
@@ -40,7 +39,6 @@ start_server(Port) ->
 	{ok, ListenSocket} = gen_tcp:listen(Port, [binary, {packet, 0}, {active, false}]),
 	io:format("[RBridge Server Started]~n"),
 	loop(ListenSocket).
-	
 
 % Just kill the parent thread.
 stop_server() ->
@@ -54,26 +52,27 @@ loop(ListenSocket) ->
 	case gen_tcp:accept(ListenSocket) of
 	  
     % If the connection is valid read the commands and attempt to eval them.
-	  {ok, Socket} -> 
-	    spawn(fun() ->
-	      handle_connection(Socket)
+    {ok, Socket} -> 
+      spawn(fun() ->
+        handle_connection(Socket)
       end),
-      % Continue the loop
-	    loop(ListenSocket)
+    
+    % Continue the loop
+  	loop(ListenSocket)
   end.
 	
 % Wrapper that catches errors and closes the socket after we're done with it.
 handle_connection(Socket) ->
-	% Try to execute the commands in the tcp socket.
-	try communication(Socket)
-	% But catch any errors and pass them along to the tcp socket so we can see 
+  % Try to execute the commands in the tcp socket.
+  try communication(Socket)
+  % But catch any errors and pass them along to the tcp socket so we can see 
   % them in ruby.
   catch
     error:Reason ->
-  	  {gen_tcp:send(Socket, io_lib:format("Error: ~p~n", [Reason]))}
+      {gen_tcp:send(Socket, io_lib:format("Error: ~p~n", [Reason]))}
   end,
   % Finally make sure the socket gets closed.
-	ok = gen_tcp:close(Socket).
+  ok = gen_tcp:close(Socket).
 
 % Try to evaluate the code submitted throwing an exception if the evaluation
 % doesn't work. 

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: rbridge
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ""
 authors: 
 - Chuck Vose
 - Toshiyuki Hirooka
-- Sean Steiger-McRae
 autorequire: 
 bindir: bin
 cert_chain: 
@@ -32,7 +31,7 @@ cert_chain:
   6uVjBw==
   -----END CERTIFICATE-----
 
-date: 2008-03-10 00:00:00 -07:00
+date: 2008-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.5.3
     version: 
 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
@@ -56,19 +55,20 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
+- Todo.txt
 files: 
-- .DS_Store
 - Authors.txt
 - GPL.txt
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
+- Todo.txt
 - bin/rulang
 - lib/erlang_adapter.rb
+- lib/mnesia_adapter.rb
 - lib/rbridge.rb
-- lib/vosetools.rb
-- rulang_server/rulang
+- rulang_server/rulang.erl
 - spec/rulang_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/vosetools.rb

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