fuci-travis 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3256a449901907f1fa2e79c9fa83982c98e0fc74
-  data.tar.gz: 53d44425b67a318275afdb00050465c3f4aeee42
+  metadata.gz: 47d7a6b11a3f4dcb7fdad0853c725288dd0aa2e6
+  data.tar.gz: 06f5cf889bbf21478e558c77c711de73a9277ed3
 SHA512:
-  metadata.gz: 702d35200176a11b07263f05f11a078820da9f23c8bdffae8bf50e9653181405d2eaff573de8a75dbc8d39bf363f79114b6b71bce202527d082e35d394b01c31
-  data.tar.gz: ee49ffb4e29bd6c62c73e46c804f54fcc5f0169fbe24aeda66af06068fa4151d9f01971098804bf14c06be129eaead556f748ed043fbf0ef5f390b763cc4dbe0
+  metadata.gz: a58239b15c1713dd5c31f3f0b1e129b8e24f493191475897aee546edb1cea2ad7d2ef4019d4318293e421295d0df1f6f60b6366b5a36bfab40884f454c7dfb3e
+  data.tar.gz: 6ec84669542d9ab524275abd31e9b6be828f1c6835b9fcd38f504a301ca8527659cd86a2e0d0e3337e03f598b87076406d185e0025a75924e89290de74a5185b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### version 0.3.0 *August 5, 2013*
+* Update Fuci to v0.3.0 which adds some git helpers
+* Adds `--pull-request`/`-p` option, which runs failures from the last
+build triggered by a pull request. Running it with a branch name as an
+argument will run failures from the last build triggered by a pull
+request on that branch name.
+
 ### version 0.2.0 *July 31, 2013*
 * Updates to Fuci 0.2.0 which adds `--last`/`-l` option
 

data/README.md

@@ -7,7 +7,7 @@ Run Travis failures locally. A [Fuci](https://github.com/davejachimiak/fuci) ser
 
 Add this line to your application's Gemfile:
 
-    gem 'fuci-travis', '~> 0.2'
+    gem 'fuci-travis', '~> 0.3'
 
 And then execute:
 
@@ -120,17 +120,35 @@ Run your latest ci failures locally:
 $ fuci
 ```
 `fuci` will fetch the CI failures from the default branch declared in
-your configuration. If no default branch is declared in the
-configuration, `fuci` will fetch the CI failures from the branch of the
-same name as your current local branch.
+your configuration. If no default branch is declared , `fuci` will fetch
+the CI failures from the branch of the same name as your current local
+branch.
 
-To run a specific branch's failures branch, call `fuci` with the branch.
-For example, this will run the failures from the latest master build
-on your local code:
+Call `fuci` with a branch name to run a specific branch's failures
+branch. For example, this will run the failures from the latest master
+build on your local code:
 ```sh
 $ fuci master
 ```
 
+Run failures from your last pull-request-triggered build:
+
+```sh
+$ fuci --pull-request
+$ # or
+$ fuci -p
+```
+
+Those will find the latest build triggered by a pull request from the
+remote branch of the same name as your current local branch. Use a
+branch name as an argument to run failures specific branch's pull
+request:
+
+```sh
+$ git checkout another_branch
+$ fuci -p my_feature_branch_that_breaks_things
+```
+
 ## Known incompatibilities/weirdnesses
 * Build configurations with more than one job. Multiple jobs typically
 mean test runs in different environments. Switching between these
@@ -138,7 +156,6 @@ environments locally and automatically can be tricky and may not even
 be desirable.
 
 ## TODO
-* Run failed tests from last pull request with some command-line option.
 * Rake task that bootstraps project with gitignore'd config file,
 complete with access_token and pro flag
 * Support for multiple jobs per build (?)

data/fuci-travis.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fuci', '~> 0.2'
+  spec.add_dependency 'fuci', '~> 0.3'
   spec.add_dependency 'travis', '~> 1.4'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "minitest-spec-expect", "~> 0.1"

data/lib/fuci/travis/build/generic.rb

@@ -0,0 +1,18 @@
+module Fuci
+  module Travis
+    class Build
+      class Generic < Build
+        def build_branch
+          puts "Fetching #{branch_name} branch..."
+          if branch = repo.branches[branch_name]
+            puts "Using #{branch_name} branch."
+            branch
+          else
+            puts "#{branch_name} branch not found on Travis."
+            exit
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fuci/travis/build/master.rb

@@ -1,15 +1,15 @@
-require_relative '../build'
+require 'fuci/travis/build/sha_detectable'
 
 module Fuci
   module Travis
     class Build
-      class Master < Fuci::Travis::Build
+      class Master < Build
+        include ShaDetectable
+
         def initialize; end;
 
         def build_branch
-          repo.builds.detect do |build|
-            build.commit.sha == remote_master_sha
-          end
+          detect_build_with_sha remote_master_sha
         end
       end
     end

data/lib/fuci/travis/build/pull_request.rb

@@ -0,0 +1,27 @@
+require 'fuci/travis/build/sha_detectable'
+
+module Fuci
+  module Travis
+    class Build
+      class PullRequest < Build
+        include ShaDetectable
+
+        def build_branch
+          sha = begin
+                  pull_merge_sha_from branch_name
+                rescue Fuci::Git::NoPullError
+                  puts "No pull request was detected for #{branch_name}."
+                  return exit
+                end
+
+          if branch = detect_build_with_sha(sha)
+            branch
+          else
+            puts "No build was detected for pull request from #{branch_name}."
+            exit
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fuci/travis/build/sha_detectable.rb

@@ -0,0 +1,21 @@
+module Fuci
+  module Travis
+    class Build
+      module ShaDetectable
+        def detect_build_with_sha sha
+          repo_builds.detect { |build| commit(build).sha == sha }
+        end
+
+        private
+
+        def repo_builds
+          repo.builds
+        end
+
+        def commit build
+          build.commit
+        end
+      end
+    end
+  end
+end

data/lib/fuci/travis/build.rb

@@ -2,6 +2,8 @@ require 'forwardable'
 require 'fuci/git'
 require 'fuci/travis/cli_options'
 require 'fuci/travis/build/master'
+require 'fuci/travis/build/generic'
+require 'fuci/travis/build/pull_request'
 
 module Fuci
   module Travis
@@ -19,10 +21,6 @@ module Fuci
         @branch_name = branch_name
       end
 
-      def branch
-        @branch ||= build_branch
-      end
-
       def status
         case state
         when FAILED
@@ -38,7 +36,22 @@ module Fuci
         jobs.first.log.body
       end
 
+      def branch
+        @branch ||= build_branch
+      end
+
+      def build_branch
+        raise NotImplementedError
+      end
+
       def self.create
+        if Fuci::Travis::CliOptions.pull_request?
+          branch_name =
+            Fuci::Travis::CliOptions.pull_request_branch || current_branch_name
+
+          return PullRequest.new branch_name
+        end
+
         branch_name =
           Fuci::Travis::CliOptions.branch ||
           Fuci::Travis.default_branch     ||
@@ -49,25 +62,14 @@ module Fuci
 
       def self.from_branch_name branch_name
         if branch_name == 'master'
-          Fuci::Travis::Build::Master.new
+          Master.new
         else
-          new branch_name
+          Generic.new branch_name
         end
       end
 
       private
 
-      def build_branch
-        puts "Fetching #{branch_name} branch..."
-        if branch = repo.branches[branch_name]
-          puts "Using #{branch_name} branch."
-          branch
-        else
-          puts "#{branch_name} branch not found on Travis."
-          exit
-        end
-      end
-
       def repo
         Fuci::Travis.repo
       end

data/lib/fuci/travis/cli_options.rb

@@ -1,10 +1,28 @@
 module Fuci
   module Travis
     class CliOptions
+      PULL_REQUEST_INDICATORS = ['--pull-request', '-p']
+
       def self.branch
         argv.first
       end
 
+      def self.pull_request?
+        (argv & PULL_REQUEST_INDICATORS).any?
+      end
+
+      def self.pull_request_branch
+        branch = nil
+
+        argv.each_with_index do |arg, index|
+          if PULL_REQUEST_INDICATORS.include? arg
+            branch = argv[index+1]
+          end
+        end
+
+        branch
+      end
+
       private
 
       def self.argv

data/lib/fuci/travis/version.rb

@@ -1,5 +1,5 @@
 module Fuci
   module Travis
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/spec/lib/fuci/travis/build/generic_spec.rb

@@ -0,0 +1,46 @@
+require_relative '../../../../spec_helper'
+require_relative '../../../../../lib/fuci/travis/build'
+require_relative '../../../../../lib/fuci/travis/build/generic'
+
+describe Fuci::Travis::Build::Generic do
+  describe 'composition' do
+    it 'inherits from Build' do
+      generic = Fuci::Travis::Build::Generic.new 'branch'
+      expect(generic).to_be_kind_of Fuci::Travis::Build
+    end
+  end
+
+  describe '#build_branch' do
+    before do
+      @branch_name = 'my-ci'
+      @build       = mock
+      Fuci::Travis.stubs(:repo).returns @repo = mock
+      @build_wrapper = Fuci::Travis::Build::Generic.new @branch_name
+      @build_wrapper.expects(:puts).with "Fetching #{@branch_name} branch..."
+    end
+
+    describe 'when the branch is found' do
+      before do
+        @repo.stubs(:branches).returns branches = { @branch_name => @build }
+        @build_wrapper.expects(:puts).with "Using #{@branch_name} branch."
+      end
+
+      it 'logs fetching and calls branch hash with the branch_name on the repo' do
+        expect(@build_wrapper.send :build_branch ).to_equal @build
+      end
+    end
+
+    describe 'when branch is not found' do
+      before do
+        @repo.stubs(:branches).returns branches = {}
+        @build_wrapper.expects(:puts).
+          with "#{@branch_name} branch not found on Travis."
+        @build_wrapper.expects :exit
+      end
+
+      it 'logs that the branch could not be found and exits' do
+        @build_wrapper.send :build_branch
+      end
+    end
+  end
+end

data/spec/lib/fuci/travis/build/master_spec.rb

@@ -1,4 +1,5 @@
 require_relative '../../../../spec_helper'
+require_relative '../../../../../lib/fuci/travis/build'
 require_relative '../../../../../lib/fuci/travis/build/master'
 
 describe Fuci::Travis::Build::Master do
@@ -14,13 +15,11 @@ describe Fuci::Travis::Build::Master do
 
   describe '#build_branch' do
     it 'detects the build branch' do
-      Fuci::Travis.stubs(:repo).returns repo = mock
-
-      @master.stubs(:remote_master_sha).returns master_sha = '123abc'
-      commit = OpenStruct.new(sha: master_sha)
-      build  = OpenStruct.new(commit: commit)
-      repo.stubs(:builds).returns [build]
-
+      @master.stubs(:remote_master_sha).
+        returns remote_master_sha = mock
+      @master.stubs(:detect_build_with_sha).
+        with(remote_master_sha).
+        returns build = mock
       expect(@master.build_branch).to_equal build
     end
   end

data/spec/lib/fuci/travis/build/pull_request_spec.rb

@@ -0,0 +1,77 @@
+require_relative '../../../../spec_helper'
+require_relative '../../../../../lib/fuci/travis/build'
+require_relative '../../../../../lib/fuci/travis/build/pull_request'
+
+module Fuci
+  module Git
+    class NoPullError < StandardError
+    end
+  end
+end
+
+describe Fuci::Travis::Build::PullRequest do
+  before do
+    @branch_name  = 'branch'
+    @pull_request = Fuci::Travis::Build::PullRequest.new @branch_name
+  end
+
+  describe 'composition' do
+    it 'inherits from Build' do
+      expect(@pull_request).to_be_kind_of Fuci::Travis::Build
+    end
+  end
+
+  describe '#build_branch' do
+    before do
+      @pull_merge_sha_from = @pull_request.
+        stubs(:pull_merge_sha_from).
+        with @branch_name
+    end
+
+    describe 'there is no pull request for the branch' do
+      before do
+        @pull_merge_sha_from.raises Fuci::Git::NoPullError
+      end
+
+      it 'logs that no pull request was detected for the branch and exits' do
+        @pull_request.expects(:puts).
+          with "No pull request was detected for #{@branch_name}."
+        @pull_request.expects(:exit)
+
+        @pull_request.build_branch
+      end
+    end
+
+    describe 'there is a pull request for the branch' do
+      before do
+        @pull_merge_sha_from.returns @sha = '23iadf89wro'
+        @detect_build_with_sha = @pull_request.
+          stubs(:detect_build_with_sha).with @sha
+      end
+
+      describe 'a build was not detected for the pull request' do
+        before do
+          @detect_build_with_sha.with(@sha).returns nil
+        end
+
+        it 'logs that no build was detected with pull request and exits' do
+          @pull_request.expects(:puts).
+            with "No build was detected for pull request from #{@branch_name}."
+          @pull_request.expects(:exit)
+
+          @pull_request.build_branch
+        end
+      end
+
+      describe 'a build was detected for the pull request' do
+        before do
+         @detect_build_with_sha.returns @build = mock
+        end
+
+        it 'returns the build' do
+          expect(@pull_request.build_branch).to_equal @build
+        end
+      end
+    end
+  end
+end

data/spec/lib/fuci/travis/build/sha_detectable_spec.rb

@@ -0,0 +1,22 @@
+require_relative '../../../../spec_helper'
+require_relative '../../../../../lib/fuci/travis/build/sha_detectable'
+
+stub_class 'SomeBuild'
+
+describe Fuci::Travis::Build::ShaDetectable do
+  before { @build = SomeBuild.new.extend Fuci::Travis::Build::ShaDetectable }
+
+  describe '#detect_build_with_sha' do
+    it 'returns the build with the same sha as the one passed in' do
+      sha    = mock
+      commit = OpenStruct.new sha: sha
+      build  = OpenStruct.new commit: commit
+      builds = [build]
+      repo   = OpenStruct.new builds: builds
+
+      @build.stubs(:repo).returns repo
+
+      expect(@build.detect_build_with_sha(sha)).to_equal build
+    end
+  end
+end

data/spec/lib/fuci/travis/build_spec.rb

@@ -2,6 +2,7 @@ require_relative '../../../spec_helper'
 require_relative '../../../../lib/fuci/travis/build'
 
 stub_class 'Fuci::Travis::Build::Master'
+stub_class 'Fuci::Travis::Build::PullRequest'
 stub_class 'Fuci::Travis::CliOptions' do
   public
   def branch; end;
@@ -76,10 +77,49 @@ describe Fuci::Travis::Build do
 
   describe '.create' do
     before do
+      @pull_request    = Fuci::Travis::CliOptions.stubs :pull_request?
       @branch_from_cli = Fuci::Travis::CliOptions.stubs :branch
       @expect_from_branch_name = Fuci::Travis::Build.expects :from_branch_name
     end
 
+    describe 'a pull request option is declared from the command line' do
+      before do
+        @pull_request.returns true
+        @expect_from_branch_name.never
+        @pull_request_branch =
+          Fuci::Travis::CliOptions.stubs :pull_request_branch
+      end
+
+      describe 'when a pull request branch is declared' do
+        before do
+          @branch_name = 'branch_name'
+          @pull_request_branch.returns @branch_name
+        end
+
+        it 'instantiates pull request build with the branch' do
+          Fuci::Travis::Build::PullRequest.expects(:new).
+            with @branch_name
+
+          Fuci::Travis::Build.create
+        end
+      end
+
+      describe 'when a pull request branch is not declared' do
+        before do
+          @pull_request_branch.returns nil
+          Fuci::Travis::Build.stubs(:current_branch_name).
+            returns @current_branch_name = 'current_branch_name'
+        end
+
+        it 'instantiates a pull request build with the current branch name' do
+          Fuci::Travis::Build::PullRequest.expects(:new).
+            with @current_branch_name
+
+          Fuci::Travis::Build.create
+        end
+      end
+    end
+
     describe 'a branch option is declared from the command line' do
       before do
         @branch = 'master'
@@ -134,7 +174,7 @@ describe Fuci::Travis::Build do
       before { @branch_name = 'limb' }
 
       it 'creates a new generic build' do
-        Fuci::Travis::Build.stubs(:new).with(@branch_name).
+        Fuci::Travis::Build::Generic.stubs(:new).with(@branch_name).
           returns generic_build = mock
         build = Fuci::Travis::Build.from_branch_name @branch_name
         expect(build).to_equal generic_build
@@ -143,36 +183,9 @@ describe Fuci::Travis::Build do
   end
 
   describe '#build_branch' do
-    before do
-      @branch_name = 'my-ci'
-      @build       = mock
-      Fuci::Travis.stubs(:repo).returns @repo = mock
-      @build_wrapper = Fuci::Travis::Build.new @branch_name
-      @build_wrapper.expects(:puts).with "Fetching #{@branch_name} branch..."
-    end
-
-    describe 'when the branch is found' do
-      before do
-        @repo.stubs(:branches).returns branches = { @branch_name => @build }
-        @build_wrapper.expects(:puts).with "Using #{@branch_name} branch."
-      end
-
-      it 'logs fetching and calls branch hash with the branch_name on the repo' do
-        expect(@build_wrapper.send :build_branch ).to_equal @build
-      end
-    end
-
-    describe 'when branch is not found' do
-      before do
-        @repo.stubs(:branches).returns branches = {}
-        @build_wrapper.expects(:puts).
-          with "#{@branch_name} branch not found on Travis."
-        @build_wrapper.expects :exit
-      end
-
-      it 'logs that the branch could not be found and exits' do
-        @build_wrapper.send :build_branch
-      end
+    it 'raises not implemented' do
+      build = Fuci::Travis::Build.new 'branch'
+      expect { build.build_branch }.to_raise NotImplementedError
     end
   end
 end

data/spec/lib/fuci/travis/cli_options_spec.rb

@@ -17,6 +17,45 @@ describe Fuci::Travis::CliOptions do
     end
   end
 
+  describe '.pull_request?' do
+    describe 'when --pull-request is passed in' do
+      it 'returns true' do
+        Fuci::Travis::CliOptions.stubs(:argv).returns ['--pull-request']
+        expect(Fuci::Travis::CliOptions.pull_request?).to_equal true
+      end
+    end
+
+    describe 'when -p is passed in' do
+      it 'returns true' do
+        Fuci::Travis::CliOptions.stubs(:argv).returns ['-p']
+        expect(Fuci::Travis::CliOptions.pull_request?).to_equal true
+      end
+    end
+
+    describe 'when neither are passed in' do
+      it 'returns false' do
+        Fuci::Travis::CliOptions.stubs(:argv).returns []
+        expect(Fuci::Travis::CliOptions.pull_request?).to_equal false
+      end
+    end
+  end
+
+  describe '.pull_request_branch' do
+    describe 'when a branch arg is passed in' do
+      it 'returns the next argument after the pull request indicator' do
+        Fuci::Travis::CliOptions.stubs(:argv).returns ['-p', branch = 'branch']
+        expect(Fuci::Travis::CliOptions.pull_request_branch).to_equal branch
+      end
+    end
+
+    describe 'when a branch arg is not passed in' do
+      it 'returns nil' do
+        Fuci::Travis::CliOptions.stubs(:argv).returns ['-p']
+        expect(Fuci::Travis::CliOptions.pull_request_branch).to_equal nil
+      end
+    end
+  end
+
   describe '.argv' do
     it 'delegates to Fuci::CliOptions' do
       Fuci::CliOptions.stubs(:argv).returns argv = mock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuci-travis
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dave Jachimiak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuci
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -112,11 +112,17 @@ files:
 - fuci-travis.gemspec
 - lib/fuci/travis.rb
 - lib/fuci/travis/build.rb
+- lib/fuci/travis/build/generic.rb
 - lib/fuci/travis/build/master.rb
+- lib/fuci/travis/build/pull_request.rb
+- lib/fuci/travis/build/sha_detectable.rb
 - lib/fuci/travis/cli_options.rb
 - lib/fuci/travis/server.rb
 - lib/fuci/travis/version.rb
+- spec/lib/fuci/travis/build/generic_spec.rb
 - spec/lib/fuci/travis/build/master_spec.rb
+- spec/lib/fuci/travis/build/pull_request_spec.rb
+- spec/lib/fuci/travis/build/sha_detectable_spec.rb
 - spec/lib/fuci/travis/build_spec.rb
 - spec/lib/fuci/travis/cli_options_spec.rb
 - spec/lib/fuci/travis/server_spec.rb
@@ -147,7 +153,10 @@ signing_key:
 specification_version: 4
 summary: Run failures from your recent Travis builds locally.
 test_files:
+- spec/lib/fuci/travis/build/generic_spec.rb
 - spec/lib/fuci/travis/build/master_spec.rb
+- spec/lib/fuci/travis/build/pull_request_spec.rb
+- spec/lib/fuci/travis/build/sha_detectable_spec.rb
 - spec/lib/fuci/travis/build_spec.rb
 - spec/lib/fuci/travis/cli_options_spec.rb
 - spec/lib/fuci/travis/server_spec.rb