quick 0.1 → 0.2

data/bin/quick

@@ -2,25 +2,11 @@
 require 'thor'
 require 'brb'
 require 'pathname'
-require 'pry-remote-em/client'
 require 'uri'
 require_relative '../lib/quick'
 
-def brb_service
-	uri = File.read('#brb_uri')
-	service = BrB::Tunnel.create nil, uri
-	if service.error?
-		puts "failed to connect to the Quick instance"
-		exit 2
-	end
-	service
-rescue Errno::ENOENT
-	puts "not in a Quick directory"
-	exit 1
-end
-
 class QuickCLI < Thor
-	desc "start MOUNT_DIR", "run Quick, mounting the FS on MOUNT_DIR"
+	desc 'start MOUNT_DIR', "run Quick, mounting the FS on MOUNT_DIR"
 	option :foreground, type: :boolean, aliases: :f
 	def start(dir)
 		if File.file? dir or
@@ -39,32 +25,51 @@ class QuickCLI < Thor
 				exit
 			end
 		end
-		Quick::Service.run dir
+		Quick.run dir
 		Dir.rmdir dir unless existed
 	end
 
-	desc "stop", "stop the Quick instance that owns your CWD"
+	desc 'stop', "stop your current Quick instance"
 	def stop
-		brb_service.stop
-		sleep 0.1
+		Quick.stop
 	end
 
-	desc "pry", "start a pry in the module corresponding to your CWD"
+	desc 'pry', "start a pry in an instance of the current module"
 	option :module, type: :boolean, aliases: :m
 	def pry
-		service = brb_service
-		root = Pathname.new service.mount_point_block
-		path = Pathname.pwd.relative_path_from root
-		uri = service.pry_at_block(path.to_path, !options.module?)
+		uri = Quick.pry_here !options.module?
 		system "pry-remote-em #{uri}"
-		exit
-		EM.run do
-			PryRemoteEm::Client.start(uri.host, uri.port) {|e| EM.stop}
+	end
+
+	desc 'module NAME', "create a new module here"
+	def module(name)
+		Quick.module_here name
+	end
+
+	map 'class' => :class_
+	desc 'class NAME [SUPERCLASS_PATH]', "create a new class here"
+	def class_(name, super_path='Object')
+		Quick.class_here name, super_path
+	end
+
+	desc 'eval CODE', "evaluate some code in an instance of the current module"
+	option :module, type: :boolean, aliases: :m
+	def eval(code)
+		success, result = Quick.eval_here code, !options.module?
+		if success
+			puts "=> #{result}"
+		else
+			puts "error: #{result}"
 		end
 	end
 end
 
-QuickCLI.start
+begin
+	QuickCLI.start
+rescue RuntimeError => e
+	puts e.message
+	exit 1
+end
 
 # vim:tabstop=2 shiftwidth=2 noexpandtab:
 

data/lib/quick/service.rb

@@ -17,7 +17,7 @@ end
 
 module Quick
 	module Service
-		module_function
+		extend self
 
 		# warning: run/stop/hibernate are pretty awful because I
 		# don't actually know how to use EventMachine properly.
@@ -63,10 +63,12 @@ module Quick
 		def eval(module_path, code, instance=true)
 			mod = resolve_path module_path
 			if instance
-				mod.quick_instance.quick_binding.eval code
+				[true, mod.quick_instance.quick_binding.eval(code).inspect]
 			else
-				mod.quick_binding.eval code
+				[true, mod.quick_binding.eval(code).inspect]
 			end
+		rescue => e
+			[false, e.message]
 		end
 
 		def new_mod(parent_path, name, super_path=nil)
@@ -77,6 +79,7 @@ module Quick
 				superclass = resolve_path super_path
 				parent.const_set name, Class.new(superclass)
 			end
+			name
 		end
 
 		def pries

data/lib/quick.rb

@@ -2,3 +2,62 @@ require_relative 'quick/core_ext'
 require_relative 'quick/fs'
 require_relative 'quick/service'
 
+module Quick
+	extend self
+
+	def brb_service
+		@brb_service ||=
+			begin
+				uri = File.read('#brb_uri')
+				service = BrB::Tunnel.create nil, uri
+				if service.error?
+					raise "failed to connect to the Quick instance"
+				end
+				service
+			end
+	rescue Errno::ENOENT
+		raise "not in a Quick directory"
+	end
+
+	def run(dir)
+		Quick::Service.run dir
+	end
+
+	def stop
+		brb_service.stop
+		sleep 1
+	end
+
+	def pry_here(instance=true)
+		brb_service.pry_at_block pwd_from_root, instance
+	end
+
+	def eval_here(code, instance=true)
+		brb_service.eval_block pwd_from_root, code, instance
+	end
+
+	def module_here(name)
+		raise "invalid module name" unless ('A'..'Z').include? name[0]
+		brb_service.new_mod_block pwd_from_root, name
+	end
+
+	def class_here(name, super_path='Object')
+		raise "invalid class name" unless ('A'..'Z').include? name[0]
+		p [pwd_from_root, name, from_root(super_path)]
+		brb_service.new_mod_block pwd_from_root, name, from_root(super_path)
+	end
+
+	def pwd_from_root
+		from_root Dir.pwd
+	end
+
+	def from_root(path)
+		pn = Pathname.new path
+		return path if pn.relative?
+		root = Pathname.new brb_service.mount_point_block
+		pn.relative_path_from(root).to_path
+	end
+end
+
+# vim:tabstop=2 shiftwidth=2 noexpandtab:
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quick
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -129,6 +129,6 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A Smalltalk-ish live dev environment for Ruby.
+summary: Code in a living environment!
 test_files: []
 has_rdoc: