o 2.0.1 → 2.0.2

data/README.md

@@ -7,6 +7,8 @@ O, a configuration libraray for Ruby
 **Documentation**: [http://rubydoc.info/gems/o/frames](http://rubydoc.info/gems/o/frames) <br/>
 **Issue Tracker**: [https://github.com/GutenYe/o/issues](https://github.com/GutenYe/o/issues) <br/>
 
+then name `o` comes from option/setting, short and handy, eh-ah~
+
 Features
 --------
 
@@ -22,11 +24,11 @@ do configuration at three levels: system, user, cmdline
 
 	lib/guten/rc.rb   # system level
 	~/.gutenrc        # user level
-	$ guten --list    # cmdline level
+	$ guten --list or ENV[GEMFILE]=x guten  # cmdline level
 		
 	module Guten
 		Rc = O.require("guten/rc") + O.require("~/.gutenrc")
-		Rc.list = true
+		Rc.list = true or Rc.gemfile = ENV[GEMFILE] # from cmdline.
 	end
 
 
@@ -62,7 +64,7 @@ alternative syntax
 		c.time = proc{|offset| Time.now}
 	end
 
-a sugar syntax 
+a sugar syntax. _works in a file only_ 
 
 	# file: guten/rc.rb
 	development:
@@ -78,8 +80,9 @@ a sugar syntax
 		username "guten"
 	end
 
-**WARNNING**:  must use \t to indent for this sugar syntax.
+this is not pure ruby syntax, but it works.
 
+**WARNNING**:  must use \t to indent for this sugar syntax.
 
 ### initialize ###
 
@@ -136,9 +139,9 @@ either way is fine
 			friend do
 				age 3
 				p age     #=> 3
-				p __.age  #=> 2  relative
-				p ___.age #=> 1
-				p _.age   #=> 1  root
+				p __.age  #=> 2  __ is relative up to 1 times
+				p ___.age #=> 1  ___ and so on is relative up to 2 and so on times
+				p _.age   #=> 1  _ is root
 			end
 		end
 	end

data/lib/o.rb

@@ -9,7 +9,7 @@ class O
 	Error 		= Class.new Exception 
 	LoadError = Class.new Error
 
-	BUILTIN_METHODS = [ :p, :pd, :raise, :sleep, :rand, :srand, :exit, :require, :at_exit, :autoload, :open]
+	BUILTIN_METHODS = [ :p, :raise, :sleep, :rand, :srand, :exit, :require, :at_exit, :autoload, :open]
 
 	class << self
 		public *BUILTIN_METHODS 
@@ -189,7 +189,7 @@ class O
 	# .a.b.c
 	#
 	def method_missing name, *args, &blk
-		#O.pd 'missing', name, args, blk
+		#O.p d 'missing', name, args, blk
 
 		# path: root
 		if name == :_

data/lib/o/parser.rb

@@ -51,7 +51,6 @@ class O
 
 			content.scan(/(.*?)(\n+|\Z)/).each do |line, newline|
 
-				#pd line.match(/^(\t*)(.*)/)
 				_, indents, statement = line.match(/^(\t*)(.*)/).to_a
 
 				# indent

data/lib/o/version.rb

@@ -2,7 +2,7 @@ class O
 	module VERSION
 		MAJOR = 2
 		MINOR = 0
-		PATCH = 1
+		PATCH = 2
 
 		IS = [MAJOR, MINOR, PATCH].join(".") 
 	end

metadata

@@ -2,7 +2,7 @@
 name: o
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Guten
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 Z
+date: 2011-07-26 00:00:00 Z
 dependencies: []
 
 description: |
@@ -36,7 +36,6 @@ files:
 - lib/o/parser.rb
 - lib/o/semantics.rb
 - lib/o/version.rb
-- lib/o1.rb
 - o.gemspec
 - o.watchr
 - spec/data/home/gutenrc

data/lib/o1.rb

@@ -1,189 +0,0 @@
-#
-# internal: store data in a Hash, the key of the Hash is always converted to symbol.
-#
-#
-#
-class O < Hash
-	autoload :VERSION,	"o/version"
-
-	# PATH for O.load
-	PATH = []
-	Error = Exception.new 
-	LoadError = Exception.new(Error)
-
-	class O_Eval
-		def _data
-			_data = {}
-			self.instance_variables.each do |k|
-				key = k[1..-1].to_sym
-				value = self.instance_variable_get(k)
-				_data[key] = value 
-			end
-			_data
-		end
-	end
-
-	class << self
-		# convert <#Hash> to <#O>
-		#
-		# @param [hash] hash
-		# @return O
-		def from_hash hash
-			o = O.new
-			o._replace hash
-		end
-
-		# load a configuration file,
-		# support PATH, and '~/.gutenrc'
-		#
-		# first try name.rb, then use name
-		#
-		# @example
-		#   option = O.load("~/.gutenrc")
-		#
-		#   option = O.load("/absolute/path/a.rb")
-		#   
-		#   O::Path << "/home"
-		#   option = O.load("guten")  #=> try guten.rb; then try guten
-		#   option = O.load("guten.rb")
-		#
-		# @param [String] name
-		# @return [O]
-		def load name
-			path = nil
-			if name =~ /^~/
-				file = File.expand_path(name)
-				path = file if File.exists?(file)
-			elsif File.absolute_path(name) == name
-				path = name if File.exists?(name)
-			else
-				catch :break do
-					PATH.each  do |p|
-						['.rb', ''].each {|ext|
-							file = File.join(p, name+ext)
-							if File.exists? file
-								path = file
-								throw :break
-							end
-						}
-					end
-				end
-			end
-
-			raise LoadError, "can't find file -- #{name}" unless path
-
-			eval_file path
-		end
-
-		# relative load a configuration file
-		# @see load
-		#
-		# @param [String] name
-		# @return [O] option
-		def relative_load name
-			pd caller if $TEST
-			a,file, line, method = caller[0].match(/^(.*):(\d+):.*`(.*)'$/).to_a
-			raise LoadError, "#{type} is called in #{file}" if file=~/\(.*\)/ # eval, etc.
-
-			file = File.readlink(file) if File.symlink?(file)
-
-			path = nil
-			[".rb", ""].each do |ext|
-				f = File.absolute_path(File.join(File.dirname(file), name+ext))
-				if File.exists?(f)
-					path = f
-					break
-				end
-			end
-
-			raise LoadError, "can't find file -- #{name}" unless path
-
-			eval_file path
-		end
-
-		private
-		def eval_file path
-			content = File.open(path){|f| f.read}
-			o_eval = O_Eval.new
-			o_eval.instance_eval(content)
-			O.from_hash(o_eval._data)
-		end
-
-	end
-
-	attr_reader :_data
-
-	def initialize default=nil, &blk
-		@_data = Hash.new(default)
-		if blk
-			o_eval = O_Eval.new
-			o_eval.instance_eval &blk
-			@_data.merge!(o_eval._data)
-		end
-	end
-
-	def []= key, value
-		@_data[key.to_sym] = value
-	end
-
-	def [] key
-		@_data[key.to_sym]
-	end
-
-	def + other
-		O.new(@_data, other._data)
-	end
-
-	def _replace data
-		case data
-		when Hash
-			@_data = data
-		when O
-			@_data = data._data
-		end
-		self
-	end
-
-	#
-	# _method goes to @_data.send(_method, ..)
-	# method? #=> !! @_data[:method]
-	# method #=> @_data[:method]
-	# method=value #=> @_data[:method]=value
-	#
-	def method_missing method, *args, &blk
-		if method =~ /(.*)=$/
-			@_data[$1.to_sym] = args[0]
-		elsif method =~ /(.*)\?$/
-			!! @_data[$1.to_sym]
-		elsif method =~ /^_(.*)/
-			method = $1.to_sym
-			args.map!{|arg| O===arg ? arg._data : arg} 
-			rst = @_data.send(method, *args, &blk)
-
-			if [:merge!].include method
-				self
-			elsif [:merge].include method
-				O.new(rst)
-			end
-		else
-			@_data[method]
-		end
-	end
-
-	def inspect 
-		rst = "<#O "
-		@_data.each do |k,v|
-			rst << "#{k}:#{v.inspect} "
-		end
-		rst << " >" 
-	end
-
-	alias to_s inspect
-
-end
-
-module Kernel
-	def O default=nil, &blk
-		O.new(default, &blk)
-	end
-end