buzzcore 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/buzzcore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buzzcore}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-16}
   s.description = %q{buzzcore is the ruby core library developed and used by Buzzware Solutions.}
   s.email = %q{contact@buzzware.com.au}
   s.extra_rdoc_files = [
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
     "test/buzzcore_test.rb",
      "test/config_test.rb",
      "test/credentials_test.rb",
+     "test/misc_test.rb",
      "test/shell_test.rb",
      "test/test_helper.rb"
   ]

data/lib/buzzcore/misc_utils.rb

@@ -163,8 +163,42 @@ module MiscUtils
 		return aPath if !aBasePath
 		return path_relative?(aPath) ? File.join(aBasePath,aPath) : aPath	
 	end
+	
+	# make path real according to file system
+	def self.real_path(aPath)
+		(path = Pathname.new(File.expand_path(aPath))) && path.realpath
+	end
+
+	# takes a path and combines it with a root path (which defaults to Dir.pwd) unless it is absolute
+	# the final result is then expanded
+	def self.canonize_path(aPath,aRootPath=nil)
+		path = path_combine(aRootPath,aPath)
+		path = real_path(path) if path
+		path
+	end
+	
+	def self.find_upwards(aStartPath,aPath)
+		curr_path = File.expand_path(aStartPath)
+		while curr_path && !(test_path_exists = File.exists?(test_path = File.join(curr_path,aPath))) do
+			curr_path = MiscUtils.path_parent(curr_path)
+		end
+		curr_path && test_path_exists ? test_path : nil
+	end
+
+
+	# allows special symbols in path
+	# currently only ... supported, which looks upward in the filesystem for the following relative path from the basepath
+	def self.expand_magic_path(aPath,aBasePath=nil)
+		aBasePath ||= Dir.pwd
+		path = aPath
+		if path.begins_with?('...')
+			rel_part = StringUtils.split3(path,/\.\.\.[\/\\]/)[2]
+			path = find_upwards(aBasePath,rel_part)
+		end
+	end
 
 	def self.path_parent(aPath)
+		return nil if is_root_path?(aPath)
 		MiscUtils.append_slash(File.dirname(MiscUtils.remove_slash(File.expand_path(aPath))))
 	end
 
@@ -214,6 +248,14 @@ module MiscUtils
 		/^[a-zA-Z0-9+_]+\:\/\// =~ aString ? true : false
 	end
 
+	def self.is_root_path?(aPath)
+		if is_windows?
+			(aPath =~ /^[a-zA-Z]\:[\\\/]$/)==0
+		else
+			aPath == '/'
+		end
+	end
+
 	def self.native_path(aPath)
 		is_windows? ? windows_path(aPath) : ruby_path(aPath)
 	end
@@ -231,14 +273,6 @@ module MiscUtils
 	def self.is_windows?
 		platform=='mswin32'
 	end
-
-	# takes a path and combines it with a root path (which defaults to Dir.pwd) unless it is absolute
-	# the final result is then expanded
-	def self.canonize_path(aPath,aRootPath=nil)
-		path = Pathname.new(aPath)
-		path = Pathname.new(aRootPath || Dir.pwd)+path if path.relative?
-		File.expand_path(path)
-	end
 	
 	def self.get_files(aArray,aPath,aFullPath=true,aRootPath=nil,&block)
 		#puts "get_files: aPath='#{aPath}'"

data/test/misc_test.rb

@@ -0,0 +1,42 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require 'rubygems'
+
+require 'test/unit'
+gem 'Shoulda'; require 'shoulda'
+
+require 'fileutils'
+
+gem 'buzzcore'; require 'buzzcore'
+
+class MiscTest < Test::Unit::TestCase
+
+	context "expand_magic_path" do
+		
+		setup do
+			@temp_path = MiscUtils.canonize_path(MiscUtils.make_temp_dir('expand_magic_path'))
+			FileUtils.mkdir_p(@c = File.join(@temp_path,'a/b/c'))
+			FileUtils.mkdir_p(@aaa = File.join(@temp_path,'aaa'))
+			@xxx = MiscUtils.make_temp_file('xxx',@aaa)
+    end
+
+		should "expand leading .../ and find existing path" do
+			assert_equal @aaa,MiscUtils.expand_magic_path('.../aaa',@c)
+			assert_equal @xxx,MiscUtils.expand_magic_path('.../aaa/xxx',@c)
+			Dir.chdir(@c) do
+				assert_equal @aaa,MiscUtils.expand_magic_path('.../aaa')
+				assert_equal @xxx,MiscUtils.expand_magic_path('.../aaa/xxx')
+			end
+		end
+
+		should "return nil when expand leading .../ fails" do
+			assert_equal nil,MiscUtils.expand_magic_path('.../aaa/xyz',@c)
+		end
+		
+	end
+	
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: buzzcore
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - buzzware
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +08:00
+date: 2010-01-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,5 +105,6 @@ test_files:
 - test/buzzcore_test.rb
 - test/config_test.rb
 - test/credentials_test.rb
+- test/misc_test.rb
 - test/shell_test.rb
 - test/test_helper.rb