livecode 0.0.7 → 0.0.8

data/README.rdoc

@@ -22,6 +22,16 @@ Open a new TextMate document and set the language to "Ruby Livecode". You can
 now press CMD+E to run either the selected text or the current line on 
 the server. Hack away! 
 
+== Multiplayer livecoding
+
+Instead of running your own server, you can connect to a remote session by running:
+
+ livecode connect drb://somewhere.else:123456
+
+When you're done, disconnect with:
+
+ livecode disconnect
+
 == Making your own client
 
 ..is fairly simple:

data/Rakefile

@@ -11,7 +11,7 @@ begin
 		gem.homepage    = "http://github.com/elektronaut/livecode"
 		gem.authors     = ["Inge Jørgensen"]
 		gem.add_dependency "daemons"
-		gem.files.include 'extras/**/*'
+		#gem.files.include 'extras/**/*'
 		#gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
 		# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 	end

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/livecode

@@ -1,68 +1,5 @@
 #!/usr/bin/env ruby
-
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'livecode_server/command'
 
-require 'pathname'
-require 'rubygems'
-require 'daemons'
-require 'livecode_server'
-
-class Daemons::Controller
-	def print_usage
-		puts "Usage: #{@app_name} <command> <options> -- <application options>"
-		puts
-		puts "Server control commands:"
-		puts "  start             Start the server"
-		puts "  stop              Stop the server"
-		puts "  restart           Stop and restart the server"
-		puts "  run               Start the server and stay on top"
-		puts "  status            Show server status"
-		#puts "  zap           set the application to a stopped state"
-		puts
-		puts "Tools:"
-		puts "  update_textmate   Install or update the TextMate bundle"
-		puts
-		puts "* and where <options> may contain several of the following:"
-		puts @optparse.usage
-	end
-end
-
-LivecodeServer.make_dir!
-
-daemon_options = {
-	:dir_mode => :normal,
-	:dir      => LivecodeServer::CONFIG_DIR
-}
-
-case ARGV.first
-when 'update_textmate'
-	puts "Updating Textmate bundle.."
-	`sudo mkdir -p /Library/Application\\ Support/TextMate/Bundles`
-	if File.exists?("/Library/Application Support/TextMate/Bundles/Ruby Livecode.tmbundle")
-		`sudo rm /Library/Application\\ Support/TextMate/Bundles/Ruby\\ Livecode.tmbundle`
-	end
-	bundle_path = Pathname.new(File.join(Gem.cache.find_name('livecode').map{|g| g.full_gem_path}.sort.last, 'extras/textmate/Ruby Livecode.tmbundle')).realpath.to_s
-	escaped_bundle_path = bundle_path.gsub(/\s/, '\ ')
-	`sudo ln -s #{escaped_bundle_path} /Library/Application\\ Support/TextMate/Bundles/Ruby\\ Livecode.tmbundle`
-	`osascript -e 'tell app "TextMate" to reload bundles'`
-else
-	group = Daemons.run_proc(File.basename($0), daemon_options) do
-		LivecodeServer.make_dir!
-		unless LivecodeServer.running?
-			server = LivecodeServer::Daemon.new
-			DRb.start_service nil, server
-			LivecodeServer.register_uri DRb.uri
-			puts "Started Livecode server on #{DRb.uri}"
-			puts "Press ^C to exit"
-			trap_proc = proc{ 
-				puts "Exiting..."
-				LivecodeServer.register_shutdown
-				exit 
-			}
-			%w{SIGINT TERM}.each{|s| trap s, trap_proc}
-			DRb.thread.join
-		else
-			puts "Livecode server appears to be running on #{LivecodeServer.uri}. Please check your processes."
-		end
-	end
-end
+LivecodeServer::Command.run!(*ARGV)

data/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Document.tmCommand

@@ -18,6 +18,8 @@ rescue LivecodeServer::ConnectionError => e
 	puts "Livecode server not running!\n\n"
 	puts '- Press ⌘B to start in daemon mode'
 	puts '- Run in Terminal with "livecode run"'
+rescue DRb::DRbBadURI => e
+	puts "Error! Can't connect to remote server."
 rescue Exception => e
 	puts "Error!"
 	puts "  #{e.class}: #{e}"

data/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Line.tmCommand

@@ -18,6 +18,8 @@ rescue LivecodeServer::ConnectionError => e
 	puts "Livecode server not running!\n\n"
 	puts '- Press ⌘B to start in daemon mode'
 	puts '- Run in Terminal with "livecode run"'
+rescue DRb::DRbBadURI => e
+	puts "Error! Can't connect to remote server."
 rescue Exception => e
 	puts "Error!"
 	puts "  #{e.class}: #{e}"

data/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Scope.tmCommand

@@ -18,6 +18,8 @@ rescue LivecodeServer::ConnectionError => e
 	puts "Livecode server not running!\n\n"
 	puts '- Press ⌘B to start in daemon mode'
 	puts '- Run in Terminal with "livecode run"'
+rescue DRb::DRbBadURI => e
+	puts "Error! Can't connect to remote server."
 rescue Exception => e
 	puts "Error!"
 	puts "  #{e.class}: #{e}"

data/lib/livecode_server/client.rb

@@ -1,7 +1,18 @@
 module LivecodeServer
-	class ConnectionError < StandardError; end
+	
+	# Connection error, raised when trying to connect while the server isn't running.
+	class ConnectionError < StandardError
+	end
 
+	# Livecode server client
+	#
+	# Usage:
+	#  client = LivecodeServer::Client.new
+	#  client.run 'puts "Hello world"'
+	
 	class Client
+
+		# Daemon connection, connects to it if necessary.
 		def server
 			unless @server
 				if LivecodeServer.running?
@@ -14,6 +25,7 @@ module LivecodeServer
 			@server
 		end
 
+		# Runs code on the server.
 		def run(code)
 			server.run code
 		end

data/lib/livecode_server/command.rb

@@ -0,0 +1,243 @@
+require 'rubygems'
+require 'optparse'
+require 'pathname'
+require 'daemons'
+
+require 'livecode_server'
+
+module LivecodeServer
+	class Command
+		class << self
+
+			def version
+				"Livecode server " + File.read(File.join(File.dirname(__FILE__), '../../VERSION'))
+			end
+
+			# Run command
+			def run!(*args)
+				options = {}
+				optparse = OptionParser.new do |opts|
+					opts.banner  = "Usage: #{File.basename($0)} [command] [options]\n\n"
+					opts.banner += "  Server control commands:\n"
+					opts.banner += "    start                            Start the server as a daemon\n"
+					opts.banner += "    stop                             Stop the server\n"
+					opts.banner += "    restart                          Restart the server\n"
+					opts.banner += "    run                              Start the server and stay on top\n"
+					opts.banner += "    status                           Show server status\n"
+					opts.banner += "\n"
+					opts.banner += "  Client control commands:\n"
+					opts.banner += "    connect                          Connect to remote server\n"
+					opts.banner += "    disconnect                       Disconnect from remote server\n"
+					opts.banner += "\n"
+					opts.banner += "  Other commands:\n"
+					opts.banner += "    update_textmate                  Update TextMate bundle\n"
+					opts.banner += "\n"
+					opts.banner += "  Options:"
+					opts.on('-h', '--help', 'Show this message') do
+						puts opts
+						exit
+					end
+					opts.on('-v', '--version', 'Show version') do
+						puts self.version
+						exit
+					end
+				end
+				optparse.parse!
+				
+				if ARGV.length > 0
+					command = self.new(options)
+					run_command = ARGV.shift
+					unless command.dispatch!(run_command, *ARGV)
+						puts "ERROR! Invalid command: #{run_command}\n\n"
+						puts optparse
+					end
+				else
+					puts optparse
+				end
+			end
+		end
+		
+		protected
+
+			def daemon_group
+				daemon_options = {
+					:mode     => :proc,
+					:multiple => false,
+					:ontop    => @options[:ontop] ? true : false,
+					:dir_mode => :normal,
+					:dir      => LivecodeServer::CONFIG_DIR
+				}
+				daemon_options[:proc] = proc do
+					LivecodeServer.make_dir!
+					server = LivecodeServer::Daemon.new
+					DRb.start_service nil, server
+					LivecodeServer.register_uri DRb.uri
+					puts "Started Livecode server on #{DRb.uri}"
+					puts "Press ^C to exit"
+					trap_proc = proc{ 
+						puts "Exiting..."
+						LivecodeServer.register_shutdown
+						exit 
+					}
+					%w{SIGINT TERM}.each{|s| trap s, trap_proc}
+					DRb.thread.join
+				end
+				unless @daemon_group
+					@daemon_group = Daemons::ApplicationGroup.new(@app_name, daemon_options)
+					@daemon_group.setup
+				end
+				@daemon_group
+			end
+			
+			def server_running?
+				(daemon_group.applications.length > 0) ? true : false
+			end
+
+		public
+
+			def initialize(options)
+				@app_name = "livecode"
+				@options = {}.merge(options)
+			end
+		
+			# Dispatch a command
+			def dispatch!(command, *args)
+				if (self.public_methods - Object.methods - ['dispatch!']).include?(command)
+					begin
+						self.send(command.to_sym, *args)
+					rescue ArgumentError => e
+						puts "Error: #{e}"
+					end
+					return command
+				else
+					return nil
+				end
+			end
+			
+			# Start the server
+			def start(*args)
+				if server_running?
+					puts "Livecode server is already running on #{LivecodeServer.uri}"
+				else
+					daemon_group.new_application.start
+					sleep(2)
+					puts "Started Livecode server on #{LivecodeServer.uri}"
+				end
+			end
+		
+			# Start the server and stay on top
+			def run(*args)
+				@options[:ontop] = true
+				if server_running?
+					puts "Livecode server is already running on #{LivecodeServer.uri}"
+				else
+					daemon_group.new_application.start
+				end
+			end
+
+			# Stop the server
+			def stop(*args)
+				if server_running?
+					daemon_group.stop_all
+					puts "Livecode server stopped."
+				else
+					puts "Livecode server isn't running, nothing to stop."
+				end
+			end
+			
+			# Restart the server
+			def restart
+				if server_running?
+					puts "Restarting server.."
+					daemon_group.stop_all
+					sleep(1)
+					daemon_group.start_all
+					sleep(2)
+					puts "Livecode server is now running on #{LivecodeServer.uri}"
+				else
+					puts "Livecode server isn't running, nothing to restart."
+				end
+			end
+			
+			# Show server status
+			def status
+				if server_running?
+					puts "Livecode server is running on #{LivecodeServer.uri}"
+				elsif LivecodeServer.running?
+					puts "Remote connected to server on #{LivecodeServer.uri}"
+				else
+					puts "Livecode server isn't running."
+				end
+			end
+
+			# Connect to a remote server
+			def connect(url, *args)
+				if url =~ /^drb:\/\/.+/
+					if server_running?
+						daemon_group.stop_all
+						sleep(1)
+					end
+					LivecodeServer.register_uri url
+					puts "Now connected to server on #{url}"
+				else
+					puts "Error: Not a valid server url"
+				end
+			end
+			
+			# Disconnect from remote server
+			def disconnect
+				if server_running?
+					puts "Livecode server running as daemon, shutdown to disconnect."
+				elsif LivecodeServer.running?
+					puts "Livecode server disconnected."
+					LivecodeServer.register_shutdown
+				else
+					puts "Not connected to any Livecode servers."
+				end
+			end
+			
+			# Update TextMate bundle
+			def update_textmate
+				update_bundle       = true
+				bundle_path         = File.join(File.dirname(__FILE__), '../../extras/textmate/Ruby Livecode.tmbundle')
+				bundle_path         = Pathname.new(bundle_path).realpath.to_s
+				escaped_bundle_path = bundle_path.gsub(/\s/, '\ ')
+				target_path         = '/Library/Application Support/TextMate/Bundles/Ruby Livecode.tmbundle'
+				escaped_target_path = target_path.gsub(/\s/, '\ ')
+
+				# Handle existing files
+				if File.exists?(target_path)
+					if File.symlink?(target_path)
+						if Pathname.new(target_path).realpath.to_s == bundle_path
+							puts "TextMate bundle is already up to date."
+							update_bundle = false
+						else
+							puts "Existing symlink found:\n\n"
+							puts "- " + Pathname.new(target_path).realpath.to_s
+							puts "+ " + bundle_path
+							print "\nReplace? [y/n] "
+						end
+					else
+						print "Existing bundle found, are you sure you want to replace it? [y/n] "
+					end
+					if update_bundle
+						if STDIN.readline.chomp =~ /^y/i
+							`sudo rm -rf #{escaped_target_path}`
+						else
+							update_bundle = false
+						end
+					end
+				end
+				
+				if update_bundle
+					unless File.exists?("/Library/Application Support/TextMate/Bundles")
+						`sudo mkdir -p /Library/Application\\ Support/TextMate/Bundles`
+					end
+					puts "Updating Textmate bundle.."
+					`sudo ln -s #{escaped_bundle_path} #{escaped_target_path}`
+					`osascript -e 'tell app "TextMate" to reload bundles'`
+				end
+			end
+		
+	end
+end

data/lib/livecode_server/daemon.rb

@@ -1,4 +1,6 @@
 module LivecodeServer
+
+	# LivecodeServer daemon
 	class Daemon
 		attr_reader :scope
 

data/livecode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{livecode}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Inge J\303\270rgensen"]
-  s.date = %q{2009-10-22}
+  s.date = %q{2009-10-23}
   s.default_executable = %q{livecode}
   s.description = %q{A toolkit for livecoding using Ruby and TextMate on OSX}
   s.email = %q{inge@elektronaut.no}
@@ -27,22 +27,16 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/livecode",
      "extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Document.tmCommand",
-     "extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Document.tmCommand",
-     "extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Line.tmCommand",
      "extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Line.tmCommand",
      "extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Scope.tmCommand",
-     "extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Scope.tmCommand",
-     "extras/textmate/Ruby Livecode.tmbundle/Commands/Start.tmCommand",
      "extras/textmate/Ruby Livecode.tmbundle/Commands/Start.tmCommand",
      "extras/textmate/Ruby Livecode.tmbundle/Commands/Stop.tmCommand",
-     "extras/textmate/Ruby Livecode.tmbundle/Commands/Stop.tmCommand",
-     "extras/textmate/Ruby Livecode.tmbundle/Syntaxes/Ruby Livecode.tmLanguage",
      "extras/textmate/Ruby Livecode.tmbundle/Syntaxes/Ruby Livecode.tmLanguage",
      "extras/textmate/Ruby Livecode.tmbundle/info.plist",
-     "extras/textmate/Ruby Livecode.tmbundle/info.plist",
      "lib/livecode.rb",
      "lib/livecode_server.rb",
      "lib/livecode_server/client.rb",
+     "lib/livecode_server/command.rb",
      "lib/livecode_server/daemon.rb",
      "lib/livecode_server/scope.rb",
      "livecode.gemspec",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: livecode
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - "Inge J\xC3\xB8rgensen"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 +02:00
+date: 2009-10-23 00:00:00 +02:00
 default_executable: livecode
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - lib/livecode.rb
 - lib/livecode_server.rb
 - lib/livecode_server/client.rb
+- lib/livecode_server/command.rb
 - lib/livecode_server/daemon.rb
 - lib/livecode_server/scope.rb
 - livecode.gemspec