octo_merge 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc888e5760a08871d2d68cd5e43044e4cc03eb92
-  data.tar.gz: e715350366209678d5c31d315ac5d905ef9e1904
+  metadata.gz: d04807b8aa3b52cc6ba26b896fd4c293a6ce2b15
+  data.tar.gz: f61a9911d245112f1e2db1e324fd32d110a29f6e
 SHA512:
-  metadata.gz: 777dc01da1a20b0c2df6711089a0fce0a065a76e789c7c1aae5a9948c96ad0ee14954929ce222c77cf47839873da37584efd432c4b74ed9f9663741af05a6748
-  data.tar.gz: 53660d4e55248fff632d5cee36c71cc32c3024047769b3a6aaf12bbad188a740764425224e538538cd4f7d0a5ee0dc2eccf0bc7df743d706add9379713a917f3
+  metadata.gz: be5dcf239a003519014f413e5024ecb5d9df799d736df2394de0bf428e90481fcb4f86e49c002d6339808fd99166c2d275a6713eb65fa679475818b74cec8772
+  data.tar.gz: 8f3534fe23b033a617f23fbffd6d40f5d781dc98ba6fb7404f05dace046328b16b526101028ede993d142495f09969080044b65d4fc3d831662c4a24a5f565be

data/exe/octo-merge

@@ -4,11 +4,18 @@ require "optparse"
 require "octo_merge"
 require "yaml"
 
-options = if File.exist?(".octo-merge.yml")
+options = {}
+
+user_config_path = File.expand_path("~/.octo-merge.yml")
+
+if File.exist?(user_config_path)
+  body = File.read(user_config_path)
+  options.merge!(YAML.load(body))
+end
+
+if File.exist?(".octo-merge.yml")
   body = File.read(".octo-merge.yml")
-  YAML.load(body)
-else
-  {}
+  options.merge!(YAML.load(body))
 end
 
 # Symbolize keys

data/lib/octo_merge/git.rb

@@ -17,6 +17,7 @@ class Git
   end
 
   git :checkout
+  git :commit
   git :fetch
   git :merge_no_ff, "merge --no-ff"
   git :rebase

data/lib/octo_merge/merge_with_rebase_and_message.rb

@@ -0,0 +1,87 @@
+require 'tempfile'
+
+module OctoMerge
+  class MergeWithRebaseAndMessage < AbstractMerge
+    def run
+      git.checkout(master)
+      git.fetch(upstream)
+      git.reset_hard("#{upstream}/#{master}")
+
+      pull_requests.each do |pull_request|
+        git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
+        git.fetch(pull_request.remote)
+        git.checkout(pull_request.branch)
+        git.rebase(master)
+        git.checkout(master)
+        git.merge_no_ff(pull_request.branch)
+
+        add_merge_message(pull_request)
+      end
+    end
+
+    private
+
+    # TODO: Can we add a custom message to a merge commit in an easier way?
+    #
+    # Note: It's hard to add a multiline message with `merge --message`.
+    #
+    # The `--file` options does not work for `git --merge` so we abuse
+    # `git commit --amend` to apply this message to the merge commit.
+    def add_merge_message(pull_request)
+      MergeMessageFile.path_for(pull_request) do |path|
+        git.commit("--amend --file=#{path}")
+      end
+    end
+
+    class MergeMessageFile
+      def initialize(pull_request)
+        @pull_request = pull_request
+        file.write(body)
+        file.close
+      end
+
+      def self.path_for(pull_request)
+        new(pull_request).tap do |file|
+          yield(file.path)
+          file.delete
+        end
+      end
+
+      def path
+        file.path
+      end
+
+      def delete
+        file.unlink
+      end
+
+      private
+
+      attr_reader :pull_request
+
+      def file
+        @file ||= Tempfile.new('merge_commit_message')
+      end
+
+      def body
+        sanitize <<-BODY
+Merge branch '#{pull_request.branch}'
+
+Resolves and closes: #{pull_request.url}
+
+= #{pull_request.title}
+
+#{pull_request.body}
+BODY
+
+      end
+
+      def sanitize(body)
+        # Replace leading "#" and replace with "="
+        body.gsub(/^#+/) { |s| "=" * s.length }
+      end
+    end
+
+    private_constant :MergeMessageFile
+  end
+end

data/lib/octo_merge/pull_request.rb

@@ -9,6 +9,10 @@ module OctoMerge
       @number = number.to_s
     end
 
+    def url
+      github_api_result.html_url
+    end
+
     def remote
       github_api_result.user.login
     end
@@ -21,6 +25,14 @@ module OctoMerge
       github_api_result.head.ref
     end
 
+    def title
+      github_api_result.title
+    end
+
+    def body
+      github_api_result.body
+    end
+
     def ==(other_pull_request)
       repo == other_pull_request.repo && number == other_pull_request.number
     end

data/lib/octo_merge/version.rb

@@ -1,3 +1,3 @@
 module OctoMerge
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/octo_merge.rb

@@ -10,6 +10,7 @@ require "octo_merge/pull_request"
 
 require "octo_merge/abstract_merge"
 require "octo_merge/merge_with_rebase"
+require "octo_merge/merge_with_rebase_and_message"
 require "octo_merge/merge_without_rebase"
 
 module OctoMerge

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octo_merge
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Patrick Helm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -137,6 +137,7 @@ files:
 - lib/octo_merge/interactive_pull_requests.rb
 - lib/octo_merge/list_pull_requests.rb
 - lib/octo_merge/merge_with_rebase.rb
+- lib/octo_merge/merge_with_rebase_and_message.rb
 - lib/octo_merge/merge_without_rebase.rb
 - lib/octo_merge/pull_request.rb
 - lib/octo_merge/version.rb