xcpretty 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1a03b19be84f708774b6c76d7b89cac3231eed1
-  data.tar.gz: 282c28b193dd9f9e92e83e46f38e86481c3f8432
+  metadata.gz: cc82776a1b5b7af57ec1112e3272f12a6942513b
+  data.tar.gz: 521c086a0311bf369acd88e7edf6ca3730ae6389
 SHA512:
-  metadata.gz: 9ac22b284e55a4397cb190a9406e4fc4992ab79ebb2b1a25b1210361f5bacbebdd26e269228ccdbb2cd3856bea055314c66f52f78bf213ae2c34d0110aa21230
-  data.tar.gz: 63fb8efd9849d07ad752efad960bfdadab4a67e4d741600fe62a70a92f3e97b4e3b5bf725b7ad2d06ebb85612dcd155dae8eef4d77c961b5f14b494b66de4116
+  metadata.gz: c9e3c17930e218fea3f34d5d8ea42b279d269c3869616c039ce84f356bdb9ac9528a3800d1fc25fcba975776036edc3ef0fb27894d0edbf0ea9a415603865d5a
+  data.tar.gz: 6d1274dbbf1824d65e07cf802d4f5795276e850778e24c2f82d07a47fb822d37761eebba5b2286a71ddcfae6c8b46f058160077bc96211c1c3a1dd3c65028af6

data/lib/xcpretty.rb

@@ -1,14 +1,15 @@
-require "xcpretty/version"
-require "xcpretty/printer"
-require "xcpretty/syntax"
-require "xcpretty/formatters/formatter"
-require "xcpretty/formatters/simple"
-require "xcpretty/formatters/rspec"
-require "xcpretty/formatters/knock"
-require "xcpretty/formatters/tap"
-require "xcpretty/reporters/junit"
-require "xcpretty/reporters/html"
-require "xcpretty/reporters/json_compilation_database"
+require 'xcpretty/version'
+require 'xcpretty/printer'
+require 'xcpretty/syntax'
+require 'xcpretty/snippet'
+require 'xcpretty/formatters/formatter'
+require 'xcpretty/formatters/simple'
+require 'xcpretty/formatters/rspec'
+require 'xcpretty/formatters/knock'
+require 'xcpretty/formatters/tap'
+require 'xcpretty/reporters/junit'
+require 'xcpretty/reporters/html'
+require 'xcpretty/reporters/json_compilation_database'
 
 module XCPretty
 

data/lib/xcpretty/formatters/formatter.rb

@@ -111,14 +111,21 @@ module XCPretty
 
     def format_failures(failures_per_suite)
       failures_per_suite.map do |suite, failures|
-        formatted_failures = failures.map do |f|
-          "  #{f[:test_case]}, #{red(f[:reason])}\n  #{cyan(f[:file])}"
+        formatted_failures = failures.map do |failure|
+          format_failure(failure)
         end.join("\n\n")
 
         "\n#{suite}\n#{formatted_failures}"
       end.join("\n")
     end
 
+    def format_failure(f)
+      "  #{f[:test_case]}, #{red(f[:reason])}\n  #{cyan(f[:file_path])}\n" +
+      "  ```\n" +
+      Syntax.highlight(Snippet.from_filepath(f[:file_path])) +
+      "  ```"
+    end
+
     def error_symbol
       use_unicode? ? ERROR : ASCII_ERROR
     end

data/lib/xcpretty/parser.rb

@@ -391,7 +391,7 @@ module XCPretty
     def store_failure(file, test_suite, test_case, reason)
       failures_per_suite[test_suite] ||= []
       failures_per_suite[test_suite] << {
-        :file => file,
+        :file_path => file,
         :reason => reason,
         :test_case => test_case
       }

data/lib/xcpretty/reporters/html.rb

@@ -43,17 +43,12 @@ module XCPretty
 
     private
 
-    def formatted_snippet filepath
-      file, line = filepath.split(':')
-      f = File.open(file)
-      line.to_i.times { f.gets }
-      text = $_.strip
-      f.close
-      Syntax.highlight(text, "-f html -O style=colorful -O noclasses")
-    rescue
-      nil
+    def formatted_snippet(filepath)
+      snippet = Snippet.from_filepath(filepath)
+      Syntax.highlight(snippet, "-f html -O style=colorful -O noclasses")
     end
 
+
     def add_test(suite_name, data)
       @test_count += 1
       @test_suites[suite_name] ||= {:tests => []}
@@ -66,6 +61,7 @@ module XCPretty
 
     def write_report
       File.open(@filepath, 'w') do |f|
+        # WAT: get rid of these locals. BTW Cucumber fails if you remove them
         test_suites = @test_suites
         fail_count  = @fail_count
         test_count  = @test_count
@@ -74,4 +70,4 @@ module XCPretty
       end
     end
   end
-end
+end

data/lib/xcpretty/snippet.rb

@@ -0,0 +1,34 @@
+module XCPretty
+  class Snippet
+
+    def self.from_filepath(filepath)
+      path, line = filepath.split(':')
+      file = File.open(path)
+
+      text = read_snippet(file, line)
+
+      file.close
+      text
+    rescue
+      ''
+    end
+
+
+    private
+
+    def self.read_snippet(file, around_line)
+      text = ""
+      starting_position = around_line.to_i - 2
+      starting_position.times { file.gets }
+      3.times { text += readline(file) }
+      text
+    end
+
+    def self.readline(file)
+      file.gets
+      $_ || ''
+    end
+
+  end
+end
+

data/lib/xcpretty/syntax.rb

@@ -18,4 +18,3 @@ module XCPretty
     end
   end
 end
-

data/lib/xcpretty/version.rb

@@ -1,3 +1,3 @@
 module XCPretty
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/fixtures/NSStringTests.m

@@ -0,0 +1,64 @@
+//
+//  NSStringTests.m
+//  SampleProject
+//
+//  Created by Neil on 05/12/2012.
+//  Copyright (c) 2012 @mneorr | mneorr.com. All rights reserved.
+//
+
+#import "Kiwi.h"
+#import "ObjectiveSugar.h"
+
+SPEC_BEGIN(StringAdditions)
+
+describe(@"Foundation-style functions", ^{
+
+    it(@"NSStringWithFormat makes NSString -stringWithFormat", ^{
+
+        [[NSStringWithFormat(@"This is %@", @1) should] equal:@"This is 1"];
+    });
+
+});
+
+describe(@"Additions", ^{
+
+    NSString *sentence = @"Jane Doe's going    in a shop,and,yeah;";
+
+    it(@"-split splits by whitespace", ^{
+        [[[@" the\r\nquick brown\t \tfox\n" split] should] equal:@[@"the", @"quick", @"brown", @"fox"]];
+    });
+
+    it(@"-split: splits with given delimiter", ^{
+        [[[sentence split:@","] should] equal:@[@"Jane Doe's going    in a shop", @"and", @"yeah;"]];
+    });
+
+    it(@"-split: splits with delimiter string, not just a char", ^{
+        [[[@"one / two / three" split:@" / "] should] equal:@[@"one", @"two", @"three"]];
+    });
+
+    it(@"contains string", ^{
+        [[@([sentence containsString:@"jane doe"]) should] beTrue];
+    });
+
+    context(@"CamelCase and snake_case", ^{
+
+        it(@"converts snake_cased to CamelCased", ^{
+            [[[@"snake_case" camelCase] should] equal:@"SnakeCase"];
+        });
+
+        it(@"handles correctly snake case on beginning and at the end", ^{
+            [[[@"_snake_case" camelCase] should] equal:@"SnakeCase"];
+            [[[@"snake_case_" camelCase] should] equal:@"SnakeCase"];
+        });
+
+    });
+
+    it(@"-strip strips whitespaces and newlines from both ends", ^{
+        [[[@"  Look mo, no empties!   " strip] should] equal:@"Look mo, no empties!"];
+    });
+
+});
+
+
+
+SPEC_END

data/spec/fixtures/oneliner.m

@@ -0,0 +1 @@
+[[[@1 should] equal] @3];

data/spec/xcpretty/formatters/formatter_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'xcpretty'
+require 'fixtures/constants'
 
 module XCPretty
 
@@ -64,16 +65,21 @@ module XCPretty
 
     if RUBY_VERSION > '1.8.7'
       it "formats failures per suite" do
+        Syntax.stub(:highlight) { |text| text }
+
+        first_path = File.expand_path('spec/fixtures/NSStringTests.m:46')
+        second_path = File.expand_path('spec/fixtures/NSStringTests.m:57')
+
         failures = {
           'CarSpec' => [
             {
-              :file => 'path/to/file2',
+              :file_path => first_path,
               :reason => "just doesn't work",
               :test_case => 'Starting the car'
             }],
             'StringSpec' => [
               {
-                :file => 'path/to/file1',
+                :file_path => second_path,
                 :reason => "doesn't split",
                 :test_case => 'Splitting the string'
               }]
@@ -82,15 +88,24 @@ module XCPretty
 
 CarSpec
   Starting the car, #{@formatter.red("just doesn't work")}
-  #{@formatter.cyan("path/to/file2")}
+  #{@formatter.cyan(first_path)}
+  ```
+        it(@"converts snake_cased to CamelCased", ^{
+            [[[@"snake_case" camelCase] should] equal:@"SnakeCase"];
+        });
+  ```
 
 StringSpec
   Splitting the string, #{@formatter.red("doesn't split")}
-  #{@formatter.cyan("path/to/file1")}
+  #{@formatter.cyan(second_path)}
+  ```
+    it(@"-strip strips whitespaces and newlines from both ends", ^{
+        [[[@"  Look mo, no empties!   " strip] should] equal:@"Look mo, no empties!"];
+    });
+  ```
 
 
 #{@formatter.red(SAMPLE_EXECUTED_TESTS)})
-
       end
     end # only ruby 1.9 above because of ordered hashes
 

data/spec/xcpretty/snippet_spec.rb

@@ -0,0 +1,39 @@
+require 'xcpretty/snippet'
+
+module XCPretty
+
+  describe Snippet do
+
+    it "gets the snippet out of the file path" do
+      path = File.expand_path('spec/fixtures/NSStringTests.m:36')
+      Snippet.from_filepath(path).should ==
+<<-EOS
+    it(@"-split: splits with delimiter string, not just a char", ^{
+        [[[@"one / two / three" split:@" / "] should] equal:@[@"one", @"two", @"three"]];
+    });
+EOS
+    end
+
+    it "doesn't crash when there's nothing to read" do
+      path = File.expand_path('spec/fixtures/NSStringTests.m:64')
+      Snippet.from_filepath(path).should == "\nSPEC_END\n"
+    end
+
+    it "doesn't crash if file path is invalid" do
+      path = 'invalid-path'
+      Snippet.from_filepath(path).should == ''
+    end
+
+    it "doesn't crash if a failure is on the first line" do
+      path = File.expand_path('spec/fixtures/NSStringTests.m:0')
+      Snippet.from_filepath(path).should == "//\n//  NSStringTests.m\n//  SampleProject\n"
+    end
+
+    it "doesn't crash if the file has only 1 line" do
+      path = File.expand_path('spec/fixtures/oneliner.m:0')
+      Snippet.from_filepath(path).should == "[[[@1 should] equal] @3];\n"
+    end
+
+  end
+end
+

data/xcpretty.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 2"
   spec.add_development_dependency "cucumber"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,16 +43,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -118,10 +118,13 @@ files:
 - lib/xcpretty/reporters/html.rb
 - lib/xcpretty/reporters/json_compilation_database.rb
 - lib/xcpretty/reporters/junit.rb
+- lib/xcpretty/snippet.rb
 - lib/xcpretty/syntax.rb
 - lib/xcpretty/version.rb
+- spec/fixtures/NSStringTests.m
 - spec/fixtures/constants.rb
 - spec/fixtures/custom_formatter.rb
+- spec/fixtures/oneliner.m
 - spec/fixtures/raw_kiwi_compilation_fail.txt
 - spec/fixtures/raw_kiwi_fail.txt
 - spec/fixtures/raw_specta_fail.txt
@@ -133,6 +136,7 @@ files:
 - spec/xcpretty/formatters/simple_spec.rb
 - spec/xcpretty/parser_spec.rb
 - spec/xcpretty/printer_spec.rb
+- spec/xcpretty/snippet_spec.rb
 - spec/xcpretty/syntax_spec.rb
 - vendor/json_pure/COPYING
 - vendor/json_pure/LICENSE
@@ -181,8 +185,10 @@ test_files:
 - features/tap_format.feature
 - features/test_format.feature
 - features/xcpretty.feature
+- spec/fixtures/NSStringTests.m
 - spec/fixtures/constants.rb
 - spec/fixtures/custom_formatter.rb
+- spec/fixtures/oneliner.m
 - spec/fixtures/raw_kiwi_compilation_fail.txt
 - spec/fixtures/raw_kiwi_fail.txt
 - spec/fixtures/raw_specta_fail.txt
@@ -194,5 +200,6 @@ test_files:
 - spec/xcpretty/formatters/simple_spec.rb
 - spec/xcpretty/parser_spec.rb
 - spec/xcpretty/printer_spec.rb
+- spec/xcpretty/snippet_spec.rb
 - spec/xcpretty/syntax_spec.rb
 has_rdoc: