cli-topic 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8003d6632558c53150f15cf2a82014647761331b
-  data.tar.gz: a677aa796f1db1f45c00b62881994cddd962a90c
+  metadata.gz: 69133ceab5e2dd9f9b2c2951f950ce3e747e25b6
+  data.tar.gz: b4b3dd0561e6a1b903b2d1c14a1420353a14bba3
 SHA512:
-  metadata.gz: 38947da78454ed0682444d86365dfd6239da094ecccc16badd3381aef6919b54eb8f7f6978d395f0a0dd9d124c16538b0519152951f53b288d319e8ab7e47f9a
-  data.tar.gz: 2bfbbf15f4e7126d190e958eaa8379c30fa42ff0fa79d80dffb4bb8013bd290bd630a0ee714e8324094a7e167929a9ae6f9482ff7bb14fb33035cb83d02ce643
+  metadata.gz: 99223e53b380536a589bb9f3752a43db56f3ce4ec46d070afaa1729438713a85ac897a83400e35cc813ee8046b0b4d8c23e74dc74ba38c4765d4b40cf07d77db
+  data.tar.gz: 83e6817b3568220fb3da79972aee428f0c689a0009c1cc2019405d6ed3d117162b0d09ce12d664c57b037418b5f6923181aa863607e378f6bbb77ebb37c6db40

data/lib/clitopic/command/base.rb

@@ -71,10 +71,10 @@ module Clitopic
           opts.each do |name, value|
             name = name.to_s.to_sym
             if !value.nil?
-              if options[name].nil?
-                options[name] = value
-              elsif options[name].is_a?(Array)
+              if options[name].is_a?(Array)
                 options[name] += value
+              else
+                options[name] = value
               end
             end
           end
@@ -106,20 +106,20 @@ module Clitopic
               cmd_defaults = defaults["commands"][self.name]
             end
           else
-            if defaults.has_key?(self.topic.name)
-              cmd_defaults = defaults[self.topic.name][self.name]
-              topic_opts = defaults[self.topic.name]['topic_options']
+            if defaults.has_key?("topics") && defaults["topics"].has_key?(self.topic.name)
+              cmd_defaults = defaults['topics'][self.topic.name][self.name]
+              topic_opts = defaults['topics'][self.topic.name]['topic_options']
             end
           end
 
+          load_options(topic_opts)
+
           if cmd_defaults.nil?
             puts "no defaults"
             return
           end
 
-          load_options(topic_opts)
           load_options(cmd_defaults["options"])
-
           if cmd_defaults["args"] && !arguments
             @arguments += Array(cmd_defaults["args"])
           end

data/lib/clitopic/command/clito.rb

@@ -42,6 +42,11 @@ module Clitopic
           end
         end
 
+        def deep_merge(h1, h2)
+          merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+          h1.merge(h2, &merger)
+        end
+
         def dump_options(file, merge=true, force=false)
           opts = {"common_options" => {}}
           opts["common_options"] = {} if Clitopic::Commands.global_options.size > 0
@@ -52,16 +57,17 @@ module Clitopic
           Clitopic::Commands.global_commands.each do |c, cmd|
             cmd_opts(cmd, opts["commands"])
           end
+          opts['topics'] = {}
           Clitopic::Topics.topics.each do |topic_name, topic|
             if (!topic.hidden || options[:hidden])
-              opts[topic_name] = {}
-              opts[topic_name]["topic_options"] = {} if topic.topic_options.size > 0
+              opts['topics'][topic_name] = {}
+              opts['topics'][topic_name]["topic_options"] = {} if topic.topic_options.size > 0
               topic.topic_options.each do |opt|
-                opts[topic_name]["topic_options"][opt[:name].to_s] = opt[:default]
+                opts['topics'][topic_name]["topic_options"][opt[:name].to_s] = opt[:default]
               end
               if topic.commands.size > 0
                 topic.commands.each do |c, cmd|
-                  cmd_opts(cmd, opts[topic_name])
+                  cmd_opts(cmd, opts['topics'][topic_name])
                 end
               end
             end
@@ -72,7 +78,7 @@ module Clitopic
               raise ArgumentError.new("File #{file} exists, use --merge or --force")
             end
             if merge && !force
-              opts = opts.merge(YAML.load_file(file))
+              opts = deep_merge(opts, YAML.load_file(file))
             end
           end
           puts "write: #{file}"

data/lib/clitopic/command/help.rb

@@ -111,26 +111,6 @@ module Clitopic
           end
         end
 
-        def display_topic(topic_name, with_commands=false, with_header=false)
-          if with_commands
-            longest = longest_cmd
-          else
-            longest = longest_topic
-          end
-          topic = Topics[topic_name]
-          header(topic) if with_header
-
-          if topic.hidden == false || options[:with_hidden] == true
-            puts ("%-#{longest + 3}s  # %s" % [ "#{topic_name}", "#{topic.short_description}" ]).indent(2)
-            if with_commands
-              topic.commands.each do |cmd_name, cmd|
-                puts ("   %-#{longest}s  # %s" % [ "#{cmd.fullname}", "#{cmd.short_description}"]).indent(2)
-              end
-              puts ""
-            end
-          end
-        end
-
         def display_topics(with_commands=false)
           puts "Additional topics:\n\n"
           Clitopic::Topics.topics.each do |topic_name, topic|

data/lib/clitopic/commands.rb

@@ -97,10 +97,10 @@ module Clitopic
                                     "See `help` for a list of available commands."
                                   ].compact.join("\n\n"))
         end
-        prepare_run(@current_cmd, arguments)
         if @current_cmd.options[:load_defaults] == true || Clitopic.load_defaults?
           @current_cmd.load_defaults
         end
+        prepare_run(@current_cmd, arguments)
         @current_cmd.call
       end
 

data/lib/clitopic/helpers.rb

@@ -74,12 +74,12 @@ module Clitopic
     def confirm_command(app_to_confirm = app, message=nil)
       if confirmed_app = Clitopic::Commands.current_options[:confirm]
         unless confirmed_app == app_to_confirm
-          raise(Clitopic::Command::CommandFailed, "Confirmed app #{confirmed_app} did not match the selected app #{app_to_confirm}.")
+          raise(Clitopic::Commands::CommandFailed, "Confirmed app #{confirmed_app} did not match the selected app #{app_to_confirm}.")
         end
         return true
       else
         display
-        message ||= "WARNING: Destructive Action\nThis command will affect the app: #{app_to_confirm}"
+        message ||= "WARNING: Destructive Action\n"
         message << "\nTo proceed, type \"#{app_to_confirm}\" or re-run this command with --confirm #{app_to_confirm}"
         output_with_bang(message)
         display
@@ -109,28 +109,6 @@ module Clitopic
       Clitopic::Command.run(command, args)
     end
 
-    def retry_on_exception(*exceptions)
-      retry_count = 0
-      begin
-        yield
-      rescue *exceptions => ex
-        raise ex if retry_count >= 3
-        sleep 3
-        retry_count += 1
-        retry
-      end
-    end
-
-    def has_git?
-      %x{ git --version }
-      $?.success?
-    end
-
-    def git(args)
-      return "" unless has_git?
-      flattened_args = [args].flatten.compact.join(" ")
-      %x{ git #{flattened_args} 2>&1 }.strip
-    end
 
     def time_ago(since)
       if since.is_a?(String)
@@ -258,7 +236,7 @@ module Clitopic
     end
 
     def fail(message)
-      raise Clitopic::Command::CommandFailed, message
+      raise Clitopic::Commands::CommandFailed, message
     end
 
     ## DISPLAY HELPERS
@@ -413,8 +391,8 @@ module Clitopic
     def format_error(error, message='Clitopic client internal error.')
       formatted_error = []
       formatted_error << " !    #{message}"
-      formatted_error << ' !    Search for help at: https://help.clitopic.com"'
-      formatted_error << ' !    Or report a bug at: https://github.com/ant31/clitopic/issues/new'
+      formatted_error << " !    Search for help at: #{Clitopic.help_page || "https://github.com/ant31/cli-topic/wiki"}"
+      formatted_error << " !    Or report a bug at: #{Clitopic.issue_report || "https://github.com/ant31/cli-topic/issues/new"} "
       formatted_error << ''
 
       command = ARGV.map do |arg|

data/lib/clitopic/version.rb

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

data/lib/clitopic.rb

@@ -3,7 +3,7 @@ require 'clitopic/parsers'
 
 module Clitopic
   class << self
-    attr_accessor :debug, :commands_dir, :version, :default_files, :load_defaults, :name
+    attr_accessor :debug, :commands_dir, :version, :default_files, :load_defaults, :name, :help_page, :issue_report
     def name
       @name ||= 'clito'
     end

data/spec/spec_helper.rb

@@ -19,7 +19,9 @@ require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 SimpleCov.start do
   add_filter 'spec/'
+  add_filter 'lib/clitopic/helpers.rb'
   add_group 'lib', 'lib'
+  add_group 'commands', 'lib/clitopic/command'
 end
 
 require 'clitopic'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cli-topic
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Antoine Legrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec