xcpretty 0.1.7 → 0.1.8

data/spec/xcpretty/snippet_spec.rb

@@ -6,7 +6,7 @@ module XCPretty
 
     it "gets the snippet out of the file path" do
       path = File.expand_path('spec/fixtures/NSStringTests.m:36')
-      Snippet.from_filepath(path).should ==
+      Snippet.from_filepath(path).contents.should ==
 <<-EOS
     it(@"-split: splits with delimiter string, not just a char", ^{
         [[[@"one / two / three" split:@" / "] should] equal:@[@"one", @"two", @"three"]];
@@ -14,24 +14,31 @@ module XCPretty
 EOS
     end
 
+    it 'saves the file path' do
+      path = File.expand_path('spec/fixtures/NSStringTests.m:36')
+      Snippet.from_filepath(path).file_path.should == path
+    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"
+      Snippet.from_filepath(path).contents.should == "\nSPEC_END\n"
     end
 
     it "doesn't crash if file path is invalid" do
       path = 'invalid-path'
-      Snippet.from_filepath(path).should == ''
+      Snippet.from_filepath(path).contents.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"
+      Snippet.from_filepath(path).contents.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"
+      Snippet.from_filepath(path).contents.should ==
+         "[[[@1 should] equal] @3];\n"
     end
 
   end

data/spec/xcpretty/syntax_spec.rb

@@ -4,29 +4,57 @@ module XCPretty
 
   describe Syntax do
 
-    before(:each) do
-      Syntax.instance_variable_set(:@available, nil)
-    end
+    let(:snippet) { Snippet.new('self.color = [UIColor redColor];', 'test.m') }
+    let(:code) { snippet.contents }
 
     it "caches the pygments availability" do
-      Syntax.should_receive(:system).once.and_return(false)
-      4.times { Syntax.highlight('meh') }
+      Pygments.should_receive(:system).once.and_return(false)
+      4.times { Syntax.highlight(Snippet.new('meh')) }
     end
 
     context "pygments are installed" do
 
-      it "highlights code" do
-        Syntax.stub(:system).and_return(true)
-        Syntax.highlight('int a = 5;').should include("\e[36mint\e[39;49;00m")
+      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
     end
 
     context "pygments are not installed" do
 
       it "prints plain code" do
         Syntax.stub(:system).and_return(false)
-        Syntax.highlight('int a = 5;').should == 'int a = 5;'
+        Syntax.highlight(snippet).should == 'self.color = [UIColor redColor];'
       end
 
     end

data/vendor/json_pure/parser.rb

@@ -361,4 +361,4 @@ module JSON
       end
     end
   end
-end
+end

data/xcpretty.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "xcpretty"
   spec.version       = XCPretty::VERSION
   spec.authors       = ["Marin Usalj", "Delisa Mason"]
-  spec.email         = ["mneorr@gmail.com", "iskanamagus@gmail.com"]
+  spec.email         = ["marin2211@gmail.com", "iskanamagus@gmail.com"]
   spec.required_ruby_version = '>= 1.8.7'
   spec.description   =
   %q{
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   and it can also mine Bitcoins.
   }
   spec.summary       = %q{xcodebuild formatter done right}
-  spec.homepage      = "https://github.com/mneorr/xcpretty"
+  spec.homepage      = "https://github.com/supermarin/xcpretty"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,7 @@ description: "\n  Xcodebuild formatter designed to be piped with `xcodebuild`,\n
   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:
-- mneorr@gmail.com
+- marin2211@gmail.com
 - iskanamagus@gmail.com
 executables:
 - xcpretty
@@ -79,6 +79,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".kick"
 - ".travis.yml"
 - CHANGELOG.md
@@ -145,7 +146,7 @@ files:
 - vendor/json_pure/generator.rb
 - vendor/json_pure/parser.rb
 - xcpretty.gemspec
-homepage: https://github.com/mneorr/xcpretty
+homepage: https://github.com/supermarin/xcpretty
 licenses:
 - MIT
 metadata: {}