git_reflow 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a848dbfa0ca060e1c78945ad87b11441bb8d6bb
-  data.tar.gz: b1cf8c05a4db8375f94ecd6fb683ec60500ec582
+  metadata.gz: a03428bd10395a06f13dba78ed2d3c0f5a44d365
+  data.tar.gz: 39ccbe0eba5a4bc2d1c8dd4f773abdaf2a4494e3
 SHA512:
-  metadata.gz: 60873747519ba15c8253e2253dad87f536c76cf5008499fd62a45d16b0ed7626289a05eb5c75b9fb16b97376ea325b8e3fb4d22c89f6a3eda468347fe6dc584c
-  data.tar.gz: fbc7ad889fe2c9069395b5be431e32120f3788e4e6fd614e6335ef7b319ea5931d8f45ac8f70525a3c462ba19258a073b5711a3b784ac079d0b1b278342b16f9
+  metadata.gz: cf391753fa8dce7bbc246b1310e83b7a30407462b69bb5a99e675b07adf3ca5ecf5a54b50e425db533a8d97f0b9b889c263010fbb60e3b2dc23da1e3a2cd6025
+  data.tar.gz: dcfad07027cc0a827a62b614c2a8b1f201df578a46b8c8a710758c3103dffa1bfb4276d30908ab091bb55449bbbbe33bd9b85a6a0d1bdc7d069fcec868373b3f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.6.4)
+    git_reflow (0.6.5)
       colorize (= 0.6.0)
       github_api (= 0.12.3)
       gli (= 2.12.2)

data/README.rdoc

@@ -310,6 +310,14 @@ http://reenhanced.com/images/reflow.png
   Squash commits to master mean every commit represents the whole feature, not a "typo fix".
 
 
+== Configuration
+
+  In order to streamline delivery you can set the following git config to
+  always push the branch after merge and clean up the feature branch.
+
+  git config --global --add "reflow.always-deploy-and-cleanup" "true"
+
+
 ---
 
 == Contributing

data/lib/git_reflow.rb

@@ -99,8 +99,12 @@ module GitReflow
 
           if committed
             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
+
+            # check if user always wants to push and cleanup, otherwise ask
+            always_deploy_and_cleanup = GitReflow::Config.get('reflow.always-deploy-and-cleanup') == "true"
+            deploy_and_cleanup = always_deploy_and_cleanup || (ask "Would you like to push this branch to your remote repo and cleanup your feature branch? ") =~ /^y/i
+
+            if deploy_and_cleanup
               run_command_with_label "git push origin #{options['base']}"
               run_command_with_label "git push origin :#{feature_branch}"
               run_command_with_label "git branch -D #{feature_branch}"

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/spec/git_reflow_spec.rb

@@ -281,17 +281,42 @@ describe GitReflow do
                 end
               end
 
-              it "pushes local squash merged base branch to remote repo" do
-                expect { subject }.to have_run_command("git push origin master")
-              end
+              context "not always" do
+                before do
+                  GitReflow::Config.stub(:get) { "false" }
+                end
+
+                it "pushes local squash merged base branch to remote repo" do
+                  expect { subject }.to have_run_command("git push origin master")
+                end
 
-              it "deletes the remote feature branch" do
-                expect { subject }.to have_run_command("git push origin :new-feature")
+                it "deletes the remote feature branch" do
+                  expect { subject }.to have_run_command("git push origin :new-feature")
+                end
+
+                it "deletes the local feature branch" do
+                  expect { subject }.to have_run_command("git branch -D new-feature")
+                end
               end
 
-              it "deletes the local feature branch" do
-                expect { subject }.to have_run_command("git branch -D new-feature")
+              context "always" do
+                before do
+                  GitReflow::Config.stub(:get) { "true" }
+                end
+
+                it "pushes local squash merged base branch to remote repo" do
+                  expect { subject }.to have_run_command("git push origin master")
+                end
+
+                it "deletes the remote feature branch" do
+                  expect { subject }.to have_run_command("git push origin :new-feature")
+                end
+
+                it "deletes the local feature branch" do
+                  expect { subject }.to have_run_command("git branch -D new-feature")
+                end
               end
+
             end
 
             context "and not cleaning up feature branch" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -306,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A better git process