zenflow 0.8.2 → 0.8.3

data/spec/zenflow/helpers/branch_spec.rb

@@ -47,10 +47,42 @@ describe Zenflow::Branch do
 
   describe "self.update" do
     it "updates the branch" do
+      Zenflow::Config.should_receive(:[]).with(:merge_strategy).and_return('merge')
       Zenflow.should_receive(:Log).with("Updating the master branch")
       Zenflow::Shell.should_receive(:run).with("git checkout master && git pull")
       Zenflow::Branch.update('master')
     end
+
+    it "updates the branch using a rebase override" do
+      Zenflow::Config.should_receive(:[]).with(:merge_strategy).and_return('merge')
+      Zenflow.should_receive(:Log).with("Updating the master branch using pull with --rebase")
+      Zenflow::Shell.should_receive(:run).with("git checkout master && git pull --rebase")
+      Zenflow::Branch.update('master', true)
+    end
+  end
+
+  describe "self.apply_merge_strategy" do
+    it "merges the branch using the merge strategy" do
+      Zenflow::Config.should_receive(:[]).with(:merge_strategy).and_return('merge')
+      Zenflow::Branch.should_receive(:checkout).with("feature/testing-123")
+      Zenflow::Branch.should_receive(:merge).with('master')
+
+      Zenflow::Branch.apply_merge_strategy('feature', 'testing-123', 'master')
+    end
+
+    it "merges the branch using the rebase strategy" do
+      Zenflow::Config.should_receive(:[]).with(:merge_strategy).and_return('rebase')
+      Zenflow::Branch.should_receive(:rebase).with("feature/testing-123", 'master')
+
+      Zenflow::Branch.apply_merge_strategy('feature', 'testing-123', 'master')
+    end
+
+    it "optionally allows the merge strategy to be overridden by a --rebase flag when doing an update" do
+      Zenflow::Config.should_receive(:[]).with(:merge_strategy).and_return('merge')
+      Zenflow::Branch.should_receive(:rebase).with("feature/testing-123", 'master')
+
+      Zenflow::Branch.apply_merge_strategy('feature', 'testing-123', 'master', true)
+    end
   end
 
   describe "self.create" do
@@ -201,6 +233,14 @@ describe Zenflow::Branch do
     end
   end
 
+  describe "self.rebase" do
+    it "checks out the branch" do
+      Zenflow.should_receive(:Log).with("Rebasing feature/test-checkout on top of the master branch")
+      Zenflow::Shell.should_receive(:run).with("git rebase master feature/test-checkout")
+      Zenflow::Branch.rebase('feature/test-checkout', 'master')
+    end
+  end
+
   describe "self.merge" do
     it "merges in the specified branch" do
       Zenflow.should_receive(:Log).with("Merging in the feature/test-merging branch")

data/spec/zenflow/helpers/changelog_spec.rb

@@ -67,7 +67,7 @@ describe Zenflow::Changelog do
         file_handler.should_receive(:write).with('some other text I suppose')
         File.should_receive(:open).with("CHANGELOG.md", "w").and_yield(file_handler)
         Zenflow::Changelog.should_not_receive(:rotate)
-        Zenflow::Shell.should_receive(:run).with("git add . && git commit -a -m 'Adding line to CHANGELOG: changed the world'")
+        Zenflow::Shell.should_receive(:run).with("git add CHANGELOG.md && git commit -a -m 'Adding line to CHANGELOG: changed the world'")
         Zenflow::Changelog.prepend_change_to_changelog('changed the world')
       end
     end
@@ -76,7 +76,7 @@ describe Zenflow::Changelog do
       it "prepends changes to the changelog" do
         File.should_receive(:open).with("CHANGELOG.md", "w")
         Zenflow::Changelog.should_receive(:rotate)
-        Zenflow::Shell.should_receive(:run).with("git add . && git commit -a -m 'Adding line to CHANGELOG: changed the world'")
+        Zenflow::Shell.should_receive(:run).with("git add CHANGELOG.md && git commit -a -m 'Adding line to CHANGELOG: changed the world'")
         Zenflow::Changelog.prepend_change_to_changelog('changed the world', :rotate => true)
       end
     end

data/spec/zenflow/helpers/cli_spec.rb

@@ -102,7 +102,7 @@ describe Zenflow::CLI do
   end
 
   describe "#already_configured" do
-    let(:question) {['There is an existing config file. Overwrite it?', {:options => ["y", "N"], :default => "N"}]}
+    let(:question) {['There is an existing config file. Overwrite it?', {:options => ["y", "N"], :default => "n"}]}
     before do
       Zenflow.should_receive(:Log).with('Warning', :color => :red)
     end
@@ -133,7 +133,7 @@ describe Zenflow::CLI do
   describe "#configure_branch" do
     context "when the user wants to configure a staging branch" do
       before do
-        Zenflow.should_receive(:Ask).with("Use a branch for staging releases and hotfixes?", :options => ["Y", "n"], :default => "Y").and_return('y')
+        Zenflow.should_receive(:Ask).with("Use a branch for staging releases and hotfixes?", :options => ["Y", "n"], :default => "y").and_return('y')
       end
 
       it 'names the staging branch whatever the user wants' do
@@ -145,7 +145,7 @@ describe Zenflow::CLI do
 
     context "when the user does not want to configure a staging branch" do
       before do
-        Zenflow.should_receive(:Ask).with("Use a branch for staging releases and hotfixes?", :options => ["Y", "n"], :default => "Y").and_return('n')
+        Zenflow.should_receive(:Ask).with("Use a branch for staging releases and hotfixes?", :options => ["Y", "n"], :default => "y").and_return('n')
       end
 
       it 'names the staging branch whatever the user wants' do
@@ -155,6 +155,24 @@ describe Zenflow::CLI do
     end
   end
 
+  describe "#configure_merge_strategy" do
+    context "when the user wants to keep the default merge strategy of 'merge'" do
+      it 'sets the merge strategy to merge' do
+        Zenflow.should_receive(:Ask).with("What merge strategy would you prefer?", :options => ["merge", "rebase"], :default => "merge").and_return('merge')
+        Zenflow::Config.should_receive(:[]=).with(:merge_strategy, 'merge')
+        subject.configure_merge_strategy
+      end
+    end
+
+    context "when the user wants to change the default merge strategy to 'rebase'" do
+      it 'sets the merge strategy to rebase' do
+        Zenflow.should_receive(:Ask).with("What merge strategy would you prefer?", :options => ["merge", "rebase"], :default => "merge").and_return('rebase')
+        Zenflow::Config.should_receive(:[]=).with(:merge_strategy, 'rebase')
+        subject.configure_merge_strategy
+      end
+    end
+  end
+
   describe "#configure_project" do
     it 'asks the user to name their project' do
       Zenflow.should_receive(:Ask).with("What is the name of this project?", :required => true).and_return('zenflow')
@@ -177,7 +195,7 @@ describe Zenflow::CLI do
   describe "#configure_remotes" do
     context "when the user wants to configure a backup remote" do
       before do
-        Zenflow.should_receive(:Ask).with("Use a backup remote?", :options => ["Y", "n"], :default => "n").and_return('y')
+        Zenflow.should_receive(:Ask).with("Use a backup remote?", :options => ["y", "N"], :default => "n").and_return('y')
       end
 
       it 'configures the primary remote and a backup remote' do
@@ -191,7 +209,7 @@ describe Zenflow::CLI do
 
     context "when the user does not want to configure a backup remote" do
       before do
-        Zenflow.should_receive(:Ask).with("Use a backup remote?", :options => ["Y", "n"], :default => "n").and_return('n')
+        Zenflow.should_receive(:Ask).with("Use a backup remote?", :options => ["y", "N"], :default => "n").and_return('n')
       end
 
       it 'configures the primary remote and a backup remote' do
@@ -213,7 +231,7 @@ describe Zenflow::CLI do
 
       context "when the user wants to set up a changelog" do
         it 'sets up the changelog' do
-          Zenflow.should_receive(:Ask).with("Set up a changelog?", :options => ["Y", "n"], :default => "Y").and_return('y')
+          Zenflow.should_receive(:Ask).with("Set up a changelog?", :options => ["Y", "n"], :default => "y").and_return('y')
           Zenflow::Changelog.should_receive(:create)
           subject.set_up_changelog
         end
@@ -221,7 +239,7 @@ describe Zenflow::CLI do
 
       context "when the user does not want to set up a changelog" do
         it 'does not set up the changelog' do
-          Zenflow.should_receive(:Ask).with("Set up a changelog?", :options => ["Y", "n"], :default => "Y").and_return('n')
+          Zenflow.should_receive(:Ask).with("Set up a changelog?", :options => ["Y", "n"], :default => "y").and_return('n')
           Zenflow::Changelog.should_not_receive(:create)
           subject.set_up_changelog
         end
@@ -235,7 +253,7 @@ describe Zenflow::CLI do
 
       it 'does not set up the changelog' do
         Zenflow.should_not_receive(:Log).with("Changelog Management")
-        Zenflow.should_not_receive(:Ask).with("Set up a changelog?", :options => ["Y", "n"], :default => "Y")
+        Zenflow.should_not_receive(:Ask).with("Set up a changelog?", :options => ["Y", "n"], :default => "y")
         Zenflow::Changelog.should_not_receive(:create)
         subject.set_up_changelog
       end
@@ -245,9 +263,9 @@ describe Zenflow::CLI do
   describe "#confirm_some_stuff" do
     it "confirms staging deployment and code review requirements" do
       Zenflow.should_receive(:Log).with("Confirmations")
-      Zenflow.should_receive(:Ask).with("Require deployment to a staging environment?", :options => ["Y", "n"], :default => "Y").and_return('y')
+      Zenflow.should_receive(:Ask).with("Require deployment to a staging environment?", :options => ["Y", "n"], :default => "y").and_return('y')
       Zenflow::Config.should_receive(:[]=).with(:confirm_staging, true)
-      Zenflow.should_receive(:Ask).with("Require code reviews?", :options => ["Y", "n"], :default => "Y").and_return('n')
+      Zenflow.should_receive(:Ask).with("Require code reviews?", :options => ["Y", "n"], :default => "y").and_return('n')
       Zenflow::Config.should_receive(:[]=).with(:confirm_review, false)
       subject.confirm_some_stuff
     end
@@ -265,6 +283,7 @@ describe Zenflow::CLI do
         subject.should_receive(:authorize_github)
         subject.should_receive(:configure_project)
         subject.should_receive(:configure_branches)
+        subject.should_receive(:configure_merge_strategy)
         subject.should_receive(:configure_remotes)
         subject.should_receive(:confirm_some_stuff)
         subject.should_receive(:set_up_changelog)
@@ -285,6 +304,7 @@ describe Zenflow::CLI do
           subject.should_receive(:authorize_github)
           subject.should_receive(:configure_project)
           subject.should_receive(:configure_branches)
+          subject.should_receive(:configure_merge_strategy)
           subject.should_receive(:configure_remotes)
           subject.should_receive(:confirm_some_stuff)
           subject.should_receive(:set_up_changelog)
@@ -305,6 +325,7 @@ describe Zenflow::CLI do
           subject.should_not_receive(:authorize_github)
           subject.should_not_receive(:configure_project)
           subject.should_not_receive(:configure_branches)
+          subject.should_not_receive(:configure_merge_strategy)
           subject.should_not_receive(:configure_remotes)
           subject.should_not_receive(:confirm_some_stuff)
           subject.should_not_receive(:set_up_changelog)

data/spec/zenflow/helpers/help_spec.rb

@@ -13,9 +13,10 @@ describe Zenflow::Help do
                               :usage    => "test-help (optional please)",
                               :commands => ['test-help', 'spec-help'])}
 
-  it "has an amazing banner" do
-    expect(subject.banner).to eq("\e[36m- Summary ------------------------------\e[0m\ntests Zenflow::Help\n\n\e[36m- Usage --------------------------------\e[0m\ntest-help (optional please)\n\n\e[36m- Available Commands -------------------\e[0m\n[\"test-help\", \"spec-help\"]\n\n\e[36m- Options ------------------------------\e[0m")
-  end
+  it{expect(subject.banner).to match(/Summary/)}
+  it{expect(subject.banner).to match(/Usage/)}
+  it{expect(subject.banner).to match(/Available Commands/)}
+  it{expect(subject.banner).to match(/Options/)}
 
   context "#unknown_command" do
     describe "when the command is missing" do

data/spec/zenflow/helpers/log_spec.rb

@@ -18,7 +18,7 @@ describe Zenflow do
       end
 
       it 'colorizes the text' do
-        $stdout.should_receive(:puts).with(/\e\[34mfoo/)
+        $stdout.should_receive(:puts).with(/foo/)
         Zenflow.Log('foo', color: :blue, arrows: false)
       end
 

data/spec/zenflow/helpers/pull_request_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe Zenflow::PullRequest do
   before(:each){
-    Zenflow::Github.stub(:user).and_return('github-user')
-    Zenflow::Github.stub(:token).and_return('github-token')
     Zenflow::Github.stub(:zenflow_token).and_return('zenflow-token')
+    Zenflow::Github.stub(:user).and_return('github-user')
     Zenflow::GithubRequest.base_uri 'https://api.github.com/repos/zencoder/zenflow-example'
   }
 
@@ -63,8 +62,8 @@ describe Zenflow::PullRequest do
     end
   end
 
-  describe '.create', vcr: { cassette_name: "create pull request" } do
-    let(:request_options) do
+  context "creating pull requests" do
+    let(:good_request_options) do
       {
         base: 'master',
         head: 'feature/new-branch',
@@ -72,36 +71,40 @@ describe Zenflow::PullRequest do
         body: 'making a new pull request'
       }
     end
-    it{ expect(Zenflow::PullRequest.create(request_options)).to(
-      be_a_kind_of(Zenflow::PullRequest)
-    ) }
-  end
 
-  describe '#valid?' do
-    context 'good request', vcr: { cassette_name: "create pull request" } do
-      let(:request){Zenflow::PullRequest.create({})}
-      it{expect(request.valid?).to be_true}
+    let(:bad_request_options) do
+      {
+        base: 'master',
+        head: 'feature/phoney',
+        title: 'this feature does not exist',
+        body: 'gonna fail'
+      }
+    end
+
+    describe '.create', vcr: { cassette_name: "create pull request" } do
+      it{ expect(Zenflow::PullRequest.create(good_request_options)).to(
+        be_a_kind_of(Zenflow::PullRequest)
+      ) }
     end
 
-    context 'bad request', vcr: { cassette_name: "create bad pull request" } do
-      let(:request_options) do
-        {
-          base: 'master',
-          head: 'feature/phoney',
-          title: 'this feature does not exist',
-          body: 'gonna fail'
-        }
+    describe '#valid?' do
+      context 'good request', vcr: { cassette_name: "create pull request" } do
+        let(:request){Zenflow::PullRequest.create(good_request_options)}
+        it{expect(request.valid?).to be_true}
+      end
+
+      context 'bad request', vcr: { cassette_name: "create bad pull request" } do
+        let(:request){Zenflow::PullRequest.create(bad_request_options)}
+        it{expect(request.valid?).to be_false}
       end
-      let(:request){Zenflow::PullRequest.create()}
-      it{expect(request.valid?).to be_false}
     end
-  end
 
-  describe '#[]' do
-    context 'good request', vcr: { cassette_name: "create pull request" } do
-      let(:request){Zenflow::PullRequest.create({})}
-      it{expect(request["comments"]).to_not be_nil}
-      it{expect(request["fdsfa"]).to be_nil}
+    describe '#[]' do
+      context 'good request', vcr: { cassette_name: "create pull request" } do
+        let(:request){Zenflow::PullRequest.create(good_request_options)}
+        it{expect(request["comments"]).to_not be_nil}
+        it{expect(request["fdsfa"]).to be_nil}
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenflow
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Adam Kittelson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Branch management and deployment tool.