baf 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae9e185856672962cc03ee541efbfaeaacf3f64
-  data.tar.gz: 96e339bd95ee8a9695973df19dba8a0fa26220ed
+  metadata.gz: e012a75cf9bb4b0b0a480a05a226734bb99f5bda
+  data.tar.gz: 0fec7f1fddc5e577b8b788c3fbd88b4d318ebcf9
 SHA512:
-  metadata.gz: 3c43bd18e04dbddb92053d3842bd232ff7b889aa4690da333268ff738ccaa3331115b5462c5accbc981a95fda149baab7a22c2f26fbc7910fffcd283d509d12d
-  data.tar.gz: aecf2e2f7d9c2b58c95739613a933c9dee2846d699c3f3c09250b29b4fe22b8f708a2a2e873fc914cae502d9ccbfdccc31df97dd4f61bb1c34919424c49db5cc
+  metadata.gz: 6f2729161ce545abfa3c88ebaa6f599b56b6858824a11cf41b0b72e954e8deb50be03953f59e5e8490860c0ec10049346e6f0bdaf70c38d0450588e57821a95d
+  data.tar.gz: d98e8d9e303aa0bd7cd4d1028cc7275839d88cdb9a39afb061d9d8c9b316cdec4fc44f836e37a643bc3b4ffcdc669fd2711c7a280970bd6d8dd39a1cae8c51b6

data/lib/baf/cli.rb

@@ -2,6 +2,7 @@ require 'optparse'
 
 require 'baf'
 require 'baf/env'
+require 'baf/flag'
 require 'baf/option'
 require 'baf/options_registrant'
 
@@ -33,9 +34,9 @@ module Baf
       @env        = env
       @arguments  = arguments
       @parser     = opts[:parser]     || OptionParser.new
-      @registrant = opts[:registrant] || OptionsRegistrant.new(env, parser)
+      @registrant = opts[:registrant] || OptionsRegistrant.new
 
-      registrant.register { setup }
+      registrant.register(env, parser) { setup }
     end
 
     def setup

data/lib/baf/flag.rb

@@ -0,0 +1,21 @@
+require 'baf/option'
+
+module Baf
+  class Flag < Option
+    DESCRIPTION_FORMAT = 'enable %s mode'.freeze
+
+    def env_definition
+      :predicate
+    end
+
+  private
+
+    def parser_argument_desc
+      if desc then super else DESCRIPTION_FORMAT % long end
+    end
+
+    def parser_argument_block env
+      -> * { env.send :"#{long}=", true }
+    end
+  end
+end

data/lib/baf/option.rb

@@ -1,27 +1,39 @@
 module Baf
   class Option
-    attr_accessor :short, :long, :arg, :desc, :block, :flag, :tail
+    LONG_PREFIX             = '--'.freeze
+    LONG_NORMALIZE_SEARCH   = ?_.freeze
+    LONG_NORMALIZE_REPLACE  = ?-.freeze
+    LONG_WITH_ARG_GLUE      = ' '.freeze
+    PARSER_MESSAGE          = :on
+    PARSER_MESSAGE_TAIL     = :on_tail
 
-    def initialize *args, flag: false, tail: false
+    attr_accessor :short, :long, :arg, :desc, :block, :tail
+
+    def initialize *args, 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
+    def env_definition
+      :accessor
+    end
+
+    def block?
+      !!block
     end
 
     def tail?
       !!tail
     end
 
-    def to_parser_arguments
-      ["-#{short}", parser_argument_long, desc]
+    def to_parser_arguments env
+      message = tail? ? PARSER_MESSAGE_TAIL : PARSER_MESSAGE
+      mblock  = block ? -> * { block[env] } : parser_argument_block(env)
+      [message, "-#{short}", parser_argument_long, parser_argument_desc, mblock]
     end
 
-  protected
+  private
 
     def build_attrs short, long, arg_or_desc = nil, desc_or_block = nil
       {
@@ -45,9 +57,19 @@ module Baf
 
     def parser_argument_long
       [
-        '--' + long.to_s.tr(?_, ?-),
+        LONG_PREFIX + long
+          .to_s
+          .tr(LONG_NORMALIZE_SEARCH, LONG_NORMALIZE_REPLACE),
         arg
-      ].compact.join ' '
+      ].compact.join LONG_WITH_ARG_GLUE
+    end
+
+    def parser_argument_desc
+      desc
+    end
+
+    def parser_argument_block env
+      -> v { env.send :"#{long}=", v }
     end
   end
 end

data/lib/baf/options_registrant.rb

@@ -1,41 +1,45 @@
+require 'baf/flag'
 require 'baf/option'
 
 module Baf
   class OptionsRegistrant
-    SUMMARY_HEADER = "\noptions:".freeze
+    SUMMARY_HEADER    = "\noptions:".freeze
+    HELP_PARSER_ARGS  = %w[
+      -h
+      --help
+      print\ this\ message
+    ].freeze.each &:freeze
 
-    def initialize env, parser, options = []
-      @env      = env
-      @parser   = parser
-      @options  = options
+    def initialize options = []
+      @options = options
     end
 
     def flag *args, **opts
-      options << Option.new(*args, flag: true, **opts)
+      options << Flag.new(*args, **opts)
     end
 
     def option *args
       options << Option.new(*args)
     end
 
-    def register
+    def register env, parser
       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
+      options_tail, options_standard = options.partition &:tail?
+      options_standard.each { |opt|register_option env, parser, opt }
+      register_default_options env, parser
+      options_tail.each { |opt|register_option env, parser, opt }
     end
 
-  protected
+  private
 
-    attr_reader :env, :parser, :options
+    attr_reader :options
 
     def define_env_accessor env, name
       (class << env; self end).send :attr_accessor, name
     end
 
-    def define_env_flag env, name
+    def define_env_predicate env, name
       define_env_accessor env, name
       env.send :"#{name}=", false
       env.define_singleton_method :"#{name}?" do
@@ -44,41 +48,17 @@ module Baf
       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
+    def register_default_options env, parser
       parser.separator '' if options.any?
-      parser.on_tail '-h', '--help', 'print this message' do
+      parser.on_tail *HELP_PARSER_ARGS 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
+    def register_option env, parser, opt
+      send :"define_env_#{opt.env_definition}", env, opt.long unless opt.block?
+      *args, block = opt.to_parser_arguments env
+      parser.send *args, &block
     end
   end
 end

data/lib/baf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baf-testing
@@ -47,6 +47,7 @@ files:
 - lib/baf.rb
 - lib/baf/cli.rb
 - lib/baf/env.rb
+- lib/baf/flag.rb
 - lib/baf/option.rb
 - lib/baf/options_registrant.rb
 - lib/baf/testing/cucumber.rb