rcoli 0.5.7 → 0.5.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rcoli (0.5.7)
+    rcoli (0.5.8)
       highline (~> 1.6.11)
 
 GEM

data/lib/rcoli/extensions.rb

@@ -7,7 +7,7 @@ def setter(name)
   define_method("value_of_#{name}") do
     ivar = "@#{name}"
     if (instance_variable_get(ivar))
-      instance_variable_get(ivar).to_s
+      instance_variable_get(ivar)
     else
       nil
     end

data/lib/rcoli/model.rb

@@ -8,8 +8,12 @@ module RCoLi
   
   module CommandContainer
     
+    setter :force
+    
+    
     attr_accessor :parent
     
+    
     def action(&block)
       @action = block
     end
@@ -18,8 +22,8 @@ module RCoLi
       @action
     end
     
-    def command(name, &block)
-      obj = Command.new(name)
+    def command(nam, &block)
+      obj = Command.new(nam)
       obj.parent = self
       block.call(obj)  
       commands << obj
@@ -66,6 +70,7 @@ module RCoLi
           result.command = cmd
           cmd.put_default_values(result)
           cmd.parse_args(args, result)
+          cmd.validate_options(result, :options)
         elsif (commands.empty?)
           result.arguments << arg
         else
@@ -83,7 +88,18 @@ module RCoLi
     end
     
     def find_command(name)
-      commands.find{|command| command.value_of_name.eql? name}
+      result = commands.find{|command| command.value_of_name.to_s.eql? name}
+      return result
+    end
+    
+    def validate_options(result, target)
+      if (result.command.value_of_force == true)
+        return
+      else
+        self.options.find_all{|o| o.is_a? Flag and o.value_of_required}.each do |o|
+          raise InvalidCommand, "Required option '#{o.to_s}' is missing" unless o.keys.find{|key| result.send(target)[key]}
+        end
+      end
     end
     
     private
@@ -111,6 +127,10 @@ module RCoLi
       [@s_name, @l_name].compact
     end
     
+    def to_s
+      keys.join(', ')
+    end
+    
     def help_keys
       result = []
       result << "-#{@s_name}" if @s_name
@@ -136,6 +156,7 @@ module RCoLi
     
     setter :default_value
     setter :arg_name
+    setter :required
     
   end
     
@@ -145,14 +166,8 @@ module RCoLi
     setter :summary
     setter :description
     setter :syntax
-    
-    def solitaire
-      @solitaire = true
-    end
-    
-    def solitaire?
-      return true == @solitaire
-    end
+    setter :skip_pre
+    setter :skip_post
     
     def initialize(name)
       @name = name
@@ -186,11 +201,12 @@ module RCoLi
       result = ParsedArgs.new
       put_default_values(result)      
       parse_args(args, result)
+      validate_options(result, :global_options)
       if result.command
         
         # command has to have the action block
         action = result.command.get_action
-        raise "Invalid configuration. Missing action block." unless action
+        raise ApplicationError, "Invalid configuration. Missing action block." unless action
         
         # enable/disable logging level DEBUG
         if (result.global_options['debug'])
@@ -200,11 +216,11 @@ module RCoLi
         end
         
         # execution of the pre block
-        context.instance_exec(result.global_options, result.options, result.arguments, &@pre_action) if (@pre_action and !result.command.solitaire?) 
+        context.instance_exec(result.global_options, result.options, result.arguments, &@pre_action) if (@pre_action and !result.command.value_of_skip_pre) 
         # execution of the main block
         context.instance_exec(result.global_options, result.options, result.arguments, &action)
         # execution of the post block
-        context.instance_exec(result.global_options, result.options, result.arguments, &@post_action) if (@post_action and !result.command.solitaire?) 
+        context.instance_exec(result.global_options, result.options, result.arguments, &@post_action) if (@post_action and !result.command.value_of_skip_post) 
       else
         say "This feature is comming soon. Now you should execute '#{value_of_name} help'"
       end

data/lib/rcoli/version.rb

@@ -1,5 +1,5 @@
 module RCoLi
   
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
   
 end

data/lib/rcoli.rb

@@ -16,7 +16,9 @@ def application(id, &block)
   
   @program.command(:help) do |c|
     c.description "Display help documentation"
-    c.solitaire
+    c.skip_pre true
+    c.skip_post true
+    c.force true
     c.action do |global_opts, opts, args|
       @program.help args
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcoli
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2584008343828068554
+      hash: 2822556458840030411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2584008343828068554
+      hash: 2822556458840030411
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24