git_reflow 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b9d1f62f165da2fa44742c87666802d88b484d
-  data.tar.gz: df62b69368422f3fee100b6c0d95145321cd2215
+  metadata.gz: cb8b35b203f33dbcaa666927680ee42b0d0c1286
+  data.tar.gz: 7108e41d39cc19884abfb2adac608efee27a8e45
 SHA512:
-  metadata.gz: c64744638a2767e4a3b24877a7b5dc61506715d6cb729665b91f3460c5731a1f918f84c6258e7c14b85e1830135a3b2f87318ae36c04122fa856914d63c3a50c
-  data.tar.gz: b1f37dd0b8db8c3e554d643d0e94e3b39942ea0e7a081f1fe4f7beea0c105cc652478543ab1ba9da0d52b73044ccefd633b034d816b37c9db00deefa35db9140
+  metadata.gz: 3c4c04e3b8af67d57f0b0caf72358b7a535412dd00bae16fac1dcaed55d621de07d4344affdd7ff34616c7080219ad3dadac9c4254e294494dc5e00ff7c66ab6
+  data.tar.gz: 7a35d001f876dd3184470d5a536e01e2a8343d43c7d0b9cd0d612bdb2df158ca2475d7a174c0a0baf27f3d9a3401e740980a6640eff4388695dc5de87b49b286

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 **/.DS_Store
 .rspec
+gemfiles

data/Appraisals

@@ -0,0 +1,12 @@
+appraise "latest-gli-release" do
+  gem "gli"
+end
+
+appraise "latest-github-api-release" do
+  gem "github_api"
+end
+
+appraise "current-reflow-locked-versions" do
+  gem "gli", "2.12.2"
+  gem "github_api", "0.12.3"
+end

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
+
 gemspec

data/Gemfile.lock

@@ -1,33 +1,38 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.4.2)
+    git_reflow (0.5.0)
       colorize (= 0.6.0)
       github_api (= 0.12.3)
       gli (= 2.12.2)
       highline
       httpclient
       json_pure
+      reenhanced_bitbucket_api (= 0.3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
+    addressable (2.3.7)
+    appraisal (1.0.3)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    byebug (4.0.1)
+      columnize (= 0.9.0)
+      rb-readline (= 0.5.2)
     coderay (1.1.0)
     colorize (0.6.0)
-    columnize (0.8.9)
+    columnize (0.9.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    debugger-linecache (1.2.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
     github_api (0.12.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
@@ -38,14 +43,13 @@ GEM
       oauth2
     gli (2.12.2)
     hashie (3.4.0)
-    highline (1.6.21)
+    highline (1.7.1)
     httpclient (2.6.0.1)
-    json (1.7.5)
     json_pure (1.8.2)
-    jwt (1.2.1)
+    jwt (1.4.1)
     method_source (0.8.2)
     mini_portile (0.6.2)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.6.2)
@@ -60,36 +64,47 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (2.0.0)
-      byebug (~> 3.4)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
       pry (~> 0.10)
     rack (1.6.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
+    rake (10.4.2)
+    rb-readline (0.5.2)
+    rdoc (4.2.0)
+    reenhanced_bitbucket_api (0.3.2)
+      faraday (~> 0.9.0)
+      faraday_middleware (~> 0.9.0)
+      hashie (>= 3.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (>= 1.5.2)
+      simple_oauth (>= 0.3.0)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.3)
+    rspec-core (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    rspec-expectations (3.0.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
+    rspec-mocks (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
-    safe_yaml (1.0.1)
+    rspec-support (3.0.4)
+    safe_yaml (1.0.4)
+    simple_oauth (0.3.1)
     slop (3.6.0)
-    thread_safe (0.3.4)
-    webmock (1.17.4)
-      addressable (>= 2.2.7)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    webmock (1.20.4)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
+    wwtd (0.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal (= 1.0.3)
   bundler
   git_reflow!
   pry-byebug
@@ -97,3 +112,4 @@ DEPENDENCIES
   rdoc
   rspec (~> 3.0.0)
   webmock
+  wwtd (= 0.7.0)

data/README.rdoc

@@ -1,8 +1,6 @@
-= git-reflow
-
-http://www.reenhanced.com/images/reflow.png
-
+= git-reflow (2015 Fukuoka Ruby Award Winner)
 
+http://reenhanced.com/reflow/git-reflow-deliver.gif
 
 If your workflow looks like this:
 1. Create a feature branch
@@ -14,6 +12,8 @@ If your workflow looks like this:
 
 Reflow will make your life easier.
 
+Reflow automatically creates pull requests, ensures the code review is approved, and squash merges finished branches to master with a great commit message template.
+
 == Quickstart
 Create and switch to new branch +nh-branchy-branch+:
   $ git reflow start nh-branchy-branch
@@ -85,6 +85,8 @@ Then for your Enterprise projects, you have to setup GitReflow for each one:
   git reflow setup --enterprise --local
 
 === Starting a feature branch
+http://reenhanced.com/reflow/git-reflow-start.gif
+
   git reflow start
 
 This sets up a feature branch remotely and brings a local copy to your machine. Yeah, you can do this by hand pretty easily, so skip this command if you want. This is just a handy shortcut with no magic.
@@ -95,6 +97,8 @@ This sets up a feature branch remotely and brings a local copy to your machine.
           who is responsible for each. My initials are 'NH', so all of my branches start with +nh-+
 
 === Reviewing your work
+http://reenhanced.com/reflow/git-reflow-review.gif
+
   git reflow review
 
 All of our work is reviewed by our team. This helps spread knowledge to multiple parties and keeps the quality of our code consistent.
@@ -139,6 +143,8 @@ Do we have pull request?
 If not, create it and print "Pull request created at http://pull-url/". If so, print the url for the existing request.
 
 === Checking your branch status
+http://reenhanced.com/reflow/git-reflow-status.gif
+
   git reflow status
 
 Sometimes you start working on a branch and can't get back to it for a while. It happens. Use +status+ to check on the status of your work.
@@ -158,6 +164,8 @@ This gives you details on who's reviewed your pull request. If someone has parti
 +status+ prevents you from having to open a browser to find out where your pull request is at. But in case you want to take a look, we give you the option to open it for you.
 
 === Delivering approved code
+http://reenhanced.com/reflow/git-reflow-deliver.gif
+
   git reflow deliver
 
 You kick butt. You've got your code reviewed and now you're ready to merge it down to +master+ and deploy. Reflow +deliver+ will take care of all of the steps for you to make this happen.
@@ -258,8 +266,10 @@ If 'n', then just stop here. The user can reset his local +master+.
 
 And we're done.
 
-
 == Guiding principles:
+* Your workflow should resemble the following:
+http://reenhanced.com/images/reflow.png
+
 * You should already know what you're doing.
   We assume you know how to use git.
 

data/Rakefile

@@ -1,10 +1,11 @@
 #!/usr/bin/env rake
 require 'rake'
 require 'bundler/gem_tasks'
+require 'bundler/setup'
 require 'rspec/core/rake_task'
- 
+
 Dir[File.join(File.dirname(__FILE__),'lib/tasks/*.rake')].each { |f| load f }
 
 RSpec::Core::RakeTask.new(:spec)
- 
+
 task :default => [:spec]

data/circle.yml

@@ -0,0 +1,16 @@
+dependencies:
+  pre:
+    - rvm install 2.0.0
+    - rvm install 2.1.5
+    - rvm install 2.2.1
+
+  override:
+    - 'rvm-exec 2.0.0-p643 bundle install'
+    - 'rvm-exec 2.1.5 bundle install'
+    - 'rvm-exec 2.2.1 bundle install'
+
+test:
+  override:
+    - 'rvm-exec 2.0.0-p643 bundle exec rake'
+    - 'rvm-exec 2.1.5 bundle exec rake'
+    - 'rvm-exec 2.2.1 bundle exec rake'

data/git_reflow.gemspec

@@ -19,12 +19,14 @@ spec = Gem::Specification.new do |s|
   s.require_paths    << 'lib'
   s.rdoc_options     << '--title' << 'git_reflow' << '--main' << 'README.rdoc' << '-ri'
 
+  s.add_development_dependency('appraisal', '1.0.3')
   s.add_development_dependency('bundler')
   s.add_development_dependency('pry-byebug')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec', '~> 3.0.0')
   s.add_development_dependency('webmock')
+  s.add_development_dependency('wwtd', '0.7.0')
 
   s.add_dependency('colorize', '0.6.0')
   s.add_dependency('gli', '2.12.2')
@@ -32,6 +34,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('httpclient')
   s.add_dependency('json_pure')
   s.add_dependency('github_api', '0.12.3')
+  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'"
 end

data/lib/git_reflow.rb

@@ -10,6 +10,7 @@ require 'git_reflow/version.rb' unless defined?(GitReflow::VERSION)
 require 'git_reflow/config'
 require 'git_reflow/git_server'
 require 'git_reflow/git_server/git_hub'
+require 'git_reflow/git_server/bit_bucket'
 require 'git_reflow/sandbox'
 require 'git_reflow/git_helpers'
 
@@ -22,7 +23,7 @@ module GitReflow
   LGTM = /lgtm|looks good to me|:\+1:|:thumbsup:|:shipit:/i
 
   def status(destination_branch)
-    pull_request = git_server.find_pull_request( :from => current_branch, :to => destination_branch )
+    pull_request = git_server.find_open_pull_request( :from => current_branch, :to => destination_branch )
 
     if pull_request.nil?
       puts "\n[notice] No pull request exists for #{current_branch} -> #{destination_branch}"
@@ -41,7 +42,8 @@ module GitReflow
     begin
       push_current_branch
 
-      if existing_pull_request = git_server.find_pull_request( from: current_branch, to: options['base'] )
+      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)
         ask_to_open_in_browser(existing_pull_request.html_url)
@@ -57,7 +59,7 @@ module GitReflow
     rescue Github::Error::UnprocessableEntity => e
       puts "Github Error: #{e.to_s}"
     rescue StandardError => e
-      puts "Error: #{e.inspect}"
+      puts "\nError: #{e.inspect}"
     end
   end
 
@@ -69,32 +71,34 @@ module GitReflow
     update_destination(current_branch)
 
     begin
-      existing_pull_request = git_server.find_pull_request( :from => current_branch, :to => options['base'] )
+      existing_pull_request = git_server.find_open_pull_request( :from => current_branch, :to => options['base'] )
 
       if existing_pull_request.nil?
-        puts "Error: No pull request exists for #{remote_user}:#{current_branch}\nPlease submit your branch for review first with \`git reflow review\`"
+        say "No pull request exists for #{remote_user}:#{current_branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
       else
 
-        open_comment_authors = git_server.find_authors_of_open_pull_request_comments(existing_pull_request)
         has_comments         = git_server.has_pull_request_comments?(existing_pull_request)
-        status = git_server.get_build_status existing_pull_request.head.sha
+        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
 
-        # if there any comment_authors left, then they haven't given a lgtm after the last commit
-        if ((status.nil? or status.state == "success") and has_comments and open_comment_authors.empty?) or options['skip_lgtm']
-          lgtm_authors   = git_server.comment_authors_for_pull_request(existing_pull_request, :with => LGTM)
-          commit_message = ("#{existing_pull_request[:body]}".length > 0) ? 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}'"
+        if  options['skip_lgtm'] or ((status.nil? or status.state == "success") and (has_comments and open_comment_authors.empty?))
+          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(options['base'])
           merge_feature_branch(feature_branch,
                                :destination_branch  => options['base'],
                                :pull_request_number => existing_pull_request.number,
-                               :lgtm_authors        => lgtm_authors,
+                               :lgtm_authors        => git_server.approvals(existing_pull_request),
                                :message             => commit_message)
           committed = run_command_with_label 'git commit', with_system: true
 
           if committed
-            puts "Merge complete!"
+            say "Merge complete!", :success
             deploy_and_cleanup = ask "Would you like to push this branch to your remote repo and cleanup your feature branch? "
             if deploy_and_cleanup =~ /^y/i
               run_command_with_label "git push origin #{options['base']}"
@@ -102,18 +106,18 @@ module GitReflow
               run_command_with_label "git branch -D #{feature_branch}"
               puts "Nice job buddy."
             else
-              puts "Cleanup haulted.  Local changes were not pushed to remote repo.".colorize(:red)
+              puts "Cleanup halted.  Local changes were not pushed to remote repo.".colorize(:red)
               puts "To reset and go back to your branch run \`git reset --hard origin/master && git checkout new-feature\`"
             end
           else
-            puts "There were problems commiting your feature... please check the errors above and try again."
+            say "There were problems commiting your feature... please check the errors above and try again.", :error
           end
         elsif !status.nil? and status.state != "success"
-          puts "[#{ 'deliver halted'.colorize(:red) }] #{status.description}: #{status.target_url}"
+          say "#{status.description}: #{status.target_url}", :deliver_halted
         elsif open_comment_authors.count > 0
-          puts "[deliver halted] You still need a LGTM from: #{open_comment_authors.join(', ')}"
+          say "You still need a LGTM from: #{open_comment_authors.join(', ')}", :deliver_halted
         else
-          puts "[deliver halted] Your code has not been reviewed yet."
+          say "Your code has not been reviewed yet.", :deliver_halted
         end
       end
 
@@ -125,40 +129,39 @@ module GitReflow
   end
 
   def git_server
-    @git_server ||= GitServer.connect provider: 'GitHub', silent: true
+    @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.head.label} -> #{pull_request.base.label}",
+      "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.comment_authors_for_pull_request(pull_request).map {|author| author.colorize(:red) }
+    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.head.sha
+    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
-    pull_comments = git_server.pull_request_comments(pull_request)
-    if pull_comments.reject {|comment| comment.user.login == git_server.class.user}.any?
-      open_comment_authors = git_server.find_authors_of_open_pull_request_comments(pull_request)
-      last_committed_at    = git_server.get_commited_time(pull_request.head.sha)
-      lgtm_authors         = git_server.comment_authors_for_pull_request(pull_request, :with => LGTM, :after => last_committed_at)
+    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"  => pull_comments.last[:body].inspect)
+      summary_data.merge!("Last comment"  => last_comment)
 
-      if lgtm_authors.any?
-        reviewed_by.map! { |author| lgtm_authors.include?(author.uncolorize) ? author.colorize(:green) : author }
+      if approvals.any?
+        reviewed_by.map! { |author| approvals.include?(author.uncolorize) ? author.colorize(:green) : author }
       end
 
-      notices << "[notice] You still need a LGTM from: #{open_comment_authors.join(', ')}\n" if open_comment_authors.any?
+      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

data/lib/git_reflow/commands/setup.rb

@@ -10,7 +10,7 @@ command :setup do |c|
       menu.prompt = "Which service would you like to use for this project?  "
 
       menu.choice('GitHub')    { GitReflow::GitServer.connect reflow_options.merge({ provider: 'GitHub', silent: false }) }
-      menu.choice('BitBucket') { say("Coming soon...") }
+      menu.choice('BitBucket (team-owned repos only)') { GitReflow::GitServer.connect reflow_options.merge({ provider: 'BitBucket', silent: false }) }
     end
   end
 end