baf 0.10.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68a55ae3de806571fd45ae9d85c810a34e831b50
-  data.tar.gz: 3cf2f785dd185410dfdbed6c695b7bb3b02c3d17
+SHA256:
+  metadata.gz: 9311e4cba4d27aee336f9983d97efd78d8296b5672ec1dccc3337056b66ba620
+  data.tar.gz: a9ba3e9ab48e78e71173faaa63eece4addadcc9573e28ea6d3b19adbe6fc41c9
 SHA512:
-  metadata.gz: 6123ed05f4dc3999b15c9e55f930d5e4151cbd6078c726b01e9a6fe920a00f71b67e4023fa8a4599a4d5e2375752cd462dd31a5c3d22075abaedc7aed697e971
-  data.tar.gz: 2a133158337ee65a02accb9654e94fb9c388342322a0feaffcd4eee507eac8cac2faa39867facc2425adf1f66cf0ff8f62b644a94caafd9bc68795ade0fe7710
+  metadata.gz: 7aeeb1da2a0f359a5a537580ab13384b3cba5501a6c00722c0f025760eb4c31c951ddf0616410138520bd2457972386dd1bf9bd976259aa271d6365187a0d6e7
+  data.tar.gz: 74267eaf156de24338b988e46960565cb1eefc6dc5b241ccb1dba4db022ed6bd313f5932d944833ab010f858b314daeb3145318e01a8a6b52925e730f753f1af

data/lib/baf.rb

@@ -1,4 +1,4 @@
 module Baf
-  Error         = Class.new(::StandardError)
-  ArgumentError = Class.new(Error)
+  Error = Class.new ::StandardError
+  ArgumentError = Class.new Error
 end

data/lib/baf/cli.rb

@@ -8,41 +8,52 @@ require 'baf/options_registrant'
 
 module Baf
   class CLI
-    ArgumentError = Class.new(::Baf::ArgumentError)
+    ArgumentError = Class.new ::Baf::ArgumentError
 
-    EX_USAGE    = 64
+    EX_USAGE = 64
     EX_SOFTWARE = 70
 
     class << self
       def run arguments, stdin: $stdin, stdout: $stdout, stderr: $stderr
-        cli = new env_class.new(input: stdin, output: stdout), arguments
+        cli = new env = build_env(stdin, stdout, stderr), arguments
         cli.parse_arguments!
         cli.run
       rescue ArgumentError => e
         stderr.puts e
         exit EX_USAGE
       rescue StandardError => e
-        stderr.puts "#{e.class.name}: #{e}"
-        stderr.puts e.backtrace.map { |l| '  %s' % l }
+        if respond_to? :handle_error
+          status = handle_error cli.env, e
+          exit status if status.respond_to? :to_int
+        else
+          stderr.puts "#{e.class.name}: #{e}"
+          stderr.puts e.backtrace.map { |l| '  %s' % l }
+        end
         exit EX_SOFTWARE
       end
 
     private
 
+      def build_env stdin, stdout, stderr
+        env_class.new input: stdin, output: stdout, output_error: stderr
+      end
+
       def env_class
         return Env unless parent_name = name =~ /::[^:]+\Z/ ? $` : nil
-        parent = Object.const_get(parent_name)
+        parent = Object.const_get parent_name
         parent.const_defined?(:Env) ? parent.const_get(:Env) : Env
       end
+
+      def ruby2_keywords *; end unless Module.respond_to? :ruby2_keywords, true
     end
 
     attr_reader :arguments, :env, :parser
 
     def initialize env, arguments, **opts
-      @env        = env
-      @arguments  = arguments
-      @parser     = opts[:parser]     || OptionParser.new
-      @registrant = opts[:registrant] || OptionsRegistrant.new
+      @env = env
+      @arguments = arguments
+      @parser = opts.fetch(:parser) { OptionParser.new }
+      @registrant = opts.fetch(:registrant) { OptionsRegistrant.new }
 
       registrant.register(env, parser) { setup }
     end
@@ -54,6 +65,7 @@ module Baf
       registrant.banner = arg
     end
 
+    ruby2_keywords \
     def flag *args
       registrant.flag *args
     end
@@ -71,15 +83,19 @@ module Baf
         tail: true
     end
 
-    def option *args
-      args = [*args, Proc.new] if block_given?
+    def option *args, &block
+      args = [*args, block] if block_given?
       registrant.option *args
     end
 
     def parse_arguments!
       parser.parse! arguments
     rescue OptionParser::InvalidOption
-      raise ArgumentError, parser
+      fail ArgumentError, parser
+    end
+
+    def usage!
+      fail ArgumentError, parser
     end
 
     def run

data/lib/baf/env.rb

@@ -5,10 +5,20 @@ module Baf
     extend Forwardable
     def_delegators :@input, :gets
     def_delegators :@output, :print, :puts
+    def_delegator :@output_error, :puts, :puts_error
 
-    def initialize input: $input, output: $stdout
-      @input  = input
+    def initialize input: $stdin, output: $stdout, output_error: $stderr
+      @input = input
       @output = output
+      @output_error = output_error
     end
+
+    def sync_output
+      output.sync = true
+    end
+
+  private
+
+    attr_reader :output
   end
 end

data/lib/baf/option.rb

@@ -41,20 +41,20 @@ module Baf
 
     def build_attrs short, long, arg_or_desc = nil, desc_or_block = nil, block = nil
       {
-        short:  short,
-        long:   long,
-        desc:   arg_or_desc
+        short: short,
+        long: long,
+        desc: arg_or_desc
       }.merge case desc_or_block
       when Proc
         {
-          desc:   arg_or_desc,
-          block:  desc_or_block
+          desc: arg_or_desc,
+          block: desc_or_block
         }
       when String
         {
-          arg:    arg_or_desc,
-          desc:   desc_or_block,
-          block:  block
+          arg: arg_or_desc,
+          desc: desc_or_block,
+          block: block
         }
       else
         {}

data/lib/baf/testing/cucumber/steps/output.rb

@@ -14,6 +14,10 @@ def expect_output content, stream: :output
 end
 
 
+Then /^the output must be empty$/ do
+  expect(last_command_started.output).to be_empty
+end
+
 Then /^the output must contain:$/ do |content|
   expect(last_command_started.output).to include unescape_text content
 end

data/lib/baf/testing/cucumber/steps/output_wait.rb

@@ -33,19 +33,19 @@ def wait_until message: 'condition not met after %d seconds'
   timeout = ENV.key?('BAF_TEST_TIMEOUT') ?
     ENV['BAF_TEST_TIMEOUT'].to_i :
     2
-  Timeout.timeout(timeout) do
+  Timeout.timeout timeout do
     loop do
       break if yield
       sleep 0.05
     end
   end
 rescue Timeout::Error
-  raise Baf::Testing::WaitError.new(message % timeout, timeout)
+  fail Baf::Testing::WaitError.new(message % timeout, timeout)
 end
 
 
 Then /^the output will match \/([^\/]+)\/([a-z]*)$/ do |pattern, options|
-  wait_output! build_regexp(pattern, options)
+  wait_output! build_regexp pattern, options
 end
 
 Then /^the output will contain:$/ do |content|

data/lib/baf/version.rb

@@ -1,3 +1,3 @@
 module Baf
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: baf
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Thibault Jouan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baf-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -60,7 +60,7 @@ homepage: https://rubygems.org/gems/baf
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Basic Application Framework
 test_files: []