cli-topic 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69133ceab5e2dd9f9b2c2951f950ce3e747e25b6
-  data.tar.gz: b4b3dd0561e6a1b903b2d1c14a1420353a14bba3
+  metadata.gz: d33cb99755097e7f69ff49226238d5c488c61d70
+  data.tar.gz: a35ff75d0e23174c3f5968b8115ac957ae687d0f
 SHA512:
-  metadata.gz: 99223e53b380536a589bb9f3752a43db56f3ce4ec46d070afaa1729438713a85ac897a83400e35cc813ee8046b0b4d8c23e74dc74ba38c4765d4b40cf07d77db
-  data.tar.gz: 83e6817b3568220fb3da79972aee428f0c689a0009c1cc2019405d6ed3d117162b0d09ce12d664c57b037418b5f6923181aa863607e378f6bbb77ebb37c6db40
+  metadata.gz: e1f67ad380e9b3869542722a7c33ab5ab6c0e6129cddd154b3be14b26087e6c094d71167b23df7bb5bb150b000f873e0d8e500204b804bc456a3c9cb3c7cb05c
+  data.tar.gz: 6ea6f508801838b752e8455b26d18fb1b83f88c846539a4d12eec27f584beae4f335c68197df5e88402593e48278eed3540966b2996d6e1befb18c77fc37635d

data/lib/clitopic/command/base.rb

@@ -115,7 +115,6 @@ module Clitopic
           load_options(topic_opts)
 
           if cmd_defaults.nil?
-            puts "no defaults"
             return
           end
 

data/lib/clitopic/commands.rb

@@ -60,6 +60,7 @@ module Clitopic
         end
       end
 
+
       def all_commands
         cmds = []
         Topics.topics.each do |k,topic|
@@ -77,6 +78,7 @@ module Clitopic
 
       def prepare_run(cmd, arguments)
         @current_options, @current_args = cmd.parse(arguments.dup)
+        return @current_options, @current_args
       rescue OptionParser::ParseError => e
         $stderr.puts Clitopic::Helpers.format_with_bang(e.message)
         cmd.options = {}

data/lib/clitopic/parser/option_parser.rb

@@ -54,17 +54,35 @@ module Clitopic
         parser.to_s
       end
 
+      def check_required (opts)
+        opts.each do |opt|
+          if opt[:required] == true
+            if options[opt[:name]].nil?
+              message = "Missing required option: #{opt[:args][0]}"
+              $stderr.puts(Clitopic::Helpers.format_with_bang(message) + "\n\n")
+              Clitopic::Commands.run(self.fullname, ["--help"])
+            end
+          end
+        end
+      end
+
+      def check_all_required
+        check_required(self.cmd_options)
+        check_required(self.topic.topic_options)
+        check_required(Clitopic::Commands.global_options)
+      end
+
       def parse(args)
         @invalid_options ||= []
         parser.parse!(args)
+        check_all_required
         @arguments = args
         Clitopic::Commands.validate_arguments!(@invalid_options)
         return @options, @arguments
-      rescue OptionParser::InvalidOption => ex
+      rescue OptionParser::InvalidOption  => ex
         @invalid_options << ex.args.first
         retry
       end
-
     end
   end
 end

data/lib/clitopic/version.rb

@@ -1,3 +1,3 @@
 module Clitopic
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cli-topic
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Antoine Legrand