baf 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 150c3cca7fba34de369d231d80ac5d40570b788e
-  data.tar.gz: eae88fb291406234386f09da17458982395d4af3
+  metadata.gz: 4ae9e185856672962cc03ee541efbfaeaacf3f64
+  data.tar.gz: 96e339bd95ee8a9695973df19dba8a0fa26220ed
 SHA512:
-  metadata.gz: acf3c301be34c11193d54e90234ce1cfba6420ac1ed8f721ac032fa7a47d342f41978df191c3f9283329e1f2a420c51786b3c80d24cd304973db3a30d343de32
-  data.tar.gz: e5993ca64496e85ee17ebb676a1a996348afa12b5da7201c7b471cce4f2bbda5f9bbb6f86363bd5fb7f56425e012c38daa077fffb772660b6f0f91b212c1d0dc
+  metadata.gz: 3c43bd18e04dbddb92053d3842bd232ff7b889aa4690da333268ff738ccaa3331115b5462c5accbc981a95fda149baab7a22c2f26fbc7910fffcd283d509d12d
+  data.tar.gz: aecf2e2f7d9c2b58c95739613a933c9dee2846d699c3f3c09250b29b4fe22b8f708a2a2e873fc914cae502d9ccbfdccc31df97dd4f61bb1c34919424c49db5cc

data/lib/baf/cli.rb

@@ -35,8 +35,7 @@ module Baf
       @parser     = opts[:parser]     || OptionParser.new
       @registrant = opts[:registrant] || OptionsRegistrant.new(env, parser)
 
-      registrant.register_default_options
-      setup
+      registrant.register { setup }
     end
 
     def setup
@@ -47,15 +46,16 @@ module Baf
     end
 
     def flag_debug
-      flag :d, 'debug'
+      flag :d, :debug
     end
 
     def flag_verbose
-      flag :v, 'verbose'
+      flag :v, :verbose
     end
 
     def flag_version version
-      flag :V, 'version', 'print version', -> env { env.puts version }
+      flag :V, :version, 'print version', -> env { env.puts version },
+        tail: true
     end
 
     def option *args

data/lib/baf/option.rb

@@ -1,10 +1,20 @@
 module Baf
   class Option
-    attr_accessor :short, :long, :arg, :desc, :block
+    attr_accessor :short, :long, :arg, :desc, :block, :flag, :tail
 
-    def initialize *args
+    def initialize *args, flag: false, tail: false
       attrs = args.size > 1 ? build_attrs(*args) : args[0]
       attrs.each { |k, v| send :"#{k}=", v }
+      self.flag = flag
+      self.tail = tail
+    end
+
+    def flag?
+      !!flag
+    end
+
+    def tail?
+      !!tail
     end
 
     def to_parser_arguments
@@ -13,7 +23,7 @@ module Baf
 
   protected
 
-    def build_attrs(short, long, arg_or_desc = nil, desc_or_block = nil)
+    def build_attrs short, long, arg_or_desc = nil, desc_or_block = nil
       {
         short:  short,
         long:   long

data/lib/baf/options_registrant.rb

@@ -1,41 +1,35 @@
+require 'baf/option'
+
 module Baf
   class OptionsRegistrant
-    def initialize env, parser
-      @env    = env
-      @parser = parser
-    end
+    SUMMARY_HEADER = "\noptions:".freeze
 
-    def register_default_options
-      parser.separator ''
-      parser.separator 'options:'
-      parser.on_tail '-h', '--help', 'print this message' do
-        env.print parser
-      end
+    def initialize env, parser, options = []
+      @env      = env
+      @parser   = parser
+      @options  = options
     end
 
-    def flag *args
-      opt = Option.new(*args)
-      if opt.block
-        parser.on(*opt.to_parser_arguments) { opt.block[env] }
-      else
-        define_env_flag env, opt.long
-        parser.on "-#{opt.short}", "--#{opt.long}", "enable #{opt.long} mode" do
-          env.send :"#{opt.long}=", true
-        end
-      end
+    def flag *args, **opts
+      options << Option.new(*args, flag: true, **opts)
     end
 
     def option *args
-      opt = Option.new(*args)
-      define_env_accessor env, opt.long
-      parser.on *opt.to_parser_arguments do |v|
-        env.send :"#{opt.long}=", v
+      options << Option.new(*args)
+    end
+
+    def register
+      yield if block_given?
+      parser.separator SUMMARY_HEADER
+      options.each do |opt|
+        if opt.flag? then register_flag opt else register_option opt end
       end
+      register_default_options
     end
 
   protected
 
-    attr_reader :env, :parser, :config
+    attr_reader :env, :parser, :options
 
     def define_env_accessor env, name
       (class << env; self end).send :attr_accessor, name
@@ -49,5 +43,42 @@ module Baf
       end
       env.instance_variable_set :"@#{name}", false
     end
+
+    def env_flag! name
+      env_flag_set name, true
+    end
+
+    def env_flag_set name, value
+      env.send :"#{name}=", value
+    end
+
+    def register_default_options
+      parser.separator '' if options.any?
+      parser.on_tail '-h', '--help', 'print this message' do
+        env.print parser
+      end
+    end
+
+    def register_flag opt
+      position = opt.tail ? :on_tail : :on
+      if opt.block
+        parser.send position, *opt.to_parser_arguments do
+          opt.block[env]
+        end
+      else
+        define_env_flag env, opt.long
+        parser.send position,
+            "-#{opt.short}", "--#{opt.long}", "enable #{opt.long} mode" do
+          env_flag! opt.long
+        end
+      end
+    end
+
+    def register_option opt
+      define_env_accessor env, opt.long
+      parser.on *opt.to_parser_arguments do |v|
+        self.env_flag_set opt.long, v
+      end
+    end
   end
 end

data/lib/baf/version.rb

@@ -1,3 +1,3 @@
 module Baf
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Thibault Jouan