git_reflow 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 412c28714e64f91f462fe9b108b3679a7d299f59
-  data.tar.gz: 0984ef9112a092cba604b95845b394aa986725ce
+  metadata.gz: 9b04665f9b041b4458192a789b097f5c455f5322
+  data.tar.gz: e1f40457e04fdf6f3e0f6876bdbd00ed2983f5b7
 SHA512:
-  metadata.gz: d3d16defd3d4924b6827a3e145c7115061a7b9d14a3572cf10ef8cbdd373b348739bbb3b61092ad33a758e3a439851c55b0e4b9cb2c3b709e39ea1dac45c2d8e
-  data.tar.gz: 8d4ef3aafabe9ad955982d0248cd7cc74d1decb6817b1c69c7c0d0ffd600ed21f287be9ce28cd008d824288181a6fb55d05ae40fdfdb327b7fac7e7d372577c9
+  metadata.gz: 90869eb8058b2de453b8790520daf94e5d47ae63010b05cf1065c2590c3ff2138774b58360708d399a91cfac9527eeb71454b0d838a7ad001e5ee30ca6e2e797
+  data.tar.gz: 93640654d91e1e1c1d23be975c15df7346a42df35c044e02e444917d8f059b788cb4eeee7536ffd8cacaa46d9384ba8e9f98d54b92d175eb1ae9c21304bc7331

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.6.7)
+    git_reflow (0.7.0)
       colorize (>= 0.7.0)
-      github_api (= 0.12.3)
-      gli (= 2.12.2)
+      github_api (= 0.12.4)
+      gli (= 2.13.2)
       highline
       httpclient
       json_pure
@@ -21,6 +21,7 @@ GEM
     byebug (4.0.1)
       columnize (= 0.9.0)
       rb-readline (= 0.5.2)
+    chronic (0.10.2)
     coderay (1.1.0)
     colorize (0.7.7)
     columnize (0.9.0)
@@ -31,19 +32,19 @@ GEM
     diff-lcs (1.2.5)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
+    faraday_middleware (0.9.2)
       faraday (>= 0.7.4, < 0.10)
-    github_api (0.12.3)
+    github_api (0.12.4)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
+      hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
+      nokogiri (~> 1.6.6)
       oauth2
-    gli (2.12.2)
+    gli (2.13.2)
     hashie (3.4.2)
-    highline (1.7.3)
+    highline (1.7.7)
     httpclient (2.6.0.1)
     json_pure (1.8.2)
     jwt (1.5.1)
@@ -106,6 +107,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (= 1.0.3)
   bundler
+  chronic
   git_reflow!
   pry-byebug
   rake

data/README.rdoc

@@ -1,5 +1,7 @@
 = git-reflow (2015 Fukuoka Ruby Award Winner)
 
+{<img src="https://circleci.com/gh/reenhanced/gitreflow/tree/master.svg?style=svg" alt="Circle CI" />}[https://circleci.com/gh/reenhanced/gitreflow/tree/master]
+
 http://reenhanced.com/reflow/git-reflow-deliver.gif
 
 If your workflow looks like this:
@@ -301,7 +303,7 @@ http://reenhanced.com/images/reflow.png
 * If you make a new commit in your branch, you require another review.
 
 * All participants in a pull request must approve the pull request.
-  If 2 guys comment, you need 2 'LGTM's before the code is ready to merge.
+  If 2 people comment, you need 2 'LGTM's before the code is ready to merge.
 
 * Once approved, your feature branch is squash merged to master.
   This makes the history of the master branch extremely clean and easy to follow.

data/bin/git-reflow

@@ -1,15 +1,4 @@
 #!/usr/bin/env ruby
-# 1.9 adds realpath to resolve symlinks; 1.8 doesn't
-# have this method, so we add it so we get resolved symlinks
-# and compatibility
-unless File.respond_to? :realpath
-  class File #:nodoc:
-    def self.realpath path
-      return realpath(File.readlink(path)) if symlink?(path)
-      path
-    end
-  end
-end
 $: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
 require 'rubygems'
 require 'gli'

data/bin/gitreflow-common

@@ -259,7 +259,7 @@ require_clean_working_tree() {
     die "fatal: Working tree contains unstaged changes. Aborting."
   fi
   if [ $result -eq 2 ]; then
-    die "fatal: Index contains uncommited changes. Aborting."
+    die "fatal: Index contains uncommitted changes. Aborting."
   fi
 }
 

data/git_reflow.gemspec

@@ -21,6 +21,7 @@ spec = Gem::Specification.new do |s|
 
   s.add_development_dependency('appraisal', '1.0.3')
   s.add_development_dependency('bundler')
+  s.add_development_dependency('chronic')
   s.add_development_dependency('pry-byebug')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
@@ -29,11 +30,11 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('wwtd', '0.7.0')
 
   s.add_dependency('colorize', '>= 0.7.0')
-  s.add_dependency('gli', '2.12.2')
+  s.add_dependency('gli', '2.13.2')
   s.add_dependency('highline')
   s.add_dependency('httpclient')
   s.add_dependency('json_pure')
-  s.add_dependency('github_api', '0.12.3')
+  s.add_dependency('github_api', '0.12.4')
   s.add_dependency('reenhanced_bitbucket_api', '0.3.2')
 
   s.post_install_message = "You need to setup your GitHub OAuth token\nPlease run 'git-reflow setup'"

data/lib/git_reflow.rb

@@ -31,7 +31,7 @@ module GitReflow
       puts "[notice] Run 'git reflow review #{destination_branch}' to start the review process"
     else
       puts "Here's the status of your review:"
-      display_pull_request_summary(pull_request)
+      pull_request.display_pull_request_summary
       ask_to_open_in_browser(pull_request.html_url)
     end
   end
@@ -46,7 +46,7 @@ module GitReflow
       existing_pull_request = git_server.find_open_pull_request( from: current_branch, to: options['base'] )
       if existing_pull_request
         puts "A pull request already exists for these branches:"
-        display_pull_request_summary(existing_pull_request)
+        existing_pull_request.display_pull_request_summary
         ask_to_open_in_browser(existing_pull_request.html_url)
       else
         pull_request = git_server.create_pull_request(title: options['title'],
@@ -78,23 +78,20 @@ module GitReflow
         say "No pull request exists for #{remote_user}:#{current_branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
       else
 
-        has_comments         = (git_server.has_pull_request_comments?(existing_pull_request) or git_server.approvals(existing_pull_request).any?)
-        open_comment_authors = git_server.reviewers_pending_response(existing_pull_request)
-        status               = git_server.get_build_status existing_pull_request.build_status
-        commit_message       = if "#{existing_pull_request.description}".length > 0
-                                 existing_pull_request.description
-                               else
-                                 "#{get_first_commit_message}"
-                               end
+        commit_message = if "#{existing_pull_request.description}".length > 0
+                           existing_pull_request.description
+                         else
+                           "#{get_first_commit_message}"
+                         end
 
-        if  options['skip_lgtm'] or ((status.nil? or status.state == "success") and (has_comments and open_comment_authors.empty?))
+        if existing_pull_request.good_to_merge?(force: options['skip_lgtm'])
           puts "Merging pull request ##{existing_pull_request.number}: '#{existing_pull_request.title}', from '#{existing_pull_request.feature_branch_name}' into '#{existing_pull_request.base_branch_name}'"
 
           update_destination(base_branch)
           merge_feature_branch(feature_branch,
                                :destination_branch  => base_branch,
                                :pull_request_number => existing_pull_request.number,
-                               :lgtm_authors        => git_server.approvals(existing_pull_request),
+                               :lgtm_authors        => existing_pull_request.approvals,
                                :message             => commit_message)
           committed = run_command_with_label 'git commit', with_system: true
 
@@ -117,10 +114,10 @@ module GitReflow
           else
             say "There were problems commiting your feature... please check the errors above and try again.", :error
           end
-        elsif !status.nil? and status.state != "success"
-          say "#{status.description}: #{status.target_url}", :deliver_halted
-        elsif open_comment_authors.count > 0
-          say "You still need a LGTM from: #{open_comment_authors.join(', ')}", :deliver_halted
+        elsif !existing_pull_request.build_status.nil? and existing_pull_request.build_status != "success"
+          say "#{existing_pull_request.build.description}: #{existing_pull_request.build.url}", :deliver_halted
+        elsif existing_pull_request.reviewers_pending_response.count > 0
+          say "You still need a LGTM from: #{existing_pull_request.reviewers_pending_response.join(', ')}", :deliver_halted
         else
           say "Your code has not been reviewed yet.", :deliver_halted
         end
@@ -137,48 +134,4 @@ module GitReflow
     @git_server ||= GitServer.connect provider: GitReflow::Config.get('reflow.git-server').strip, silent: true
   end
 
-  def display_pull_request_summary(pull_request)
-    summary_data = {
-      "branches"    => "#{pull_request.feature_branch_name} -> #{pull_request.base_branch_name}",
-      "number"      => pull_request.number,
-      "url"         => pull_request.html_url
-    }
-
-    notices = ""
-    reviewed_by = git_server.reviewers(pull_request).map {|author| author.colorize(:red) }
-
-    # check for CI build status
-    status = git_server.get_build_status pull_request.build_status
-    if status
-      notices << "[notice] Your build status is not successful: #{status.target_url}.\n" unless status.state == "success"
-      summary_data.merge!( "Build status" => git_server.colorized_build_description(status) )
-    end
-
-    # check for needed lgtm's
-    if git_server.reviewers(pull_request).any?
-      approvals    = git_server.approvals(pull_request)
-      pending      = git_server.reviewers_pending_response(pull_request)
-      last_comment = git_server.last_comment_for_pull_request(pull_request)
-
-      summary_data.merge!("Last comment"  => last_comment)
-
-      if approvals.any?
-        reviewed_by.map! { |author| approvals.include?(author.uncolorize) ? author.colorize(:green) : author }
-      end
-
-      notices << "[notice] You still need a LGTM from: #{pending.join(', ')}\n" if pending.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
 end

data/lib/git_reflow/commands/deliver.rb

@@ -2,10 +2,9 @@ desc 'deliver your feature branch'
 long_desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
 
 command :deliver do |c|
-  c.desc 'skip the lgtm checks and deliver your feature branch'
-  c.switch [:f, :'skip-lgtm']
   c.desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
   c.arg_name 'base_branch - the branch you want to merge into'
+  c.switch [:f, :'skip-lgtm'], desc: 'skip the lgtm checks and deliver your feature branch'
   c.action do |global_options,options,args|
     deliver_options = {'base' => nil, 'head' => nil, 'skip_lgtm' => options[:'skip-lgtm']}
     case args.length

data/lib/git_reflow/commands/start.rb

@@ -7,12 +7,6 @@ long_desc <<LONGTIME
 LONGTIME
 arg_name '[new-feature-branch-name] - name of the new feature branch'
 command :start do |c|
-  c.desc 'Describe a switch to list'
-  c.switch :s
-
-  c.desc 'Describe a flag to list'
-  c.default_value 'default'
-  c.flag :f
   c.action do |global_options, options, args|
     if args.empty?
       raise "usage: git-reflow start [new-branch-name]"

data/lib/git_reflow/config.rb

@@ -2,39 +2,40 @@ module GitReflow
   module Config
     extend self
 
-    def get(key, options = {reload: false})
-      if options[:reload] == false and cached_key_value = instance_variable_get(:"@#{key.tr('.-', '_')}")
+    def get(key, reload: false, all: false, local: false)
+      if reload == false and cached_key_value = instance_variable_get(:"@#{key.tr('.-', '_')}")
         cached_key_value
       else
-        if options[:all]
-          new_value = GitReflow::Sandbox.run "git config --get-all #{key}", loud: false
+        local = local ? '--local ' : ''
+        if all
+          new_value = GitReflow::Sandbox.run "git config #{local}--get-all #{key}", loud: false
         else
-          new_value = GitReflow::Sandbox.run "git config --get #{key}", loud: false
+          new_value = GitReflow::Sandbox.run "git config #{local}--get #{key}", loud: false
         end
         instance_variable_set(:"@#{key.tr('.-', '_')}", new_value.strip)
       end
     end
 
-    def set(key, value, options = { local: false })
+    def set(key, value, local: false)
       value = value.strip
-      if options.delete(:local)
+      if local
         GitReflow::Sandbox.run "git config --replace-all #{key} \"#{value}\"", loud: false
       else
         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
+    def unset(key, value: nil, local: false)
+      value = (value.nil?) ? "" : "\"#{value}\""
+      if local
+        GitReflow::Sandbox.run "git config --unset-all #{key} #{value}", loud: false
       else
-        GitReflow::Sandbox.run "git config --global --unset #{key} #{value}", loud: false
+        GitReflow::Sandbox.run "git config --global --unset-all #{key} #{value}", loud: false
       end
     end
 
-    def add(key, value, options = { local: false })
-      if options.delete(:local)
+    def add(key, value, local: false)
+      if local
         GitReflow::Sandbox.run "git config --add #{key} \"#{value}\"", loud: false
       else
         GitReflow::Sandbox.run "git config --global --add #{key} \"#{value}\"", loud: false

data/lib/git_reflow/git_server.rb

@@ -1,14 +1,16 @@
 module GitReflow
   module GitServer
-    autoload :Base,   'git_reflow/git_server/base'
-    autoload :GitHub, 'git_reflow/git_server/git_hub'
+    autoload :Base,        'git_reflow/git_server/base'
+    autoload :GitHub,      'git_reflow/git_server/git_hub'
+    autoload :PullRequest, 'git_reflow/git_server/pull_request'
 
     extend self
 
     class ConnectionError < StandardError; end
 
-    def connect(options = nil)
-      options ||= { provider: 'GitHub' }
+    def connect(options = {})
+      options ||= {}
+      options[:provider] = 'GitHub' if "#{options[:provider]}".length <= 0
       begin
         provider_name = options[:provider]
         provider = provider_class_for(options.delete(:provider)).new(options)
@@ -42,6 +44,14 @@ module GitReflow
       GitReflow::GitServer.const_defined?(provider)
     end
 
+    def create_pull_request(options = {})
+      raise "#{self.class.to_s}#create_pull_request method must be implemented"
+    end
+
+    def find_open_pull_request(options = {})
+      raise "#{self.class.to_s}#find_open_pull_request method must be implemented"
+    end
+
     private
 
     def provider_class_for(provider)

data/lib/git_reflow/git_server/base.rb

@@ -6,22 +6,6 @@ module GitReflow
 
     @@connection = nil
 
-    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 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
@@ -72,18 +56,6 @@ module GitReflow
       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
-
-    def has_pull_request_comments?(pull_request)
-      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
@@ -92,16 +64,5 @@ module GitReflow
       raise "#{self.class.to_s}#colorized_build_description(status) method must be implemented"
     end
 
-    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 reviewers_pending_response(pull_request)
-      reviewers(pull_request) - approvals(pull_request)
-    end
   end
 end

data/lib/git_reflow/git_server/bit_bucket.rb

@@ -4,31 +4,17 @@ 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
+      require_relative 'bit_bucket/pull_request'
 
       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
+        # 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', 'BitBucket', local: project_only)
       end
 
       def self.connection
@@ -38,17 +24,17 @@ module GitReflow
       end
 
       def self.api_endpoint
-        endpoint         = GitReflow::Config.get("bitbucket.endpoint")
+        endpoint         = GitReflow::Config.get("bitbucket.endpoint", local: project_only?)
         (endpoint.length > 0) ? endpoint : ::BitBucket::Configuration::DEFAULT_ENDPOINT
       end
 
       def self.site_url
-        site_url     = GitReflow::Config.get("bitbucket.site")
+        site_url     = GitReflow::Config.get("bitbucket.site", local: project_only?)
         (site_url.length > 0) ? site_url : 'https://bitbucket.org'
       end
 
       def self.api_key
-        GitReflow::Config.get("bitbucket.api-key", reload: true)
+        GitReflow::Config.get("bitbucket.api-key", reload: true, local: project_only?)
       end
 
       def self.api_key=(key)
@@ -59,7 +45,7 @@ module GitReflow
       end
 
       def self.user
-        GitReflow::Config.get('bitbucket.user')
+        GitReflow::Config.get('bitbucket.user', local: project_only?)
       end
 
       def self.user=(bitbucket_user)
@@ -92,73 +78,22 @@ module GitReflow
         @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
+      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
+      def colorized_build_description(state, description)
         ""
       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]
+      def create_pull_request(options = {})
+        PullRequest.create(options)
       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
+      def find_open_pull_request(options = {})
+        PullRequest.find_open(options)
       end
 
     end