git_reflow 0.4.2 → 0.5.0

data/lib/git_reflow/config.rb

@@ -2,12 +2,16 @@ module GitReflow
   module Config
     extend self
 
-    def get(key)
-      if cached_key_value = instance_variable_get(:"@#{key.tr('.-', '_')}")
+    def get(key, options = {reload: false})
+      if options[:reload] == false and cached_key_value = instance_variable_get(:"@#{key.tr('.-', '_')}")
         cached_key_value
       else
-        new_value = GitReflow::Sandbox.run "git config --get #{key}", loud: false
-        instance_variable_set(:"@#{key.tr('.-', '_')}", new_value)
+        if options[:all]
+          new_value = GitReflow::Sandbox.run "git config --get-all #{key}", loud: false
+        else
+          new_value = GitReflow::Sandbox.run "git config --get #{key}", loud: false
+        end
+        instance_variable_set(:"@#{key.tr('.-', '_')}", new_value.strip)
       end
     end
 
@@ -19,5 +23,22 @@ module GitReflow
         GitReflow::Sandbox.run "git config --global --replace-all #{key} \"#{value}\"", loud: false
       end
     end
+
+    def unset(key, options = { local: false })
+      value = (options[:value].nil?) ? "" : "\"#{options[:value]}\""
+      if options.delete(:local)
+        GitReflow::Sandbox.run "git config --unset #{key} #{value}", loud: false
+      else
+        GitReflow::Sandbox.run "git config --global --unset #{key} #{value}", loud: false
+      end
+    end
+
+    def add(key, value, options = { local: false })
+      if options.delete(:local)
+        GitReflow::Sandbox.run "git config --add #{key} \"#{value}\"", loud: false
+      else
+        GitReflow::Sandbox.run "git config --global --add #{key} \"#{value}\"", loud: false
+      end
+    end
   end
 end

data/lib/git_reflow/git_server/base.rb

@@ -2,12 +2,27 @@ require 'git_reflow/config'
 
 module GitReflow
   class GitServer::Base
-    @@connection       = nil
-    @@project_only     = false
+    extend GitHelpers
 
-    def initialize(options)
-      @@project_only = !!options.delete(:project_only)
+    @@connection = nil
+
+    class PullRequest
+      attr_accessor :description, :html_url, :feature_branch_name, :base_branch_name, :build_status, :source_object
 
+      def initialize(attributes)
+        raise "PullRequest#initialize must be implemented"
+      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
+
+    def initialize(options)
       site_url     = self.class.site_url
       api_endpoint = self.class.api_endpoint
 
@@ -17,14 +32,6 @@ module GitReflow
       authenticate
     end
 
-    def authenticate
-      raise "#{self.class.to_s}#authenticate method must be implemented"
-    end
-
-    def find_pull_request(options)
-      raise "#{self.class.to_s}#find_pull_request(options) method must be implemented"
-    end
-
     def self.connection
       raise "#{self.class.to_s}.connection method must be implemented"
     end
@@ -33,14 +40,6 @@ module GitReflow
       raise "#{self.class.to_s}.user method must be implemented"
     end
 
-    def self.oauth_token
-      raise "#{self.class.to_s}.oauth_token method must be implemented"
-    end
-
-    def self.oauth_token=(oauth_token)
-      raise "#{self.class.to_s}.oauth_token= method must be implemented"
-    end
-
     def self.api_endpoint
       raise "#{self.class.to_s}.api_endpoint method must be implemented"
     end
@@ -57,10 +56,22 @@ module GitReflow
       raise "#{self.class.to_s}.site_url= method must be implemented"
     end
 
+    def self.project_only?
+      GitReflow::Config.get("reflow.local-projects", all: true).include? "#{remote_user}/#{remote_repo_name}"
+    end
+
     def connection
       @connection ||= self.class.connection
     end
 
+    def authenticate
+      raise "#{self.class.to_s}#authenticate method must be implemented"
+    end
+
+    def find_open_pull_request(options)
+      raise "#{self.class.to_s}#find_open_pull_request(options) method must be implemented"
+    end
+
     def pull_request_comments(pull_request)
       raise "#{self.class.to_s}#pull_request_comments(pull_request) method must be implemented"
     end
@@ -69,6 +80,10 @@ module GitReflow
       pull_request_comments(pull_request).count > 0
     end
 
+    def last_comment_for_pull_request(pull_request)
+      raise "#{self.class.to_s}#last_comment_for_pull_request(pull_request) method must be implemented"
+    end
+
     def get_build_status sha
       raise "#{self.class.to_s}#get_build_status(sha) method must be implemented"
     end
@@ -77,12 +92,16 @@ module GitReflow
       raise "#{self.class.to_s}#colorized_build_description(status) method must be implemented"
     end
 
-    def find_authors_of_open_pull_request_comments(pull_request)
-      raise "#{self.class.to_s}#find_authors_of_open_pull_request_comments(pull_request) method must be implemented"
+    def reviewers(pull_request)
+      raise "#{self.class.to_s}#reviewers(pull_request) method must be implemented"
+    end
+
+    def approvals(pull_request)
+      raise "#{self.class.to_s}#approvals(pull_request) method must be implemented"
     end
 
-    def get_commited_time(commit_sha)
-      raise "#{self.class.to_s}#get_commited_time(commit_sha) method must be implemented"
+    def reviewers_pending_response(pull_request)
+      reviewers(pull_request) - approvals(pull_request)
     end
   end
 end

data/lib/git_reflow/git_server/bit_bucket.rb

@@ -0,0 +1,166 @@
+require 'bitbucket_rest_api'
+require 'git_reflow/git_helpers'
+
+module GitReflow
+  module GitServer
+    class BitBucket < Base
+
+      class PullRequest < Base::PullRequest
+        def initialize(attributes)
+          self.description = attributes.description
+          self.source_object       = attributes
+          self.number              = attributes.id
+          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
+        end
+      end
+
+      attr_accessor :connection
+
+      def initialize(config_options = {})
+        project_only = !!config_options.delete(:project_only)
+
+        if project_only
+          GitReflow::Config.add('reflow.local-projects', "#{self.class.remote_user}/#{self.class.remote_repo_name}")
+          GitReflow::Config.set('reflow.git-server', 'BitBucket', 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', 'BitBucket')
+        end
+      end
+
+      def self.connection
+        if api_key_setup?
+          @connection ||= ::BitBucket.new login: remote_user, password: api_key
+        end
+      end
+
+      def self.api_endpoint
+        endpoint         = GitReflow::Config.get("bitbucket.endpoint")
+        (endpoint.length > 0) ? endpoint : ::BitBucket::Configuration::DEFAULT_ENDPOINT
+      end
+
+      def self.site_url
+        site_url     = GitReflow::Config.get("bitbucket.site")
+        (site_url.length > 0) ? site_url : 'https://bitbucket.org'
+      end
+
+      def self.api_key
+        GitReflow::Config.get("bitbucket.api-key", reload: true)
+      end
+
+      def self.api_key=(key)
+        GitReflow::Config.set("bitbucket.api-key", key, local: project_only?)
+      end
+      def self.api_key_setup?
+        (self.api_key.length > 0)
+      end
+
+      def self.user
+        GitReflow::Config.get('bitbucket.user')
+      end
+
+      def self.user=(bitbucket_user)
+        GitReflow::Config.set('bitbucket.user', bitbucket_user, local: project_only?)
+      end
+
+      def authenticate(options = {silent: false})
+        begin
+          if connection and self.class.api_key_setup?
+            unless options[:silent]
+              puts "\nYour BitBucket account was already setup with:"
+              puts "\tUser Name: #{self.class.user}"
+            end
+          else
+            self.class.user = options[:user] || ask("Please enter your BitBucket username: ")
+            puts "\nIn order to connect your BitBucket account,"
+            puts "you'll need to generate an API key for your team"
+            puts "Visit #{self.class.site_url}/account/user/#{self.class.remote_user}/api-key/, to generate it\n"
+            self.class.api_key = ask("Please enter your team's API key: ")
+            connection.repos.all(self.class.remote_user).count
+            self.class.say "Connected to BitBucket\!", :success
+          end
+        rescue ::BitBucket::Error::Unauthorized => e
+          GitReflow::Config.unset('bitbucket.api-key', local: self.class.project_only?)
+          self.class.say "Invalid API key for team #{self.class.remote_user}.", :error
+        end
+      end
+
+      def connection
+        @connection ||= self.class.connection
+      end
+
+      def create_pull_request(options = {})
+        PullRequest.new connection.repos.pull_requests.create(self.class.remote_user, self.class.remote_repo_name,
+                                                              title: options[:title],
+                                                              body: options[:body],
+                                                              source: {
+                                                                branch: { name: self.class.current_branch },
+                                                                repository: { full_name: "#{self.class.remote_user}/#{self.class.remote_repo_name}" }
+                                                              },
+                                                              destination: {
+                                                                branch: { name: options[:base] }
+                                                              },
+                                                              reviewers: [username: self.class.user])
+      end
+
+      def find_open_pull_request(options = {})
+        begin
+          matching_pull = connection.repos.pull_requests.all(self.class.remote_user, self.class.remote_repo_name, limit: 1).select do |pr|
+            pr.source.branch.name == options[:from] and
+            pr.destination.branch.name == options[:to]
+          end.first
+
+          if matching_pull
+            PullRequest.new matching_pull
+          end
+        rescue ::BitBucket::Error::NotFound => e
+          self.class.say "No BitBucket repo found for #{self.class.remote_user}/#{self.class.remote_repo_name}", :error
+        rescue ::BitBucket::Error::Forbidden => e
+          self.class.say "You don't have API access to this repo", :error
+        end
+      end
+
+      def pull_request_comments(pull_request)
+        connection.repos.pull_requests.comments.all(self.class.remote_user, self.class.remote_repo_name, pull_request.id)
+      end
+
+      def last_comment_for_pull_request(pull_request)
+        last_comment = pull_request_comments(pull_request).first
+        return "" unless last_comment
+        "#{pull_request_comments(pull_request).first.content.raw}"
+      end
+
+      def get_build_status sha
+        # BitBucket does not currently support build status via API
+        # for updates: https://bitbucket.org/site/master/issue/8548/better-ci-integration-add-a-build-status
+        return nil
+      end
+
+      def colorized_build_description status
+        ""
+      end
+
+      def reviewers(pull_request)
+        comments = pull_request_comments(pull_request)
+
+        return [] unless comments.size > 0
+        comments.map {|c| c.user.username } - [self.class.user]
+      end
+
+      def approvals(pull_request)
+        approved  = []
+
+        connection.repos.pull_requests.activity(self.class.remote_user, self.class.remote_repo_name, pull_request.id).each do |activity|
+          break unless activity.respond_to?(:approval) and activity.approval.user.username != self.class.user
+          approved |= [activity.approval.user.username]
+        end
+
+        approved
+      end
+
+    end
+  end
+end

data/lib/git_reflow/git_server/git_hub.rb

@@ -4,21 +4,29 @@ require 'git_reflow/git_helpers'
 module GitReflow
   module GitServer
     class GitHub < Base
-      include GitHelpers
+      extend GitHelpers
+
+      class PullRequest < Base::PullRequest
+        def initialize(attributes)
+          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
 
-      @@project_only     = false
-      @@using_enterprise = false
-
       def initialize(config_options = {})
-        @@project_only     = !!config_options.delete(:project_only)
-        @@using_enterprise = !!config_options.delete(:enterprise)
+        project_only     = !!config_options.delete(:project_only)
+        using_enterprise = !!config_options.delete(:enterprise)
 
         gh_site_url     = self.class.site_url
         gh_api_endpoint = self.class.api_endpoint
-        
-        if @@using_enterprise
+
+        if using_enterprise
           gh_site_url     = ask("Please enter your Enterprise site URL (e.g. https://github.company.com):")
           gh_api_endpoint = ask("Please enter your Enterprise API endpoint (e.g. https://github.company.com/api/v3):")
         end
@@ -26,13 +34,66 @@ module GitReflow
         self.class.site_url     = gh_site_url
         self.class.api_endpoint = gh_api_endpoint
 
-        if @@project_only
+        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
       end
 
+      def self.connection
+        if self.oauth_token.length > 0
+          @connection ||= ::Github.new do |config|
+            config.oauth_token = GitServer::GitHub.oauth_token
+            config.endpoint    = GitServer::GitHub.api_endpoint
+            config.site        = GitServer::GitHub.site_url
+          end
+        end
+      end
+
+      def self.user
+        GitReflow::Config.get('github.user')
+      end
+
+      def self.user=(github_user)
+        GitReflow::Config.set('github.user', github_user, local: project_only?)
+      end
+
+      def self.oauth_token
+        GitReflow::Config.get('github.oauth-token')
+      end
+
+      def self.oauth_token=(oauth_token)
+        GitReflow::Config.set('github.oauth-token', oauth_token, local: project_only?)
+        oauth_token
+      end
+
+      def self.api_endpoint
+        endpoint         = "#{GitReflow::Config.get('github.endpoint')}".strip
+        (endpoint.length > 0) ? endpoint : ::Github.endpoint
+      end
+
+      def self.api_endpoint=(api_endpoint)
+        GitReflow::Config.set("github.endpoint", api_endpoint, local: project_only?)
+        api_endpoint
+      end
+
+      def self.site_url
+        site_url     = "#{GitReflow::Config.get('github.site')}".strip
+        (site_url.length > 0) ? site_url : ::Github.site
+      end
+
+      def self.site_url=(site_url)
+        GitReflow::Config.set("github.site", site_url, local: project_only?)
+        site_url
+      end
+
+      def connection
+        @connection ||= self.class.connection
+      end
+
       def authenticate(options = {silent: false})
         if connection and self.class.oauth_token.length > 0
           unless options[:silent]
@@ -82,77 +143,42 @@ module GitReflow
       end
 
       def create_pull_request(options = {})
-        pull_request = connection.pull_requests.create(remote_user, remote_repo_name,
+        pull_request = connection.pull_requests.create(self.class.remote_user, self.class.remote_repo_name,
                                                        title: options[:title],
                                                        body:  options[:body],
-                                                       head:  "#{remote_user}:#{current_branch}",
+                                                       head:  "#{self.class.remote_user}:#{self.class.current_branch}",
                                                        base:  options[:base])
       end
 
-      def find_pull_request(options = {})
-        connection.pull_requests.all(remote_user, remote_repo_name, base: options[:to], head: "#{remote_user}:#{options[:from]}", :state => 'open').first
-      end
-
-      def self.connection
-        if self.oauth_token.length > 0
-          @connection ||= ::Github.new do |config|
-            config.oauth_token = GitServer::GitHub.oauth_token
-            config.endpoint    = GitServer::GitHub.api_endpoint
-            config.site        = GitServer::GitHub.site_url
-          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 self.user
-        GitReflow::Config.get('github.user')
+      def reviewers(pull_request)
+        comment_authors_for_pull_request(pull_request)
       end
 
-      def self.user=(github_user)
-        GitReflow::Config.set('github.user', github_user, local: @@project_only)
-      end
-
-      def self.oauth_token
-        GitReflow::Config.get('github.oauth-token')
-      end
-
-      def self.oauth_token=(oauth_token)
-        GitReflow::Config.set('github.oauth-token', oauth_token, local: @@project_only)
-        oauth_token
-      end
-
-      def self.api_endpoint
-        endpoint         = GitReflow::Config.get('github.endpoint')
-        (endpoint.length > 0) ? endpoint : ::Github.endpoint
-      end
-
-      def self.api_endpoint=(api_endpoint)
-        GitReflow::Config.set("github.endpoint", api_endpoint, local: @@project_only)
-        api_endpoint
-      end
-
-      def self.site_url
-        site_url     = GitReflow::Config.get('github.site')
-        (site_url.length > 0) ? site_url : ::Github.site
-      end
-
-      def self.site_url=(site_url)
-        GitReflow::Config.set("github.site", site_url, local: @@project_only)
-        site_url
-      end
-
-      def connection
-        @connection ||= self.class.connection
+      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        remote_user, remote_repo_name, number: pull_request.number
-        review_comments = connection.pull_requests.comments.all remote_user, remote_repo_name, number: pull_request.number
+        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
-        connection.repos.statuses.all(remote_user, remote_repo_name, sha).first
+        connection.repos.statuses.all(self.class.remote_user, self.class.remote_repo_name, sha).first
       end
 
       def colorized_build_description status
@@ -160,15 +186,6 @@ module GitReflow
         status.description.colorize( colorized_statuses[status.state.to_sym] )
       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)
-        comment_authors        = comment_authors_for_pull_request(pull_request)
-        lgtm_authors           = comment_authors_for_pull_request(pull_request, :with => LGTM, :after => pull_last_committed_at)
-
-        comment_authors - lgtm_authors
-      end
-
       def comment_authors_for_pull_request(pull_request, options = {})
         all_comments    = pull_request_comments(pull_request)
         comment_authors = []
@@ -185,7 +202,7 @@ module GitReflow
       end
 
       def get_commited_time(commit_sha)
-        last_commit = connection.repos.commits.find remote_user, remote_repo_name, 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]
       end