saddler-reporter-github 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a81128131c117620cbe27e63865f7da10d5991e9
-  data.tar.gz: d6453b2d9f0cc3d36211abc244cf0690e5e51402
+  metadata.gz: 750c8b25473348017527723645d1ac09de0fa088
+  data.tar.gz: 880f5ef8924eb4531135e43af26e4a9694150764
 SHA512:
-  metadata.gz: 65d5483b667341f6b4abc250c078629e23776aa7997c4a08608b44037ff120cafc20eed50013b54ff80ea5e237e13d8e06d42207e6a06593b12defaa607dc1cb
-  data.tar.gz: 05f5304df72be7a9d2623daf394fecbae5e7d4082a340284ada5ca234d1d9a5a76b5427151167317f0a5fae0b8300728254d4bf39b5966fa05cc449d19c2e09d
+  metadata.gz: f6d62556030b30ef5a028124768e29210ef95af015a3bc069ad5cf284154c62817e3e32735ae23ee265fdb7cc5d7ba8b7bfbe1d4d7c2db61280bf470ffe5b9c9
+  data.tar.gz: 5e1f0533bf9ecc36cd629c0abea67565bb286cd34ec47afc731c3ef79513bb05e889a3c375e43f0e5f4a4890a5b304ac34b418110c40bb870b953b86874e23fa

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="0.4.0"></a>
+# [0.4.0](https://github.com/packsaddle/ruby-saddler-reporter-github/compare/v0.3.0...v0.4.0) (2016-05-02)
+
+* Use env_pull_request
+* Update dependencies
+
+
 <a name="0.3.0"></a>
 # [0.3.0](https://github.com/packsaddle/ruby-saddler-reporter-github/compare/v0.2.2...v0.3.0) (2016-01-04)
 

data/Rakefile

@@ -10,8 +10,8 @@ task default: :test
 
 require 'yard'
 require 'yard/rake/yardoc_task'
-DOC_FILES = ['lib/**/*.rb']
-DOC_OPTIONS = ['--debug', '--verbose']
+DOC_FILES = ['lib/**/*.rb'].freeze
+DOC_OPTIONS = ['--debug', '--verbose'].freeze
 YARD::Rake::YardocTask.new(:doc) do |t|
   t.files = DOC_FILES
   t.options = DOC_OPTIONS if Rake.application.options.trace

data/lib/saddler/reporter/github.rb

@@ -1,5 +1,6 @@
 require 'octokit'
 require 'git_diff_parser'
+require 'env_pull_request'
 require 'saddler/reporter/support'
 require 'saddler/reporter/support/git'
 require 'saddler/reporter/github/version'

data/lib/saddler/reporter/github/client.rb

@@ -83,13 +83,18 @@ module Saddler
 
         # @return [Integer, nil] pull request id
         def pull_id
-          @pull_id ||= begin
-            pull_id = env_pull_id
-            if pull_id
-              pull_id.to_i
-            elsif @repo.current_branch
-              pull = pull_requests.find { |pr| pr[:head][:ref] == @repo.current_branch }
-              pull[:number].to_i if pull
+          return @pull_id unless @pull_id.nil?
+
+          if env_pull_id
+            @pull_id = env_pull_id
+            return @pull_id
+          end
+
+          if @repo.current_branch
+            pull = pull_requests.find { |pr| pr[:head][:ref] == @repo.current_branch }
+            if pull
+              @pull_id = pull[:number].to_i
+              return @pull_id
             end
           end
         end
@@ -118,15 +123,7 @@ module Saddler
 
         # @return [Integer, nil] pull request id from environment variables
         def env_pull_id
-          if ENV['PULL_REQUEST_ID']
-            ENV['PULL_REQUEST_ID'].to_i
-          elsif ENV['TRAVIS_PULL_REQUEST'] && ENV['TRAVIS_PULL_REQUEST'] != 'false'
-            ENV['TRAVIS_PULL_REQUEST'].to_i
-          elsif ENV['CIRCLE_PR_NUMBER']
-            ENV['CIRCLE_PR_NUMBER'].to_i
-          elsif ENV['ghprbPullId']
-            ENV['ghprbPullId'].to_i
-          end
+          @env_pull_id ||= EnvPullRequest.new.pull_request_id
         end
       end
     end

data/lib/saddler/reporter/github/comment.rb

@@ -4,8 +4,8 @@ module Saddler
       Comment = Struct.new(:sha, :body, :path, :position) do
         def ==(other)
           position == other.position &&
-          path == other.path &&
-          body == other.body
+            path == other.path &&
+            body == other.body
         end
       end
     end

data/lib/saddler/reporter/github/version.rb

@@ -1,7 +1,7 @@
 module Saddler
   module Reporter
     module Github
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'.freeze
     end
   end
 end

data/saddler-reporter-github.gemspec

@@ -16,24 +16,25 @@ Gem::Specification.new do |spec|
 
   spec.files         = \
     `git ls-files -z`
-      .split("\x0")
-      .reject { |f| f.match(%r{^(test|spec|features)/}) }
-      .reject do |f|
-        [
-          '.travis.yml',
-          'circle.yml',
-          '.tachikoma.yml',
-          'package.json'
-        ].include?(f)
-      end
+    .split("\x0")
+    .reject { |f| f.match(%r{^(test|spec|features)/}) }
+    .reject do |f|
+      [
+        '.travis.yml',
+        'circle.yml',
+        '.tachikoma.yml',
+        'package.json'
+      ].include?(f)
+    end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'octokit', '>= 0'
   spec.add_runtime_dependency 'git_diff_parser', '>= 2.0', '< 3.0'
-  spec.add_runtime_dependency 'saddler-reporter-support', '>= 0.1', '< 0.2'
-  spec.add_runtime_dependency 'saddler-reporter-support-git', '>= 0.3', '< 0.4'
+  spec.add_runtime_dependency 'saddler-reporter-support', '>= 1.0'
+  spec.add_runtime_dependency 'saddler-reporter-support-git', '>= 1.0'
+  spec.add_runtime_dependency 'env_pull_request', '>= 1.0'
 
   spec.add_development_dependency 'bundler', '>= 0'
   spec.add_development_dependency 'rake', '>= 0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saddler-reporter-github
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -50,40 +50,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: saddler-reporter-support-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - "<"
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: env_pull_request
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Saddler reporter for GitHub.