filigree 0.3.0 → 0.3.1

data/test/tc_application.rb

@@ -21,32 +21,32 @@ class ApplicationTester < Minitest::Test
 	class Foo
 		include Filigree::Application
 	end
-	
+
 	class Bar
 		include Filigree::Application
-		
+
 		class Configuration
 			auto :foo do
 				:foo
 			end
 		end
-		
+
 		def kill;   end
 		def pause;  end
 		def resume; end
 		def run;    end
 		def stop;   end
 	end
-	
+
 	def setup
-	
+
 	end
-	
+
 	def test_application
 		assert_raises(NoMethodError)	{ Foo.finalize }
 		Bar.finalize
 	end
-	
+
 	def test_embedded_config
 		assert_equal :foo, Bar.new.config.foo
 	end

data/test/tc_boolean.rb

@@ -19,19 +19,19 @@ require 'filigree/boolean'
 
 class BooleanTester < Minitest::Test
 	def setup
-		
+
 	end
-	
+
 	def test_integer
 		assert  1.to_bool
 		assert 10.to_bool
 		assert !0.to_bool
 	end
-	
+
 	def test_true
 		assert_equal 1, true.to_i
 	end
-	
+
 	def test_false
 		assert_equal 0, false.to_i
 	end

data/test/tc_class.rb

@@ -19,25 +19,25 @@ require 'filigree/class'
 
 class ClassTester < Minitest::Test
 	module Foo; end
-	
+
 	class Bar
 		include Foo
-	
+
 		class Baf; end
 	end
-	
+
 	class Baz < Bar; end
-	
+
 	def setup
-		
+
 	end
-	
+
 	def test_class
 		assert Bar.includes_module?(Foo)
-		
-		assert_equal 'ClassTester::Bar::Baf', Bar::Baf.name 
+
+		assert_equal 'ClassTester::Bar::Baf', Bar::Baf.name
 		assert_equal 'Baf', Bar::Baf.short_name
-		
+
 		assert  Baz.subclass_of?(Bar)
 		assert !Baz.subclass_of?(Fixnum)
 		assert_raises(TypeError) { Baz.subclass_of?(1) }

data/test/tc_class_methods_module.rb

@@ -20,51 +20,109 @@ require 'filigree/class_methods_module'
 class ClassMethodsModuleTester < Minitest::Test
 	module Foo
 		include Filigree::ClassMethodsModule
-		
+
 		def foo
 			:foo
 		end
-		
+
 		module ClassMethods
 			def foo
 				:foo
 			end
 		end
 	end
-	
+
 	module Baz
 		include Filigree::ClassMethodsModule
-		
+
 		def baz
 			:baz
 		end
-		
+
 		module ClassMethods
 			def baz
 				:baz
 			end
 		end
 	end
-	
+
 	class Bar
 		include Foo
 	end
-	
+
 	class Baf
 		include Foo
 		include Baz
 	end
-	
+
+#	module ModuleVarTester0
+#		include Filigree::ClassMethodsModule
+
+#		module ClassMethods
+#			module Variables
+#				@
+#			end
+
+#			def answer
+#				@answer
+#			end
+
+#			def answer=(val)
+#				@answer = val
+#			end
+#		end
+#	end
+
+#	module ModuleVarTester1
+#		include Filigree::ClassMethodsModule
+
+#		def ClassVariables
+#			@hoopy = :frood
+#		end
+
+#		module ClassMethods
+#			def hoopy
+#				@hoopy
+#			end
+#		end
+#	end
+
+#	class VarTester0
+#		include ModuleVarTester0
+#	end
+
+#	class VarTester1
+#		include ModuleVarTester0
+#	end
+
+#	class VarTester2
+#		include ModuleVarTester0
+#		include ModuleVarTester1
+#	end
+
 	def test_class_methods_module
 		assert_equal :foo, Bar.foo
 		assert_equal :foo, Bar.new.foo
 	end
-	
+
+#	def test_class_variables
+#		assert_equal 42, VarTester0.answer
+#		assert_equal 42, VarTester1.answer
+
+#		VarTester1.answer = 0
+
+#		assert_equal 42, VarTester0.answer
+#		assert_equal  0, VarTester1.answer
+
+#		assert_equal     42, VarTester2.answer
+#		assert_equal :frood, VarTester2.hoopy
+#	end
+
 	def test_double_include
-		
+
 		assert_equal :foo, Baf.foo
 		assert_equal :foo, Baf.new.foo
-		
+
 		assert_equal :baz, Baf.baz
 		assert_equal :baz, Baf.new.baz
 	end

data/test/tc_commands.rb

@@ -20,19 +20,19 @@ require 'filigree/commands'
 class CommandTester < Minitest::Test
 	class TestCommands
 		include Filigree::Commands
-		
+
 		command 'foo' do
 			:foo
 		end
-		
+
 		command 'foo bar' do
 			:foobar
 		end
-		
+
 		command 'hello1' do |subject|
 			"hello #{subject}"
 		end
-		
+
 		config do
 			default 'world'
 			option 'subject', 's', conversions: [:to_s]
@@ -40,38 +40,38 @@ class CommandTester < Minitest::Test
 		command 'hello2' do
 			"hello #{subject}"
 		end
-		
+
 		command 'add' do |x, y|
 			x.to_i + y.to_i
 		end
 	end
-	
+
 	def setup
 		@commander = TestCommands.new
 	end
-	
+
 	def test_command_not_found
 		assert_raises(CommandNotFoundError) { @commander.('bar') }
 	end
-	
+
 	def test_command_args
 		assert_equal 'hello world', @commander.('hello1 world')
 		assert_equal 42, @commander.('add 27 15')
 	end
-	
+
 	def test_command_with_wrong_args
 		assert_raises(ArgumentError) { @commander.('hello1 cat dog') }
 	end
-	
+
 	def test_configured_command
 		assert_equal 'hello world', @commander.('hello2')
 		assert_equal 'hello dog', @commander.('hello2 -s dog')
 	end
-	
+
 	def test_subcommand
 		assert_equal :foobar, @commander.('foo bar')
 	end
-	
+
 	def test_zero_arg_command
 		assert_equal :foo, @commander.('foo')
 	end

data/test/tc_configuration.rb

@@ -20,153 +20,153 @@ require 'filigree/configuration'
 class ConfigurationTester < Minitest::Test
 	class TestConfig
 		include Filigree::Configuration
-		
+
 		help 'Does foo.'
 		default { moo.to_s }
 		string_option 'foo', 'f'
-		
+
 		help 'This is a longer help message to test and see how the string segmentation works. I hope it is long enough.'
 		default 42
 		option 'bar', 'b', conversions: [:to_i]
-		
+
 		help 'Does baz.'
 		option 'baz', 'z', conversions: [:to_sym, :to_sym]
-		
+
 		help 'Does moo.'
 		required
 		option 'moo', 'm' do |i|
 			i.to_i * 6
 		end
-		
+
 		help 'This does daf'
 		option 'daf', 'd' do |*syms|
 			syms.map { |syms| syms.to_sym }
 		end
-		
+
 		bool_option :bool
-		
+
 		auto :cow do
 			self.moo / 3
 		end
 	end
-	
+
 	def setup
 		@defaults = ['--moo', '10']
 	end
-	
+
 	def test_auto
 		conf = TestConfig.new @defaults
-		
+
 		assert_equal 20, conf.cow
 	end
-	
+
 	def test_bool_option
 		conf = TestConfig.new @defaults.clone
 		assert !conf.bool, 'Boolean flag set in config object'
-				
+
 		conf = TestConfig.new(@defaults.clone << '--bool')
 		assert conf.bool, 'Boolean flag not set in config object'
 	end
-	
+
 	def test_defaults
 		conf = TestConfig.new @defaults
-		
+
 		assert_equal 42, conf.bar
 		assert_equal '60', conf.foo
 	end
-	
+
 	def test_long_option
 		conf = TestConfig.new @defaults
-		
+
 		assert_equal 60, conf.moo
 	end
-	
+
 	def test_proc_handler
 		conf = TestConfig.new (@defaults + ['--foo', 'hello world'])
-		
+
 		assert_equal 'hello world', conf.foo
 	end
-	
+
 	def test_required
 		assert_raises(ArgumentError)	{ TestConfig.new([]) }
 		TestConfig.new(@defaults)
 	end
-	
+
 	def test_serialization
 		require 'tempfile'
-		
+
 		conf = TestConfig.new (@defaults + ['-f', 'hello world', '-b', '32', '-z', 'a', 'b'])
-		
+
 		yaml_string = conf.dump
-		
+
 		conf = TestConfig.new yaml_string
-		
+
 		assert_equal 60,            conf.moo
 		assert_equal 'hello world',	conf.foo
 		assert_equal 32,            conf.bar
 		assert_equal [:a, :b],      conf.baz
-		
+
 		yaml_file      = Tempfile.new 'tc_configuration_serialization'
 		yaml_file_path = yaml_file.path
 		yaml_file.close
-		
+
 		# Dump the file.
 		File.open(yaml_file_path, 'w') { |f| conf.dump f }
-		
+
 		# Load the configuration from the file.
 		conf = File.open(yaml_file_path, 'r') { |f| TestConfig.new f }
-		
+
 		assert_equal 60,            conf.moo
 		assert_equal 'hello world', conf.foo
 		assert_equal 32,            conf.bar
 		assert_equal [:a, :b],      conf.baz
-		
+
 		# Remove the file.
 		FileUtils.rm yaml_file_path
-		
+
 		# Re-create an empty file.
 		FileUtils.touch yaml_file_path
-		
+
 		# Dump the config again.
 		conf.dump yaml_file_path
-		
+
 		# Load the configuration again.
 		conf = TestConfig.new yaml_file_path
-		
+
 		assert_equal 60,            conf.moo
 		assert_equal 'hello world', conf.foo
 		assert_equal 32,            conf.bar
 		assert_equal [:a, :b],      conf.baz
-		
+
 		#########################
 		# Partial Serialization #
 		#########################
-		
+
 		yaml_string = conf.dump nil, :moo, :foo, :bar
-		
+
 		conf = TestConfig.new yaml_string
-		
+
 		assert_equal 60,			conf.moo
 		assert_equal 'hello world',	conf.foo
 		assert_equal 32,			conf.bar
 	end
-	
+
 	def test_short_option
 		conf = TestConfig.new ['-m', 10]
-		
+
 		assert_equal 60, conf.moo
 	end
-	
+
 	def test_splat
 		conf = TestConfig.new (['-d', 'a', 'b', 'c'] + @defaults)
-		
+
 		assert_equal [:a, :b, :c], conf.daf
 	end
-	
+
 	def test_symbol_handler
 		conf = TestConfig.new (@defaults + ['-b', '32'])
 		assert_equal 32, conf.bar
-		
+
 		conf = TestConfig.new (@defaults + ['-z', 'a', 'b'])
 		assert_equal [:a, :b], conf.baz
 	end