slather 0.0.31 → 0.0.231

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjczM2RkMDA4MTllMjlkNjJmZTkwOTQyOGZiMTkzMjY4ZTUwZDhiNg==
-  data.tar.gz: !binary |-
-    MWIwNjIxZGNiNDYxNjM0ZjU0NmNjYmY4MGRiMjZiNjQ0YjkxZGI4Yg==
+SHA1:
+  metadata.gz: e9eccd3caedb1595ff247cc1bd137f175111b210
+  data.tar.gz: e73ae6a6144454ba82578f8f67280e456748c936
 SHA512:
-  metadata.gz: !binary |-
-    OWQ0NzczYjMzMTI3NTNlMjcwMWI5NTJiNTg2MDAxMWNjMWM3ODM5ZjUzZjAz
-    YjRmMDBhNmVjMzNhOTc4MzQwY2Q4ZTVmZTdmOGNhMTA4ZWVlNTQ1ODZiODEw
-    YjEzY2M0Y2FhOGY0NjRiNGMyZTFkNDBkYmIyMjFmNmQxOGY1MTg=
-  data.tar.gz: !binary |-
-    MzhiZWI2ZDVlYmUwM2JiMGRiNjhlMmEzYTljNjZiNTMyZDIxOGMxMzVkODgz
-    MzVhMzVlNjkxMzcwYzVlNThmNjMzZjRhYzIwNjdkOTNjYWM5M2E2ZWJhYjMx
-    ZmQyYTJmOWNkZjE3ZmFlZGUwODE0NGNiMTEyODhhZWI4OWNiMWE=
+  metadata.gz: 63b47495e539eff10410c48bd3a1d16a3bf7110c5c873778c9d931821d84b3ee45d52fa9f06eeb6b71ff13a7f5ab23fe434bd3f46c7024afb1b504916b12ba5c
+  data.tar.gz: ca0da25a7195c2a412d56bde2aa3902950bf860b8774c7785c11cbc2257f54d728c0033d414a915d7ec5e2aa1023e83f916a5e132d7e2ec64b441ccc470445c2

data/.gitignore

@@ -21,22 +21,4 @@ tmp
 *.a
 mkmf.log
 
-# Xcode
-#
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
 *.DS_Store

data/README.md

@@ -1,9 +1,6 @@
 # Slather
 
-Generate test coverage reports for Xcode projects. Apply tests liberally.
-
-| [Parsimmon](https://github.com/ayanonagon/Parsimmon) | [![Parsimmon Coverage](https://coveralls.io/repos/ayanonagon/Parsimmon/badge.png?branch=master)](https://coveralls.io/r/ayanonagon/Parsimmon?branch=master) |
-|------------------------------------------------------------|:----------------------------------------------------:|
+TODO: Write a gem description
 
 ## Installation
 
@@ -15,54 +12,18 @@ And then execute:
 
     $ bundle
 
-## Usage
-
-Setup your project for test coverage:
-
-    $ slather setup path/to/project.xcodeproj
-
-This will enable the `Generate Test Coverage` and `Instrument Program Flow` flags for your project.
-
-
-To test if you're ready to generate test coverage, run your test suite on your project, and then run:
-
-    $ slather coverage -s path/to/project.xcodeproj
-
-### Coveralls
-
-Login to https://coveralls.io/ and enable your repository. Right now, `slather` only supports coveralls via Travis CI.
+Or install it yourself as:
 
-Make a `.slather.yml` file:
+    $ gem install slather
 
-```yml
-# .slather.yml
-
-coverage_service: coveralls
-xcodeproj: path/to/project.xcodeproj
-ignore:
-  - ExamplePodCode/*
-  - ProjectTestsGroup/*
-```
-
-And then in your `.travis.yml`, call `slather` after a successful_build
-
-```yml
-# .travis.yml
-
-after_success: slather
-```
-
-### Custom Build Directory
+## Usage
 
-Slather will look for the test coverage files in `DerivedData` by default. If you send build output to a custom location, like [this](https://github.com/erikdoe/ocmock/blob/master/Tools/travis.sh#L12), then you should also set the `build_directory` property in `.slather.yml`
+TODO: Write usage instructions here
 
 ## Contributing
 
-We'd love to see your ideas for improving this library! The best way to contribute is by submitting a pull request. We'll do our best to respond to your patch as soon as possible. You can also submit a [new Github issue](https://github.com/venmo/slather/issues/new) if you find bugs or have questions. :octocat:
-
-Please make sure to follow our general coding style and add test coverage for new features!
-
-## Contributors
-
-* [@tpoulos](https://github.com/tpoulos), the perfect logo.
-* [@ayanonagon](https://github.com/ayanonagon) and [@kylef](https://github.com/benzguo), feedback and testing.
+1. Fork it ( https://github.com/[my-github-username]/slather/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/bin/slather

@@ -1,85 +1,19 @@
 #!/usr/bin/env ruby
+
 require 'clamp'
-require 'yaml'
-require File.join(File.dirname(__FILE__), '../lib/slather')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'slather')
 
 Clamp do
 
-  self.default_subcommand = "coverage"
-
-  subcommand "coverage", "Computes coverage for the supplised project" do
-
-    parameter "[xcodeproj]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
-
-    option ["--travis", "-t"], :flag, "Indicate that the builds are running on Travis CI"
-
-    option ["--coveralls", "-c"], :flag, "Post coverage results to coveralls"
-    option ["--simple-output", "-s"], :flag, "Post coverage results to coveralls"
-
-    option ["--build-directory", "-b"], "BUILD_DIRECTORY", "The directory where gcno files will be written to. Defaults to derived data."
-    option ["--ignore", "-i"], "IGNORE", "ignore files conforming to a path", :multivalued => true
-
-    def execute
-      puts "Slathering..."
-          
-      setup_service_name
-      setup_ignore_list
-      setup_build_directory
-      setup_coverage_service
-
-      post
-
-      puts "Slathered"
-    end
-
-    def setup_build_directory
-      project.build_directory = build_directory if build_directory
-    end
-
-    def setup_ignore_list
-      project.ignore_list = ignore_list if !ignore_list.empty?
-    end
-
-    def setup_service_name
-      if travis?
-        project.ci_service = :travis_ci
-      end
-    end
-
-    def post
-      project.post
-    end
-
-    def project
-      @project ||= begin
-        xcodeproj_path_to_open = xcodeproj_path || Slather::Project.yml["xcodeproj"]
-        if xcodeproj_path_to_open
-          project = Slather::Project.open(xcodeproj_path_to_open)
-        else
-          raise StandardError, "Must provide an xcodeproj through .slather.yml"
-        end
-      end
-    end
-
-    def setup_coverage_service
-      if coveralls?
-        project.coverage_service = :coveralls
-      elsif simple_output?
-        project.coverage_service = :terminal
-      end
-    end
+  parameter "xcodeproj", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
+  option ["--build-directory", "-b"], "BUILD_DIRECTORY", "The directory where gcno files will be written to. Defaults to derived data."
 
+  def execute
+    puts "Slathering..."
+    project = Slather::Project.open(xcodeproj_path)
+    project.build_directory = build_directory
+    project.post_to_coveralls
+    puts "Done slathering!"
   end
 
-  subcommand "setup", "Configures an xcodeproj for test coverage generation" do
-
-    parameter "[xcodeproj]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
-
-    def execute
-      project = Slather::Project.open(xcodeproj_path)
-      project.setup_for_coverage
-      project.save
-    end
-
-  end
 end

data/lib/slather.rb

@@ -2,11 +2,9 @@ require 'slather/version'
 require 'slather/project'
 require 'slather/coverage_file'
 require 'slather/coveralls_coverage_file'
-require 'slather/coverage_service/coveralls'
-require 'slather/coverage_service/simple_output'
 
 module Slather
 
-  Encoding.default_external = "utf-8"
+  Encoding.default_internal = Encoding::UTF_8
 
 end

data/lib/slather/coverage_file.rb

@@ -3,17 +3,16 @@ module Slather
 
     attr_accessor :project, :gcno_file_pathname
 
-    def initialize(project, gcno_file_pathname)
-      self.project = project
-      self.gcno_file_pathname = Pathname(gcno_file_pathname)
+    def initialize(gcno_file_pathname)
+      @gcno_file_pathname = Pathname(gcno_file_pathname)
     end
 
     def source_file_pathname
       @source_file_pathname ||= begin
         base_filename = gcno_file_pathname.basename.sub_ext("")
         # TODO: Handle Swift
-        pbx_file = project.files.detect { |pbx_file| pbx_file.real_path.basename.to_s == "#{base_filename}.m" }        
-        pbx_file && pbx_file.real_path
+        path = Dir["#{project.main_group.real_path}/*/#{base_filename}.m"].first
+        path && Pathname(path)
       end
     end
 
@@ -25,8 +24,8 @@ module Slather
       source_file.read
     end
 
-    def source_file_pathname_relative_to_repo_root
-      source_file_pathname.relative_path_from(Pathname("./").realpath)
+    def source_file_pathname_relative_to_project_root
+      source_file_pathname.relative_path_from(project.main_group.real_path)
     end
 
     def gcov_data
@@ -58,11 +57,5 @@ module Slather
       end
     end
 
-    def ignored?
-      project.ignore_list.any? do |ignore|
-        File.fnmatch(ignore, source_file_pathname_relative_to_repo_root)
-      end
-    end
-
   end
 end

data/lib/slather/coveralls_coverage_file.rb

@@ -11,7 +11,7 @@ module Slather
 
     def as_json
       {
-        :name => source_file_pathname_relative_to_repo_root.to_s,
+        :name => source_file_pathname_relative_to_project_root.to_s,
         :source => source_data,
         :coverage => coverage_data
       }

data/lib/slather/project.rb

@@ -1,18 +1,11 @@
 require 'fileutils'
 require 'xcodeproj'
 require 'json'
-require 'yaml'
 
 module Slather
   class Project < Xcodeproj::Project
 
-    attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service
-
-    def self.open(xcodeproj)
-      proj = super
-      proj.configure_from_yml
-      proj
-    end
+    attr_accessor :build_directory
 
     def derived_data_dir
       File.expand_path('~') + "/Library/Developer/Xcode/DerivedData/"
@@ -22,74 +15,40 @@ module Slather
     def build_directory
       @build_directory || derived_data_dir
     end
+    private :build_directory
 
     def coverage_files
-      coverage_files = Dir["#{build_directory}/**/*.gcno"].map do |file|
-        coverage_file = coverage_file_class.new(self, file)
-        # If there's no source file for this gcno, it probably belongs to another project.
-        coverage_file.source_file_pathname && !coverage_file.ignored? ? coverage_file : nil
+      Dir["#{build_directory}/**/*.gcno"].map do |file|
+        coverage_file = Slather::CoverallsCoverageFile.new(file)
+        coverage_file.project = self
+        # If there's no source file for this gcno, or the gcno is old, it probably belongs to another project.
+        if coverage_file.source_file_pathname
+          stale_seconds_limit = 60
+          if (Time.now - File.mtime(file) < stale_seconds_limit)
+            next coverage_file
+          else
+            puts "Skipping #{file} -- older than #{stale_seconds_limit} seconds ago."
+          end
+        end
+        next nil
       end.compact
-
-      if coverage_files.empty?
-        raise StandardError, "No coverage files found. Are you sure your project is setup for generating coverage files? Try `slather setup your/project.pbxproj`"
-      else
-        coverage_files
-      end
     end
     private :coverage_files
 
-    def self.yml_filename
-      '.slather.yml'
-    end
-
-    def self.yml
-      @yml ||= File.exist?(yml_filename) ? YAML.load_file(yml_filename) : {}
-    end
-
-    def configure_from_yml
-      configure_build_directory_from_yml
-      configure_ignore_list_from_yml
-      configure_ci_service_from_yml
-      configure_coverage_service_from_yml
-    end
-
-    def configure_build_directory_from_yml
-      self.build_directory = self.class.yml["build_directory"] if self.class.yml["build_directory"] && !@build_directory
-    end
-
-    def configure_ignore_list_from_yml
-      self.ignore_list = [(self.class.yml["ignore"] || [])].flatten unless self.ignore_list
-    end
-
-    def configure_ci_service_from_yml
-      self.ci_service = (self.class.yml["ci_service"] || :travis_ci) unless self.ci_service
-    end
-
-    def ci_service=(service)
-      @ci_service = service && service.to_sym
-    end
-
-    def configure_coverage_service_from_yml
-      self.coverage_service = (self.class.yml["coverage_service"] || :terminal) unless coverage_service
-    end
-
-    def coverage_service=(service)
-      service = service && service.to_sym
-      if service == :coveralls
-        extend(Slather::CoverageService::Coveralls)
-      elsif service == :terminal
-        extend(Slather::CoverageService::SimpleOutput)
-      else
-        raise ArgumentError, "`#{coverage_service}` is not a valid coverage service. Try `terminal` or `coveralls`"
-      end
-      @coverage_service = service
+    def coveralls_coverage_data
+      {
+        :service_job_id => ENV['TRAVIS_JOB_ID'],
+        :service_name => "travis-ci",
+        :source_files => coverage_files.map(&:as_json)
+      }.to_json
     end
+    private :coveralls_coverage_data
 
-    def setup_for_coverage
-      build_configurations.each do |build_configuration|
-        build_configuration.build_settings["GCC_INSTRUMENT_PROGRAM_FLOW_ARCS"] = "YES"
-        build_configuration.build_settings["GCC_GENERATE_TEST_COVERAGE_FILES"] = "YES"
-      end
+    def post_to_coveralls
+      f = File.open('coveralls_json_file', 'w+')
+      f.write(coveralls_coverage_data)
+      `curl -s --form json_file=@#{f.path} https://coveralls.io/api/v1/jobs`
+      FileUtils.rm(f)
     end
 
   end

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = "0.0.31"
+  VERSION = "0.0.231"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.231
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
 description: 
@@ -102,7 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,29 +110,10 @@ files:
 - bin/slather
 - lib/slather.rb
 - lib/slather/coverage_file.rb
-- lib/slather/coverage_service/coveralls.rb
-- lib/slather/coverage_service/simple_output.rb
 - lib/slather/coveralls_coverage_file.rb
 - lib/slather/project.rb
 - lib/slather/version.rb
 - slather.gemspec
-- spec/fixtures/fixtures.xcodeproj/project.pbxproj
-- spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
-- spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch
-- spec/fixtures/fixtures/fixtures.h
-- spec/fixtures/fixtures/fixtures.m
-- spec/fixtures/fixtures/more_files/peekaview.h
-- spec/fixtures/fixtures/more_files/peekaview.m
-- spec/fixtures/fixturesTests/Supporting Files/en.lproj/InfoPlist.strings
-- spec/fixtures/fixturesTests/Supporting Files/fixturesTests-Info.plist
-- spec/fixtures/fixturesTests/fixturesTests.m
-- spec/fixtures/fixturesTests/peekaviewTests.m
-- spec/slather/coverage_file_spec.rb
-- spec/slather/coverage_service/coveralls_spec.rb
-- spec/slather/coverage_service/simple_output_spec.rb
-- spec/slather/fixtures.gcno
-- spec/slather/project_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/marklarr/slather
 licenses:
 - MIT
@@ -143,12 +124,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -157,22 +138,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Test coverage reports for Xcode projects
-test_files:
-- spec/fixtures/fixtures.xcodeproj/project.pbxproj
-- spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
-- spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch
-- spec/fixtures/fixtures/fixtures.h
-- spec/fixtures/fixtures/fixtures.m
-- spec/fixtures/fixtures/more_files/peekaview.h
-- spec/fixtures/fixtures/more_files/peekaview.m
-- spec/fixtures/fixturesTests/Supporting Files/en.lproj/InfoPlist.strings
-- spec/fixtures/fixturesTests/Supporting Files/fixturesTests-Info.plist
-- spec/fixtures/fixturesTests/fixturesTests.m
-- spec/fixtures/fixturesTests/peekaviewTests.m
-- spec/slather/coverage_file_spec.rb
-- spec/slather/coverage_service/coveralls_spec.rb
-- spec/slather/coverage_service/simple_output_spec.rb
-- spec/slather/fixtures.gcno
-- spec/slather/project_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []