xcpretty 0.1.12 → 0.2.0

data/spec/xcpretty/parser_spec.rb

@@ -106,6 +106,11 @@ module XCPretty
       @parser.parse(SAMPLE_COMPILE_XIB)
     end
 
+    it "parses compiling storyboards" do
+      @formatter.should receive(:format_compile_storyboard).with("Main.storyboard", "sample/Main.storyboard")
+      @parser.parse(SAMPLE_COMPILE_STORYBOARD)
+    end
+
     it 'parses CopyPlistFile' do
       @formatter.should receive(:format_copy_plist_file).with(
         '/path/to/Some.plist', '/some other/File.plist')
@@ -119,7 +124,7 @@ module XCPretty
 
     it "parses CpHeader" do
       @formatter.should receive(:format_copy_header_file).with(
-        '/path/to/Header.h','/some other/path/Header.h')
+        '/path/to/Header.h', '/some other/path/Header.h')
       @parser.parse('CpHeader /path/to/Header.h /some other/path/Header.h')
     end
 
@@ -198,6 +203,16 @@ module XCPretty
       @parser.parse(SAMPLE_MEASURING_TEST)
     end
 
+    it "parses build success indicator" do
+      @formatter.should receive(:format_phase_success).with('BUILD')
+      @parser.parse(SAMPLE_BUILD_SUCCEEDED)
+    end
+
+    it "parses clean success indicator" do
+      @formatter.should receive(:format_phase_success).with('CLEAN')
+      @parser.parse(SAMPLE_CLEAN_SUCCEEDED)
+    end
+
     it "parses PhaseScriptExecution" do
       @formatter.should receive(:format_phase_script_execution).with('Check Pods Manifest.lock')
       @parser.parse(SAMPLE_RUN_SCRIPT)
@@ -226,7 +241,7 @@ module XCPretty
 
     it 'parses changing directories' do
       @formatter.should receive(:format_shell_command).with('cd',
-        '/some/place/out\ there')
+                                                            '/some/place/out\ there')
       @parser.parse('    cd /some/place/out\ there')
     end
 
@@ -238,8 +253,8 @@ module XCPretty
 
     it "parses Touch" do
       @formatter.should receive(:format_touch).with(
-        '/Users/musalj/Library/Developer/Xcode/DerivedData/Alcatraz-aobuxcinaqyzjugrnxjjhfzgwaou/Build/Products/Debug/AlcatrazTests.octest',
-        'AlcatrazTests.octest')
+        '/Users/musalj/Library/Developer/Xcode/DerivedData/Alcatraz-aobuxcinaqyzjugrnxjjhfzgwaou/Build/Products/Debug/Alcatraz Tests.octest',
+        'Alcatraz Tests.octest')
       @parser.parse(SAMPLE_TOUCH)
     end
 
@@ -328,7 +343,7 @@ module XCPretty
       end
 
       it "parses cocoapods errors" do
-        @formatter.should receive(:format_error).with("The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.")
+        @formatter.should receive(:format_error).with("error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.")
         @parser.parse(SAMPLE_PODS_ERROR)
       end
 
@@ -351,17 +366,25 @@ module XCPretty
           "'SomeRandomHeader.h' file not found",
           '#import "SomeRandomHeader.h"',
           '        ^'
-          # For now, it's probably not worth to provide the import stack
-          # It'd require more state, and not sure if it'd be any useful
-#%Q(In file included from /Users/musalj/code/OSS/SampleApp/Pods/SuperCoolPod/SuperAwesomeClass.m:12:
-#In file included from /Users/musalj/code/OSS/SampleApp/Pods/../LessCoolPod/LessCoolClass.h:9:
-#In file included from /Users/musalj/code/OSS/SampleApp/Pods/../LessCoolPod/EvenLessCoolClass.h:10:)
+        # For now, it's probably not worth to provide the import stack
+        # It'd require more state, and not sure if it'd be any useful
+        # %Q(In file included from /Users/musalj/code/OSS/SampleApp/Pods/SuperCoolPod/SuperAwesomeClass.m:12:
+        # In file included from /Users/musalj/code/OSS/SampleApp/Pods/../LessCoolPod/LessCoolClass.h:9:
+        # In file included from /Users/musalj/code/OSS/SampleApp/Pods/../LessCoolPod/EvenLessCoolClass.h:10:)
         )
         SAMPLE_FATAL_COMPILE_ERROR.each_line do |line|
           @parser.parse(line)
         end
       end
 
+      it 'parses file missing errors' do
+        @formatter.should receive(:format_file_missing_error).with(
+          'error: no such file or directory:',
+          '/Users/travis/build/supermarin/project/Classes/Class + Category/Two Words/MissingViewController.swift'
+        )
+        @parser.parse(SAMPLE_FILE_MISSING_ERROR)
+      end
+
       it 'parses fatal error: on the beginning of the line for corrupted AST files' do
         @formatter.should receive(:format_error).with(
           "fatal error: malformed or corrupted AST file: 'could not find file '/Users/mpv/dev/project/Crashlytics.framework/Headers/Crashlytics.h' referenced by AST file' note: after modifying system headers, please delete the module cache at '/Users/mpv/Library/Developer/Xcode/DerivedData/ModuleCache/M5WJ0FYE7N06'"
@@ -444,6 +467,11 @@ module XCPretty
           @parser.parse(line)
         end
       end
+
+      it "parses ld warnings" do
+        @formatter.should receive(:format_ld_warning).with("ld: embedded dylibs/frameworks only run on iOS 8 or later")
+        @parser.parse("ld: warning: embedded dylibs/frameworks only run on iOS 8 or later")
+      end
     end
 
     context "summary" do
@@ -511,3 +539,4 @@ module XCPretty
 
   end
 end
+

data/spec/xcpretty/printer_spec.rb

@@ -7,7 +7,7 @@ module XCPretty
 
     before(:each) do
       STDOUT.stub(:print) { |text| text }
-      @printer = Printer.new(:colorize => true, :unicode => true, :formatter => DummyFormatter)
+      @printer = Printer.new(colorize: true, unicode: true, formatter: DummyFormatter)
     end
 
     it "prints to stdout" do
@@ -22,7 +22,7 @@ module XCPretty
 
     it "prints with newlines only when needed" do
       @printer.formatter.stub(:optional_newline).and_return("")
-      
+
       STDOUT.should receive(:print).with("hey ho let's go")
       @printer.pretty_print("hey ho let's go")
     end
@@ -35,19 +35,21 @@ module XCPretty
   end
 end
 
-module XCPretty; class DummyFormatter < Formatter
+module XCPretty
+  class DummyFormatter < Formatter
 
-  def initialize(unicode, colorize)
-    @use_unicode = unicode
-    @colorize = colorize
-  end
+    def initialize(unicode, colorize)
+      @use_unicode = unicode
+      @colorize = colorize
+    end
 
-  def pretty_format(text)
-    text
-  end
+    def pretty_format(text)
+      text
+    end
 
-  def optional_newline
-    "\n"
+    def optional_newline
+      "\n"
+    end
   end
+end
 
-end; end

data/spec/xcpretty/syntax_spec.rb

@@ -1,62 +1,38 @@
 require 'xcpretty/syntax'
 
 module XCPretty
-
   describe Syntax do
+    it 'syntax highlights given code' do
+      code = 'self.color = [UIColor redColor];'
+      snippet = Snippet.new(code, 'test.m')
+      output = Syntax.highlight(snippet)
 
-    let(:snippet) { Snippet.new('self.color = [UIColor redColor];', 'test.m') }
-    let(:code) { snippet.contents }
-
-    it "caches the pygments availability" do
-      Pygments.should_receive(:system).once.and_return(false)
-      4.times { Syntax.highlight(Snippet.new('meh')) }
+      stripped_output = output.gsub(/(?:(?:\u001b\[)|\u009b)(?:(?:[0-9]{1,3})?(?:;[0-9]{0,3})*?[A-M|f-m])|\u001b[A-M]/, '')
+      stripped_output.should == code
     end
 
-    context "pygments are installed" do
-
-      before(:each) do
-        Pygments.stub(:available?).and_return(true)
-      end
-
-      it 'supports highlighting with options' do
-        Pygments.should_receive(:pygmentize).with(code, 'objc', '-f html')
-        Syntax.highlight(snippet, '-f html')
-      end
-
-      it 'highlights objective-c code by filename' do
-        Pygments.should_receive(:pygmentize).with(code, 'objc', '')
-        Syntax.highlight(snippet)
-      end
-
-      it 'highlights objective-c code by default' do
-        Pygments.should_receive(:pygmentize).with(code, 'objc', '')
-        Syntax.highlight(Snippet.new(code))
-      end
-
-      it 'highlights other languages by filename' do
-        test_language 'swift',  '.swift'
-        test_language 'c++',    '.cc', '.cpp', '.hpp', '.c++', '.cxx'
-        test_language 'objc++', '.mm', '.hh'
-        test_language 'objc',   '.m', '.h'
-        test_language 'dylan',  '.dyl'
-        test_language 'ruby',   '.rb', '.ruby'
-      end
-
-      def test_language(language, *extensions)
-        extensions.each do |extension|
-          Pygments.should_receive(:pygmentize).with(code, language, '')
-          Syntax.highlight(Snippet.new(code, "file#{extension}"))
-        end
-      end
+    it 'uses Objective-C lexer for Objective-C' do
+      Syntax.find_lexer('test.m', '').should == Rouge::Lexers::ObjectiveC
+      Syntax.find_lexer('test.h', '').should == Rouge::Lexers::ObjectiveC
     end
 
-    context "pygments are not installed" do
+    it 'uses Swift lexer for Swift' do
+      Syntax.find_lexer('test.swift', '').should == Rouge::Lexers::Swift
+    end
 
-      it "prints plain code" do
-        Syntax.stub(:system).and_return(false)
-        Syntax.highlight(snippet).should == 'self.color = [UIColor redColor];'
-      end
+    it 'uses Ruby lexer for Ruby' do
+      Syntax.find_lexer('test.rb', '').should == Rouge::Lexers::Ruby
+      Syntax.find_lexer('test.ruby', '').should == Rouge::Lexers::Ruby
+    end
 
+    it 'uses C++ lexer for C++' do
+      Syntax.find_lexer('test.cpp', '').should == Rouge::Lexers::Cpp
+      Syntax.find_lexer('test.cc', '').should == Rouge::Lexers::Cpp
+      Syntax.find_lexer('test.c++', '').should == Rouge::Lexers::Cpp
+      Syntax.find_lexer('test.cxx', '').should == Rouge::Lexers::Cpp
+      Syntax.find_lexer('test.hpp', '').should == Rouge::Lexers::Cpp
+      Syntax.find_lexer('test.h++', '').should == Rouge::Lexers::Cpp
+      Syntax.find_lexer('test.hxx', '').should == Rouge::Lexers::Cpp
     end
   end
 end

data/spec/xcpretty/term_spec.rb

@@ -0,0 +1,26 @@
+require 'xcpretty/term'
+
+module XCPretty
+  describe Term do
+    it "marks unicode as unavailable" do
+      Encoding.stub(:default_external).and_return(Encoding::ASCII)
+      Term.unicode?.should be false
+    end
+
+    it "marks unicode as available" do
+      Encoding.stub(:default_external).and_return(Encoding::UTF_8)
+      Term.unicode?.should be true
+    end
+
+    it 'marks color as unavailable' do
+      STDOUT.stub(:tty?).and_return(false)
+      Term.color?.should be false
+    end
+
+    it 'marks color as available' do
+      STDOUT.stub(:tty?).and_return(true)
+      Term.color?.should be true
+    end
+  end
+end
+

data/xcpretty.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |spec|
   spec.version       = XCPretty::VERSION
   spec.authors       = ["Marin Usalj", "Delisa Mason"]
   spec.email         = ["marin2211@gmail.com", "iskanamagus@gmail.com"]
-  spec.required_ruby_version = '>= 1.8.7'
-  spec.description   =
-  %q{
-  Xcodebuild formatter designed to be piped with `xcodebuild`,
-  and thus keeping 100% compatibility.
+  spec.required_ruby_version = '>= 2.0.0'
+  spec.description =
+    %q{
+    Xcodebuild formatter designed to be piped with `xcodebuild`,
+    and thus keeping 100% compatibility.
 
-  It has modes for CI, running tests (RSpec dot-style),
-  and it can also mine Bitcoins.
-  }
-  spec.summary       = %q{xcodebuild formatter done right}
+    It has modes for CI, running tests (RSpec dot-style),
+    and it can also mine Bitcoins.
+    }
+  spec.summary       = %q(xcodebuild formatter done right)
   spec.homepage      = "https://github.com/supermarin/xcpretty"
   spec.license       = "MIT"
 
@@ -26,8 +26,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'rouge', '~> 1.8'
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2"
-  spec.add_development_dependency "cucumber", "~> 1"
+  spec.add_development_dependency "rubocop", "~> 0.34.0"
+  spec.add_development_dependency "rspec", "~> 2.0"
+  spec.add_development_dependency "cucumber", "~> 1.0"
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,37 +53,51 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.34.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-description: "\n  Xcodebuild formatter designed to be piped with `xcodebuild`,\n  and
-  thus keeping 100% compatibility.\n\n  It has modes for CI, running tests (RSpec
-  dot-style),\n  and it can also mine Bitcoins.\n  "
+        version: '1.0'
+description: "\n    Xcodebuild formatter designed to be piped with `xcodebuild`,\n
+  \   and thus keeping 100% compatibility.\n\n    It has modes for CI, running tests
+  (RSpec dot-style),\n    and it can also mine Bitcoins.\n    "
 email:
 - marin2211@gmail.com
 - iskanamagus@gmail.com
@@ -81,6 +109,7 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".kick"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -123,6 +152,7 @@ files:
 - lib/xcpretty/reporters/junit.rb
 - lib/xcpretty/snippet.rb
 - lib/xcpretty/syntax.rb
+- lib/xcpretty/term.rb
 - lib/xcpretty/version.rb
 - spec/fixtures/NSStringTests.m
 - spec/fixtures/constants.rb
@@ -141,10 +171,7 @@ files:
 - spec/xcpretty/printer_spec.rb
 - spec/xcpretty/snippet_spec.rb
 - spec/xcpretty/syntax_spec.rb
-- vendor/json_pure/COPYING
-- vendor/json_pure/LICENSE
-- vendor/json_pure/generator.rb
-- vendor/json_pure/parser.rb
+- spec/xcpretty/term_spec.rb
 - xcpretty.gemspec
 homepage: https://github.com/supermarin/xcpretty
 licenses:
@@ -158,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -207,3 +234,4 @@ test_files:
 - spec/xcpretty/printer_spec.rb
 - spec/xcpretty/snippet_spec.rb
 - spec/xcpretty/syntax_spec.rb
+- spec/xcpretty/term_spec.rb

data/vendor/json_pure/COPYING

@@ -1,57 +0,0 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see GPL file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.