git_reflow 0.6.7 → 0.7.0

data/lib/git_reflow/git_server/bit_bucket/pull_request.rb

@@ -0,0 +1,84 @@
+require 'git_reflow/git_server/pull_request'
+
+module GitReflow
+  module GitServer
+    class BitBucket
+      class PullRequest < GitReflow::GitServer::PullRequest
+        def initialize(attributes)
+          self.number              = attributes.id
+          self.description         = attributes.description
+          self.html_url            = "#{attributes.source.repository.links.html.href}/pull-request/#{self.number}"
+          self.feature_branch_name = attributes.source.branch.name
+          self.base_branch_name    = attributes.destination.branch.name
+          self.build_status        = nil
+          self.source_object       = attributes
+        end
+
+        def self.create(options = {})
+          self.new GitReflow.git_server.connection.repos.pull_requests.create(
+            GitReflow.git_server.class.remote_user,
+            GitReflow.git_server.class.remote_repo_name,
+            title: options[:title],
+            body: options[:body],
+            source: {
+              branch: { name: GitReflow.git_server.class.current_branch },
+              repository: { full_name: "#{GitReflow.git_server.class.remote_user}/#{GitReflow.git_server.class.remote_repo_name}" }
+            },
+            destination: {
+              branch: { name: options[:base] }
+            },
+            reviewers: [username: GitReflow.git_server.class.user])
+        end
+
+        def self.find_open(to: 'master', from: GitReflow.git_server.class.current_branch)
+          begin
+            matching_pull = GitReflow.git_server.connection.repos.pull_requests.all(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, limit: 1).select do |pr|
+              pr.source.branch.name == from and
+              pr.destination.branch.name == to
+            end.first
+
+            if matching_pull
+              self.new matching_pull
+            end
+          rescue ::BitBucket::Error::NotFound => e
+            GitReflow.git_server.say "No BitBucket repo found for #{GitReflow.git_server.class.remote_user}/#{GitReflow.git_server.class.remote_repo_name}", :error
+          rescue ::BitBucket::Error::Forbidden => e
+            GitReflow.git_server.say "You don't have API access to this repo", :error
+          end
+        end
+
+        def commit_author
+          # use the author of the pull request
+          self.author.username
+        end
+
+        def comments
+          GitReflow.git_server.connection.repos.pull_requests.comments.all(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, self.id)
+        end
+
+        def last_comment
+          last_comment = comments.first
+          return "" unless last_comment
+          "#{last_comment.content.raw}"
+        end
+
+        def reviewers
+          return [] unless comments.size > 0
+          comments.map {|c| c.user.username }.uniq - [GitReflow.git_server.class.user]
+        end
+
+        def approvals
+          approved  = []
+
+          GitReflow.git_server.connection.repos.pull_requests.activity(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, self.id).each do |activity|
+            break unless activity.respond_to?(:approval) and activity.approval.user.username != GitReflow.git_server.class.user
+            approved |= [activity.approval.user.username]
+          end
+
+          approved
+        end
+
+      end
+    end
+  end
+end

data/lib/git_reflow/git_server/git_hub.rb

@@ -4,21 +4,11 @@ require 'git_reflow/git_helpers'
 module GitReflow
   module GitServer
     class GitHub < Base
+      require_relative 'git_hub/pull_request'
+
       extend GitHelpers
       include Sandbox
 
-      class PullRequest < Base::PullRequest
-        def initialize(attributes)
-          self.number              = attributes.number
-          self.description         = attributes.body
-          self.html_url            = attributes.html_url
-          self.feature_branch_name = attributes.head.label
-          self.base_branch_name    = attributes.base.label
-          self.build_status        = attributes.head.sha
-          self.source_object       = attributes
-        end
-      end
-
       attr_accessor :connection
 
       def initialize(config_options = {})
@@ -36,13 +26,10 @@ module GitReflow
         self.class.site_url     = gh_site_url
         self.class.api_endpoint = gh_api_endpoint
 
-        if project_only
-          GitReflow::Config.add('reflow.local-projects', "#{self.class.remote_user}/#{self.class.remote_repo_name}")
-          GitReflow::Config.set('reflow.git-server', 'GitHub', local: true)
-        else
-          GitReflow::Config.unset('reflow.local-projects', value: "#{self.class.remote_user}/#{self.class.remote_repo_name}")
-          GitReflow::Config.set('reflow.git-server', 'GitHub')
-        end
+        # We remove any existing setup first, then setup our required config settings
+        GitReflow::Config.unset('reflow.local-projects', value: "#{self.class.remote_user}/#{self.class.remote_repo_name}")
+        GitReflow::Config.add('reflow.local-projects', "#{self.class.remote_user}/#{self.class.remote_repo_name}") if project_only
+        GitReflow::Config.set('reflow.git-server', 'GitHub', local: project_only)
       end
 
       def self.connection
@@ -144,69 +131,25 @@ module GitReflow
         @connection
       end
 
-      def create_pull_request(options = {})
-        pull_request = connection.pull_requests.create(self.class.remote_user, self.class.remote_repo_name,
-                                                       title: options[:title],
-                                                       body:  options[:body],
-                                                       head:  "#{self.class.remote_user}:#{self.class.current_branch}",
-                                                       base:  options[:base])
-      end
-
-      def find_open_pull_request(options = {})
-        matching_pull = connection.pull_requests.all(self.class.remote_user, self.class.remote_repo_name, base: options[:to], head: "#{self.class.remote_user}:#{options[:from]}", :state => 'open').first
-        if matching_pull
-          PullRequest.new matching_pull
-        end
-      end
-
-      def reviewers(pull_request)
-        comment_authors_for_pull_request(pull_request)
-      end
-
-      def approvals(pull_request)
-        pull_last_committed_at = get_commited_time(pull_request.head.sha)
-        lgtm_authors           = comment_authors_for_pull_request(pull_request, :with => LGTM, :after => pull_last_committed_at)
-      end
-
-      def pull_request_comments(pull_request)
-        comments        = connection.issues.comments.all        self.class.remote_user, self.class.remote_repo_name, number: pull_request.number
-        review_comments = connection.pull_requests.comments.all self.class.remote_user, self.class.remote_repo_name, number: pull_request.number
-
-        review_comments.to_a + comments.to_a
-      end
-
-      def last_comment_for_pull_request(pull_request)
-        "#{pull_request_comments(pull_request).last.body.inspect}"
-      end
-
-      def get_build_status sha
+      def get_build_status(sha)
         connection.repos.statuses.all(self.class.remote_user, self.class.remote_repo_name, sha).first
       end
 
-      def colorized_build_description status
-        colorized_statuses = { pending: :yellow, success: :green, error: :red, failure: :red }
-        status.description.colorize( colorized_statuses[status.state.to_sym] )
+      def colorized_build_description(state, description)
+        colorized_statuses = {
+          pending: :yellow,
+          success: :green,
+          error: :red,
+          failure: :red }
+        description.colorize( colorized_statuses[state.to_sym] )
       end
 
-      def comment_authors_for_pull_request(pull_request, options = {})
-        all_comments    = pull_request_comments(pull_request)
-        comment_authors = []
-
-        all_comments.each do |comment|
-          next if options[:after] and Time.parse(comment.created_at) < options[:after]
-          if (options[:with].nil? or comment[:body] =~ options[:with])
-            comment_authors |= [comment.user.login]
-          end
-        end
-
-        # remove the current user from the list to check
-        comment_authors -= [self.class.remote_user]
-        comment_authors.uniq
+      def create_pull_request(options = {})
+        PullRequest.create(options)
       end
 
-      def get_commited_time(commit_sha)
-        last_commit = connection.repos.commits.find self.class.remote_user, self.class.remote_repo_name, commit_sha
-        Time.parse last_commit.commit.author[:date]
+      def find_open_pull_request(options = {})
+        PullRequest.find_open(options)
       end
 
     end

data/lib/git_reflow/git_server/git_hub/pull_request.rb

@@ -0,0 +1,108 @@
+require 'git_reflow/git_server/pull_request'
+
+module GitReflow
+  module GitServer
+    class GitHub
+      class PullRequest < GitReflow::GitServer::PullRequest
+        def initialize(attributes)
+          self.number              = attributes.number
+          self.description         = attributes[:body]
+          self.html_url            = attributes.html_url
+          self.feature_branch_name = attributes.head.label
+          self.base_branch_name    = attributes.base.label
+          self.source_object       = attributes
+          self.build_status        = build.state
+        end
+
+        def self.create(options = {})
+          self.new(GitReflow.git_server.connection.pull_requests.create(
+            GitReflow.git_server.class.remote_user,
+            GitReflow.git_server.class.remote_repo_name,
+            title: options[:title],
+            body:  options[:body],
+            head:  "#{GitReflow.git_server.class.remote_user}:#{GitReflow.git_server.class.current_branch}",
+            base:  options[:base]))
+        end
+
+        def self.find_open(to: 'master', from: GitReflow.git_server.class.current_branch)
+          matching_pull = GitReflow.git_server.connection.pull_requests.all(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, base: to, head: "#{GitReflow.git_server.class.remote_user}:#{from}", state: 'open').first
+          if matching_pull
+            self.new matching_pull
+          end
+        end
+
+        # override attr_reader for auto-updates
+        def build_status
+          @build_status ||= build.state
+        end
+
+        def commit_author
+          begin
+            username, branch = base.label.split(':')
+            first_commit = GitReflow.git_server.connection.pull_requests.commits(username, GitReflow.git_server.class.remote_repo_name, number.to_s).first
+            "#{first_commit.commit.author.name} <#{first_commit.commit.author.email}>".strip
+          rescue Github::Error::NotFound
+            nil
+          end
+        end
+
+        def reviewers
+          comment_authors
+        end
+
+        def approvals
+          pull_last_committed_at = get_committed_time(self.head.sha)
+          comment_authors(with: LGTM, after: pull_last_committed_at)
+        end
+
+        def comments
+          comments        = GitReflow.git_server.connection.issues.comments.all        GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, number: self.number
+          review_comments = GitReflow.git_server.connection.pull_requests.comments.all GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, number: self.number
+
+          review_comments.to_a + comments.to_a
+        end
+
+        def last_comment
+          "#{comments.last.body.inspect}"
+        end
+
+        def build
+          github_build_status = GitReflow.git_server.get_build_status(self.head.sha)
+          build_status_object = Struct.new(:state, :description, :url)
+          if github_build_status
+            build_status_object.new(
+              github_build_status.state,
+              github_build_status.description,
+              github_build_status.target_url
+            )
+          else
+            build_status_object.new
+          end
+        end
+
+        private
+
+        def comment_authors(with: nil, after: nil)
+          comment_authors = []
+
+          comments.each do |comment|
+            next if after and Time.parse(comment.created_at) < after
+            if (with.nil? or comment[:body] =~ with)
+              comment_authors |= [comment.user.login]
+            end
+          end
+
+          # remove the current user from the list to check
+          comment_authors -= [self.user.login]
+          comment_authors.uniq
+        end
+
+        def get_committed_time(commit_sha)
+          last_commit = GitReflow.git_server.connection.repos.commits.find GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, commit_sha
+          Time.parse last_commit.commit.author[:date]
+        end
+
+      end
+    end
+  end
+end

data/lib/git_reflow/git_server/pull_request.rb

@@ -0,0 +1,97 @@
+module GitReflow
+  module GitServer
+    class PullRequest
+      attr_accessor :description, :html_url, :feature_branch_name, :base_branch_name, :build_status, :source_object, :number
+
+      def initialize(attributes)
+        raise "PullRequest#initialize must be implemented"
+      end
+
+      def commit_author
+        raise "#{self.class.to_s}#commit_author method must be implemented"
+      end
+
+      def comments
+        raise "#{self.class.to_s}#comments method must be implemented"
+      end
+
+      def has_comments?
+        comments.count > 0
+      end
+
+      def last_comment
+        raise "#{self.class.to_s}#last_comment_for method must be implemented"
+      end
+
+      def reviewers
+        raise "#{self.class.to_s}#reviewers method must be implemented"
+      end
+
+      def approvals
+        raise "#{self.class.to_s}#approvals method must be implemented"
+      end
+
+      def reviewers_pending_response
+        reviewers - approvals
+      end
+
+      def good_to_merge?(force: false)
+        return true if force
+        has_comments_or_approvals = (has_comments? or approvals.any?)
+
+        force == true or (
+          (build_status.nil? or build_status == "success") and
+          (has_comments_or_approvals and reviewers_pending_response.empty?))
+      end
+
+      def display_pull_request_summary
+        summary_data = {
+          "branches"    => "#{self.feature_branch_name} -> #{self.base_branch_name}",
+          "number"      => self.number,
+          "url"         => self.html_url
+        }
+
+        notices = ""
+        reviewed_by = []
+
+        # check for CI build status
+        if self.build_status
+          notices << "[notice] Your build status is not successful: #{self.build.url}.\n" unless self.build.state == "success"
+          summary_data.merge!( "Build status" => GitReflow.git_server.colorized_build_description(self.build.state, self.build.description) )
+        end
+
+        # check for needed lgtm's
+        if self.reviewers.any?
+          reviewed_by = self.reviewers.map {|author| author.colorize(:red) }
+          summary_data.merge!("Last comment"  => self.last_comment)
+
+          if self.approvals.any?
+            reviewed_by.map! { |author| approvals.include?(author.uncolorize) ? author.colorize(:green) : author }
+          end
+
+          notices << "[notice] You still need a LGTM from: #{reviewers_pending_response.join(', ')}\n" if reviewers_pending_response.any?
+        else
+          notices << "[notice] No one has reviewed your pull request.\n"
+        end
+
+        summary_data['reviewed by'] = reviewed_by.join(', ')
+
+        padding_size = summary_data.keys.max_by(&:size).size + 2
+        summary_data.keys.sort.each do |name|
+          string_format = "    %-#{padding_size}s %s\n"
+          printf string_format, "#{name}:", summary_data[name]
+        end
+
+        puts "\n#{notices}" unless notices.empty?
+      end
+
+      def method_missing(method_sym, *arguments, &block)
+        if source_object and source_object.respond_to? method_sym
+          source_object.send method_sym
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/spec/fixtures/issues/comment.json.erb

@@ -0,0 +1,27 @@
+{
+  "id": <%= id || 1 %>,
+  "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/issues/comments/<%= pull_request_number %>",
+  "html_url": "https://github.com/<%= repo_owner %>/<%= repo_name %>/issues/<%= pull_request_number %>#issuecomment-1",
+  "body": "<%= body || "Hmmm..." %>",
+  "user": {
+    "login": "<%= author %>",
+    "id": 1,
+    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+    "gravatar_id": "somehexcode",
+    "url": "https://api.github.com/users/<%= author %>",
+    "html_url": "https://github.com/<%= author %>",
+    "followers_url": "https://api.github.com/users/<%= author %>/followers",
+    "following_url": "https://api.github.com/users/<%= author %>/following{/other_user}",
+    "gists_url": "https://api.github.com/users/<%= author %>/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/<%= author %>/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/<%= author %>/subscriptions",
+    "organizations_url": "https://api.github.com/users/<%= author %>/orgs",
+    "repos_url": "https://api.github.com/users/<%= author %>/repos",
+    "events_url": "https://api.github.com/users/<%= author %>/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/<%= author %>/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "created_at": "<%= created_at %>",
+  "updated_at": "2011-04-14T16:00:49Z"
+}