baf 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5885bd5c54f82a2332b2af104090112ba279bb
-  data.tar.gz: fc785f6261b8aa42c23ccd04ed822d314cd82ae7
+  metadata.gz: eb7e742e40fa882d844b78c036a6bca5f131c171
+  data.tar.gz: 37d3817b1e22de1bfc64893e160348def169cc21
 SHA512:
-  metadata.gz: c6f56b483aa1c0173b1993634b4b066324c1d30586a8c129bc943a91bc9b4011d4887de4c8cbdd892aeb6f99d0007b9cf261192759e6c56e8b02273bcb930ad2
-  data.tar.gz: f8f09d9a661222facdd6a0768fc6d814396c4fceda131ed4c40db4ec39fdca2ee0869b37d8769586cd97d0bb41660249e57397f26f139df177a940fa90a82455
+  metadata.gz: df951baa4362f0ab932d930cb01f90e903008cb3bfb2274ecb8af91d42e6234d621fe25c946ac60b8f8d692d711e440c398491d83722cb7347dc1bb9f6b068d9
+  data.tar.gz: 808326c6382a87fd570dabd173c50958929702cf32ffc22363acda37ab933af0ce94f33e82fa611c0284fc916bbb590e907d6ab09017e42f1f6592e9a4b1507f

data/lib/baf.rb

@@ -1,10 +1,3 @@
-require 'forwardable'
-require 'optparse'
-
-require 'baf/cli'
-require 'baf/env'
-require 'baf/options_registrant'
-
 module Baf
   Error         = Class.new(::StandardError)
   ArgumentError = Class.new(Error)

data/lib/baf/cli.rb

@@ -1,42 +1,20 @@
+require 'optparse'
+
+require 'baf'
+require 'baf/env'
+require 'baf/option'
 require 'baf/options_registrant'
 
 module Baf
   class CLI
-    ArgumentError = Class.new(ArgumentError)
+    ArgumentError = Class.new(::Baf::ArgumentError)
 
     EX_USAGE    = 64
     EX_SOFTWARE = 70
 
-    CONFIG_DEFAULTS = {
-      flags:      [],
-      options:    [],
-      parser:     OptionParser.new,
-      registrant: OptionsRegistrant
-    }.freeze
-
     class << self
-      def config
-        @config ||= CONFIG_DEFAULTS.dup
-      end
-
-      def flag *args
-        config[:flags] << Option.new(*args)
-      end
-
-      def flag_verbose
-        config[:flags] << Option.new(:v, 'verbose')
-      end
-
-      def flag_debug
-        config[:flags] << Option.new(:d, 'debug')
-      end
-
-      def option *args
-        config[:options] << Option.new(*args)
-      end
-
       def run arguments, stdout: $stdout, stderr: $stderr
-        cli = new Env.new(stdout), arguments, config
+        cli = new Env.new(stdout), arguments
         cli.parse_arguments!
         cli.run
       rescue ArgumentError => e
@@ -47,29 +25,50 @@ module Baf
         stderr.puts e.backtrace.map { |l| '  %s' % l }
         exit EX_SOFTWARE
       end
+    end
+
+    attr_reader :arguments, :env, :parser
 
-    protected
+    def initialize env, arguments, **opts
+      @env        = env
+      @arguments  = arguments
+      @parser     = opts[:parser]     || OptionParser.new
+      @registrant = opts[:registrant] || OptionsRegistrant.new(env, parser)
 
-      Option = Struct.new('Option', :short, :long, :arg, :desc)
+      registrant.register_default_options
+      setup
     end
 
-    attr_reader :arguments, :env, :option_parser
+    def setup
+    end
 
-    def initialize env, arguments, config
-      @env            = env
-      @option_parser  = config[:parser]
-      @arguments      = arguments
+    def flag *args
+      registrant.flag *args
+    end
 
-      config[:registrant].register env, config[:parser], config
+    def flag_debug
+      flag :d, 'debug'
+    end
+
+    def flag_verbose
+      flag :v, 'verbose'
+    end
+
+    def option *args
+      registrant.option *args
     end
 
     def parse_arguments!
-      option_parser.parse! arguments
+      parser.parse! arguments
     rescue OptionParser::InvalidOption
-      raise ArgumentError, option_parser
+      raise ArgumentError, parser
     end
 
     def run
     end
+
+  private
+
+    attr_reader :registrant
   end
 end

data/lib/baf/env.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Baf
   class Env
     extend Forwardable

data/lib/baf/option.rb

@@ -0,0 +1,16 @@
+module Baf
+  Option = Struct.new('Option', :short, :long, :arg, :desc) do
+    def to_parser_arguments
+      ["-#{short}", parser_argument_long, desc]
+    end
+
+  protected
+
+    def parser_argument_long
+      [
+        '--' + long.to_s.tr(?_, ?-),
+        arg
+      ].join ' '
+    end
+  end
+end

data/lib/baf/options_registrant.rb

@@ -1,21 +1,16 @@
 module Baf
   class OptionsRegistrant
-    class << self
-      def register *args
-        new(*args).register
-      end
-    end
-
-    def initialize env, parser, config
+    def initialize env, parser
       @env    = env
       @parser = parser
-      @config = config
     end
 
-    def register
-      declare_default_options
-      config[:flags].each   { |o| flag o.short, o.long }
-      config[:options].each { |o| option o }
+    def register_default_options
+      parser.separator ''
+      parser.separator 'options:'
+      parser.on_tail '-h', '--help', 'print this message' do
+        env.print parser
+      end
     end
 
     def flag short, long
@@ -25,9 +20,10 @@ module Baf
       end
     end
 
-    def option opt
+    def option *args
+      opt = Option.new(*args)
       define_env_accessor env, opt.long
-      parser.on "-#{opt.short}", "--#{opt.long} #{opt.arg}", opt.desc do |v|
+      parser.on *opt.to_parser_arguments do |v|
         env.send :"#{opt.long}=", v
       end
     end
@@ -36,14 +32,6 @@ module Baf
 
     attr_reader :env, :parser, :config
 
-    def declare_default_options
-      parser.separator ''
-      parser.separator 'options:'
-      parser.on_tail '-h', '--help', 'print this message' do
-        env.print parser
-      end
-    end
-
     def define_env_accessor env, name
       (class << env; self end).send :attr_accessor, name
     end

data/lib/baf/version.rb

@@ -1,3 +1,3 @@
 module Baf
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: baf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: baf-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
 description: Basic Application Framework
 email: tj@a13.fr
 executables: []
@@ -81,6 +47,7 @@ files:
 - lib/baf.rb
 - lib/baf/cli.rb
 - lib/baf/env.rb
+- lib/baf/option.rb
 - lib/baf/options_registrant.rb
 - lib/baf/testing/cucumber.rb
 - lib/baf/testing/cucumber/steps/execution.rb