bovem 1.0.1 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bovem (1.0.1)
+    bovem (1.1.0)
       lazier (~> 1.0)
       open4 (~> 1.3.0)
 
@@ -32,8 +32,8 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.4)
-    json (1.7.4)
-    lazier (1.0.2)
+    json (1.7.5)
+    lazier (1.0.3)
       actionpack (~> 3.0)
       json (~> 1.7.0)
       tzinfo (~> 0.3.0)

data/lib/bovem/console.rb

@@ -140,7 +140,7 @@ module Bovem
 
     # Initializes a new Console.
     def initialize
-      @line_width = 80
+      @line_width = self.get_screen_width
       @indentation = 0
       @indentation_string = " "
     end
@@ -149,7 +149,7 @@ module Bovem
     #
     # @return [Fixnum] The screen width.
     def get_screen_width
-      ::Bovem::Console.execute("tput cols").to_integer
+      ::Bovem::Console.execute("tput cols").to_integer(80)
     end
 
     # Sets the new indentation width.
@@ -193,7 +193,7 @@ module Bovem
       if width.to_integer <= 0 then
         message
       else
-        width = (width == true || width.to_integer < 0 ? @line_width : width.to_integer)
+        width = (width == true || width.to_integer < 0 ? self.get_screen_width : width.to_integer)
 
         message.split("\n").collect { |line|
           line.length > width ? line.gsub(/(.{1,#{width}})(\s+|$)/, "\\1\n").strip : line
@@ -247,10 +247,23 @@ module Bovem
       rv = message
 
       rv = self.replace_markers(rv, plain) # Replace markers
+
+      # Compute the real width available for the screen, if we both indent and wrap
+      if wrap == true then
+        wrap = @line_width
+
+        if indent == true then
+          wrap -= self.indentation
+        else
+          indent_i = indent.to_integer
+          wrap -= (indent_i > 0 ? self.indentation : 0) + indent_i
+        end
+      end
+
       rv = self.wrap(rv, wrap) # Wrap
       rv = self.indent(rv, indent) # Indent
 
-      rv += suffix if suffix # Add the suffix
+      rv += suffix.ensure_string if suffix # Add the suffix
       rv
     end
 

data/lib/bovem/shell.rb

@@ -29,9 +29,10 @@ module Bovem
     # @param run [Boolean] If `false`, it will just print a message with the full command that will be run.
     # @param show_exit [Boolean] If show the exit status.
     # @param show_output [Boolean] If show command output.
+    # @param show_command [Boolean] If show the command that will be run.
     # @param fatal [Boolean] If quit in case of fatal errors.
     # @return [Hash] An hash with `status` and `output` keys.
-    def run(command, message = nil, run = true, show_exit = true, show_output = false, fatal = true)
+    def run(command, message = nil, run = true, show_exit = true, show_output = false, show_command = false, fatal = true)
       rv = {:status => 0, :output => ""}
       command = command.ensure_string
 
@@ -45,6 +46,7 @@ module Bovem
       else # Run
         output = ""
 
+        self.console.info("Running command: {mark=bright}\"#{command}\"{/mark}...") if show_command
         rv[:status] = ::Open4::open4(command + " 2>&1") { |pid, stdin, stdout, stderr|
           stdout.each_line do |line|
             output << line

data/lib/bovem/version.rb

@@ -14,10 +14,10 @@ module Bovem
     MAJOR = 1
 
     # The minor version.
-    MINOR = 0
+    MINOR = 1
 
     # 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

@@ -54,14 +54,14 @@ describe Bovem::Console do
   describe "#initialize" do
     it "should correctly set defaults" do
       expect(console.indentation).to eq(0)
-      expect(console.line_width).to eq(80)
+      expect(console.line_width).to eq(`tput cols`.to_integer)
       expect(console.indentation_string).to eq(" ")
     end
   end
 
   describe "#get_screen_width" do
     it "should execute tput cols" do
-      ::Bovem::Console.should_receive(:execute).with("tput cols")
+      ::Bovem::Console.should_receive(:execute).with("tput cols").at_least(1)
       console.get_screen_width
     end
 
@@ -372,6 +372,7 @@ describe Bovem::Console do
       Kernel.stub(:gets).and_return("VALUE\n")
       stty = %x{which stty}.strip
 
+      ::Bovem::Console.should_receive(:execute).with("tput cols").and_return(80)
       ::Bovem::Console.should_receive(:execute).with("which stty").and_return(stty)
       ::Bovem::Console.should_receive(:execute).with(stty).and_return("speed 9600 baud;\nlflags: echoe echoke echoctl pendin\niflags: iutf8\noflags: -oxtabs\ncflags: cs8 -parenb")
       ::Bovem::Console.should_receive(:execute).with("#{stty} -echo")

data/spec/bovem/shell_spec.rb

@@ -39,7 +39,12 @@ describe Bovem::Shell do
       shell.run("echo OK", nil, true, false)
     end
 
-    it "should only print the command" do
+    it "should print the command line" do
+      shell.console.should_receive("info").with("Running command: {mark=bright}\"echo OK\"{/mark}...")
+      shell.run("echo OK", nil, true, false, false, true)
+    end
+
+    it "should only print the command if requested to" do
       shell.console.should_receive("warn").with("Will run command: {mark=bright}\"echo OK\"{/mark}...")
       ::Open4.should_not_receive("open4")
       shell.run("echo OK", nil, false, false)
@@ -55,7 +60,7 @@ describe Bovem::Shell do
       shell.console.should_receive(:status).with(:ok)
       shell.run("echo OK", nil, true, true)
       shell.console.should_receive(:status).with(:fail)
-      shell.run("echo1 OK", nil, true, true, false, false)
+      shell.run("echo1 OK", nil, true, true, false, false, false)
     end
 
     it "should print output" do
@@ -64,7 +69,7 @@ describe Bovem::Shell do
     end
 
     it "should raise a exception for failures" do
-      expect { shell.run("echo1 OK", nil, true, false, false, false) }.to_not raise_error(SystemExit)
+      expect { shell.run("echo1 OK", nil, true, false, false, false, false) }.to_not raise_error(SystemExit)
       expect { shell.run("echo1 OK", nil, true, false, false) }.to raise_error(SystemExit)
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bovem
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Shogun
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-19 00:00:00 Z
+date: 2012-08-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement