flash_flow 1.2.1 → 1.2.2.a

data/test/lib/test_deploy.rb

@@ -59,7 +59,7 @@ module FlashFlow
 
       current_branch_error = "ERROR: Your branch did not merge to test_acceptance. Run 'flash_flow --resolve', fix the merge conflict(s) and then re-run this script\n"
 
-      @deploy.instance_variable_get('@git'.to_sym).stub(:working_branch, 'pushing_branch') do
+      @deploy.instance_variable_get('@local_git'.to_sym).stub(:working_branch, 'pushing_branch') do
         assert_equal(current_branch_error, @deploy.format_errors)
       end
     end
@@ -73,12 +73,10 @@ module FlashFlow
     end
 
     def test_check_out_to_working_branch
-      @deploy.stub(:in_shadow_repo, true) do
-        @deploy.stub(:check_repo, true) do
-          @deploy.stub(:check_version, true) do
-            Lock::Base.stub_any_instance(:with_lock, -> { raise Lock::Error }) do
-              assert_output(/Failure!/) { @deploy.run }
-            end
+      @deploy.stub(:check_repo, true) do
+        @deploy.stub(:check_version, true) do
+          Lock::Base.stub_any_instance(:with_lock, -> { raise Lock::Error }) do
+            assert_output(/Failure!/) { @deploy.run }
           end
         end
       end
@@ -137,7 +135,7 @@ module FlashFlow
 
     def test_ignore_pushing_master_or_acceptance
       ['test_master', 'test_acceptance'].each do |branch|
-        @deploy.instance_variable_get('@git'.to_sym).stub(:working_branch, branch) do
+        @deploy.instance_variable_get('@local_git'.to_sym).stub(:working_branch, branch) do
           refute(@deploy.open_pull_request)
         end
       end

data/test/lib/test_git.rb

@@ -40,15 +40,15 @@ module FlashFlow
       @cmd_runner.expect(:run, true, ['rm -rf rr-cache/*'])
       @cmd_runner.expect(:run, true, ['cp -R .git/rr-cache/xyz rr-cache/'])
       @cmd_runner.expect(:run, true, ['cp -R .git/rr-cache/abc rr-cache/'])
-      @cmd_runner.expect(:run, true, ['git add rr-cache/'])
-      @cmd_runner.expect(:run, true, ["git commit -m 'Update rr-cache'"])
+      @cmd_runner.expect(:run, true, ['git add rr-cache/', {}])
+      @cmd_runner.expect(:run, true, ["git commit -m 'Update rr-cache'", {}])
 
       instance.commit_rerere(['xyz', 'abc'])
       @cmd_runner.verify
     end
 
     def test_read_file_from_merge_branch
-      @cmd_runner.expect(:run, true, ["git show origin/acceptance:SomeFilename.txt"])
+      @cmd_runner.expect(:run, true, ["git show origin/acceptance:SomeFilename.txt", log: CmdRunner::LOG_CMD])
       @cmd_runner.expect(:last_stdout, 'some_json', [])
       @git_args['use_rerere'] = false
 
@@ -65,7 +65,7 @@ module FlashFlow
 
     def setup_cmd_runner
       cmd_runner = Minitest::Mock.new
-      cmd_runner.expect(:run, true, ['git rev-parse --abbrev-ref HEAD'])
+      cmd_runner.expect(:run, true, ['git rev-parse --abbrev-ref HEAD', {}])
       cmd_runner.expect(:last_stdout, 'current_branch', [])
       cmd_runner
     end

data/test/lib/test_issue_tracker.rb

@@ -10,6 +10,11 @@ module FlashFlow
         def stories_pushed; 'pushed!'; end
         def production_deploy; 'deployed!'; end
         def stories_delivered; 'delivered!'; end
+        def story_deployable?(story_id); "deployable: #{story_id}"; end
+        def story_link(story_id); "link: #{story_id}"; end
+        def story_title(story_id); "title: #{story_id}"; end
+        def release_keys(story_id); "release_keys: #{story_id}"; end
+        def stories_for_release(release_keys); "release stories: #{release_keys}"; end
       end
 
       def test_issue_tracker_class_not_set
@@ -19,6 +24,11 @@ module FlashFlow
             assert_nil(empty_issue_tracker.stories_pushed)
             assert_nil(empty_issue_tracker.stories_delivered)
             assert_nil(empty_issue_tracker.production_deploy)
+            assert_nil(empty_issue_tracker.story_deployable?('123'))
+            assert_nil(empty_issue_tracker.story_link('123'))
+            assert_nil(empty_issue_tracker.story_title('123'))
+            assert_nil(empty_issue_tracker.release_keys('123'))
+            assert_nil(empty_issue_tracker.stories_for_release('release'))
           end
         end
       end
@@ -29,6 +39,11 @@ module FlashFlow
             assert_equal(FakeIssueTracker.new.stories_pushed, issue_tracker.stories_pushed)
             assert_equal(FakeIssueTracker.new.stories_delivered, issue_tracker.stories_delivered)
             assert_equal(FakeIssueTracker.new.production_deploy, issue_tracker.production_deploy)
+            assert_equal(FakeIssueTracker.new.story_deployable?('123'), issue_tracker.story_deployable?('123'))
+            assert_equal(FakeIssueTracker.new.story_link('123'), issue_tracker.story_link('123'))
+            assert_equal(FakeIssueTracker.new.story_title('123'), issue_tracker.story_title('123'))
+            assert_equal(FakeIssueTracker.new.release_keys('123'), issue_tracker.release_keys('123'))
+            assert_equal(FakeIssueTracker.new.stories_for_release('release'), issue_tracker.stories_for_release('release'))
           end
         end
       end

data/test/lib/test_resolve.rb

@@ -4,10 +4,6 @@ module FlashFlow
   class TestResolve< Minitest::Test
 
     class ResolveTester < Resolve
-      def in_shadow_repo
-        yield
-      end
-
       def in_working_branch
         yield
       end
@@ -71,30 +67,5 @@ module FlashFlow
       end
     end
 
-    
-    
-# def start
-#           if unresolved_conflicts.empty?
-#             puts "You have already resolved all conflicts."
-#           else
-#             launch_bash
-#             @git.run("rerere")
-#
-#             unless unresolved_conflicts.empty?
-#               puts "There are still unresolved conflicts in these files:\n#{unresolved_conflicts.join("\n")}\n\n"
-#             end
-#           end
-#
-#           @git.run("reset --hard HEAD")
-#         end
-#       end
-#     end
-
-
-    private
-
-    def shadow_repo
-      Minitest::Mock.new.expect(:in_dir, true)
-    end
   end
 end

data/test/minitest_helper.rb

@@ -7,11 +7,13 @@ ENV['GH_TOKEN'] = 'fake_token'
 class Minitest::Test
 
   class TestCmdRunner < Minitest::Mock
+    LOG_NONE = :log_none
+    LOG_CMD = :log_cmd
+
     def initialize(opts={}); super(); end
-    def run(_); end
-    def last_success?
-      true
-    end
+    def run(_, opts={}); end
+    def last_success?; true; end
+    def dir=(other); other; end
     def last_stdout; ''; end
     def last_stderr; ''; end
     def last_command; ''; end

data/update_gem.sh

@@ -0,0 +1,5 @@
+gem uninstall -x flash_flow
+gem build flash_flow.gemspec
+export VERSION=`ruby -r./lib/flash_flow/version -e "puts FlashFlow::VERSION"`
+gem install flash_flow-$VERSION.gem --no-ri --no-rdoc
+rbenv rehash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2.a
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: ruby-graphviz
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +172,10 @@ files:
 - lib/flash_flow/issue_tracker/pivotal.rb
 - lib/flash_flow/lock.rb
 - lib/flash_flow/lock/github.rb
+- lib/flash_flow/merge_master.rb
+- lib/flash_flow/merge_master/merge_status.html.erb
+- lib/flash_flow/merge_master/release_graph.rb
+- lib/flash_flow/merge_master/status.rb
 - lib/flash_flow/notifier.rb
 - lib/flash_flow/notifier/hipchat.rb
 - lib/flash_flow/options.rb
@@ -173,6 +191,8 @@ files:
 - test/lib/data/test_store.rb
 - test/lib/issue_tracker/test_pivotal.rb
 - test/lib/lock/test_github.rb
+- test/lib/merge_master/test_release_graph.rb
+- test/lib/merge_master/test_status.rb
 - test/lib/test_branch_merger.rb
 - test/lib/test_config.rb
 - test/lib/test_deploy.rb
@@ -181,6 +201,7 @@ files:
 - test/lib/test_notifier.rb
 - test/lib/test_resolve.rb
 - test/minitest_helper.rb
+- update_gem.sh
 homepage: https://github.com/FlashFunders/flash_flow
 licenses:
 - MIT
@@ -196,9 +217,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -213,6 +234,8 @@ test_files:
 - test/lib/data/test_store.rb
 - test/lib/issue_tracker/test_pivotal.rb
 - test/lib/lock/test_github.rb
+- test/lib/merge_master/test_release_graph.rb
+- test/lib/merge_master/test_status.rb
 - test/lib/test_branch_merger.rb
 - test/lib/test_config.rb
 - test/lib/test_deploy.rb