rubikon 0.4.1 → 0.5.0

data/test/test_application.rb

@@ -43,8 +43,12 @@ class TestApplication < Test::Unit::TestCase
         assert_instance_of SystemExit, e
         assert_equal 1, e.status
       end
-      @ostream.rewind
-      assert_equal "Error:\n", @ostream.gets
+      if @app.instance.instance_eval { @settings[:colors] }
+        error_text = "\e[0;31mError:\e[0m\n"
+      else
+        error_text = "Error:\n"
+      end
+      assert_equal error_text, @ostream.gets
       assert_equal "    Unknown command: unknown\n", @ostream.gets
     end
 
@@ -72,16 +76,12 @@ class TestApplication < Test::Unit::TestCase
       @istream.puts input_string
       @istream.rewind
       assert_equal input_string, @app.run(%w{input})
-      @ostream.rewind
       assert_equal 'input: ', @ostream.gets
     end
 
     should 'not break output while displaying a throbber or progress bar' do
       @app.run(%w{throbber})
       assert_match (/ \x08(?:(?:-|\\|\/|\|)\x08){4,}don't\nbreak\n/), @ostream.string
-
-      @ostream.rewind
-
       @app.run(%w{progressbar})
       assert_equal "#" * 20 << "\n" << "test\n" * 4, @ostream.string
     end

data/test/test_command.rb

@@ -42,10 +42,10 @@ class TestCommand < Test::Unit::TestCase
     should 'correctly parse given parameters' do
       command = Command.new @app, :command, [:cmd_arg] do end
       option = Option.new(@app, :test, [:opt_arg])
-      command.add_param option
+      command.send(:add_param, option)
       flag = Flag.new(@app, :t)
-      command.add_param flag
-      command.run(*%w{--test arg -t test})
+      command.send(:add_param, flag)
+      command.send(:run, *%w{--test arg -t test})
       assert option.active?
       assert flag.active?
       assert_equal %w{test}, command.arguments
@@ -56,21 +56,21 @@ class TestCommand < Test::Unit::TestCase
       assert_equal 'arg', command.test.opt_arg
 
       assert_raise UnknownParameterError do
-        command.run(*%w{--unknown})
+        command.send(:run, *%w{--unknown})
       end
     end
 
     should 'allow parameter aliases' do
       command = Command.new @app, :command do end
-      command.add_param({ :t => :test })
+      command.send(:add_param, { :t => :test })
       flag1 = Flag.new(@app, :test)
-      command.add_param flag1
+      command.send(:add_param, flag1)
       flag2 = Flag.new(@app, :test2)
-      command.add_param flag2
-      command.add_param({ :t2 => :test2 })
-      command.run(*%w{-t --t2})
-      assert flag1.active?
-      assert flag2.active?
+      command.send(:add_param, flag2)
+      command.send(:add_param, { :t2 => :test2 })
+      command.send(:run, *%w{-t --t2})
+      assert flag1.send(:active?)
+      assert flag2.send(:active?)
     end
 
     should 'run the code supplied inside its block' do
@@ -78,13 +78,13 @@ class TestCommand < Test::Unit::TestCase
       command = Command.new @app, :command do
         block_run = true
       end
-      command.run
+      command.send :run
       assert block_run
     end
 
     should 'run external code if no block is given' do
       command = Command.new @app, :external_command
-      command.run
+      command.send :run
       assert @app.sandbox.instance_variable_get(:@external_command_run)
     end
 

data/test/test_config.rb

@@ -0,0 +1,41 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2009-2010, Sebastian Staudt
+
+require 'test_helper'
+
+class TestConfig < Test::Unit::TestCase
+
+  context 'A configuration' do
+
+    setup do
+      path = File.join(File.dirname(__FILE__), 'config')
+      @config_file = 'config.yml'
+      @search_paths = []
+      @search_paths << File.join(path, '0')
+      @search_paths << File.join(path, '1')
+      @search_paths << File.join(path, '2')
+      @search_paths << File.join(path, '3')
+
+      @factory = Rubikon::Config::Factory.new(@config_file, @search_paths)
+    end
+
+    should 'search multiple paths for a configuration file' do
+      config_files = @search_paths[0..-2].map { |p| File.join(p, @config_file) }
+      assert_equal config_files, @factory.files
+    end
+
+    should 'read the configuration from the specified files' do
+      config = {
+        :value     => 0,
+        :value1    => 1,
+        :value2    => 2,
+        :overriden => 2
+      }
+      assert_equal config, @factory.config
+    end
+
+  end
+
+end

data/test/test_flag.rb

@@ -21,7 +21,7 @@ class TestFlag < Test::Unit::TestCase
       flag = Flag.new @app, :flag do
         block_run = true
       end
-      flag.active!
+      flag.send :active!
       assert flag.active?
       assert block_run
     end
@@ -29,11 +29,11 @@ class TestFlag < Test::Unit::TestCase
     should 'not allow any arguments' do
       flag = Flag.new @app, :test
       assert_raise ExtraArgumentError do
-        flag << 'argument'
+        flag.send(:<<, 'argument')
       end
 
-      assert flag.args_full?
-      assert !flag.more_args?
+      assert flag.send(:args_full?)
+      assert !flag.send(:more_args?)
       assert !flag.respond_to?(:args)
     end
 

data/test/test_has_arguments.rb

@@ -22,71 +22,71 @@ class TestHasArguments < Test::Unit::TestCase
 
     should 'allow a Numeric as argument count' do
       has_arg = HasArg.new(1)
-      assert_equal 1..1, has_arg.arg_count
+      assert_equal 1..1, has_arg.send(:arg_count)
       assert_nil has_arg.arg_names
     end
 
     should 'allow a Range as argument count' do
       has_arg = HasArg.new(1..3)
-      assert_equal 1..3, has_arg.arg_count
+      assert_equal 1..3, has_arg.send(:arg_count)
       assert_nil has_arg.arg_names
     end
 
     should 'allow an Array as argument count' do
       has_arg = HasArg.new([2, 5, 6])
-      assert_equal 2..6, has_arg.arg_count
+      assert_equal 2..6, has_arg.send(:arg_count)
       assert_nil has_arg.arg_names
     end
 
     should 'allow a Symbol Array as argument names' do
       has_arg = HasArg.new([:arg1, :arg2, :arg3])
-      assert_equal 3..3, has_arg.arg_count
+      assert_equal 3..3, has_arg.send(:arg_count)
       assert_equal [:arg1, :arg2, :arg3], has_arg.arg_names
     end
 
     should 'only have required arguments if argument count is > 0' do
       has_arg = HasArg.new(2)
-      assert !has_arg.args_full?
-      assert has_arg.more_args?
-      has_arg << 'argument'
+      assert !has_arg.send(:args_full?)
+      assert has_arg.send(:more_args?)
+      has_arg.send(:<<, 'argument')
       assert_equal %w{argument}, has_arg.args
       assert_raise MissingArgumentError do
-        has_arg.check_args
+        has_arg.send :check_args
       end
-      has_arg << 'argument'
-      assert has_arg.args_full?
-      assert !has_arg.more_args?
+      has_arg.send(:<<, 'argument')
+      assert has_arg.send(:args_full?)
+      assert !has_arg.send(:more_args?)
       assert_equal %w{argument argument}, has_arg.args
       assert_raise ExtraArgumentError do
-        has_arg << 'argument'
+        has_arg.send(:<<, 'argument')
       end
       assert_equal %w{argument argument}, has_arg.args
     end
 
     should 'have required and optional arguments if argument count is < 0' do
       has_arg = HasArg.new(-1)
-      assert !has_arg.args_full?
-      assert has_arg.more_args?
+      assert !has_arg.send(:args_full?)
+      assert has_arg.send(:more_args?)
       assert_raise MissingArgumentError do
-        has_arg.check_args
+        has_arg.send :check_args
       end
-      has_arg << 'argument'
-      assert has_arg.args_full?
-      assert has_arg.more_args?
+      has_arg.send(:<<, 'argument')
+      assert has_arg.send(:args_full?)
+      assert has_arg.send(:more_args?)
       assert_equal %w{argument}, has_arg.args
     end
 
     should 'only have optional arguments if argument count is 0' do
       has_arg = HasArg.new(0)
-      assert has_arg.args_full?
-      assert has_arg.more_args?
-      has_arg << 'argument'
+      assert has_arg.send(:args_full?)
+      assert has_arg.send(:more_args?)
+      has_arg.send(:<<, 'argument')
       assert_equal %w{argument}, has_arg.args
     end
 
     should 'provide named arguments' do
       has_arg = HasArg.new([:named])
-      has_arg << 'argument'
+      has_arg.send(:<<, 'argument')
       assert_equal 'argument', has_arg[:named]
       assert_equal 'argument', has_arg.named
       assert_raise NoMethodError do
@@ -99,8 +99,8 @@ class TestHasArguments < Test::Unit::TestCase
       has_arg = HasArg.new nil do
         block_run = true
       end
-      has_arg.active!
-      assert has_arg.active?
+      has_arg.send :active!
+      assert has_arg.send(:active?)
       assert block_run
     end
 

data/test/test_ini_provider.rb

@@ -0,0 +1,26 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2010, Sebastian Staudt
+
+require 'test_helper'
+
+class TestIniProvider < Test::Unit::TestCase
+
+  context 'A configuration provider for INI files' do
+
+    should 'return correct values' do
+      ini = File.join(File.dirname(__FILE__), 'config', 'test.ini')
+      expected = {
+        'section' => {
+          'value' => '1',
+          'test1' => '1',
+          'test2' => '2'
+        }
+      }
+      assert_equal expected, Rubikon::Config::IniProvider.load_config(ini)
+    end
+
+  end
+
+end

data/test/test_progress_bar.rb

@@ -100,6 +100,24 @@ class TestProgressBar < Test::Unit::TestCase
       assert_equal 101, @bar.instance_variable_get(:@value)
     end
 
+    should 'have brackets when enabled' do
+      ostream = StringIO.new
+      options = {
+        :brackets => true,
+        :bracket_filler => '-',
+        :ostream => ostream
+      }
+
+      @bar = ProgressBar.new options
+      assert_equal '[' + '-' * 20 + ']' + "\b" * 21, ostream.string
+
+      @bar + 50
+      assert_equal '[' + '-' * 20 + ']' + "\b" * 21 + '#' * 10, ostream.string
+
+      @bar + 50
+      assert_equal '[' + '-' * 20 + ']' + "\b" * 21 + '#' * 20 + "\n", ostream.string
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubikon
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +02:00
+date: 2010-11-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,12 @@ files:
 - lib/rubikon/application/dsl_methods.rb
 - lib/rubikon/application/instance_methods.rb
 - lib/rubikon/application/sandbox.rb
+- lib/rubikon/colored_io.rb
 - lib/rubikon/command.rb
+- lib/rubikon/config/auto_provider.rb
+- lib/rubikon/config/factory.rb
+- lib/rubikon/config/ini_provider.rb
+- lib/rubikon/config/yaml_provider.rb
 - lib/rubikon/exceptions.rb
 - lib/rubikon/flag.rb
 - lib/rubikon/has_arguments.rb
@@ -90,13 +95,16 @@ files:
 - lib/rubikon/parameter.rb
 - lib/rubikon/progress_bar.rb
 - lib/rubikon/throbber.rb
+- samples/config/config_sample.rb
 - samples/helloworld/hello_world.rb
 - test/commands/external_command.rb
 - test/test_application.rb
 - test/test_command.rb
+- test/test_config.rb
 - test/test_flag.rb
 - test/test_has_arguments.rb
 - test/test_helper.rb
+- test/test_ini_provider.rb
 - test/test_option.rb
 - test/test_parameter.rb
 - test/test_progress_bar.rb
@@ -140,9 +148,11 @@ test_files:
 - test/commands/external_command.rb
 - test/test_application.rb
 - test/test_command.rb
+- test/test_config.rb
 - test/test_flag.rb
 - test/test_has_arguments.rb
 - test/test_helper.rb
+- test/test_ini_provider.rb
 - test/test_option.rb
 - test/test_parameter.rb
 - test/test_progress_bar.rb