rcoli 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28273dca67c807b11bd81c7e7af01d750ae622e
-  data.tar.gz: 1acd714ad5641350afbf5b691a16d7487ab5e066
+  metadata.gz: 921fb46c2cbd5497b9113de61d816a0042449050
+  data.tar.gz: dfdac228b77b754dc6bcf77d06ab8573b5f81ab0
 SHA512:
-  metadata.gz: c6d196864e8620a1a1a9cb0d078e81733f4959a53ebc560d4c6919f91897557a663696a3dd19f3bc9430b444fc9ffcc27b306011f98bfc5851fb6a019b5624a2
-  data.tar.gz: c1752f5405dd90ffff2ebecdd6d0a2c553ef25a812ba765d24153314f1d9bd2c81e34a7b95dcc57924bcb8f6d66232c7aa6d15ed7079abc3c24305c96554a98f
+  metadata.gz: 8c72236617c59c39fc9dd25fbdc601a4f41a0ed0c0437066922064c1d4c2fbe24137e195dd168373e6160db71f0b99696d5c3dc35438980660d07797be09face
+  data.tar.gz: 19f9d4500577edb50b0985f100d768058159f50300262d2c81a6926a321ef8e81e23c0218670f707cf35b1d85e3ba8549edd3e0ac84e15f5b99c47661e139528

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    rcoli (0.6.4)
+    rcoli (0.7.0)
       highline (~> 1.6.11)
       paint (= 0.8.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    highline (1.6.15)
+    highline (1.6.20)
     paint (0.8.5)
     rake (10.0.3)
 

data/README.md

@@ -30,14 +30,14 @@ Library for development of command line applications in Ruby.
 		    c.description "Commands for creating and managing nodes"
 		    c.command :create do |sc|
 		      sc.description "Creates node"
-		      sc.action do |global_opts, opts, args|
+		      sc.action do |opts, args|
 					 # your action here
 		      end
 		    end
 				
 		    c.command :remove do |sc|
 		      sc.description "Remove node"
-		      sc.action do |global_opts, opts, args|
+		      sc.action do |opts, args|
 					 # your action here
 		      end
 		    end

data/lib/rcoli/model.rb

@@ -60,8 +60,7 @@ module RCoLi
           else
             value = true
           end
-          target = self.parent ? :options : :global_options
-          option.keys.each{|key| result.send(target)[key] = value}
+          option.keys.each{|key| result.options[key] = value}
         else
           raise InvalidCommand, "'#{arg}' is not a valid option"
         end
@@ -70,7 +69,7 @@ module RCoLi
           result.command = cmd
           cmd.put_default_values(result)
           cmd.parse_args(args, result)
-          cmd.validate_options(result, :options)
+          cmd.validate_options(result)
         elsif (commands.empty?)
           result.arguments << arg
         else
@@ -82,8 +81,7 @@ module RCoLi
     
     def put_default_values(result)
       options.find_all{|option| option.respond_to? :value_of_default_value and option.value_of_default_value}.each do |option|
-        target = self.parent ? :options : :global_options
-        option.keys.each{|key| result.send(target)[key] = option.value_of_default_value}
+        option.keys.each{|key| result.options[key] = option.value_of_default_value}
       end
     end
     
@@ -92,12 +90,12 @@ module RCoLi
       return result
     end
     
-    def validate_options(result, target)
+    def validate_options(result)
       if (result.command.nil? or 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]}
+          raise InvalidCommand, "Required option '#{o.to_s}' is missing" unless o.keys.find{|key| result.options[key]}
         end
       end
     end
@@ -105,7 +103,13 @@ module RCoLi
     private
     
     def find_option(name)
-      options.find{|opt| opt.correspond?(name)}
+      all_options = []
+      command = self
+      begin
+        all_options.concat(command.options)
+        command = command.parent
+      end while(command)
+      all_options.find{|opt| opt.correspond?(name)}
     end
 
     def is_option?(value)
@@ -201,7 +205,7 @@ module RCoLi
       result = ParsedArgs.new
       put_default_values(result)      
       parse_args(args, result)
-      validate_options(result, :global_options)
+      validate_options(result)
       if result.command
         
         # command has to have the action block
@@ -209,23 +213,23 @@ module RCoLi
         raise ApplicationError, "Invalid configuration. Missing action block." unless action
         
         # enable/disable logging level DEBUG
-        if (result.global_options['debug'])
+        if (result.options['debug'])
           context.instance_exec do
             log.level = Logger::DEBUG
           end
         end
         
         # enable dev mode
-        if (result.global_options['dev-mode'])
+        if (result.options['dev-mode'])
           ApplicationContext.instance.devmode = true
         end
         
         # execution of the pre block
-        context.instance_exec(result.global_options, result.options, result.arguments, &@pre_action) if (@pre_action and !result.command.value_of_skip_pre) 
+        context.instance_exec(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)
+        context.instance_exec(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.value_of_skip_post) 
+        context.instance_exec(result.options, result.arguments, &@post_action) if (@post_action and !result.command.value_of_skip_post) 
       else
         say "This feature is comming soon. You should execute '#{value_of_name} help' now."
       end
@@ -244,14 +248,12 @@ module RCoLi
   
   class ParsedArgs
     
-    attr_reader :global_options
-    attr_reader :options
+    attr_accessor :options
     attr_reader :arguments
     
     attr_accessor :command
     
     def initialize
-      @global_options = {}
       @options = {}
       @arguments = []
     end

data/lib/rcoli/utils.rb

@@ -28,6 +28,8 @@ module RCoLi
         case severity
         when "DEBUG"
           color = 'gray27'
+        when "FATAL"
+          color = :red
         else
           color = :white
         end

data/lib/rcoli/version.rb

@@ -1,5 +1,5 @@
 module RCoLi
   
-  VERSION = '0.6.8'
+  VERSION = '0.7.0'
   
 end

data/lib/rcoli.rb

@@ -23,7 +23,7 @@ def application(id, &block)
     c.skip_pre true
     c.skip_post true
     c.force true
-    c.action do |global_opts, opts, args|
+    c.action do |opts, args|
       @program.help args
     end
   end

data/rcoli.gemspec

@@ -5,11 +5,12 @@ require "rcoli/version"
 Gem::Specification.new do |s|
   s.name        = "rcoli"
   s.version     = RCoLi::VERSION
-  s.authors     = ["Jiri Pisa"]
-  s.email       = ["jirka.pisa@gmail.com"]
+  s.authors     = ["Jiri Pisa", "Jaroslav Barton"]
+  s.email       = ["jirka.pisa@gmail.com", "jaroslav@bartonovi.eu"]
   s.homepage    = "https://github.com/jiripisa/rcoli"
   s.summary     = "The complete solution for commandline application written in ruby."
   s.description = "The complete solution for commandline application written in ruby."
+  s.licenses    = ["MIT"]
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rcoli
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Jiri Pisa
+- Jaroslav Barton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -55,6 +56,7 @@ dependencies:
 description: The complete solution for commandline application written in ruby.
 email:
 - jirka.pisa@gmail.com
+- jaroslav@bartonovi.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -74,7 +76,8 @@ files:
 - lib/rcoli/version.rb
 - rcoli.gemspec
 homepage: https://github.com/jiripisa/rcoli
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -92,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: The complete solution for commandline application written in ruby.