git_reflow 0.8.6 → 0.8.7

data/lib/git_reflow/workflows/core.rb

@@ -1,238 +1,238 @@
-$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../..')
-require 'git_reflow/workflow'
-
-module GitReflow
-  module Workflows
-    # This class contains the core workflow for git-reflow. Going forward, this
-    # will act as the base class for customizing and extending git-reflow.
-    class Core
-      include GitReflow::Workflow
-
-      # Sets up the required git configurations that git-reflow depends on.
-      #
-      # @param local [Boolean] whether to configure git-reflow specific to the current project
-      # @param enterprise [Boolean] whether to configure git-reflow for use with Github Enterprise
-      command(:setup, defaults: {local: false, enterprise: false}) do |**params|
-        reflow_options             = { project_only: params[:local], enterprise: params[:enterprise] }
-        existing_git_include_paths = GitReflow::Config.get('include.path', all: true).split("\n")
-
-        unless File.exist?(GitReflow::Config::CONFIG_FILE_PATH) or existing_git_include_paths.include?(GitReflow::Config::CONFIG_FILE_PATH)
-          GitReflow.say "We'll walk you through setting up git-reflow's defaults for all your projects.", :notice
-          GitReflow.say "In the future, you can run \`git-reflow setup\` from the root of any project you want to setup differently.", :notice
-          GitReflow.say "To adjust these settings globally, you can run \`git-reflow setup --global\`.", :notice
-          GitReflow.run "touch #{GitReflow::Config::CONFIG_FILE_PATH}"
-          GitReflow.say "Created #{GitReflow::Config::CONFIG_FILE_PATH} for git-reflow specific configurations.", :notice
-          GitReflow::Config.add "include.path", GitReflow::Config::CONFIG_FILE_PATH, global: true
-          GitReflow.say "Added #{GitReflow::Config::CONFIG_FILE_PATH} to include.path in $HOME/.gitconfig.", :notice
-        end
-
-        choose do |menu|
-          menu.header = "Available remote Git Server services"
-          menu.prompt = "Which service would you like to use for this project?  "
-
-          menu.choice('GitHub')    { GitReflow::GitServer.connect reflow_options.merge({ provider: 'GitHub', silent: false }) }
-          menu.choice('BitBucket (team-owned repos only)') { GitReflow::GitServer.connect reflow_options.merge({ provider: 'BitBucket', silent: false }) }
-        end
-
-        GitReflow::Config.set "constants.minimumApprovals", ask("Set the minimum number of approvals (leaving blank will require approval from all commenters): "), local: reflow_options[:project_only]
-        GitReflow::Config.set "constants.approvalRegex", GitReflow::GitServer::PullRequest::DEFAULT_APPROVAL_REGEX, local: reflow_options[:project_only]
-
-        if GitReflow::Config.get('core.editor').length <= 0
-          GitReflow::Config.set('core.editor', GitReflow.default_editor, local: reflow_options[:project_only])
-          GitReflow.say "Updated git's editor (via git config key 'core.editor') to: #{GitReflow.default_editor}.", :notice
-        end
-      end
-
-      # Start a new feature branch
-      #
-      # @param feature_branch [String] the name of the branch to create your feature on
-      # @option base [String] the name of the base branch you want to checkout your feature from
-      command(:start, defaults: {base: 'master'}) do |**params|
-        base_branch    = params[:base]
-        feature_branch = params[:feature_branch]
-
-        if feature_branch.nil? or feature_branch.length <= 0
-          GitReflow.say "usage: git-reflow start [new-branch-name]", :error
-        else
-          GitReflow.run_command_with_label "git checkout #{base_branch}"
-          GitReflow.run_command_with_label "git pull origin #{base_branch}"
-          GitReflow.run_command_with_label "git push origin #{base_branch}:refs/heads/#{feature_branch}"
-          GitReflow.run_command_with_label "git checkout --track -b #{feature_branch} origin/#{feature_branch}"
-        end
-      end
-
-      # Submit a feature branch for review
-      #
-      # @option base [String] the name of the base branch you want to merge your feature into
-      # @option title [String] the title of your pull request
-      # @option body [String] the body of your pull request
-      command(:review, defaults: {base: 'master'}) do |**params|
-        base_branch         = params[:base]
-        create_pull_request = true
-
-        GitReflow.fetch_destination base_branch
-        begin
-          GitReflow.push_current_branch
-
-          existing_pull_request = GitReflow.git_server.find_open_pull_request( from: GitReflow.current_branch, to: base_branch )
-          if existing_pull_request
-            say "A pull request already exists for these branches:", :notice
-            existing_pull_request.display_pull_request_summary
-          else
-            unless params[:title] || params[:body]
-              pull_request_msg_file = "#{GitReflow.git_root_dir}/.git/GIT_REFLOW_PR_MSG"
-
-              File.open(pull_request_msg_file, 'w') do |file|
-                file.write(params[:title] || GitReflow.pull_request_template || GitReflow.current_branch)
-              end
-
-              GitReflow.run("#{GitReflow.git_editor_command} #{pull_request_msg_file}", with_system: true)
-
-              pr_msg = File.read(pull_request_msg_file).split(/[\r\n]|\r\n/).map(&:strip)
-              title  = pr_msg.shift
-
-              File.delete(pull_request_msg_file)
-
-              unless pr_msg.empty?
-                pr_msg.shift if pr_msg.first.empty?
-              end
-
-              params[:title] = title
-              params[:body]  = "#{pr_msg.join("\n")}\n"
-
-              say "\nReview your PR:\n"
-              say "--------\n"
-              say "Title:\n#{params[:title]}\n\n"
-              say "Body:\n#{params[:body]}\n"
-              say "--------\n"
-
-              create_pull_request = ask("Submit pull request? (Y)") =~ /y/i
-            end
-
-            if create_pull_request
-              pull_request = GitReflow.git_server.create_pull_request(title: params[:title] || params[:body],
-                                                            body:  params[:body],
-                                                            head:  "#{GitReflow.remote_user}:#{GitReflow.current_branch}",
-                                                            base:  params[:base])
-
-              say "Successfully created pull request ##{pull_request.number}: #{pull_request.title}\nPull Request URL: #{pull_request.html_url}\n", :success
-            else
-              say "Review aborted.  No pull request has been created.", :review_halted
-            end
-          end
-        rescue Github::Error::UnprocessableEntity => e
-          say "Github Error: #{e.to_s}", :error
-        rescue StandardError => e
-          say "\nError: #{e.inspect}", :error
-        end
-      end
-
-      # Checks the status of an existing pull request
-      #
-      # @option destination_branch [String] the branch you're merging your feature into ('master' is default)
-      command(:status, defaults: {destination_branch: 'master'}) do |**params|
-        pull_request = GitReflow.git_server.find_open_pull_request( :from => GitReflow.current_branch, :to => params[:destination_branch] )
-
-        if pull_request.nil?
-          say "No pull request exists for #{GitReflow.current_branch} -> #{params[:destination_branch]}", :notice
-          say "Run 'git reflow review #{params[:destination_branch]}' to start the review process", :notice
-        else
-          say "Here's the status of your review:"
-          pull_request.display_pull_request_summary
-        end
-      end
-
-      command(:deploy) do |**params|
-        destination_server = params[:destination_server] || 'default'
-        deploy_command = GitReflow::Config.get("reflow.deploy-to-#{destination_server}-command", local: true)
-
-        # first check is to allow for automated setup
-        if deploy_command.empty?
-          deploy_command = ask("Enter the command you use to deploy to #{destination_server} (leaving blank will skip deployment)")
-        end
-
-        # second check is to see if the user wants to skip
-        if deploy_command.empty?
-          say "Skipping deployment..."
-          false
-        else
-          GitReflow::Config.set("reflow.deploy-to-#{destination_server}-command", deploy_command, local: true)
-          run_command_with_label(deploy_command, with_system: true)
-        end
-      end
-
-      # Merge and deploy a feature branch to a staging branch
-      command(:stage) do |**params|
-        feature_branch_name = GitReflow.current_branch
-        staging_branch_name = GitReflow::Config.get('reflow.staging-branch', local: true)
-
-        if staging_branch_name.empty?
-          staging_branch_name = GitReflow.ask("What's the name of your staging branch? (default: 'staging') ")
-          staging_branch_name = 'staging' if staging_branch_name.strip == ''
-          GitReflow::Config.set('reflow.staging-branch', staging_branch_name, local: true)
-        end
-
-        GitReflow.run_command_with_label "git checkout #{staging_branch_name}"
-        GitReflow.run_command_with_label "git pull origin #{staging_branch_name}"
-
-        if GitReflow.run_command_with_label "git merge #{feature_branch_name}", with_system: true
-          GitReflow.run_command_with_label "git push origin #{staging_branch_name}"
-
-          staged = self.deploy(destination_server: :staging)
-
-          if staged
-            GitReflow.say "Deployed to Staging.", :success
-          else
-            GitReflow.say "There were issues deploying to staging.", :error
-          end
-        else
-          GitReflow.say "There were issues merging your feature branch to staging.", :error
-        end
-      end
-
-      # Deliver a feature branch to a base branch
-      #
-      # @option base [String] base branch to merge your feature branch into
-      # @option force [Boolean] whether to force-deliver the feature branch, ignoring any QA checks
-      command(:deliver, defaults: {base: 'master'}) do |**params|
-        begin
-          existing_pull_request = GitReflow.git_server.find_open_pull_request( from: GitReflow.current_branch, to: params[:base] )
-
-          if existing_pull_request.nil?
-            say "No pull request exists for #{GitReflow.remote_user}:#{GitReflow.current_branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
-          else
-
-            if existing_pull_request.good_to_merge?(force: params[:force])
-              # displays current status and prompts user for confirmation
-              self.status destination_branch: params[:base]
-              # TODO: change name of this in the merge! method
-              params[:skip_lgtm] = params[:force] if params[:force]
-              existing_pull_request.merge!(params)
-            else
-              say existing_pull_request.rejection_message, :deliver_halted
-            end
-
-          end
-
-        rescue Github::Error::UnprocessableEntity => e
-          say "Github Error: #{e.inspect}", :error
-        end
-      end
-
-
-      # Updates and synchronizes your base branch and feature branch.
-      # 
-      # Performs the following:
-      #   $ git checkout <base_branch>
-      #   $ git pull <remote_location> <base_branch>
-      #   $ git checkout <current_branch>
-      #   $ git pull origin <current_branch>
-      #   $ git merge <base_branch>
-      # @param remote [String] the name of the remote repository to fetch updates from (origin by default)
-      # @param base [String] the branch that you want to fetch updates from (master by default)
-      command(:refresh, defaults: {remote: 'origin', base: 'master'}) do |**params|
-        GitReflow.update_feature_branch(params)
-      end
-    end
-  end
-end
+$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../..')
+require 'git_reflow/workflow'
+
+module GitReflow
+  module Workflows
+    # This class contains the core workflow for git-reflow. Going forward, this
+    # will act as the base class for customizing and extending git-reflow.
+    class Core
+      include GitReflow::Workflow
+
+      # Sets up the required git configurations that git-reflow depends on.
+      #
+      # @param local [Boolean] whether to configure git-reflow specific to the current project
+      # @param enterprise [Boolean] whether to configure git-reflow for use with Github Enterprise
+      command(:setup, defaults: {local: false, enterprise: false}) do |**params|
+        reflow_options             = { project_only: params[:local], enterprise: params[:enterprise] }
+        existing_git_include_paths = GitReflow::Config.get('include.path', all: true).split("\n")
+
+        unless File.exist?(GitReflow::Config::CONFIG_FILE_PATH) or existing_git_include_paths.include?(GitReflow::Config::CONFIG_FILE_PATH)
+          GitReflow.say "We'll walk you through setting up git-reflow's defaults for all your projects.", :notice
+          GitReflow.say "In the future, you can run \`git-reflow setup\` from the root of any project you want to setup differently.", :notice
+          GitReflow.say "To adjust these settings globally, you can run \`git-reflow setup --global\`.", :notice
+          GitReflow.run "touch #{GitReflow::Config::CONFIG_FILE_PATH}"
+          GitReflow.say "Created #{GitReflow::Config::CONFIG_FILE_PATH} for git-reflow specific configurations.", :notice
+          GitReflow::Config.add "include.path", GitReflow::Config::CONFIG_FILE_PATH, global: true
+          GitReflow.say "Added #{GitReflow::Config::CONFIG_FILE_PATH} to include.path in $HOME/.gitconfig.", :notice
+        end
+
+        choose do |menu|
+          menu.header = "Available remote Git Server services"
+          menu.prompt = "Which service would you like to use for this project?  "
+
+          menu.choice('GitHub')    { GitReflow::GitServer.connect reflow_options.merge({ provider: 'GitHub', silent: false }) }
+          menu.choice('BitBucket (team-owned repos only)') { GitReflow::GitServer.connect reflow_options.merge({ provider: 'BitBucket', silent: false }) }
+        end
+
+        GitReflow::Config.set "constants.minimumApprovals", ask("Set the minimum number of approvals (leaving blank will require approval from all commenters): "), local: reflow_options[:project_only]
+        GitReflow::Config.set "constants.approvalRegex", GitReflow::GitServer::PullRequest::DEFAULT_APPROVAL_REGEX, local: reflow_options[:project_only]
+
+        if GitReflow::Config.get('core.editor').length <= 0
+          GitReflow::Config.set('core.editor', GitReflow.default_editor, local: reflow_options[:project_only])
+          GitReflow.say "Updated git's editor (via git config key 'core.editor') to: #{GitReflow.default_editor}.", :notice
+        end
+      end
+
+      # Start a new feature branch
+      #
+      # @param feature_branch [String] the name of the branch to create your feature on
+      # @option base [String] the name of the base branch you want to checkout your feature from
+      command(:start, defaults: {base: 'master'}) do |**params|
+        base_branch    = params[:base]
+        feature_branch = params[:feature_branch]
+
+        if feature_branch.nil? or feature_branch.length <= 0
+          GitReflow.say "usage: git-reflow start [new-branch-name]", :error
+        else
+          GitReflow.run_command_with_label "git checkout #{base_branch}"
+          GitReflow.run_command_with_label "git pull origin #{base_branch}"
+          GitReflow.run_command_with_label "git push origin #{base_branch}:refs/heads/#{feature_branch}"
+          GitReflow.run_command_with_label "git checkout --track -b #{feature_branch} origin/#{feature_branch}"
+        end
+      end
+
+      # Submit a feature branch for review
+      #
+      # @option base [String] the name of the base branch you want to merge your feature into
+      # @option title [String] the title of your pull request
+      # @option body [String] the body of your pull request
+      command(:review, defaults: {base: 'master'}) do |**params|
+        base_branch         = params[:base]
+        create_pull_request = true
+
+        GitReflow.fetch_destination base_branch
+        begin
+          GitReflow.push_current_branch
+
+          existing_pull_request = GitReflow.git_server.find_open_pull_request( from: GitReflow.current_branch, to: base_branch )
+          if existing_pull_request
+            say "A pull request already exists for these branches:", :notice
+            existing_pull_request.display_pull_request_summary
+          else
+            unless params[:title] || params[:body]
+              pull_request_msg_file = "#{GitReflow.git_root_dir}/.git/GIT_REFLOW_PR_MSG"
+
+              File.open(pull_request_msg_file, 'w') do |file|
+                file.write(params[:title] || GitReflow.pull_request_template || GitReflow.current_branch)
+              end
+
+              GitReflow.run("#{GitReflow.git_editor_command} #{pull_request_msg_file}", with_system: true)
+
+              pr_msg = File.read(pull_request_msg_file).split(/[\r\n]|\r\n/).map(&:strip)
+              title  = pr_msg.shift
+
+              File.delete(pull_request_msg_file)
+
+              unless pr_msg.empty?
+                pr_msg.shift if pr_msg.first.empty?
+              end
+
+              params[:title] = title
+              params[:body]  = "#{pr_msg.join("\n")}\n"
+
+              say "\nReview your PR:\n"
+              say "--------\n"
+              say "Title:\n#{params[:title]}\n\n"
+              say "Body:\n#{params[:body]}\n"
+              say "--------\n"
+
+              create_pull_request = ask("Submit pull request? (Y)") =~ /y/i
+            end
+
+            if create_pull_request
+              pull_request = GitReflow.git_server.create_pull_request(title: params[:title] || params[:body],
+                                                            body:  params[:body],
+                                                            head:  "#{GitReflow.remote_user}:#{GitReflow.current_branch}",
+                                                            base:  params[:base])
+
+              say "Successfully created pull request ##{pull_request.number}: #{pull_request.title}\nPull Request URL: #{pull_request.html_url}\n", :success
+            else
+              say "Review aborted.  No pull request has been created.", :review_halted
+            end
+          end
+        rescue Github::Error::UnprocessableEntity => e
+          say "Github Error: #{e.to_s}", :error
+        rescue StandardError => e
+          say "\nError: #{e.inspect}", :error
+        end
+      end
+
+      # Checks the status of an existing pull request
+      #
+      # @option destination_branch [String] the branch you're merging your feature into ('master' is default)
+      command(:status, defaults: {destination_branch: 'master'}) do |**params|
+        pull_request = GitReflow.git_server.find_open_pull_request( :from => GitReflow.current_branch, :to => params[:destination_branch] )
+
+        if pull_request.nil?
+          say "No pull request exists for #{GitReflow.current_branch} -> #{params[:destination_branch]}", :notice
+          say "Run 'git reflow review #{params[:destination_branch]}' to start the review process", :notice
+        else
+          say "Here's the status of your review:"
+          pull_request.display_pull_request_summary
+        end
+      end
+
+      command(:deploy) do |**params|
+        destination_server = params[:destination_server] || 'default'
+        deploy_command = GitReflow::Config.get("reflow.deploy-to-#{destination_server}-command", local: true)
+
+        # first check is to allow for automated setup
+        if deploy_command.empty?
+          deploy_command = ask("Enter the command you use to deploy to #{destination_server} (leaving blank will skip deployment)")
+        end
+
+        # second check is to see if the user wants to skip
+        if deploy_command.empty?
+          say "Skipping deployment..."
+          false
+        else
+          GitReflow::Config.set("reflow.deploy-to-#{destination_server}-command", deploy_command, local: true)
+          run_command_with_label(deploy_command, with_system: true)
+        end
+      end
+
+      # Merge and deploy a feature branch to a staging branch
+      command(:stage) do |**params|
+        feature_branch_name = GitReflow.current_branch
+        staging_branch_name = GitReflow::Config.get('reflow.staging-branch', local: true)
+
+        if staging_branch_name.empty?
+          staging_branch_name = GitReflow.ask("What's the name of your staging branch? (default: 'staging') ")
+          staging_branch_name = 'staging' if staging_branch_name.strip == ''
+          GitReflow::Config.set('reflow.staging-branch', staging_branch_name, local: true)
+        end
+
+        GitReflow.run_command_with_label "git checkout #{staging_branch_name}"
+        GitReflow.run_command_with_label "git pull origin #{staging_branch_name}"
+
+        if GitReflow.run_command_with_label "git merge #{feature_branch_name}", with_system: true
+          GitReflow.run_command_with_label "git push origin #{staging_branch_name}"
+
+          staged = self.deploy(destination_server: :staging)
+
+          if staged
+            GitReflow.say "Deployed to Staging.", :success
+          else
+            GitReflow.say "There were issues deploying to staging.", :error
+          end
+        else
+          GitReflow.say "There were issues merging your feature branch to staging.", :error
+        end
+      end
+
+      # Deliver a feature branch to a base branch
+      #
+      # @option base [String] base branch to merge your feature branch into
+      # @option force [Boolean] whether to force-deliver the feature branch, ignoring any QA checks
+      command(:deliver, defaults: {base: 'master'}) do |**params|
+        begin
+          existing_pull_request = GitReflow.git_server.find_open_pull_request( from: GitReflow.current_branch, to: params[:base] )
+
+          if existing_pull_request.nil?
+            say "No pull request exists for #{GitReflow.remote_user}:#{GitReflow.current_branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
+          else
+
+            if existing_pull_request.good_to_merge?(force: params[:force])
+              # displays current status and prompts user for confirmation
+              self.status destination_branch: params[:base]
+              # TODO: change name of this in the merge! method
+              params[:skip_lgtm] = params[:force] if params[:force]
+              existing_pull_request.merge!(params)
+            else
+              say existing_pull_request.rejection_message, :deliver_halted
+            end
+
+          end
+
+        rescue Github::Error::UnprocessableEntity => e
+          say "Github Error: #{e.inspect}", :error
+        end
+      end
+
+
+      # Updates and synchronizes your base branch and feature branch.
+      # 
+      # Performs the following:
+      #   $ git checkout <base_branch>
+      #   $ git pull <remote_location> <base_branch>
+      #   $ git checkout <current_branch>
+      #   $ git pull origin <current_branch>
+      #   $ git merge <base_branch>
+      # @param remote [String] the name of the remote repository to fetch updates from (origin by default)
+      # @param base [String] the branch that you want to fetch updates from (master by default)
+      command(:refresh, defaults: {remote: 'origin', base: 'master'}) do |**params|
+        GitReflow.update_feature_branch(params)
+      end
+    end
+  end
+end

data/lib/git_reflow/workflows/flat_merge.rb

@@ -1,10 +1,10 @@
-class FlatMerge < GitReflow::Workflows::Core
-  def self.deliver(**params)
-    base_branch     = params[:base] || 'master'
-    params[:squash] = false
-
-    super(**params)
-  end
-end
-
-FlatMerge
+class FlatMerge < GitReflow::Workflows::Core
+  def self.deliver(**params)
+    base_branch     = params[:base] || 'master'
+    params[:squash] = false
+
+    super(**params)
+  end
+end
+
+FlatMerge

data/lib/git_reflow.rb

@@ -20,18 +20,29 @@ require 'git_reflow/git_helpers'
 require 'git_reflow/git_server'
 require 'git_reflow/git_server/bit_bucket'
 require 'git_reflow/git_server/git_hub'
+require 'git_reflow/logger'
 require 'git_reflow/merge_error'
 require 'git_reflow/os_detector'
 require 'git_reflow/sandbox'
 require 'git_reflow/workflow'
 require 'git_reflow/workflows/core'
 
+# This is a work around to silence logger spam from hashie
+# https://github.com/intridea/hashie/issues/394
+require "hashie"
+require "hashie/logger"
+Hashie.logger = Logger.new(nil)
+
 module GitReflow
   include Sandbox
   include GitHelpers
 
   extend self
 
+  def logger(*args)
+    @logger ||= GitReflow::Logger.new(*args)
+  end
+
   def workflow
     Workflow.current
   end

data/spec/fixtures/awesome_workflow.rb

@@ -0,0 +1,7 @@
+class AwesomeWorkflow < GitReflow::Workflows::Core
+  def self.start(**args)
+    GitReflow.say "Awesome."
+  end
+end
+
+AwesomeWorkflow

data/spec/fixtures/git/git_config

@@ -0,0 +1,7 @@
+[user]
+	name = Reenhanced
+	email = dev@reenhanced.com
+[github]
+	user = reenhanced
+	token = 123456
+	oauth-token = 123456

data/spec/fixtures/issues/comment.json.erb

@@ -0,0 +1,27 @@
+{
+  "id": <%= id || 1 %>,
+  "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/issues/comments/<%= pull_request_number %>",
+  "html_url": "https://github.com/<%= repo_owner %>/<%= repo_name %>/issues/<%= pull_request_number %>#issuecomment-1",
+  "body": "<%= body || "Hmmm..." %>",
+  "user": {
+    "login": "<%= author %>",
+    "id": 1,
+    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+    "gravatar_id": "somehexcode",
+    "url": "https://api.github.com/users/<%= author %>",
+    "html_url": "https://github.com/<%= author %>",
+    "followers_url": "https://api.github.com/users/<%= author %>/followers",
+    "following_url": "https://api.github.com/users/<%= author %>/following{/other_user}",
+    "gists_url": "https://api.github.com/users/<%= author %>/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/<%= author %>/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/<%= author %>/subscriptions",
+    "organizations_url": "https://api.github.com/users/<%= author %>/orgs",
+    "repos_url": "https://api.github.com/users/<%= author %>/repos",
+    "events_url": "https://api.github.com/users/<%= author %>/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/<%= author %>/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "created_at": "<%= created_at %>",
+  "updated_at": "2011-04-14T16:00:49Z"
+}

data/spec/fixtures/issues/comments.json

@@ -0,0 +1,29 @@
+[
+  {
+    "id": 1,
+    "url": "https://api.github.com/repos/reenhanced/repo/issues/comments/1",
+    "html_url": "https://github.com/reenhanced/repo/issues/1#issuecomment-1",
+    "body": "Me too",
+    "user": {
+      "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": "2011-04-14T16:00:49Z",
+    "updated_at": "2011-04-14T16:00:49Z"
+  }
+]

data/spec/fixtures/issues/comments.json.erb

@@ -0,0 +1,15 @@
+[
+  <% comment_json = [] %>
+  <% comments.each_with_index do |comment, index| %>
+    <% comment_json << Fixture.new('issues/comment.json.erb',
+                    id: comment[:id] || index + 1,
+                    author: comment[:author],
+                    pull_request_number: pull_request_number,
+                    repo_owner: repo_owner,
+                    repo_name: repo_name,
+                    body: comment[:body] || 'Hmmm...',
+                    created_at: comment[:created_at] || '2011-04-14T16:00:49Z'
+                   ).to_s %>
+  <% end %>
+  <%= comment_json.join(", ") %>
+]