git_reflow 0.3.4 → 0.3.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.3.3)
+    git_reflow (0.3.5)
       colorize (= 0.6.0)
       github_api (= 0.10.2)
       gli (= 2.8.1)
@@ -38,8 +38,8 @@ GEM
     json_pure (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    mini_portile (0.5.2)
-    multi_json (1.8.2)
+    mini_portile (0.5.1)
+    multi_json (1.8.4)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.6.0)

data/README.rdoc

@@ -7,7 +7,7 @@ If your workflow looks like this:
 2. Write great code
 3. Create a pull request against master
 4. Get 'lgtm' through a code review
-5. Squash merge to master
+5. Squash merge to master (Why is squash merging our preferred workflow? https://github.com/reenhanced/gitreflow/issues/52)
 6. Delete the feature branch
 
 Reflow will make your life easier.

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/git_reflow.rb

@@ -45,8 +45,14 @@ module GitReflow
         config.ssl         = {:verify => false}
       end
 
-      authorization = github.oauth.create 'scopes' => ['repo']
-      oauth_token   = authorization[:token]
+      previous_authorizations = github.oauth.all.select {|auth| auth.note == "git-reflow (#{`hostname`.strip})" }
+      if previous_authorizations.any?
+        authorization = previous_authorizations.last
+      else
+        authorization = github.oauth.create scopes: ['repo'], note: "git-reflow (#{`hostname`.strip})"
+      end
+
+      oauth_token   = authorization.token
 
       if project_only
         set_oauth_token(oauth_token, local: true)
@@ -116,9 +122,10 @@ module GitReflow
 
         open_comment_authors = find_authors_of_open_pull_request_comments(existing_pull_request)
         has_comments         = has_pull_request_comments?(existing_pull_request)
+        status = get_build_status existing_pull_request.head.sha
 
         # if there any comment_authors left, then they haven't given a lgtm after the last commit
-        if (has_comments and open_comment_authors.empty?) or options['skip_lgtm']
+        if ((status.nil? or status.state == "success") and has_comments and open_comment_authors.empty?) or options['skip_lgtm']
           lgtm_authors   = comment_authors_for_pull_request(existing_pull_request, :with => LGTM)
           commit_message = "#{(existing_pull_request[:body] || get_first_commit_message)}"
           puts "Merging pull request ##{existing_pull_request.number}: '#{existing_pull_request.title}', from '#{existing_pull_request.head.label}' into '#{existing_pull_request.base.label}'"
@@ -144,6 +151,8 @@ module GitReflow
           else
             puts "There were problems commiting your feature... please check the errors above and try again."
           end
+        elsif status.state != "success"
+          puts "[#{ 'deliver halted'.colorize(:red) }] #{status.description}: #{status.target_url}"
         elsif open_comment_authors.count > 0
           puts "[deliver halted] You still need a LGTM from: #{open_comment_authors.join(', ')}"
         else
@@ -280,6 +289,19 @@ module GitReflow
     pull_request_comments(pull_request).count > 0
   end
 
+  def get_build_status sha
+    github.repos.statuses.all(remote_user, remote_repo_name, sha).first
+  end
+
+  def build_color status
+    colorized_statuses = { pending: :yellow, success: :green, error: :red, failure: :red }
+    colorized_statuses[status.state.to_sym]
+  end
+
+  def colorized_build_description status
+    status.description.colorize( build_color status )
+  end
+
   def find_authors_of_open_pull_request_comments(pull_request)
     # first we'll gather all the authors that have commented on the pull request
     pull_last_committed_at = get_commited_time(pull_request.head.sha)
@@ -314,6 +336,13 @@ module GitReflow
     notices = ""
     reviewed_by = comment_authors_for_pull_request(pull_request).map {|author| author.colorize(:red) }
 
+    # check for CI build status
+    status = get_build_status pull_request.head.sha
+    if status
+      notices << "[notice] Your build status is not successful: #{status.target_url}.\n" unless status.state == "success"
+      summary_data.merge!( "Build status" => colorized_build_description(status) )
+    end
+
     # check for needed lgtm's
     pull_comments = pull_request_comments(pull_request)
     if pull_comments.reject {|comment| comment.user.login == github_user}.any?

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
+  prerelease: 
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,67 +11,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,6 +88,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -85,6 +96,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -92,6 +104,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -99,48 +112,55 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: github_api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -148,6 +168,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -182,10 +203,9 @@ files:
 homepage: http://github.com/reenhanced/gitreflow
 licenses:
 - MIT
-metadata: {}
-post_install_message: |-
-  You need to setup your GitHub OAuth token
-  Please run 'git-reflow setup'
+post_install_message: ! 'You need to setup your GitHub OAuth token
+
+  Please run ''git-reflow setup'''
 rdoc_options:
 - --title
 - git_reflow
@@ -196,19 +216,27 @@ require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4495408522000953472
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4495408522000953472
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A better git process
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e987226cc58b7748ddc8aeda4bb5cdf3e38df27c
-  data.tar.gz: 6a0d8f7e352d6cca67d0dc3c452aa67bd588e465
-SHA512:
-  metadata.gz: 9305b7550459a3885e87582e39243f43f0b1287e5124606e0dcbfbb39473034a33fecf91b91f986874ac167793910f2d4e4fd10ac587aa2b27832dab79e702a3
-  data.tar.gz: 86210915b05736f6b14ee6a8c437abb877066a3166b486e231f22dc79f280372854e4de155a462640754a093157c49e2f54a4b2c2a66b3294a0c2aaf9afcd1e8