rake-funnel 0.9.0.pre → 0.9.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a24c43a1a9f0170bc60541024af1b0c7fba00bbe
-  data.tar.gz: 6781d9f355a322c4aa2a317466345d31e6c1df7c
+  metadata.gz: 654127b97949b02eee869ea2a09be66f9f2a310d
+  data.tar.gz: 612b33cf3287735aa3a0cf5454188dae4266f299
 SHA512:
-  metadata.gz: 16ee74bb0cefd902f980df81fb4e685ae6446d8fb67e8e6f28d6677c4551f224919f9e9775d9e641e6633a7e12bb5df83a6cc9240dee07d438ba960a093054b9
-  data.tar.gz: a812455493c6c84e4187ae4376559f81834a1fd2a7f3de66e11f5c445ca5f587908b62dbe4bb7d54f16b87081e27e4ba2ec34281c7762c2cbc6eaba0252196f2
+  metadata.gz: 4551b61164ed3a434664ae5a81c975397617783407e0bcef7e937fe2822331299e79161fee40744c26833976111f3540a748bdcf7c302fd286c41c0fc164a3eb
+  data.tar.gz: a8ee0e0085f6f8bd9109669340ae4257919f97e906175190b977d507fd0641d141ad276b452e2a91a18b55ba0102f114be97ed03a7190e01791f79d0154d3301

data/lib/rake/funnel/ambiguous_file_error.rb

@@ -14,18 +14,26 @@ module Rake
       end
 
       def to_s
-        msg = []
-        (msg << description) if description
-        (msg << "Search pattern used: #{@search_pattern}") if @search_pattern
-        unless (@candidates || []).empty?
-          msg << 'Candidates:'
-          msg << @candidates.map { |c| "  - #{c}" }
-        end
-
+        msg = [] << inspect_description << inspect_search_pattern << inspect_candidates
+        msg = msg.flatten.compact
         msg = [super.to_s] if msg.empty?
 
         msg.join("\n")
       end
+
+      private
+      def inspect_description
+        [description] if description
+      end
+
+      def inspect_search_pattern
+        ["Search pattern used: #{search_pattern}"] if search_pattern
+      end
+
+      def inspect_candidates
+        return if (candidates || []).empty?
+        ['Candidates:', candidates.map { |c| "  - #{c}" }]
+      end
     end
   end
 end

data/lib/rake/funnel/execution_error.rb

@@ -13,16 +13,29 @@ module Rake
       end
 
       def to_s
-        msg = []
-        (msg << description << nil) if description
-        (msg << 'Error executing:' << command << nil) if command
-        (msg << "Exit code: #{exit_code}" << nil) if exit_code
-        (msg << 'Command output (last 10 lines):' << output.split("\n").last(10) << nil) if output
-
+        msg = [] << inspect_description << inspect_command << inspect_exit_code << last_output
+        msg = msg.flatten.compact
         msg = [super.to_s] if msg.empty?
 
         msg.join("\n")
       end
+
+      private
+      def inspect_description
+        [description] if description
+      end
+
+      def inspect_command
+        ['Error executing:', command] if command
+      end
+
+      def inspect_exit_code
+        ["Exit code: #{exit_code}"] if exit_code
+      end
+
+      def last_output
+        ['Command output (last 10 lines):', output.encode('UTF-8').split("\n").last(10)] if output
+      end
     end
   end
 end

data/lib/rake/funnel/extensions/shell.rb

@@ -69,14 +69,14 @@ module Rake
         end
 
         def to_stdout(line)
-          $stdout.puts line.sub(/\n$/, '').green
+          $stdout.puts line.rstrip.green
           :success
         end
 
         def to_stderr(line, error_lines)
           return unless error_lines && line =~ error_lines
 
-          $stderr.puts line.sub(/\n$/, '').bold.red
+          $stderr.puts line.rstrip.bold.red
           :error
         end
       end

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.9.0.pre'
+    VERSION = '0.9.1.pre'
   end
 end

data/spec/rake/funnel/execution_error_spec.rb

@@ -8,60 +8,66 @@ describe Rake::Funnel::ExecutionError do
     its(:exit_code) { should be_nil }
     its(:output) { should be_nil }
     its(:description) { should be_nil }
-    its(:to_s) { should =~ /^Error executing:\scommand/ }
-  end
+    its(:to_s) { should =~ /^Error executing:\ncommand/ }
 
-  context 'with command and exit code' do
-    subject { described_class.new('command', 127) }
+    context 'and exit code' do
+      subject { described_class.new('command', 127) }
 
-    its(:command) { should == 'command' }
-    its(:exit_code) { should == 127 }
-    its(:output) { should be_nil }
-    its(:description) { should be_nil }
-    its(:to_s) { should =~ /^Error executing:\scommand/ }
-    its(:to_s) { should =~ /^Exit code: 127/ }
-    end
+      its(:command) { should == 'command' }
+      its(:exit_code) { should == 127 }
+      its(:output) { should be_nil }
+      its(:description) { should be_nil }
+      its(:to_s) { should =~ /^Error executing:\ncommand/ }
+      its(:to_s) { should =~ /^Exit code: 127/ }
 
-  context 'with command and exit code and output' do
-    subject { described_class.new('command', 127, 'output') }
+      context 'and output' do
+        subject { described_class.new('command', 127, 'output') }
 
-    its(:command) { should == 'command' }
-    its(:exit_code) { should == 127 }
-    its(:output) { should == 'output' }
-    its(:description) { should be_nil }
-    its(:to_s) { should =~ /^Error executing:\scommand/ }
-    its(:to_s) { should =~ /^Exit code: 127/ }
-    its(:to_s) { should =~ /^Command output \(last 10 lines\):\soutput/ }
-  end
+        its(:command) { should == 'command' }
+        its(:exit_code) { should == 127 }
+        its(:output) { should == 'output' }
+        its(:description) { should be_nil }
+        its(:to_s) { should =~ /^Error executing:\ncommand/ }
+        its(:to_s) { should =~ /^Exit code: 127/ }
+        its(:to_s) { should =~ /^Command output \(last 10 lines\):\noutput/ }
 
-  context 'with command and exit code and output and message' do
-    subject { described_class.new('command', 127, 'output', 'description') }
+        context 'encoded output' do
+          subject { described_class.new('command', 127, 'output äöüß'.encode('CP850')) }
 
-    its(:command) { should == 'command' }
-    its(:exit_code) { should == 127 }
-    its(:output) { should == 'output' }
-    its(:description) { should == 'description' }
-    its(:to_s) { should =~ /^description/ }
-    its(:to_s) { should =~ /^Error executing:\scommand/ }
-    its(:to_s) { should =~ /^Exit code: 127/ }
-    its(:to_s) { should =~ /^Command output \(last 10 lines\):\soutput/ }
-  end
+          its(:to_s) { should =~ /^Command output \(last 10 lines\):\noutput/ }
+        end
 
-  context 'with output longer than 10 lines' do
-    let(:output) {
-      output = []
+        context 'longer than 10 lines' do
+          let(:output) {
+            output = []
 
-      11.times.each do |i|
-        output << "output #{i}"
-      end
+            11.times.each do |i|
+              output << "output #{i}"
+            end
 
-      output.join("\n")
-    }
+            output.join("\n")
+          }
 
-    subject { described_class.new(nil, nil, output) }
+          subject { described_class.new(nil, nil, output) }
 
-    it 'should display the last 10 lines of output' do
-      expect(subject.to_s).not_to match(/^output 0/)
+          it 'should display the last 10 lines of output' do
+            expect(subject.to_s).not_to match(/^output 0/)
+          end
+        end
+
+        context 'and description' do
+          subject { described_class.new('command', 127, 'output', 'description') }
+
+          its(:command) { should == 'command' }
+          its(:exit_code) { should == 127 }
+          its(:output) { should == 'output' }
+          its(:description) { should == 'description' }
+          its(:to_s) { should =~ /^description/ }
+          its(:to_s) { should =~ /^Error executing:\ncommand/ }
+          its(:to_s) { should =~ /^Exit code: 127/ }
+          its(:to_s) { should =~ /^Command output \(last 10 lines\):\noutput/ }
+        end
+      end
     end
   end
 end

data/spec/rake/funnel/extensions/shell_spec.rb

@@ -159,6 +159,14 @@ describe Rake::Funnel::Extensions::Shell do
         expect($stdout).to have_received(:puts).with(/output 2/)
       end
     end
+
+    context 'lines with different encoding' do
+      let(:stdout_and_stderr) { StringIO.new('error äöüß'.encode('CP850')) }
+
+      it 'should log to stdout before error' do
+        expect($stderr).to have_received(:puts).with(/error/)
+      end
+    end
   end
 
   describe 'callback block' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre
+  version: 0.9.1.pre
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake