bovem 1.1.1 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bovem (1.1.0)
+    bovem (1.2.0)
       lazier (~> 1.0)
       open4 (~> 1.3.0)
 

data/lib/bovem/console.rb

@@ -130,6 +130,12 @@ module Bovem
       message
     end
 
+    # Returns the minimum length of a banner, not including brackets and leading spaces.
+    # @return [Fixnum] The minimum length of a banner.
+    def self.min_banner_length
+      1
+    end
+
     # Executes a command and returns its output.
     #
     # @param command [String] The command to execute.
@@ -306,6 +312,21 @@ module Bovem
       rv
     end
 
+    # Writes a message, aligning to a call with an empty banner.
+    #
+    # @param message [String] The message to format.
+    # @param suffix [Object] If not `nil` or `false`, a suffix to add to the message. `true` means to add `\n`.
+    # @param indent [Object] If not `nil` or `false`, the width to use for indentation. `true` means to use the current indentation, a negative value of `-x` will indent of `x` absolute spaces.
+    # @param wrap [Object] If not `nil` or `false`, the maximum length of a line for wrapped text. `true` means the current line width.
+    # @param plain [Boolean] If ignore color markers into the message.
+    # @param print [Boolean] If `false`, the result will be returned instead of be printed.
+    # @return [String] The printed message.
+    #
+    # @see #format
+    def write_banner_aligned(message, suffix = "\n", indent = true, wrap = false, plain = false, print = true)
+      self.write((" " * (::Bovem::Console.min_banner_length + 3)) + message.ensure_string, suffix, indent, wrap, plain, print)
+    end
+
     # Writes a status to the output. Valid values are `:ok`, `:pass`, `:fail`, `:warn`.
     #
     # @param status [Symbol] The status to write.
@@ -348,6 +369,7 @@ module Bovem
     # @return [String] The banner.
     # @see #format
     def get_banner(label, base_color, full_colored = false, bracket_color = "blue", brackets = ["[", "]"])
+      label = label.rjust(Bovem::Console.min_banner_length, " ")
       brackets = brackets.ensure_array
       bracket_color = base_color if full_colored
       "{mark=%s}%s{mark=%s}%s{/mark}%s{/mark}" % [bracket_color.parameterize, brackets[0], base_color.parameterize, label, brackets[1]]
@@ -366,7 +388,7 @@ module Bovem
     #
     # @see #format
     def info(message, suffix = "\n", indent = true, wrap = false, plain = false, indented_banner = false, full_colored = false, print = true)
-      banner = self.get_banner(" INFO", "bright cyan", full_colored)
+      banner = self.get_banner("I", "bright cyan", full_colored)
       message = self.indent(message, indented_banner ? 0 : indent)
       self.write(banner + " " + message, suffix, indented_banner ? indent : 0, wrap, plain, print)
     end
@@ -384,7 +406,7 @@ module Bovem
     #
     # @see #format
     def begin(message, suffix = "\n", indent = true, wrap = false, plain = false, indented_banner = false, full_colored = false, print = true)
-      banner = "    " + self.get_banner("*", "bright green")
+      banner = self.get_banner("*", "bright green")
       message = self.indent(message, indented_banner ? 0 : indent)
       self.write(banner + " " + message, suffix, indented_banner ? indent : 0, wrap, plain, print)
     end
@@ -402,7 +424,7 @@ module Bovem
     #
     # @see #format
     def warn(message, suffix = "\n", indent = true, wrap = false, plain = false, indented_banner = false, full_colored = false, print = true)
-      banner = self.get_banner(" WARN", "bright yellow", full_colored)
+      banner = self.get_banner("W", "bright yellow", full_colored)
       message = self.indent(message, indented_banner ? 0 : indent)
       self.write(banner + " " + message, suffix, indented_banner ? indent : 0, wrap, plain, print)
     end
@@ -420,7 +442,7 @@ module Bovem
     #
     # @see #format
     def error(message, suffix = "\n", indent = true, wrap = false, plain = false, indented_banner = false, full_colored = false, print = true)
-      banner = self.get_banner("ERROR", "bright red", full_colored)
+      banner = self.get_banner("E", "bright red", full_colored)
       message = self.indent(message, indented_banner ? 0 : indent)
       self.write(banner + " " + message, suffix, indented_banner ? indent : 0, wrap, plain, print)
     end
@@ -456,7 +478,7 @@ module Bovem
     #
     # @see #format
     def debug(message, suffix = "\n", indent = true, wrap = false, plain = false, indented_banner = false, full_colored = false, print = true)
-      banner = self.get_banner("DEBUG", "bright magenta", full_colored)
+      banner = self.get_banner("D", "bright magenta", full_colored)
       message = self.indent(message, indented_banner ? 0 : indent)
       self.write(banner + " " + message, suffix, indented_banner ? indent : 0, wrap, plain, print)
     end
@@ -543,7 +565,7 @@ module Bovem
           self.status(:fail, plain)
           exit(rv.length > 1 ? rv[1].to_integer : -1)
         else
-          self.status(status, plain)
+          self.status(status, plain) if message.present?
         end
       end
 

data/lib/bovem/shell.rb

@@ -342,9 +342,13 @@ module Bovem
 
     # Find a list of files in directories matching given regexps or patterns.
     #
+    # You can also pass a block to perform matching. The block will receive a single argument and the path will be considered matched if the blocks not evaluates to `nil` or `false`.
+    #
+    # Inside the block, you can call `Find.prune` to stop searching in the current directory.
+    #
     # @param directories [String] A list of directories where to search files.
-    # @param patterns [Array] A list of regexps or patterns to match files. If empty, every file is returned.
-    # @param by_extension [Boolean] If to only search in extensions.
+    # @param patterns [Array] A list of regexps or patterns to match files. If empty, every file is returned. Ignored if a block is provided.
+    # @param by_extension [Boolean] If to only search in extensions. Ignored if a block is provided.
     # @param case_sensitive [Boolean] If the search is case sensitive. Only meaningful for string patterns.
     def find(directories, patterns = [], by_extension = false, case_sensitive = false)
       rv = []
@@ -361,8 +365,12 @@ module Bovem
         if self.check(directory, [:directory, :readable, :executable]) then
           Find.find(directory) do |entry|
             found = patterns.blank? ? true : catch(:found) do
-              patterns.each do |pattern|
-                throw(:found, true) if pattern.match(entry) && (!by_extension || !File.directory?(entry))
+              if block_given? then
+                throw(:found, true) if yield(entry)
+              else
+                patterns.each do |pattern|
+                  throw(:found, true) if pattern.match(entry) && (!by_extension || !File.directory?(entry))
+                end
               end
 
               false

data/lib/bovem/version.rb

@@ -14,10 +14,10 @@ module Bovem
     MAJOR = 1
 
     # The minor version.
-    MINOR = 1
+    MINOR = 2
 
     # The patch version.
-    PATCH = 1
+    PATCH = 0
 
     # The current version number of Bovem.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/spec/bovem/console_spec.rb

@@ -51,6 +51,12 @@ describe Bovem::Console do
     end
   end
 
+  describe ".min_banner_length" do
+    it "should return a number" do
+      expect(::Bovem::Console.min_banner_length).to be_a(Fixnum)
+    end
+  end
+
   describe "#initialize" do
     it "should correctly set defaults" do
       expect(console.indentation).to eq(0)
@@ -186,6 +192,14 @@ describe Bovem::Console do
     end
   end
 
+  describe "#write_banner_aligned" do
+    it "should call #min_banner_length and #format" do
+      ::Bovem::Console.should_receive(:min_banner_length).and_return(1)
+      console.should_receive(:format).with("    A", "B", "C", "D", "E")
+      console.write_banner_aligned("A", "B", "C", "D", "E")
+    end
+  end
+
   describe "#get_banner" do
     it "should correctly format arguments" do
       expect(console.get_banner("LABEL", "red")).to eq("{mark=blue}[{mark=red}LABEL{/mark}]{/mark}")
@@ -199,9 +213,9 @@ describe Bovem::Console do
 
   describe "#info" do
     it "should forward everything to #get_banner" do
-      console.should_receive(:get_banner).with(" INFO", "bright cyan", false).at_least(1).and_return("")
+      console.should_receive(:get_banner).with("I", "bright cyan", false).at_least(1).and_return("")
       console.info("OK", "\n", true, false, false, false, false, false)
-      console.should_receive(:get_banner).with(" INFO", "bright cyan", true).at_least(1).and_return("")
+      console.should_receive(:get_banner).with("I", "bright cyan", true).at_least(1).and_return("")
       console.info("OK", "\n", true, false, false, false, true, false)
     end
 
@@ -225,9 +239,9 @@ describe Bovem::Console do
 
   describe "#warn" do
     it "should forward everything to #get_banner" do
-      console.should_receive(:get_banner).with(" WARN", "bright yellow", false).at_least(1).and_return("")
+      console.should_receive(:get_banner).with("W", "bright yellow", false).at_least(1).and_return("")
       console.warn("OK", "\n", true, false, false, false, false, false)
-      console.should_receive(:get_banner).with(" WARN", "bright yellow", true).at_least(1).and_return("")
+      console.should_receive(:get_banner).with("W", "bright yellow", true).at_least(1).and_return("")
       console.warn("OK", "\n", true, false, false, false, true, false)
     end
 
@@ -239,9 +253,9 @@ describe Bovem::Console do
 
   describe "#error" do
     it "should forward everything to #get_banner" do
-      console.should_receive(:get_banner).with("ERROR", "bright red", false).at_least(1).and_return("")
+      console.should_receive(:get_banner).with("E", "bright red", false).at_least(1).and_return("")
       console.error("OK", "\n", true, false, false, false, false, false)
-      console.should_receive(:get_banner).with("ERROR", "bright red", true).at_least(1).and_return("")
+      console.should_receive(:get_banner).with("E", "bright red", true).at_least(1).and_return("")
       console.error("OK", "\n", true, false, false, false, true, false)
     end
 
@@ -269,9 +283,9 @@ describe Bovem::Console do
 
   describe "#debug" do
     it "should forward everything to #get_banner" do
-      console.should_receive(:get_banner).with("DEBUG", "bright magenta", false).at_least(1).and_return("")
+      console.should_receive(:get_banner).with("D", "bright magenta", false).at_least(1).and_return("")
       console.debug("OK", "\n", true, false, false, false, false, false)
-      console.should_receive(:get_banner).with("DEBUG", "bright magenta", true).at_least(1).and_return("")
+      console.should_receive(:get_banner).with("D", "bright magenta", true).at_least(1).and_return("")
       console.debug("OK", "\n", true, false, false, false, true, false)
     end
 
@@ -410,10 +424,11 @@ describe Bovem::Console do
     end
 
     it "should write the correct status" do
+      console.stub(:begin)
       console.should_receive(:status).with(:ok, false)
-      console.task { :ok }
+      console.task("OK") { :ok }
       console.should_receive(:status).with(:fail, false)
-      expect { console.task { :fatal }}.to raise_error(SystemExit)
+      expect { console.task("") { :fatal }}.to raise_error(SystemExit)
     end
 
     it "should abort correctly" do

data/spec/bovem/shell_spec.rb

@@ -474,5 +474,20 @@ describe Bovem::Shell do
       expect(shell.find(root + "/lib/bovem", /bovem/, true)).to eq([])
       expect(shell.find(root + "/lib/bovem", "RB", true, true)).to eq([])
     end
+
+    it "should filter files basing using a block" do
+      files = []
+
+      Find.find(root + "/lib/bovem/") do |file|
+        files << file if !File.directory?(file)
+      end
+
+      expect(shell.find(root + "/lib/bovem", /rb/, true) { |file|
+        !File.directory?(file)
+      }).to eq(files)
+      expect(shell.find(root + "/lib/bovem", /bovem/, true) { |file|
+        false
+      }).to eq([])
+    end
   end
 end

metadata

@@ -1,167 +1,173 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bovem
-version: !ruby/object:Gem::Version
-  version: 1.1.1
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
-authors:
+authors: 
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: lazier
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+
+date: 2012-09-23 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+  name: lazier
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+  type: :runtime
+  name: open4
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 11
+        - 0
         version: 2.11.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
   type: :development
+  name: rspec
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  name: rake
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
   type: :development
+  name: simplecov
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
   type: :development
+  name: pry
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
+        version: 0.8.0
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: github-markup
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
   type: :development
+  name: yard
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+  type: :development
+  name: redcarpet
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
+  prerelease: false
+  type: :development
+  name: github-markup
+  requirement: *id009
 description: A collection of utilities for developers.
-email:
+email: 
 - shogun_panda@me.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -185,29 +191,38 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/ShogunPanda/bovem
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: bovem
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A collection of utilities for developers.
-test_files:
+test_files: 
 - spec/bovem/configuration_spec.rb
 - spec/bovem/console_spec.rb
 - spec/bovem/logger_spec.rb