flash_flow 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d3235b782d5313f27539dade0300a599ba7b470
-  data.tar.gz: ef51a03ff49f19a7a3bd7c25033e3290a2bccf84
+  metadata.gz: d6ebf90cccffeac908c0d843e1b41ecda291b996
+  data.tar.gz: dafdf83630955c37b97a715653cf43c2f560cd96
 SHA512:
-  metadata.gz: 0034d2b3b5185dab753fb866be335e853a43488d4f73b7da35fb8e7f084c4f3e90be1bf160dc8715eb2e690b2011d407986615e6b24ae35210f0dbf2c54bb573
-  data.tar.gz: 989d8f49405a254f09cd20963b98417109eb08e4e1f4e8c21a7879efaa683a61b46589bb7ad057a3a7214cc1d692d3dbafe361f528a8d147492ba8ae04d214f3
+  metadata.gz: 4b705feb54f7c4e126129541ec072b75a75da229c74b9ca89b8da7f4a7defdb3cb9ab45acffce4905aee915e819c9bb33be0a3d48571e8ccc7a60b8aba8b6958
+  data.tar.gz: 0a3433d37f0e5158af98313741bb84e5bd3116a83c14fb6d066248dcbcf2ab594716598abab456f9e8cb3986e04aba138aaae36e288712ea461d5ff0cf4942c5

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.4

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in fund_america.gemspec
 gemspec

data/Gemfile.lock

@@ -1,135 +1,145 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.5.2)
+    flash_flow (1.6.0)
       google-api-client
-      hipchat (~> 1.5)
       mail
       octokit (~> 4.1)
       percy-client
       pivotal-tracker (~> 0.5)
       prawn
       ruby-graphviz (> 0)
+      tb-bjb (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
-    builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    columnize (0.9.0)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    debugger-linecache (1.2.0)
-    domain_name (0.5.20161129)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (0.9.2)
+    excon (0.62.0)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.9.12)
-      addressable (~> 2.3)
-      googleauth (~> 0.5)
-      httpclient (~> 2.7)
-      hurley (~> 0.1)
-      memoist (~> 0.11)
-      mime-types (>= 1.6)
-      representable (~> 2.3.0)
-      retriable (~> 2.0)
-      thor (~> 0.19)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
-      logging (~> 2.0)
-      memoist (~> 0.12)
+    faraday-http-cache (1.3.1)
+      faraday (~> 0.8)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    google-api-client (0.26.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.8.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.10)
+    googleauth (0.7.1)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    hipchat (1.5.4)
-      httparty
-      mimemagic
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.14.0)
-      multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    hurley (0.2)
-    jwt (1.5.6)
-    little-plugger (1.1.4)
-    logging (2.1.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    memoist (0.15.0)
-    mime-types (3.1)
+    i18n (1.2.0)
+      concurrent-ruby (~> 1.0)
+    jwt (2.1.0)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    memoist (0.16.0)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mimemagic (0.3.2)
-    mini_portile2 (2.1.0)
+    mime-types-data (3.2018.0812)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
     minitest (5.3.5)
     minitest-stub_any_instance (1.0.1)
-    multi_json (1.12.1)
-    multi_xml (0.6.0)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
-    nokogiri-happymapper (0.5.9)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+    nokogiri-happymapper (0.8.0)
       nokogiri (~> 1.5)
-    octokit (4.3.0)
-      sawyer (~> 0.7.0, >= 0.5.3)
-    os (0.9.6)
-    pdf-core (0.6.1)
-    percy-client (1.9.0)
+    octokit (4.13.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    os (1.0.0)
+    pdf-core (0.7.0)
+    percy-client (2.0.1)
+      addressable
+      excon
       faraday (>= 0.9)
-      httpclient (>= 2.6)
     pivotal-tracker (0.5.13)
       builder
       crack
       nokogiri (>= 1.5.5)
       nokogiri-happymapper (>= 0.5.4)
       rest-client (>= 1.8.0)
-    prawn (2.1.0)
-      pdf-core (~> 0.6.1)
-      ttfunk (~> 1.4.0)
+    prawn (2.2.2)
+      pdf-core (~> 0.7.0)
+      ttfunk (~> 1.5)
+    public_suffix (3.0.3)
     rake (10.4.2)
-    representable (2.3.0)
-      uber (~> 0.0.7)
-    rest-client (2.0.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    retriable (2.1.0)
-    ruby-graphviz (1.2.2)
+    retriable (3.1.2)
+    ruby-graphviz (1.2.4)
     safe_yaml (1.0.4)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
-    signet (0.7.3)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
-      jwt (~> 1.5)
+      jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    slop (3.6.0)
-    thor (0.19.1)
-    ttfunk (1.4.0)
-    uber (0.0.15)
+    simple_oauth (0.3.1)
+    tb-bjb (1.6.1)
+      activemodel (>= 4.1.6)
+      activesupport (>= 4.1.6)
+      faraday (~> 0.9)
+      faraday-http-cache (~> 1.2)
+      faraday_middleware (~> 0.10)
+      simple_oauth (~> 0.3)
+    thread_safe (0.3.6)
+    ttfunk (1.5.1)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.6)
-  byebug (> 0)
   flash_flow!
   minitest (> 0)
   minitest-stub_any_instance (> 0)
   rake (> 0)
 
 BUNDLED WITH
-   1.14.3
+   1.17.1

data/README.md

@@ -82,11 +82,6 @@ In addition, as part of our production deploy script, we run `flash_flow --prod-
 that are newly in the `master_branch` and adds a comment "Deployed to production on 12/25/2015 at 11:11pm". Tracker
 doesn't support a real state for "In production", so for us this comment serves as that state.
 
-### Configuring hipchat
-When a branch other than the one you're on doesn't merge cleanly and can't be fixed by rerere (more on that later
-too), a notification can go out to Hipchat. The Hipchat notifier needs your token (api v2 token) and the room
-to which the message will be sent.
-
 ### Runtime options
 
 #### -v, --version

data/flash_flow.gemspec

@@ -5,11 +5,11 @@ require 'flash_flow/version'
 Gem::Specification.new do |spec|
   spec.name          = "flash_flow"
   spec.version       = FlashFlow::VERSION
-  spec.authors       = ["Flashfunders"]
-  spec.email         = ["engineering@flashfunders.com"]
-  spec.summary       = %q{Implementation of the flashfunders workflow}
+  spec.authors       = ["Brad Bennett"]
+  spec.email         = ["bradleyjaybennett@gmail.com"]
+  spec.summary       = %q{Merge your open prs together}
   spec.description   = %q{Flash flow is a command line tool for keeping your acceptance environment up to date}
-  spec.homepage      = "https://github.com/FlashFunders/flash_flow"
+  spec.homepage      = "https://github.com/bradleyjucsc/flash_flow"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'octokit', "~> 4.1"
-  spec.add_dependency 'hipchat', "~> 1.5"
+  spec.add_dependency 'tb-bjb', "~> 1.6"
   spec.add_dependency 'pivotal-tracker', "~> 0.5"
   spec.add_dependency 'ruby-graphviz', "> 0"
   spec.add_dependency 'percy-client'
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "> 0"
   spec.add_development_dependency "minitest", "> 0"
-  spec.add_development_dependency "byebug", "> 0"
+  # spec.add_development_dependency "byebug", "> 0"
   spec.add_development_dependency 'minitest-stub_any_instance', "> 0"
 end

data/flash_flow.yml.erb.example

@@ -8,9 +8,9 @@ git:
   # Which remote your branches use
   remote: origin
 
-  # This branch is owned by flash_flow, it force pushes every time. So don't use a branch to which you make
-  # commits. Treat this as 100% ephemeral, but if you can you should deploy it automatically to your
-  # review/staging env when it gets pushed.
+  # This branch is owned by flash_flow, and will be overwritten. Don't use a branch to which you make
+  # commits. Treat this as 100% ephemeral, this is the branch that you should deploy automatically to
+  # your review/staging env.
   merge_branch: acceptance
 
   # This is your mainline production branch that is the basis for the merge branch
@@ -19,23 +19,13 @@ git:
 # An arbitrary file that flash_flow will write to in the merge branch and use to store branch information.
 # Make sure it doesn't collide with a file you actually need in your application. You don't need to look at
 # this file in general.
-branch_info_file: 'your/random/file'
+branch_info_file: 'flash_flow.json'
 
 
 
 ### Everything below here is optional and should be deleted or remain commented out if you don't need it
 
 
-## This will send merge conflict notifications to the hipchat room configured below, only for branches
-## other than your own.
-
-#notifier:
-#  class:
-#    name: 'FlashFlow::Notifier::Hipchat'
-#    token: <%= ENV['HIPCHAT_TOKEN'] %>
-#    room: 'Flash Flow Notifications'
-
-
 ## If you use Pivotal Tracker, this integration can finish, deliver, un-deliver, and comment when
 ## deployed to production if you set it up.
 ## Must be used in conjuction with the "--story or --stories" options.

data/lib/flash_flow/cmd_runner.rb

@@ -10,7 +10,7 @@ module FlashFlow
     attr_accessor :dir
 
     def initialize(opts={})
-      @dir = opts[:dir] || '.'
+      @dir = opts[:dir] || `pwd`.strip
       @dry_run = opts[:dry_run]
       @logger = opts[:logger] || Logger.new('/dev/null')
     end
@@ -51,4 +51,4 @@ module FlashFlow
       end
     end
   end
-end
+end

data/lib/flash_flow/config.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'singleton'
 require 'yaml'
 require 'erb'
+require 'fileutils'
 
 module FlashFlow
   class Config
@@ -40,13 +41,24 @@ module FlashFlow
         instance.instance_variable_set("@#{attr_name}", config[attr_name])
       end
 
-      instance.instance_variable_set(:@logger, Logger.new(instance.log_file))
+      instance.instance_variable_set(:@logger, get_logger(instance.log_file))
 
       raise IncompleteConfiguration.new("Missing attributes:\n #{missing_attrs.join("\n ")}") unless missing_attrs.empty?
 
       instance.instance_variable_set(:@configured, true)
     end
 
+    def self.get_logger(log_file)
+      if log_file.to_s.empty?
+        log_file = '/dev/null'
+      else
+        dir = File.dirname(log_file)
+        FileUtils.mkdir_p(dir)
+      end
+      Logger.new(log_file)
+
+    end
+
     def self.defaults
       {
           branch_info_file: 'README.rdoc',

data/lib/flash_flow/data/base.rb

@@ -25,7 +25,7 @@ module FlashFlow
       def initialize_collection(branch_config)
         stored_collection = Collection.from_hash(stored_branches)
 
-        if ! branch_config.empty?
+        if branch_config && !branch_config.empty?
           collection = Collection.fetch(branch_config)
           # Order matters. We are marking the PRs as current, not the branches stored in the json
           collection.mark_all_as_current

data/lib/flash_flow/data/bitbucket.rb

@@ -0,0 +1,152 @@
+require 'tinybucket'
+require 'flash_flow/data/branch'
+
+module FlashFlow
+  module Data
+    class Bitbucket
+
+      attr_accessor :repo, :unmergeable_label
+
+      def initialize(config={})
+        initialize_connection!(config['oauth_token'], config['oauth_secret'])
+        @repo_owner = config['repo_owner']
+        @repo = config['repo']
+        @master_branch = config['master_branch'] || 'master'
+        @unmergeable_label = config['unmergeable_label'] || 'Flash Flow -- Unmergeable'
+        @do_not_merge_label = config['do_not_merge_label'] || 'Flash Flow -- Do Not Merge'
+        # @code_reviewed_label = config['code_reviewed_label'] || 'code reviewed'
+        # @shippable_label = config['shippable_label'] || 'shippable'
+      end
+
+      def initialize_connection!(oauth_token, oauth_secret)
+        if oauth_token.nil? || oauth_secret.nil?
+          raise RuntimeError.new("Oauth token and Oauth secret must be set in your flash_flow config file.")
+        end
+        Tinybucket.configure do |config|
+          config.oauth_token = oauth_token
+          config.oauth_secret = oauth_secret
+        end
+      end
+
+      def remove_from_merge(branch)
+        pr = pr_for(branch)
+        if pr && @do_not_merge_label
+          add_labeling(pr, @do_not_merge_label)
+        end
+      end
+
+      def fetch
+        pull_requests.map do |pr|
+          Branch.from_hash(
+              'ref' => pr.source['branch']['name'],
+              'status' => status_from_labeling(pr),
+              'metadata' => metadata(pr),
+              'sha' => pr.source['commit']['hash']
+          )
+        end
+      end
+
+      def add_to_merge(branch)
+        pr = pr_for(branch)
+
+        pr ||= create_pr(branch.ref, branch.ref, branch.ref)
+        branch.add_metadata(metadata(pr))
+
+        if pr && @do_not_merge_label
+          remove_labeling(pr, @do_not_merge_label)
+        end
+      end
+
+      def mark_success(branch)
+        remove_labeling(pr_for(branch), @unmergeable_label)
+      end
+
+      def mark_failure(branch)
+        add_labeling(pr_for(branch), @unmergeable_label)
+      end
+
+      def code_reviewed?(branch)
+        is_labeled?(pr_for(branch), @code_reviewed_label)
+      end
+
+      def can_ship?(branch)
+        is_labeled?(pr_for(branch), @shippable_label)
+      end
+
+      def branch_link(branch)
+        branch.metadata['pr_url']
+      end
+
+      private
+
+      def status_from_labeling(pr)
+        case
+        when is_labeled?(pr, @do_not_merge_label)
+            'removed'
+          when is_labeled?(pr, @unmergeable_label)
+            'fail'
+          else
+            nil
+        end
+      end
+
+      def pr_for(branch)
+        pull_requests.detect { |pr| branch.ref == pr.source['branch']['name'] }
+      end
+
+      def create_pr(branch, title, body)
+        pr_resource = Tinybucket::Resource::PullRequests.new(repo_obj, [])
+        pr = pr_resource.create(source: { branch: { name: branch }}, title: title, description: body)
+        pull_requests << pr
+        pr
+      end
+
+      def pull_requests
+        @pull_requests ||= repo_obj.pull_requests.sort_by(&:created_on)
+      end
+
+      def labeling_string(label)
+        " ---  #{label}"
+      end
+
+      def labeling_regex(label)
+        /#{Regexp.escape(labeling_string(label))}$/
+      end
+
+      def remove_labeling(pr, label)
+        if is_labeled?(pr, label)
+          pr.title.gsub!(labeling_regex(label), '')
+          pr.update
+        end
+      end
+
+      def add_labeling(pr, label)
+        unless is_labeled?(pr, label)
+          pr.title += labeling_string(label)
+          pr.update
+        end
+      end
+
+      def is_labeled?(pr, label)
+        pr.title =~ labeling_regex(label)
+      end
+
+      def metadata(pr)
+        {
+            'pr_number' => pr.id,
+            'pr_url'    => pr.links['html']['href'],
+            'user_url'  => pr.author['links']['html']['href'],
+            'repo_url'  => repo_obj.links['html']['href']
+        }
+      end
+
+      def repo_obj
+        @repo_obj ||= begin
+          repo = Tinybucket.new.repo(@repo_owner, @repo)
+          repo.load
+          repo
+        end
+      end
+    end
+  end
+end

data/lib/flash_flow/data/collection.rb

@@ -1,5 +1,6 @@
 require 'flash_flow/data/branch'
 require 'flash_flow/data/github'
+require 'flash_flow/data/bitbucket'
 
 module FlashFlow
   module Data

data/lib/flash_flow/data/github.rb

@@ -92,10 +92,6 @@ module FlashFlow
         pull_requests.detect { |p| branch.ref == p.head.ref }
       end
 
-      def update_pr(pr_number)
-        octokit.update_pull_request(repo, pr_number, {})
-      end
-
       def create_pr(branch, title, body)
         pr = octokit.create_pull_request(repo, @master_branch, branch, title, body)
         pull_requests << pr

data/lib/flash_flow/git.rb

@@ -49,6 +49,10 @@ module FlashFlow
       @cmd_runner.run("git #{cmd}", opts)
     end
 
+    def working_dir
+      @cmd_runner.dir
+    end
+
     def add_and_commit(files, message, opts={})
       files = [files].flatten
       run("add #{'-f ' if opts[:add] && opts[:add][:force]}#{files.join(' ')}")
@@ -77,11 +81,12 @@ module FlashFlow
       last_stdout
     end
 
-    def initialize_rerere
+    def initialize_rerere(copy_from_dir=nil)
       return unless use_rerere
 
       @cmd_runner.run('mkdir .git/rr-cache')
       @cmd_runner.run('cp -R rr-cache/* .git/rr-cache/')
+      @cmd_runner.run("cp -R #{File.join(copy_from_dir, '.git/rr-cache/*')} .git/rr-cache/") if copy_from_dir
     end
 
     def commit_rerere(current_rereres)
@@ -168,11 +173,12 @@ module FlashFlow
         run("branch -D #{temp_merge_branch}")
         run("checkout -b #{temp_merge_branch}")
         run("reset --hard #{remote}/#{master_branch}")
+        run("clean -x -f -d")
       end
     end
 
     def push(branch, force=false)
-      run("push #{'-f' if force} #{remote} #{branch}")
+      run("push #{'-f' if force} #{remote} #{branch}:#{branch}")
     end
 
     def copy_temp_to_branch(branch, squash_message = nil)
@@ -210,7 +216,7 @@ module FlashFlow
     end
 
     def temp_merge_branch
-      "flash_flow/#{merge_branch}"
+      "flash_flow-#{merge_branch}"
     end
 
     def get_sha(branch, opts={})
@@ -231,6 +237,15 @@ module FlashFlow
       branch_exists?(branch) && !master_branch_contains?(get_sha(branch))
     end
 
+    def version
+      run('--version')
+      semver_regex = Regexp.new('.*(\d+\.\d+\.\d+).*')
+      running_version = last_stdout.strip
+      if semver = semver_regex.match(running_version)
+        semver[1]
+      end
+    end
+
     private
 
     def squash_commits(branch, commit_message)

data/lib/flash_flow/merge/acceptance.rb

@@ -18,6 +18,7 @@ module FlashFlow
 
       def run
         check_version
+        check_git_version
         check_repo
         puts "Building #{@local_git.merge_branch}... Log can be found in #{FlashFlow::Config.configuration.log_file}"
         logger.info "\n\n### Beginning #{@local_git.merge_branch} merge ###\n\n"
@@ -27,12 +28,14 @@ module FlashFlow
 
           @lock.with_lock do
             @git.in_original_merge_branch do
-              @git.initialize_rerere
+              @git.initialize_rerere(@local_git.working_dir)
             end
 
             @git.reset_temp_merge_branch
             @git.in_temp_merge_branch do
               merge_branches(@data.mergeable) do |branch, merger|
+                # Do not merge the master branch or the merge branch
+                next if [@git.merge_branch, @git.master_branch].include?(branch.ref)
                 process_result(branch, merger)
               end
               commit_branch_info
@@ -101,7 +104,7 @@ module FlashFlow
         raise OutOfSyncWithRemote.new("Your branch is out of sync with the remote. If you want to force push, run 'flash_flow -f'") unless @local_git.last_success?
 
         if @do_not_merge
-          @data.remove_from_merge(@local_git.remote, @local_git.working_branch)
+          @data.remove_from_merge(@local_git.working_branch)
         else
           @data.add_to_merge(@local_git.working_branch)
         end

data/lib/flash_flow/merge/base.rb

@@ -47,6 +47,19 @@ module FlashFlow
         end
       end
 
+      def check_git_version
+        git_version = @local_git.version
+        return if git_version.nil?
+
+        running_version = git_version.split(".").map(&:to_i)
+        expected_version = FlashFlow::GIT_VERSION.split(".").map(&:to_i)
+
+        if running_version[0] < expected_version[0] ||
+          (running_version[0] == expected_version[0] && running_version[1] < expected_version[1]) # Ignore the point release number
+          puts "Warning: Your version of git (#{git_version}) is behind the version that is tested (#{FlashFlow::GIT_VERSION}). We recommend to upgrade to at least #{expected_version[0]}.#{expected_version[1]}.0"
+        end
+      end
+
       def merge_branches(branches)
         ordered_branches = MergeOrder.new(@git, branches).get_order
         ordered_branches.each_with_index do |branch, index|

data/lib/flash_flow/merge/master.rb

@@ -15,6 +15,7 @@ module FlashFlow
 
       def send_mail
         check_version
+        check_git_version
         puts "Checking #{@git.release_branch} QA approval"
         logger.info "\n\n### Beginning check of #{@git.release_branch} QA ###\n\n"
 
@@ -36,6 +37,7 @@ module FlashFlow
       def run
         begin
           check_version
+          check_git_version
           puts "Merging #{@git.release_branch} into #{@git.master_branch}"
           logger.info "\n\n### Beginning merge of #{@git.release_branch} into #{@git.master_branch} ###\n\n"
 

data/lib/flash_flow/merge/release.rb

@@ -21,6 +21,7 @@ module FlashFlow
       def run
         begin
           check_version
+          check_git_version
           check_branches
           puts "Merging these branches into #{@git.release_branch}:\n  #{@release_branches.map(&:ref).join("\n  ")}"
           logger.info "\n\n### Beginning #{@local_git.merge_branch} merge ###\n\n"

data/lib/flash_flow/notifier.rb

@@ -1,5 +1,4 @@
 require 'flash_flow/data'
-require 'flash_flow/notifier/hipchat'
 
 module FlashFlow
   module Notifier

data/lib/flash_flow/version.rb

@@ -1,3 +1,4 @@
 module FlashFlow
-  VERSION = '1.5.3'
+  VERSION = '1.6.0'
+  GIT_VERSION = '2.0.0'
 end

data/test/lib/merge/test_acceptance.rb

@@ -47,8 +47,30 @@ module FlashFlow
         end
       end
 
-      def test_check_version_equal
+      def test_git_version_is_nil
+        with_git_versions(nil, '2.0.0') do
+          assert_nil(@deploy.check_git_version)
+        end
+      end
+
+      def test_check_git_version_greater
+        with_git_versions('3.0.0', '2.0.0') do
+          assert_nil(@deploy.check_git_version)
+        end
+
+        with_git_versions('2.15.1', '2.0.0') do
+          assert_nil(@deploy.check_git_version)
+        end
+      end
+
+      def test_check_git_version_less_raises
+        with_git_versions('2.0.0', '2.15.1') do
+          assert_output(/Warning/) { @deploy.check_git_version }
+        end
 
+        with_git_versions('1.7.8', '2.15.1') do
+          assert_output(/Warning/) { @deploy.check_git_version }
+        end
       end
 
       def test_print_errors_with_no_errors
@@ -162,6 +184,17 @@ module FlashFlow
         FlashFlow.const_set(:VERSION, original_version)
       end
 
+      def with_git_versions(running, expected)
+        original_version = FlashFlow::GIT_VERSION
+        FlashFlow.send(:remove_const, :GIT_VERSION)
+        FlashFlow.const_set(:GIT_VERSION, expected)
+        local_git.expect(:version, running)
+        yield
+        local_git.verify
+        FlashFlow.send(:remove_const, :GIT_VERSION)
+        FlashFlow.const_set(:GIT_VERSION, original_version)
+      end
+
       def merger
         @merger ||= Minitest::Mock.new
       end
@@ -180,6 +213,13 @@ module FlashFlow
         @deploy.instance_variable_set('@data'.to_sym, @data)
       end
 
+      def local_git
+        return @local_git if @local_git
+
+        @local_git = Minitest::Mock.new
+        @deploy.instance_variable_set('@local_git'.to_sym, @local_git)
+      end
+
       def sample_branches
         @sample_branches ||= [Data::Branch.from_hash({'ref' => 'branch3', 'merge_order' => 2}),
                               Data::Branch.from_hash({'ref' => 'branch1', 'merge_order' => 3}),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
-- Flashfunders
+- Brad Bennett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: hipchat
+  name: tb-bjb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-stub_any_instance
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +181,7 @@ dependencies:
 description: Flash flow is a command line tool for keeping your acceptance environment
   up to date
 email:
-- engineering@flashfunders.com
+- bradleyjaybennett@gmail.com
 executables:
 - flash_flow
 extensions: []
@@ -217,6 +203,7 @@ files:
 - lib/flash_flow/config.rb
 - lib/flash_flow/data.rb
 - lib/flash_flow/data/base.rb
+- lib/flash_flow/data/bitbucket.rb
 - lib/flash_flow/data/branch.rb
 - lib/flash_flow/data/collection.rb
 - lib/flash_flow/data/github.rb
@@ -239,7 +226,6 @@ files:
 - lib/flash_flow/merge/status.rb
 - lib/flash_flow/merge_order.rb
 - lib/flash_flow/notifier.rb
-- lib/flash_flow/notifier/hipchat.rb
 - lib/flash_flow/options.rb
 - lib/flash_flow/release.rb
 - lib/flash_flow/release/pdf_diff_generator.rb
@@ -278,7 +264,7 @@ files:
 - test/lib/test_resolve.rb
 - test/minitest_helper.rb
 - update_gem.sh
-homepage: https://github.com/FlashFunders/flash_flow
+homepage: https://github.com/bradleyjucsc/flash_flow
 licenses:
 - MIT
 metadata: {}
@@ -298,10 +284,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Implementation of the flashfunders workflow
+summary: Merge your open prs together
 test_files:
 - test/fixtures/pdf_diff/0cbafd97ee4904001e47c0d7a4a6e4b2ee7ed830458c8616466f7a631dfeb3ce.png
 - test/fixtures/pdf_diff/142ef42e828a35e3e128f47277cb73e56215f5a81c53923c657634ac574cca07.png

data/lib/flash_flow/notifier/hipchat.rb

@@ -1,40 +0,0 @@
-require 'hipchat'
-
-module FlashFlow
-  module Notifier
-    class Hipchat
-
-      def initialize(config={})
-        @client = initialize_connection!(config['token'])
-        @room = config['room']
-      end
-
-      def merge_conflict(branch)
-        begin
-          user_name = branch.metadata['user_url'].split('/').last
-          user_url_link = %{<a href="#{branch.metadata['user_url']}">#{user_name}</a>}
-          ref_link = %{<a href="#{branch.metadata['repo_url']}/tree/#{branch.ref}">#{branch.ref}</a>}
-
-          message = %{#{user_url_link}'s branch (#{ref_link}) did not merge successfully}
-          @client[@room].send("FlashFlow", message)
-        rescue HipChat::UnknownResponseCode => e
-          puts e.message
-        end
-      end
-
-      private
-
-      def initialize_connection!(token)
-        if token.nil?
-          raise RuntimeError.new("Hipchat token must be set in your flash flow config.")
-        end
-
-        hipchat_client.new(token, api_version: "v2")
-      end
-
-      def hipchat_client
-        HipChat::Client
-      end
-    end
-  end
-end