octo_merge 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adea7dbf2172dd7c03e8a0339a7daace935e22cd
-  data.tar.gz: df5af4c44bb7c6f60ced0bcf0705e4dbb38ca9b3
+  metadata.gz: 5f99ec38437701d28091542a65cf259e028b5f82
+  data.tar.gz: bbbc0e41c04fefde9a480b918ed0dda0633ab1f0
 SHA512:
-  metadata.gz: e8a5c1510c9f5448f86f3abdea95c0ab7694a5b1a180be542ff73c946c0142499b36522142ca87a5d347ac34736cb12aafac28d0a9a758cce8a1a45d57b8884d
-  data.tar.gz: 1ab92d833992e832187d4fcc4dc1d578b1f6fc777dfa53991a5d052779c848f7c3ecc7aa0a0ba0fe1df05c0909cbe336997b7ef51d3e113eab96169d3744e7b4
+  metadata.gz: b5958a05ec2db085d9294c0c347dc2c74c9c878351b94e288cb714134aee4c86b751b6d7a4120df805a26963d8afa77e3c4ac8e2a5917d1bff0b8f69c00dd050
+  data.tar.gz: ef24a2c90b7683514e1c29e43bb3e37c81e8d4b8cc175cc362b6fe07a951f61e942bc74655a249185c45ac7d540e67a0de4466b8b8204f06ef03a853d04bacfc

data/README.md

@@ -74,6 +74,23 @@ pull_requests.each do |pull_request|
 end
 ```
 
+### Rebase
+
+```ruby
+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.rebase("#{pull_request.branch}")
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/TODO.md

@@ -0,0 +1,11 @@
+# TODO
+
+Before we release `v1.0.0` the following tasks needs to be done:
+
+* [ ] Move logic from `exe/octo-merge` into a testable class
+* [ ] Add specs for `InteractivePullRequests`
+* [ ] Create a setup task
+* [ ] Complete docs (`README.md`)
+* [ ] Try to get rid of external dependencies (`octokit`, `inquirer`)
+* [ ] Decide on gem name (`octo_merge` VS `octo-merge`)
+* [ ] Use GitHubs `secret` pull requests branches instead of adding new remotes

data/exe/octo-merge

@@ -77,7 +77,7 @@ end
 
 options[:dir] = File.expand_path(options[:dir])
 
-options[:strategy] = Object.const_get("OctoMerge::#{options[:strategy]}")
+options[:strategy] = Object.const_get("OctoMerge::Strategy::#{options[:strategy]}")
 
 options[:pull_requests] = OctoMerge::InteractivePullRequests.get(options) if options[:interactive]
 options[:pull_requests] = options[:pull_requests].to_s.split(",")

data/lib/{octo_merge/git.rb → git.rb}

@@ -24,7 +24,6 @@ class Git
   git :remote_add, "remote add"
   git :reset_hard, "reset --hard"
 
-
   private
 
   def git(cmd)

data/lib/octo_merge/interactive_pull_requests.rb

@@ -1,3 +1,5 @@
+require 'inquirer'
+
 module OctoMerge
   # TODO: Write specs
   class InteractivePullRequests
@@ -11,10 +13,16 @@ module OctoMerge
     end
 
     def pull_requests
-      display_pull_requests
-      display_input_message
+      prs = list.all
+
+      formatted_prs = prs.map do |pull_request|
+        format_pull_request(pull_request)
+      end
+
+      system("clear")
+      idx = Ask.checkbox "Select the pull requests you want to merge", formatted_prs
 
-      gets.strip
+      idx.zip(prs).select { |e| e[0] }.map { |e| e[1][:number] }.join(",")
     end
 
     private
@@ -35,7 +43,7 @@ module OctoMerge
     end
 
     def format_pull_request(pull_request)
-      "* #{pull_request.number}:\t\"#{pull_request.title}\" by @#{pull_request.user.login}"
+      "#{pull_request.number}: \"#{pull_request.title}\" by @#{pull_request.user.login}"
     end
 
     def list

data/lib/octo_merge/strategy/base.rb

@@ -0,0 +1,38 @@
+# == Links
+#
+# * https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough
+# * https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase/
+module OctoMerge
+  module Strategy
+    class Base
+      attr_reader :working_directory, :pull_requests
+
+      def initialize(working_directory:, pull_requests:)
+        @working_directory = working_directory
+        @pull_requests = pull_requests
+      end
+
+      def self.run(*args)
+        new(*args).tap { |strategy| strategy.run }
+      end
+
+      def run
+        fail NotImplementedError
+      end
+
+      private
+
+      def git
+        @git ||= Git.new(working_directory)
+      end
+
+      def upstream
+        :upstream
+      end
+
+      def master
+        :master
+      end
+    end
+  end
+end

data/lib/octo_merge/strategy/merge_with_rebase.rb

@@ -0,0 +1,20 @@
+module OctoMerge
+  module Strategy
+    class MergeWithRebase < Base
+      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)
+        end
+      end
+    end
+  end
+end

data/lib/octo_merge/strategy/merge_with_rebase_and_message.rb

@@ -0,0 +1,89 @@
+require 'tempfile'
+
+module OctoMerge
+  module Strategy
+    class MergeWithRebaseAndMessage < Base
+      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
+end

data/lib/octo_merge/strategy/merge_without_rebase.rb

@@ -0,0 +1,17 @@
+module OctoMerge
+  module Strategy
+    class MergeWithoutRebase < Base
+      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.merge_no_ff("#{pull_request.remote}/#{pull_request.branch}")
+        end
+      end
+    end
+  end
+end

data/lib/octo_merge/strategy/rebase.rb

@@ -0,0 +1,20 @@
+module OctoMerge
+  module Strategy
+    class Rebase < Base
+      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.rebase("#{pull_request.branch}")
+        end
+      end
+    end
+  end
+end

data/lib/octo_merge/strategy.rb

@@ -0,0 +1,11 @@
+require "octo_merge/strategy/base"
+
+require "octo_merge/strategy/merge_with_rebase"
+require "octo_merge/strategy/merge_with_rebase_and_message"
+require "octo_merge/strategy/merge_without_rebase"
+require "octo_merge/strategy/rebase"
+
+module OctoMerge
+  module Strategy
+  end
+end

data/lib/octo_merge/version.rb

@@ -1,3 +1,3 @@
 module OctoMerge
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/octo_merge.rb

@@ -1,17 +1,14 @@
 require "octo_merge/version"
 
+require "git"
+
 require "octo_merge/configuration"
 require "octo_merge/context"
 require "octo_merge/execute"
-require "octo_merge/git"
 require "octo_merge/interactive_pull_requests"
 require "octo_merge/list_pull_requests"
 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"
+require "octo_merge/strategy"
 
 module OctoMerge
   class << self

data/octo_merge.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "octokit", "~> 4.0"
+  spec.add_dependency "inquirer", "~> 0.2.1"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octo_merge
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Patrick Helm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: inquirer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,21 +139,24 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - bin/console
 - bin/setup
 - exe/octo-merge
+- lib/git.rb
 - lib/octo_merge.rb
-- lib/octo_merge/abstract_merge.rb
 - lib/octo_merge/configuration.rb
 - lib/octo_merge/context.rb
 - lib/octo_merge/execute.rb
-- lib/octo_merge/git.rb
 - 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/strategy.rb
+- lib/octo_merge/strategy/base.rb
+- lib/octo_merge/strategy/merge_with_rebase.rb
+- lib/octo_merge/strategy/merge_with_rebase_and_message.rb
+- lib/octo_merge/strategy/merge_without_rebase.rb
+- lib/octo_merge/strategy/rebase.rb
 - lib/octo_merge/version.rb
 - octo_merge.gemspec
 homepage: https://github.com/Deradon/octo_merge

data/lib/octo_merge/abstract_merge.rb

@@ -1,32 +0,0 @@
-module OctoMerge
-  class AbstractMerge
-    attr_reader :working_directory, :pull_requests
-
-    def initialize(working_directory:, pull_requests:)
-      @working_directory = working_directory
-      @pull_requests = pull_requests
-    end
-
-    def self.run(*args)
-      new(*args).tap { |merge| merge.run }
-    end
-
-    def run
-      fail "NotImplementedYet"
-    end
-
-    private
-
-    def git
-      @git ||= Git.new(working_directory)
-    end
-
-    def upstream
-      :upstream
-    end
-
-    def master
-      :master
-    end
-  end
-end

data/lib/octo_merge/merge_with_rebase.rb

@@ -1,22 +0,0 @@
-# == Links
-#
-# * https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough
-# * https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase/
-module OctoMerge
-  class MergeWithRebase < 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)
-      end
-    end
-  end
-end

data/lib/octo_merge/merge_with_rebase_and_message.rb

@@ -1,87 +0,0 @@
-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/merge_without_rebase.rb

@@ -1,15 +0,0 @@
-module OctoMerge
-  class MergeWithoutRebase < 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.merge_no_ff("#{pull_request.remote}/#{pull_request.branch}")
-      end
-    end
-  end
-end