rubikon 0.5.0 → 0.5.1

data/README.md

@@ -138,6 +138,7 @@ LICENSE file.
 ## Credits
 
 * Sebastian Staudt -- koraktor(at)gmail.com
+* Dotan J. Nahum -- jondotan(at)gmail.com
 
 ## See Also
 

data/lib/rubikon/application/dsl_methods.rb

@@ -16,9 +16,11 @@ module Rubikon
     # @since 0.3.0
     module DSLMethods
 
-      # @return [String] The (first) definition file of the application
+      # @return [String] The (first) file where the application has been
+      #         defined
       attr_reader :base_file
 
+      # @return [Hash] The active configuration of the application
       attr_reader :config
 
       # @return [String] The absolute path of the application
@@ -26,6 +28,26 @@ module Rubikon
 
       private
 
+      # Checks whether parameter with the given name has been supplied by the
+      # user on the command-line.
+      #
+      # @param [#to_sym] name The name of the parameter to check
+      # @since 0.2.0
+      #
+      # @example
+      #  flag :status
+      #  command :something do
+      #    print_status if active? :status
+      #  end
+      def active?(name)
+        name = name.to_sym
+        parameter = @global_parameters[name]
+        parameter = @current_command.parameters[name] if parameter.nil?
+        return false if parameter.nil?
+        parameter.send(:active?)
+      end
+      alias_method :given?, :active?
+
       # Call another named command with the given arguments
       #
       # @param [Symbol] command_name The name of the command to call
@@ -106,11 +128,11 @@ module Rubikon
       #
       # @return [Command] The default Command object
       # @since 0.2.0
-      def default(description = nil, &block)
-        if description.is_a? Symbol
-          command({ :__default => description })
+      def default(arg_count = nil, description = nil, &block)
+        if arg_count.is_a? Symbol
+          command({ :__default => arg_count })
         else
-          command(:__default, description, &block)
+          command(:__default, arg_count, description, &block)
         end
       end
 
@@ -139,26 +161,6 @@ module Rubikon
         end
       end
 
-      # Checks whether parameter with the given name has been supplied by the
-      # user on the command-line.
-      #
-      # @param [#to_sym] name The name of the parameter to check
-      # @since 0.2.0
-      #
-      # @example
-      #  flag :status
-      #  command :something do
-      #    print_status if active? :status
-      #  end
-      def active?(name)
-        name = name.to_sym
-        parameter = @global_parameters[name]
-        parameter = @current_command.parameters[name] if parameter.nil?
-        return false if parameter.nil?
-        parameter.send(:active?)
-      end
-      alias_method :given?, :active?
-
       # Create a new flag with the given name to be used globally
       #
       # Global flags are not bound to any command and can therefore be used
@@ -398,7 +400,7 @@ module Rubikon
       #
       # @param [String] text The text to write into the output stream
       # @since 0.2.0
-      def puts(text)
+      def puts(text = nil)
         ostream.puts text
       end
 

data/lib/rubikon/application/instance_methods.rb

@@ -60,7 +60,7 @@ module Rubikon
           :raise_errors    => false
         }
 
-	@settings[:config_paths] = []
+        @settings[:config_paths] = []
         if RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin/
           @settings[:config_paths] << ENV['ALLUSERSPROFILE']
         else
@@ -110,7 +110,7 @@ module Rubikon
           raise $! if @settings[:raise_errors]
 
           puts "r{Error:}\n    #{$!.message}"
-          puts "    #{$!.backtrace.join("\n    ")}" if $DEBUG
+          puts "     at #{$!.backtrace.join("\n     at ")}" if $DEBUG
           exit 1
         ensure
           InstanceMethods.instance_method(:reset).bind(self).call
@@ -299,19 +299,23 @@ module Rubikon
       #         parameters of this command that have been supplied and any
       #         additional command-line arguments supplied
       def parse_arguments(args)
-        command_arg = args.find { |arg| arg == '--' || !arg.start_with?('-') }
-        command_arg = nil if command_arg == '--'
-
-        if command_arg.nil?
+        command_arg = args.shift
+        if command_arg.nil? || command_arg.start_with?('-')
           command = @commands[:__default]
+          args.unshift(command_arg) unless command_arg.nil?
           raise NoDefaultCommandError if command.nil?
         else
           command = @commands[command_arg.to_sym]
-          args.delete_at args.find_index(command_arg)
           raise UnknownCommandError.new(command_arg) if command.nil?
         end
 
-        args.delete '--'
+        args = args.map do |arg|
+          if !arg.start_with?('--') && arg.start_with?('-') && arg.size > 2
+            arg[1..-1].split('').map { |a| "-#{a}"}
+          else
+            arg
+          end
+        end.flatten
 
         parameter  = nil
         parameters = []

data/lib/rubikon/application/sandbox.rb

@@ -61,7 +61,7 @@ module Rubikon
       # output IO object is used for printing text
       #
       # @param [String] text The text to write into the output stream
-      def puts(text)
+      def puts(text = nil)
         @__app__.send(:puts, text)
       end
 

data/lib/rubikon/progress_bar.rb

@@ -2,6 +2,7 @@
 # the terms of the new BSD License.
 #
 # Copyright (c) 2009-2010, Sebastian Staudt
+# Copyright (c) 2010, Dotan J. Nahum
 
 module Rubikon
 

data/lib/rubikon.rb

@@ -24,6 +24,6 @@ require 'rubikon/application/base'
 module Rubikon
 
   # This is the current version of the Rubikon gem
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 
 end

data/samples/helloworld/hello_world.rb

@@ -15,16 +15,11 @@ end
 # A relatively simple Hello World application using Rubikon
 class HelloWorld < Rubikon::Application::Base
 
-  set :config_file, 'helloworld.ini'
-  set :config_format, :ini
-
   # Greet the whole world per default
   flag :more
   option :name, [:who]
   option :names, -1
   default 'Simple hello world' do
-    p config
-
     debug 'Starting to greet the world...'
     if given? :name
       greet parameters[:name].who

data/test/test_application.rb

@@ -159,6 +159,14 @@ class TestApplication < Test::Unit::TestCase
       assert_equal "pre init\npost init\npre execute\nexecute\npost execute\n", @ostream.string
     end
 
+    should 'allow combining single character parameters' do
+      @app.run(%w{-dv})
+      assert $DEBUG
+      assert $VERBOSE
+      $DEBUG = false
+      $VERBOSE = false
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubikon
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +01:00
+date: 2010-12-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,8 +115,8 @@ homepage: http://koraktor.github.com/rubikon
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement