baf 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdbb678fca1424651ded0c54c5983915b3ca7d04
-  data.tar.gz: bd7557646c1eff5b19daa9aa6f21b3cd9cd49953
+  metadata.gz: 7b5885bd5c54f82a2332b2af104090112ba279bb
+  data.tar.gz: fc785f6261b8aa42c23ccd04ed822d314cd82ae7
 SHA512:
-  metadata.gz: 7385fda52a9b80301c0b5fdfd5bb3fb732debcde8d7aee68f5eb77c129f96052d3b93a1df938b73546126d374cc55e1f0fd7f0f9fabd560b7c0e9f2bbc72cc76
-  data.tar.gz: d487f12253679abf4b5b7bef4c6c3fdb3b266aae1fbcae2ccdcb4b32eaf544cb7d61709a59a2867ea393031f8d1906d37a8e176acfb6389fce31e25de64c4611
+  metadata.gz: c6f56b483aa1c0173b1993634b4b066324c1d30586a8c129bc943a91bc9b4011d4887de4c8cbdd892aeb6f99d0007b9cf261192759e6c56e8b02273bcb930ad2
+  data.tar.gz: f8f09d9a661222facdd6a0768fc6d814396c4fceda131ed4c40db4ec39fdca2ee0869b37d8769586cd97d0bb41660249e57397f26f139df177a940fa90a82455

data/lib/baf.rb

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

data/lib/baf/cli.rb

@@ -1,3 +1,5 @@
+require 'baf/options_registrant'
+
 module Baf
   class CLI
     ArgumentError = Class.new(ArgumentError)
@@ -5,17 +7,36 @@ module Baf
     EX_USAGE    = 64
     EX_SOFTWARE = 70
 
+    CONFIG_DEFAULTS = {
+      flags:      [],
+      options:    [],
+      parser:     OptionParser.new,
+      registrant: OptionsRegistrant
+    }.freeze
+
     class << self
-      def flag *args, registrant: OptionRegistrant
-        registrant.register_flag env, option_parser, *args
+      def config
+        @config ||= CONFIG_DEFAULTS.dup
       end
 
-      def option *args, registrant: OptionRegistrant
-        registrant.register_option env, option_parser, Option.new(*args)
+      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(stdout), option_parser, arguments
+        cli = new Env.new(stdout), arguments, config
         cli.parse_arguments!
         cli.run
       rescue ArgumentError => e
@@ -30,23 +51,16 @@ module Baf
     protected
 
       Option = Struct.new('Option', :short, :long, :arg, :desc)
-
-      def env output = nil
-        @env ||= Env.new(output)
-      end
-
-      def option_parser
-        @option_parser ||= OptionParser.new
-      end
     end
 
     attr_reader :arguments, :env, :option_parser
 
-    def initialize env, option_parser, arguments
+    def initialize env, arguments, config
       @env            = env
-      @option_parser  = option_parser
+      @option_parser  = config[:parser]
       @arguments      = arguments
-      setup_default_options option_parser
+
+      config[:registrant].register env, config[:parser], config
     end
 
     def parse_arguments!
@@ -57,15 +71,5 @@ module Baf
 
     def run
     end
-
-  protected
-
-    def setup_default_options option_parser
-      option_parser.separator ''
-      option_parser.separator 'options:'
-      option_parser.on_tail '-h', '--help', 'print this message' do
-        env.print option_parser
-      end
-    end
   end
 end

data/lib/baf/options_registrant.rb

@@ -0,0 +1,60 @@
+module Baf
+  class OptionsRegistrant
+    class << self
+      def register *args
+        new(*args).register
+      end
+    end
+
+    def initialize env, parser, config
+      @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 }
+    end
+
+    def flag short, long
+      define_env_flag env, long
+      parser.on "-#{short}", "--#{long}", "enable #{long} mode" do
+        env.send :"#{long}=", true
+      end
+    end
+
+    def option opt
+      define_env_accessor env, opt.long
+      parser.on "-#{opt.short}", "--#{opt.long} #{opt.arg}", opt.desc do |v|
+        env.send :"#{opt.long}=", v
+      end
+    end
+
+  protected
+
+    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
+
+    def define_env_flag env, name
+      define_env_accessor env, name
+      env.send :"#{name}=", false
+      env.define_singleton_method :"#{name}?" do
+        instance_variable_get :"@#{name}"
+      end
+      env.instance_variable_set :"@#{name}", false
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 def program_run check: false, opts: nil, args: nil
-  cmd = %w[ruby baf]
+  cmd = [*@_baf_program ||= %w[ruby baf]]
   cmd << opts if opts
   cmd << args.split(' ') if args
   run_simple cmd.join(' '), fail_on_error: false
@@ -36,3 +36,7 @@ end
 Then /^the exit status must be (\d+)$/ do |exit_status|
   program_run_check status: exit_status.to_i
 end
+
+Then /^the program must terminate successfully$/ do
+  program_run_check status: 0
+end

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

@@ -8,13 +8,17 @@ def build_regexp pattern, options
   end)
 end
 
+def expect_output content
+  expect(last_command_started.output).to eq unescape_text content
+end
+
 
 Then /^the output must contain exactly:$/ do |content|
-  expect(last_command_started.output).to eq unescape_text content + $/
+  expect_output content + $/
 end
 
 Then /^the output must contain exactly "([^"]+)"$/ do |content|
-  expect(last_command_started.output).to eq unescape_text content
+  expect_output content
 end
 
 Then /^the output must match \/([^\/]+)\/([a-z]*)$/ do |pattern, options|

data/lib/baf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baf
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -81,7 +81,7 @@ files:
 - lib/baf.rb
 - lib/baf/cli.rb
 - lib/baf/env.rb
-- lib/baf/option_registrant.rb
+- lib/baf/options_registrant.rb
 - lib/baf/testing/cucumber.rb
 - lib/baf/testing/cucumber/steps/execution.rb
 - lib/baf/testing/cucumber/steps/output.rb

data/lib/baf/option_registrant.rb

@@ -1,34 +0,0 @@
-module Baf
-  class OptionRegistrant
-    class << self
-      def register_flag env, parser, short, long
-        define_env_flag env, long
-        parser.on "-#{short}", "--#{long}", "enable #{long} mode" do
-          env.send :"#{long}=", true
-        end
-      end
-
-      def register_option env, parser, opt
-        define_env_accessor env, opt.long
-        parser.on "-#{opt.short}", "--#{opt.long} #{opt.arg}", opt.desc do |v|
-          env.send :"#{opt.long}=", v
-        end
-      end
-
-    protected
-
-      def define_env_accessor env, name
-        (class << env; self end).send :attr_accessor, name
-      end
-
-      def define_env_flag env, name
-        define_env_accessor env, name
-        env.send :"#{name}=", false
-        env.define_singleton_method :"#{name}?" do
-          instance_variable_get :"@#{name}"
-        end
-        env.instance_variable_set :"@#{name}", false
-      end
-    end
-  end
-end