cli-topic 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a26b2f2dd89ac0caefe2857dca7572a5e5fdcc27
-  data.tar.gz: b6d109a43943d7bb9df655ca9f5ec0904523b82f
+  metadata.gz: e72fc927c07de8676cfbe9825039668fb13e8f2b
+  data.tar.gz: a2e3ca0c238ed29f0bdedd98b4df5307f03f26e0
 SHA512:
-  metadata.gz: 3c11a6283867ee89d3f6568f9363263e0e20a5c457d2cbf3ddd57ec3d4530b566b12322df28ef896cfdd0b9e14c7fccae977af52b02b1b66688b083883263bbc
-  data.tar.gz: d18c8fab5ed577a26644e581c2551c09a5cc11972ba1193318923dd31b9c0e9762c609102ace22e938b17605e75d48f71488d7db0c00b3ad343860871212d952
+  metadata.gz: 9224fb4818253124250723f60f6092724f90f531e8fd66c58e55a7e8717f1dabc022bcda5c7bc086f203a5694e6d10eeec3241227c2ea2da26c1a696174bfa86
+  data.tar.gz: b657642f2745be86b60c15c2c23354e70289b7d934c29ea405f74996db185e6f7c504c2ef2c8473f452bcd658cc9efad52ba0330d7f73e9b37c8d9e3536927a6

data/lib/clitopic/command/clito.rb

@@ -23,14 +23,14 @@ module Clitopic
     end
 
     class DefaultsFile < Clitopic::Command::Base
-      register name: 'defaults_file',
+      register name: 'create-defaults',
       description: "create default file",
-      hidden: true,
+      hidden: false,
       topic: 'clitopic'
 
       option :merge, "--[no-]merge", "Merge options with current file", default: true
       option :force, "-f", "--force", "Overwrite file", default: false
-
+      option :topics, "-t", "--topics TOPICS", Array,  "create file for TOPICS list only"
 
       class << self
         def cmd_opts(cmd, opts)
@@ -40,7 +40,8 @@ module Clitopic
             opts = opts[cmd_comment]
             opts[cmd.name] = {"options" => {}, "args" =>  []}
             cmd.cmd_options.each do |opt|
-              opts[cmd.name]["options"][opt[:name].to_s] = opt[:default]
+              opts[cmd.name]["options"]["#{opt[:name].to_s}$comment"] = {}
+              opts[cmd.name]["options"]["#{opt[:name].to_s}$comment"][opt[:name].to_s] = opt[:default]
             end
           end
         end
@@ -62,13 +63,17 @@ module Clitopic
           end
           opts['topics'] = {}
           Clitopic::Topics.topics.each do |topic_name, topic|
+            if @options[:topics] && !@options[:topics].index(topic_name.to_s)
+              next
+            end
+
             if (!topic.hidden || options[:hidden])
               topic_comment = "#{topic_name}$comment"
               opts['topics'][topic_comment] = {}
               opts['topics'][topic_comment][topic_name] = {}
-              opts['topics'][topic_comment][topic_name]["topic_options"] = {} if topic.topic_options.size > 0
+              opts['topics'][topic_comment][topic_name]["topic_options$comment"] = {"topic_options" => {}} if topic.topic_options.size > 0
               topic.topic_options.each do |opt|
-                opts['topics'][topic_comment][topic_name]["topic_options"][opt[:name].to_s] = opt[:default]
+                opts['topics'][topic_comment][topic_name]["topic_options$comment"]["topic_options"][opt[:name].to_s] = opt[:default]
               end
               if topic.commands.size > 0
                 topic.commands.each do |c, cmd|
@@ -88,17 +93,16 @@ module Clitopic
           end
           puts "write: #{file}"
           yaml = opts.to_yaml
-
+          yaml = yaml.gsub("topic_options$comment:", "  # common-topic options")
           Clitopic::Topics.topics.each do |topic_name, topic|
-            yaml = yaml.gsub("#{topic_name}$comment:", topic_comment(topic))
+            yaml = yaml.gsub(/(\s+)#{topic_name}\$comment:/, '\1' + topic_comment(topic))
             if topic.commands.size > 0
               topic.commands.each do |c, cmd|
-                yaml = yaml.gsub("#{c}$comment:", cmd_comment(cmd))
+                yaml = yaml.gsub(/(\s+)#{c}\$comment:/, '\1' + cmd_comment(cmd))
+                yaml = opt_comment(cmd, yaml)
               end
             end
-
           end
-
           File.open(file, 'wb') do  |file|
             file.write(yaml)
           end
@@ -115,13 +119,18 @@ module Clitopic
           "        # #{cmd.short_description}"
         end
 
-        def opt_comment(opt)
-          "# "
+        def opt_comment(cmd, yaml)
+          if cmd.cmd_options.size > 0 && (!cmd.hidden || options[:hidden])
+            cmd.cmd_options.each do |opt|
+              yaml = yaml.gsub(/(\s+)#{opt[:name].to_s}\$comment:/, '\1' +  "# #{opt[:args].last}")
+            end
+          end
+          return yaml
         end
+
         def call
-          puts @options
           if @arguments.size == 0
-            file = Clitopic::Helpers.find_default_file
+            file = Clitopic::Helpers.find_default_file || Clitopic.default_files.first
             if file.nil?
               raise ArgumentError.new("Missing file")
             end

data/lib/clitopic/version.rb

@@ -1,3 +1,3 @@
 module Clitopic
-  VERSION = '0.9.11'
+  VERSION = '0.9.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cli-topic
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Antoine Legrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec