git_reflow 0.8.10 → 0.9.4

data/spec/fixtures/repositories/commit.json

@@ -1,53 +1,53 @@
-{
-    "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
-    "commit": {
-        "url": "https://api.github.com/repos/reenhanced/repo/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
-        "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
-        "author": {
-            "name": "Monalisa Octocat",
-            "email": "support@github.com",
-            "date": "2011-04-14T16:00:49Z"
-        },
-        "committer": {
-            "name": "Monalisa Octocat",
-            "email": "support@github.com",
-            "date": "2011-04-14T16:00:49Z"
-        },
-        "message": "Fix all the bugs",
-        "tree": {
-            "url": "https://api.github.com/repos/reenhanced/repo/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
-            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
-        }
-    },
-    "author": {
-        "login": "reenhanced",
-        "id": 1,
-        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-        "url": "https://api.github.com/users/reenhanced"
-    },
-    "committer": {
-        "login": "reenhanced",
-        "id": 1,
-        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-        "url": "https://api.github.com/users/reenhanced"
-    },
-    "parents": [
-        {
-            "url": "https://api.github.com/repos/reenhanced/repo/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
-            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
-        }
-    ],
-    "stats": {
-        "additions": 104,
-        "deletions": 4,
-        "total": 108
-    },
-    "files": [
-        {
-            "filename": "file1.txt",
-            "additions": 10,
-            "deletions": 2,
-            "total": 12
-        }
-    ]
-}
+{
+    "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+    "commit": {
+        "url": "https://api.github.com/repos/reenhanced/repo/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+        "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+        "author": {
+            "name": "Monalisa Octocat",
+            "email": "support@github.com",
+            "date": "2011-04-14T16:00:49Z"
+        },
+        "committer": {
+            "name": "Monalisa Octocat",
+            "email": "support@github.com",
+            "date": "2011-04-14T16:00:49Z"
+        },
+        "message": "Fix all the bugs",
+        "tree": {
+            "url": "https://api.github.com/repos/reenhanced/repo/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
+        }
+    },
+    "author": {
+        "login": "reenhanced",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "url": "https://api.github.com/users/reenhanced"
+    },
+    "committer": {
+        "login": "reenhanced",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "url": "https://api.github.com/users/reenhanced"
+    },
+    "parents": [
+        {
+            "url": "https://api.github.com/repos/reenhanced/repo/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
+        }
+    ],
+    "stats": {
+        "additions": 104,
+        "deletions": 4,
+        "total": 108
+    },
+    "files": [
+        {
+            "filename": "file1.txt",
+            "additions": 10,
+            "deletions": 2,
+            "total": 12
+        }
+    ]
+}

data/spec/fixtures/repositories/commit.json.erb

@@ -1,53 +1,53 @@
-{
-    "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
-    "commit": {
-        "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
-        "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
-        "author": {
-            "name": "Monalisa Octocat",
-            "email": "support@github.com",
-            "date": "<%= created_at || "2011-04-14T16:00:49Z" %>"
-        },
-        "committer": {
-            "name": "Monalisa Octocat",
-            "email": "support@github.com",
-            "date": "<%= created_at || "2011-04-14T16:00:49Z" %>"
-        },
-        "message": "Fix all the bugs",
-        "tree": {
-            "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
-            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
-        }
-    },
-    "author": {
-        "login": "<%= author %>",
-        "id": 1,
-        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-        "url": "https://api.github.com/users/<%= author %>"
-    },
-    "committer": {
-        "login": "<%= author %>",
-        "id": 1,
-        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-        "url": "https://api.github.com/users/<%= author %>"
-    },
-    "parents": [
-        {
-            "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
-            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
-        }
-    ],
-    "stats": {
-        "additions": 104,
-        "deletions": 4,
-        "total": 108
-    },
-    "files": [
-        {
-            "filename": "file1.txt",
-            "additions": 10,
-            "deletions": 2,
-            "total": 12
-        }
-    ]
-}
+{
+    "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+    "commit": {
+        "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+        "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+        "author": {
+            "name": "Monalisa Octocat",
+            "email": "support@github.com",
+            "date": "<%= created_at || "2011-04-14T16:00:49Z" %>"
+        },
+        "committer": {
+            "name": "Monalisa Octocat",
+            "email": "support@github.com",
+            "date": "<%= created_at || "2011-04-14T16:00:49Z" %>"
+        },
+        "message": "Fix all the bugs",
+        "tree": {
+            "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
+        }
+    },
+    "author": {
+        "login": "<%= author %>",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "url": "https://api.github.com/users/<%= author %>"
+    },
+    "committer": {
+        "login": "<%= author %>",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "url": "https://api.github.com/users/<%= author %>"
+    },
+    "parents": [
+        {
+            "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
+        }
+    ],
+    "stats": {
+        "additions": 104,
+        "deletions": 4,
+        "total": 108
+    },
+    "files": [
+        {
+            "filename": "file1.txt",
+            "additions": 10,
+            "deletions": 2,
+            "total": 12
+        }
+    ]
+}

data/spec/fixtures/repositories/commits.json.erb

@@ -1,13 +1,13 @@
-[
-  <% commits_json = [] %>
-  <% commits.each_with_index do |commit, index| %>
-    <% commits_json << Fixture.new('repositories/commit.json.erb',
-                         id:                  index,
-                         author:              commit[:author],
-                         repo_owner:          repo_owner,
-                         repo_name:           repo_name,
-                         created_at:          commit[:created_at] || Chronic.parse("October 21, 2015 07:28:00")
-                       ).to_s %>
-  <% end %>
-  <%= commits_json.join(", ") %>
-]
+[
+  <% commits_json = [] %>
+  <% commits.each_with_index do |commit, index| %>
+    <% commits_json << Fixture.new('repositories/commit.json.erb',
+                         id:                  index,
+                         author:              commit[:author],
+                         repo_owner:          repo_owner,
+                         repo_name:           repo_name,
+                         created_at:          commit[:created_at] || Chronic.parse("October 21, 2015 07:28:00")
+                       ).to_s %>
+  <% end %>
+  <%= commits_json.join(", ") %>
+]

data/spec/fixtures/repositories/statuses.json

@@ -1,31 +1,31 @@
-[
-  {
-    "created_at": "2012-07-20T01:19:13Z",
-    "updated_at": "2012-07-20T01:19:13Z",
-    "state": "success",
-    "target_url": "https://ci.example.com/1000/output",
-    "description": "Build has completed successfully",
-    "id": 1,
-    "url": "https://api.github.com/repos/reenhanced/example/statuses/1",
-    "context": "continuous-integration/jenkins",
-    "creator": {
-      "login": "reenhanced",
-      "id": 1,
-      "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-      "gravatar_id": "somehexcode",
-      "url": "https://api.github.com/users/reenhanced",
-      "html_url": "https://github.com/reenhanced",
-      "followers_url": "https://api.github.com/users/reenhanced/followers",
-      "following_url": "https://api.github.com/users/reenhanced/following{/other_user}",
-      "gists_url": "https://api.github.com/users/reenhanced/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/reenhanced/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/reenhanced/subscriptions",
-      "organizations_url": "https://api.github.com/users/reenhanced/orgs",
-      "repos_url": "https://api.github.com/users/reenhanced/repos",
-      "events_url": "https://api.github.com/users/reenhanced/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/reenhanced/received_events",
-      "type": "User",
-      "site_admin": false
-    }
-  }
-]
+[
+  {
+    "created_at": "2012-07-20T01:19:13Z",
+    "updated_at": "2012-07-20T01:19:13Z",
+    "state": "success",
+    "target_url": "https://ci.example.com/1000/output",
+    "description": "Build has completed successfully",
+    "id": 1,
+    "url": "https://api.github.com/repos/reenhanced/example/statuses/1",
+    "context": "continuous-integration/jenkins",
+    "creator": {
+      "login": "reenhanced",
+      "id": 1,
+      "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+      "gravatar_id": "somehexcode",
+      "url": "https://api.github.com/users/reenhanced",
+      "html_url": "https://github.com/reenhanced",
+      "followers_url": "https://api.github.com/users/reenhanced/followers",
+      "following_url": "https://api.github.com/users/reenhanced/following{/other_user}",
+      "gists_url": "https://api.github.com/users/reenhanced/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/reenhanced/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/reenhanced/subscriptions",
+      "organizations_url": "https://api.github.com/users/reenhanced/orgs",
+      "repos_url": "https://api.github.com/users/reenhanced/repos",
+      "events_url": "https://api.github.com/users/reenhanced/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/reenhanced/received_events",
+      "type": "User",
+      "site_admin": false
+    }
+  }
+]

data/spec/fixtures/users/user.json

@@ -0,0 +1,32 @@
+{
+  "login": "reenhanced",
+  "id": 1,
+  "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+  "gravatar_id": "somehexcode",
+  "url": "https://api.github.com/users/reenhanced",
+  "name": "monalisa octocat",
+  "company": "GitHub",
+  "blog": "https://github.com/blog",
+  "location": "San Francisco",
+  "email": "octocat@github.com",
+  "hireable": false,
+  "bio": "There once was...",
+  "public_repos": 2,
+  "public_gists": 1,
+  "followers": 20,
+  "following": 0,
+  "html_url": "https://github.com/reenhanced",
+  "created_at": "2008-01-14T04:33:35Z",
+  "type": "User",
+  "total_private_repos": 100,
+  "owned_private_repos": 100,
+  "private_gists": 81,
+  "disk_usage": 10000,
+  "collaborators": 8,
+  "plan": {
+    "name": "Medium",
+    "space": 400,
+    "collaborators": 10,
+    "private_repos": 20
+  }
+}

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -14,6 +14,20 @@ describe GitReflow::GitHelpers do
     stub_run_for Gitacular
   end
 
+  describe ".default_editor" do
+    subject { Gitacular.default_editor }
+
+    context "when the environment has EDITOR set" do
+      before  { allow(ENV).to receive(:[]).with('EDITOR').and_return('emacs') }
+      specify { expect( subject ).to eql('emacs') }
+    end
+
+    context "when the environment has no EDITOR set" do
+      before  { allow(ENV).to receive(:[]).with('EDITOR').and_return(nil) }
+      specify { expect( subject ).to eql('vi') }
+    end
+  end
+
   describe ".git_root_dir" do
     subject { Gitacular.git_root_dir }
     it      { expect{ subject }.to have_run_command_silently "git rev-parse --show-toplevel" }
@@ -42,7 +56,7 @@ describe GitReflow::GitHelpers do
     it { is_expected.to eq('reenhanced.spectacular') }
 
     context "remote origin url isn't set" do
-      let(:origin_url) { nil }
+      let(:origin_url) { '' }
       it { is_expected.to eq('') }
     end
 
@@ -58,7 +72,7 @@ describe GitReflow::GitHelpers do
     it { is_expected.to eq('this-is-the.shit') }
 
     context "remote origin url isn't set" do
-      let(:origin_url) { nil }
+      let(:origin_url) { '' }
       it { is_expected.to eq('') }
     end
 
@@ -68,6 +82,16 @@ describe GitReflow::GitHelpers do
     end
   end
 
+  describe '.default_base_branch' do
+    subject { Gitacular.default_base_branch }
+    it      { is_expected.to eq('master') }
+
+    context 'when configured' do
+      before { allow(GitReflow::Config).to receive(:get).with('reflow.base-branch').and_return('tuba') }
+      it { is_expected.to eq('tuba') }
+    end
+  end
+
   describe ".current_branch" do
     subject { Gitacular.current_branch }
     it      { expect{ subject }.to have_run_command_silently "git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g'" }
@@ -97,6 +121,68 @@ describe GitReflow::GitHelpers do
     end
   end
 
+  describe ".pull_request_template" do
+    subject { Gitacular.pull_request_template }
+
+    context "template file exists" do
+      let(:root_dir) { "/some_repo" }
+      let(:template_content) { "Template content" }
+
+      before do
+        allow(Gitacular).to receive(:git_root_dir).and_return(root_dir)
+        allow(File).to receive(:exist?).with("#{root_dir}/.github/PULL_REQUEST_TEMPLATE.md").and_return(true)
+        allow(File).to receive(:read).with("#{root_dir}/.github/PULL_REQUEST_TEMPLATE.md").and_return(template_content)
+      end
+
+      it { is_expected.to eq template_content }
+
+      context "when template has mustache tags" do
+        let(:template_content) { "This is the coolest {{current_branch}}" }
+        before { allow(GitReflow).to receive(:current_branch).and_return("tomato") }
+        it { is_expected.to eq "This is the coolest tomato" }
+      end
+    end
+
+    context "template file does not exist" do
+      before do
+        allow(File).to receive(:exist?).and_return(false)
+      end
+
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe ".merge_commit_template" do
+    subject { Gitacular.merge_commit_template }
+
+    context "template file exists" do
+      let(:root_dir) { "/some_repo" }
+      let(:template_content) { "Template content" }
+
+      before do
+        allow(Gitacular).to receive(:git_root_dir).and_return(root_dir)
+        allow(File).to receive(:exist?).with("#{root_dir}/.github/MERGE_COMMIT_TEMPLATE.md").and_return(true)
+        allow(File).to receive(:read).with("#{root_dir}/.github/MERGE_COMMIT_TEMPLATE.md").and_return(template_content)
+      end
+
+      it { is_expected.to eq template_content }
+
+      context "when template has mustache tags" do
+        let(:template_content) { "This is the coolest {{current_branch}}" }
+        before { allow(GitReflow).to receive(:current_branch).and_return("tomato") }
+        it { is_expected.to eq "This is the coolest tomato" }
+      end
+    end
+
+    context "template file does not exist" do
+      before do
+        allow(File).to receive(:exist?).and_return(false)
+      end
+
+      it { is_expected.to be_nil }
+    end
+  end
+
   describe ".get_first_commit_message" do
     subject { Gitacular.get_first_commit_message }
     it      { expect{ subject }.to have_run_command_silently 'git log --pretty=format:"%s" --no-merges -n 1' }
@@ -157,26 +243,43 @@ describe GitReflow::GitHelpers do
     end
   end
 
-  describe ".append_to_squashed_commit_message(message)" do
-    let(:original_squash_message) { "Oooooo, SQUASH IT" }
+  describe ".append_to_merge_commit_message(message)" do
+    let(:original_commit_message) { "Oooooo, SQUASH IT" }
     let(:message)                 { "do do the voodoo that you do" }
     let(:root_dir)                { '/home/gitreflow' }
-    let(:squash_path)             { "#{root_dir}/.git/SQUASH_MSG" }
-    let(:tmp_squash_path)         { "#{root_dir}/.git/tmp_squash_msg" }
+    let(:merge_message_path)      { "#{root_dir}/.git/SQUASH_MSG" }
+    let(:tmp_merge_message_path)  { "#{root_dir}/.git/tmp_merge_msg" }
     before                        { allow(Gitacular).to receive(:git_root_dir).and_return(root_dir) }
-    subject                       { Gitacular.append_to_squashed_commit_message(message) }
+    subject                       { Gitacular.append_to_merge_commit_message(message) }
 
     it "appends the message to git's SQUASH_MSG temp file" do
       tmp_file = double('file')
-      allow(File).to receive(:open).with(tmp_squash_path, "w").and_yield(tmp_file)
-      allow(File).to receive(:exists?).with(squash_path).and_return(true)
-      allow(File).to receive(:foreach).with(squash_path).and_yield(original_squash_message)
+      allow(File).to receive(:open).with(tmp_merge_message_path, "w").and_yield(tmp_file)
+      allow(File).to receive(:exists?).with(merge_message_path).and_return(true)
+      allow(File).to receive(:foreach).with(merge_message_path).and_yield(original_commit_message)
       expect(tmp_file).to receive(:puts).with(message)
-      expect(tmp_file).to receive(:puts).with(original_squash_message)
+      expect(tmp_file).to receive(:puts).with(original_commit_message)
 
       expect { subject }.to have_run_commands_in_order [
-        "mv #{tmp_squash_path} #{squash_path}"
+        "mv #{tmp_merge_message_path} #{merge_message_path}"
       ]
     end
+
+    context "when doing a direct merge" do
+      let(:merge_message_path) { "#{root_dir}/.git/MERGE_MSG" }
+      subject { Gitacular.append_to_merge_commit_message(message, merge_method: "merge") }
+      it "appends the message to git's MERGE_MSG temp file if using a direct merge" do
+        tmp_file = double('file')
+        allow(File).to receive(:open).with(tmp_merge_message_path, "w").and_yield(tmp_file)
+        allow(File).to receive(:exists?).with(merge_message_path).and_return(true)
+        allow(File).to receive(:foreach).with(merge_message_path).and_yield(original_commit_message)
+        expect(tmp_file).to receive(:puts).with(message)
+        expect(tmp_file).to receive(:puts).with(original_commit_message)
+
+        expect { subject }.to have_run_commands_in_order [
+          "mv #{tmp_merge_message_path} #{merge_message_path}"
+        ]
+      end
+    end
   end
 end