Make it possible to specify multiple "target" and "exclude" options

cookpad · Dec 25, 2017 · 0de1b38 · 0de1b38
1 parent 6b38dd7
commit 0de1b38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bin/miam b/bin/miam
@@ -51,8 +51,8 @@ ARGV.options do |opt|
     opt.on(''  , '--split-more')                    {    split                          = :more                                 }
     opt.on('',   '--format=FORMAT', [:ruby, :json]) {|v| format_passed = true; options[:format] = v                             }
     opt.on(''  , '--export-concurrency N', Integer) {|v| options[:export_concurrency]   = v                                     }
-    opt.on(''  , '--target REGEXP')                 {|v| options[:target]               = Regexp.new(v)                         }
-    opt.on(''  , '--exclude REGEXP')                {|v| options[:exclude]              = Regexp.new(v)                         }
+    opt.on(''  , '--target REGEXP')                 {|v| (options[:target] ||= [])     << Regexp.new(v)                         }
+    opt.on(''  , '--exclude REGEXP')                {|v| (options[:exclude] ||= [])    << Regexp.new(v)                         }
     opt.on(''  , '--ignore-login-profile')          {    options[:ignore_login_profile] = true                                  }
     opt.on(''  , '--no-color')                      {    options[:color]                = false                                 }
     opt.on(''  , '--no-progress')                   {    options[:no_progress]          = true                                  }

diff --git a/lib/miam/client.rb b/lib/miam/client.rb
@@ -527,11 +527,11 @@ def target_matched?(name)
     result = true
 
     if @options[:exclude]
-      result &&= name !~ @options[:exclude]
+      result &&= @options[:exclude].all? {|r| name !~ r}
     end
 
     if @options[:target]
-      result &&= name =~ @options[:target]
+      result &&= @options[:target].any? {|r| name =~ r}
     end
 
     result

diff --git a/lib/miam/dsl/converter.rb b/lib/miam/dsl/converter.rb
@@ -196,11 +196,11 @@ def target_matched?(name)
     result = true
 
     if @options[:exclude]
-      result &&= name !~ @options[:exclude]
+      result &&= @options[:exclude].all? {|r| name !~ r}
     end
 
     if @options[:target]
-      result &&= name =~ @options[:target]
+      result &&= @options[:target].any? {|r| name =~ r}
     end
 
     result