flash_flow 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 850c7954c81a98af1fd93586fa26480206f77e1b
-  data.tar.gz: 84c7d961f340a47df35b7815ef8aa28b476dd044
+  metadata.gz: 4aff3163ea68205769ff9157ffcc3186797b571c
+  data.tar.gz: d917594c16e2f836b6572922a227df7f696bbd39
 SHA512:
-  metadata.gz: 3152a86788e0a3a1ced7ce324b53de41c7675f16db7fb7c0c234be495240794e18e5e06363791082f08eb8fee9ef408bd8ad9ded1e90dcc5621f4876a6bfd00c
-  data.tar.gz: a24836c67acb42b3125694d48b063516393f08c83ba390ae4fef7d7d75929ff589ed4796a4ed89112a01ef1185f0254ab72b4e3365c7e68de6fe8d521b7d5637
+  metadata.gz: 39d51941b834bc218524412c37e7fd02309a3e947e39aad06ff5b45ff0815fa65c79bb6939accff3c98072c0c119e3e82753f195c1f9901101ae27b5694c4238
+  data.tar.gz: 75ba31076eaa53acb0f84a81088f7dcd4e21e892e03bd9903be25ba38df81f4c87c3fd747f49bead11ce399bf6857b6643d16a14fe0f60c412b56df2917d585f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.4.4)
+    flash_flow (1.4.5)
       hipchat (~> 1.5)
       octokit (~> 4.1)
       percy-client

data/bin/flash_flow

@@ -29,7 +29,7 @@ case
   when options[:merge_status_html]
     FlashFlow::Merge::Status.new(FlashFlow::Config.configuration.issue_tracker, FlashFlow::Config.configuration.branches, FlashFlow::Config.configuration.branch_info_file, FlashFlow::Config.configuration.git, logger: FlashFlow::Config.configuration.logger).status_html
   when options[:release_branches]
-    FlashFlow::Merge::Master.new(options).run
+    FlashFlow::Merge::Release.new(options).run
   else
     FlashFlow::Merge::Acceptance.new(options).run
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).stories_pushed

data/lib/flash_flow/merge.rb

@@ -4,5 +4,5 @@ module FlashFlow
 end
 
 require 'flash_flow/merge/acceptance'
-require 'flash_flow/merge/master'
+require 'flash_flow/merge/release'
 require 'flash_flow/merge/status'

data/lib/flash_flow/merge/acceptance.rb

@@ -56,7 +56,7 @@ module FlashFlow
 
       def commit_branch_info
         @stories.each do |story_id|
-          @data.add_story(@git.remote, @git.working_branch, story_id)
+          @data.add_story(@git.working_branch, story_id)
         end
         @data.save!
       end

data/lib/flash_flow/merge/{master.rb → release.rb}

@@ -2,7 +2,7 @@ require 'flash_flow/merge/base'
 
 module FlashFlow
   module Merge
-    class Master < Base
+    class Release < Base
 
       class PendingReleaseError < RuntimeError; end
       class NothingToMergeError < RuntimeError; end

data/lib/flash_flow/options.rb

@@ -24,6 +24,7 @@ module FlashFlow
         opts.on('--merge-status', 'Show status of all branches and their stories and exit') { |v| options[:merge_status] = true }
         opts.on('--merge-status-html', 'Show status of all branches and their stories in html format and exit') { |v| options[:merge_status_html] = true }
         opts.on('--make-release branch1,branch2', 'Comma-delimited list of branches to merge to the release branch. Run "--merge-release ready" to merge all ready to ship branches') { |v| options[:release_branches] = v.split(',') }
+        opts.on('--merge-release', 'Merge the release branch into the master branch and push') { |v| options[:merge_release] = v.split(',') }
 
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -188,8 +188,8 @@ files:
 - lib/flash_flow/merge.rb
 - lib/flash_flow/merge/acceptance.rb
 - lib/flash_flow/merge/base.rb
-- lib/flash_flow/merge/master.rb
 - lib/flash_flow/merge/merge_status.html.erb
+- lib/flash_flow/merge/release.rb
 - lib/flash_flow/merge/release_graph.rb
 - lib/flash_flow/merge/status.rb
 - lib/flash_flow/merge_order.rb