cli-topic 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad369c6742ba9fee6bd2b6a1df0aef0e5947f3ff
-  data.tar.gz: 6ad659b6362a74980a227c2e91976f8787eeb529
+  metadata.gz: 8003d6632558c53150f15cf2a82014647761331b
+  data.tar.gz: a677aa796f1db1f45c00b62881994cddd962a90c
 SHA512:
-  metadata.gz: c241ac021dbcfb34327a1e45a523724cbb63240825b5847453cc0cb3ee52844ca93658ad0cb7c7a9f6217b07b6db4d6ee6747558970d8e63cefa75ee7917d0dc
-  data.tar.gz: 4fa40fb6f956a7d3a8f6b12cfc3082c6104d1f86cb4bbfbcfa4442c929c46179e2204d5e0914f3c136059893f5e2c58d25f0c461693c6cdac3d016c218f5be0d
+  metadata.gz: 38947da78454ed0682444d86365dfd6239da094ecccc16badd3381aef6919b54eb8f7f6978d395f0a0dd9d124c16538b0519152951f53b288d319e8ab7e47f9a
+  data.tar.gz: 2bfbbf15f4e7126d190e958eaa8379c30fa42ff0fa79d80dffb4bb8013bd290bd630a0ee714e8324094a7e167929a9ae6f9482ff7bb14fb33035cb83d02ce643

data/lib/clitopic/command/base.rb

@@ -7,8 +7,7 @@ module Clitopic
   module Command
     class Base
       class << self
-        include Clitopic.parser
-
+        include Clitopic::Parser::OptParser
         attr_accessor :name, :banner, :description, :hidden, :short_description
         attr_accessor :arguments, :options
 
@@ -98,11 +97,14 @@ module Clitopic
           begin
             defaults = YAML.load_file(file)
           rescue
+            puts "failed to load defaults file: #{file}"
             return
           end
 
           if self.topic.nil?
-            cmd_defaults = defaults["commands"][self.name]
+            if defaults.has_key?("commands")
+              cmd_defaults = defaults["commands"][self.name]
+            end
           else
             if defaults.has_key?(self.topic.name)
               cmd_defaults = defaults[self.topic.name][self.name]
@@ -111,6 +113,7 @@ module Clitopic
           end
 
           if cmd_defaults.nil?
+            puts "no defaults"
             return
           end
 

data/lib/clitopic/command/clito.rb

@@ -22,7 +22,7 @@ module Clitopic
 
     end
 
-    class DefaultFile < Clitopic::Command::Base
+    class DefaultsFile < Clitopic::Command::Base
       register name: 'defaults_file',
       description: "create default file",
       hidden: true,
@@ -30,7 +30,7 @@ module Clitopic
 
       option :merge, "--[no-]merge", "Merge options with current file", default: true
       option :force, "-f", "--force", "Overwrite file", default: false
-      option :hidden, "--with-hidden", "include hidden cmds/topics", default: false
+
 
       class << self
         def cmd_opts(cmd, opts)
@@ -72,7 +72,6 @@ module Clitopic
               raise ArgumentError.new("File #{file} exists, use --merge or --force")
             end
             if merge && !force
-              return if not Clitopic::Helpers.confirm("Overwrite #{file} ? (y/N)")
               opts = opts.merge(YAML.load_file(file))
             end
           end
@@ -80,7 +79,7 @@ module Clitopic
           File.open(file, 'wb') do  |file|
             file.write(opts.to_yaml)
           end
-          puts opts.to_yaml
+          return opts
         end
 
         def call
@@ -89,7 +88,9 @@ module Clitopic
             raise ArgumentError.new("Missing file")
           end
           file = @arguments[0]
-          dump_options(file, @options[:merge], @options[:force])
+          opts = dump_options(file, @options[:merge], @options[:force])
+          puts opts
+          return opts
         end
       end
 

data/lib/clitopic/commands.rb

@@ -79,7 +79,11 @@ module Clitopic
         @current_options, @current_args = cmd.parse(arguments.dup)
       rescue OptionParser::ParseError => e
         $stderr.puts Clitopic::Helpers.format_with_bang(e.message)
-        run("help", [cmd.fullname])
+        cmd.options = {}
+        cmd.arguments = {}
+        @current_options = nil
+        @current_arguments = nil
+        run(cmd.fullname, ["--help"])
       end
 
       def run(cmd, arguments=[])
@@ -95,7 +99,6 @@ module Clitopic
         end
         prepare_run(@current_cmd, arguments)
         if @current_cmd.options[:load_defaults] == true || Clitopic.load_defaults?
-          puts 'load'
           @current_cmd.load_defaults
         end
         @current_cmd.call

data/lib/clitopic/parser/option_parser.rb

@@ -56,11 +56,11 @@ module Clitopic
 
       def parse(args)
         @invalid_options ||= []
-        parser.order!(args)
+        parser.parse!(args)
         @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

data/lib/clitopic/version.rb

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

data/lib/clitopic.rb

@@ -3,26 +3,15 @@ require 'clitopic/parsers'
 
 module Clitopic
   class << self
-    attr_accessor :debug, :commands_dir, :parser, :default_parser, :version, :default_files, :load_defaults, :name
+    attr_accessor :debug, :commands_dir, :version, :default_files, :load_defaults, :name
     def name
       @name ||= 'clito'
     end
-    def parser
-      @parser ||= default_parser
-    end
 
     def load_defaults?
-      @load_defaults ||= true
-    end
-
-    def parser=(name)
-      Clitopic::Command::Base.extend name
-      @parser = name
+      @load_defaults
     end
 
-    def default_parser
-      @default_parsre ||= Clitopic::Parser::OptParser
-    end
   end
 end
 
@@ -30,8 +19,8 @@ end
 # Defaults
 Clitopic.name = "clitopic"
 Clitopic.debug = false
-Clitopic.version = Clitopic::VERSION
 Clitopic.load_defaults = true
+Clitopic.version = Clitopic::VERSION
 Clitopic.default_files = [File.join(Dir.getwd, ".clitopic.yml"), File.join(Dir.home, ".clitopic.yml")]
 
 

data/spec/clitopic_spec.rb

@@ -0,0 +1,30 @@
+require 'tempfile'
+require 'spec_helper'
+
+describe Clitopic do
+  context 'global command load_defaults' do
+    it 'option --defaults-file should be added to common options' do
+      expect(Clitopic::Commands.global_options).to include (a_hash_including({:name => :load_defaults, :args =>[ "--defaults-file FILE", "Load default variables"]}))
+    end
+
+    it 'should not fail to load a default file' do
+      temp = Tempfile.new('load_file')
+      Clitopic::Command::DefaultsFile.arguments = [temp.path]
+      Clitopic::Command::DefaultsFile.options = {:force => false}
+      opts = Clitopic::Command::DefaultsFile.call
+      cmd = Clitopic::Commands.global_options.select{|a| a[:name] == :load_defaults}.first
+      Clitopic::Commands.current_cmd = Clitopic::Command::Help
+      cmd[:proc].call(temp.path)
+    end
+  end
+  context 'load_defaults?' do
+    it 'should be true by default' do
+      expect(Clitopic.load_defaults?).to be true
+    end
+    it 'should be false if set to' do
+      Clitopic.load_defaults = false
+      expect(Clitopic.load_defaults?).to be false
+    end
+
+  end
+end

data/spec/command/clito_defaults_file_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Clitopic::Command::DefaultsFile do
+  context 'index' do
+
+  end
+end

data/spec/command/clito_suggestions_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Clitopic::Command::Suggestions do
+  context 'Prefix' do
+    it 'Call uncompleted command should display list of commands' do
+      Clitopic::Command::Suggestions.arguments = ["clito:"]
+      response =  ["clito:defaults_file", "clito:suggestions", "clito:version"].join("\n") + "\n"
+
+
+      expect{Clitopic::Command::Suggestions.call}.to output(response).to_stdout
+    end
+  end
+  context 'Mistake' do
+    it 'Command `hep`  should propose `help`' do
+      Clitopic::Command::Suggestions.arguments = ["hep"]
+      expect{Clitopic::Command::Suggestions.call}.to output("help\n").to_stdout
+    end
+  end
+end

data/spec/command/clito_version_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Clitopic::Command::ClitoVersion do
+  context 'call' do
+    it 'should returns current cli-topic version' do
+      expect{Clitopic::Command::ClitoVersion.call}.to output("cli-topic version: #{Clitopic::VERSION}\n").to_stdout
+    end
+  end
+end

data/spec/command/version_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Clitopic::Command::Version do
+  context 'index' do
+    it 'Call without argument should print Version' do
+      expect{Clitopic::Command::Version.call}.to output("#{Clitopic.version}\n").to_stdout
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -33,6 +33,8 @@ end
 class TopicB < Clitopic::Topic::Base
   register name: "b",
   description: "describe b"
+
+  option :merge, "--[no-]merge", "Merge options with current file", default: true
 end
 
 class Topic < Clitopic::Topic::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cli-topic
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Antoine Legrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -51,6 +51,11 @@ files:
 - lib/clitopic/topics.rb
 - lib/clitopic/utils.rb
 - lib/clitopic/version.rb
+- spec/clitopic_spec.rb
+- spec/command/clito_defaults_file_spec.rb
+- spec/command/clito_suggestions_spec.rb
+- spec/command/clito_version_spec.rb
+- spec/command/version_spec.rb
 - spec/command_base_spec.rb
 - spec/commands_spec.rb
 - spec/spec_helper.rb
@@ -91,6 +96,11 @@ summary: '["Small framework to build CLI.", "Small framework to build CLI organi
   "lib/clitopic/topic/base.rb", "lib/clitopic/topics.rb", "lib/clitopic/utils.rb",
   "lib/clitopic/version.rb"]]'
 test_files:
+- spec/clitopic_spec.rb
+- spec/command/clito_defaults_file_spec.rb
+- spec/command/clito_suggestions_spec.rb
+- spec/command/clito_version_spec.rb
+- spec/command/version_spec.rb
 - spec/command_base_spec.rb
 - spec/commands_spec.rb
 - spec/spec_helper.rb