github-merge 0.0.1

data/.autotest

@@ -0,0 +1,25 @@
+# -*- ruby -*-
+
+require "autotest/restart"
+
+# Autotest.add_hook :initialize do |at|
+#   at.testlib = "minitest/unit"
+#
+#   at.extra_files << "../some/external/dependency.rb"
+#
+#   at.libs << ":../some/external"
+#
+#   at.add_exception "vendor"
+#
+#   at.add_mapping(/dependency.rb/) do |f, _|
+#     at.files_matching(/test_.*rb$/)
+#   end
+#
+#   %w(TestA TestB).each do |klass|
+#     at.extra_class_map[klass] = "test/test_misc.rb"
+#   end
+# end
+
+# Autotest.add_hook :run_command do |at|
+#   system "rake build"
+# end

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org/"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: .
+  specs:
+    github-merge (1.0.0)
+      github_api (~> 0.9.4)
+      thor (~> 0.18.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.2)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    github_api (0.9.6)
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.3)
+    httpauth (0.2.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    multi_json (1.7.2)
+    multi_xml (0.5.3)
+    multipart-post (1.2.0)
+    nokogiri (1.5.9)
+    oauth2 (0.9.1)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    thor (0.18.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  github-merge!
+  rake
+  rspec

data/History.txt

@@ -0,0 +1,6 @@
+=== 1.0.0 / 2013-03-31
+
+* 1 major enhancement
+
+  * Birthday!
+

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Arthur Maltson
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -0,0 +1,10 @@
+.autotest
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+bin/github-merge
+lib/github_merge/merge.rb
+lib/github_merge/cli.rb
+lib/github_merge.rb
+test/test_merge.rb

data/README.md

@@ -0,0 +1,74 @@
+# github-merge
+
+Script that merges multiple GitHub repositories into a new, single repository.
+
+## Installation
+
+This is a CLI app, so you'll have to:
+
+```
+$ gem install github-merge
+```
+
+## Usage
+
+`github-merge` uses a YAML based configuration that lists the
+repositories to merge and the name (and optionally organization) of the
+new combined repository. A sample configuration file:
+
+```yaml
+merged organization: acme
+merged repository: sinatra-templates
+repositories:
+  - url: https://github.com/rkh/sinatra-template.git
+    sub directory: sinatra-base-template
+  - url: https://github.com/sinatra/heroku-sinatra-app.git 
+    sub directory: sinatra-heroku-template
+```
+
+You'd then merge the repositories:
+
+```
+$ github-merge local sinatra-templates.yml
+```
+
+### Options
+
+*[--all-svn]*
+
+Pass this argument if the repositories being merged started their life
+in Subversion and were subsequently migrated to Git. This is required
+because the merge has to skip the initial commit because of a weird
+git-svn issue that causes the `git filter-branch` to bomb (don't ask
+me, it was on Stackoverflow and it works).
+
+### Technical Details
+
+The merge process is done in the following steps
+
+1. Clone repositories.
+2. For each repository to be merged, execute a `git filter-branch` to
+   move the entire repository contents into the specified subdirectory.
+3. Create a new empty Git repository.
+4. Add each repository to be merged as a remote repository.
+5. Fetch and `git merge --no-edit <remote>/master` for each repository.
+
+Note: a `git merge` is used to preserve the branching history of each
+repository being merged.
+
+### Limitations
+
+The following are limitations of github-merge that may, or may not, be
+addressed in the future.
+
+* Does not carry over tags
+* Does not carry over active (unmerged) branches
+* Does not merge repositories with only 1 commit
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+task :default => [:spec]

data/bin/github-merge

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/github_merge/cli'
+
+MergeCli.start(ARGV)

data/github-merge.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'github_merge'
+
+Gem::Specification.new do |spec|
+  spec.name          = "github-merge"
+  spec.version       = Merge::VERSION
+  spec.authors       = ["Arthur Maltson"]
+  spec.email         = ["arthur.kalm@gmail.com"]
+  spec.description   = %q{Script that merges multiple GitHub repositories into a new, single repository.}
+  spec.summary       = %q{Split your project into lots of small Git repos and finding yourself creating cross repo Pull Requests? This is the gem for you.}
+  spec.homepage      = "https://github.com/amaltson/github-merge"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "github_api", "~>0.9.4"
+  spec.add_dependency "thor", "~>0.18.1"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+end

data/lib/github_merge.rb

@@ -0,0 +1 @@
+require 'github_merge/merge.rb'

data/lib/github_merge/cli.rb

@@ -0,0 +1,10 @@
+require 'thor'
+require_relative 'merge'
+
+class MergeCli < Thor
+  desc 'local file.yml', %q{Locally merge GitHub repositories as specified in YAML file.}
+  option :all_svn, :type => :boolean
+  def local(file)
+    Merge.new(file, options).local!
+  end
+end

data/lib/github_merge/local.rb

@@ -0,0 +1,89 @@
+class LocalMerge
+
+  OUT_DIR = "#{Dir.pwd}/merged"
+
+  def initialize(config, options)
+    @config = config
+    @options = options
+  end
+
+  def merge!
+    FileUtils.mkdir_p OUT_DIR
+    Dir.chdir OUT_DIR do
+      clone_repos
+      move_repos_to_subdir
+      create_empty_merged_repo
+      merge_repositories
+    end
+  end
+
+  def clone_repos
+    @config["repositories"].each do |repo|
+      `git clone #{repo["url"]} #{repo["sub directory"]}`
+    end
+  end
+
+  def move_repos_to_subdir
+    @config["repositories"].each do |repo|
+      git_filter_branch_move(repo["sub directory"])
+    end
+  end
+
+  def create_empty_merged_repo
+    puts 'Creating merged repository'
+    `git init #{merge_repo_name}`
+  end
+
+  def merge_repositories
+    Dir.chdir merge_repo_name do
+      @config["repositories"].each_with_index do |repo, index|
+        repo_name = repo["sub directory"]
+        `git remote add #{repo_name} ../#{repo_name}`
+        `git fetch #{repo_name}`
+        `git merge --no-edit #{repo_name}/master`
+      end
+    end
+  end
+
+  def git_filter_branch_move(subdir)
+    puts "Moving repository #{subdir} to subdirectory #{subdir}..."
+
+    sed = sed_command_to_use
+    Dir.chdir subdir do
+      %x[git filter-branch --index-filter \
+        'git ls-files -s | #{sed} "s@\t@&#{subdir}/@" |
+                GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
+                        git update-index --index-info &&
+         mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' #{beginning_sha}..HEAD]
+    end
+  end
+
+  def beginning_sha
+    if @options.all_svn?
+      `git log --pretty=format:%H --reverse`.split("\n")[1]
+    else
+      `git log --pretty=format:%H --reverse`.split("\n").first
+    end
+  end
+
+  def sed_command_to_use
+    if RbConfig::CONFIG['host_os'] =~ /darwin/
+      'gsed'
+    else
+      'sed'
+    end
+  end
+
+  def merge_repo_name
+    @config["merged repository"]
+  end
+
+  def merged?
+    merge_repo_dir = "#{OUT_DIR}/#{merge_repo_name}"
+    return false unless Dir.exist? merge_repo_dir
+    Dir.chdir merge_repo_dir do
+      return false unless Dir.exists? '.git'
+      return `git log`.split("\n").size > 0
+    end
+  end
+end

data/lib/github_merge/merge.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+require 'rbconfig'
+require 'fileutils'
+require_relative 'local'
+require_relative 'push'
+
+class Merge
+  VERSION = "0.0.1"
+  MOVE_TREE_SCRIPT_PATH = "#{Dir.pwd}/lib/github_merge"
+
+  def initialize(file, options)
+    @file = file
+    @options = options
+    @config = YAML.load_file @file
+    @local_merge = LocalMerge.new(@config, @options)
+    @push_merge = PushMerge.new(@config, @options)
+  end
+
+  def local!
+    @local_merge.merge!
+  end
+
+  def push!
+    @local_merge.merge! unless @local_merge.merged?
+    @push_merge.push!
+  end
+end

data/lib/github_merge/push.rb

@@ -0,0 +1,23 @@
+class PushMerge
+
+  def initialize(config, options)
+    @config = config
+    @options = options
+  end
+
+  def push!
+    github = initialize_github
+  end
+
+  def initialize_github
+    api_endpoint = config["host"] || "https://api.github.com"
+    oauth_token = config["oauth"]
+
+    Github.new do |config|
+      config.endpoint = api_endpoint
+      config.oauth_token = oauth_token
+      config.adapter = :net_http
+    end
+  end
+
+end

data/spec/merge_spec.rb

@@ -0,0 +1,41 @@
+require 'rspec'
+require 'github_merge/merge'
+require 'fileutils'
+
+describe Merge do
+  before :each do
+    options = double()
+    options.stub(:all_svn? => false)
+    @merge = Merge.new 'spec/sample-merge-config.yml', options
+  end
+
+  after :each do
+    FileUtils.rm_rf(LocalMerge::OUT_DIR)
+  end
+
+  it "shouldn't be merged by default" do
+    @merge.instance_variable_get("@local_merge").merged?.should be_false
+  end
+
+  it "should merge locally" do
+    @merge.local!
+
+    # Check clone and rename worked
+    %w{github-merge github}.each do |repo|
+      Dir.exists?("#{LocalMerge::OUT_DIR}/#{repo}").should be_true
+      Dir.exists?("#{LocalMerge::OUT_DIR}/#{repo}/#{repo}").should be_true
+    end
+
+    # check that the merge was successful
+    merged_dir = "#{LocalMerge::OUT_DIR}/merge-test"
+    Dir.exists?(merged_dir).should be_true
+    %w{github-merge github}.each do |repo|
+      Dir.exists?("#{merged_dir}/#{repo}").should be_true
+    end
+
+    @merge.instance_variable_get("@local_merge").merged?.should be_true
+  end
+
+  it "should merge local when pushing" do
+  end
+end

data/spec/sample-merge-config.yml

@@ -0,0 +1,9 @@
+host: https://api.github.com
+oauth: oauth_token_here
+merged organization: org
+merged repository: merge-test
+repositories:
+  - url: https://github.com/amaltson/github-merge.git
+    sub directory: github-merge
+  - url: https://github.com/amaltson/github-merge.git
+    sub directory: github

metadata

@@ -0,0 +1,148 @@
+--- !ruby/object:Gem::Specification
+name: github-merge
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- Arthur Maltson
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: github_api
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Script that merges multiple GitHub repositories into a new, single repository.
+email:
+- arthur.kalm@gmail.com
+executables:
+- github-merge
+extensions: []
+extra_rdoc_files: []
+files:
+- .autotest
+- .gitignore
+- Gemfile
+- Gemfile.lock
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.md
+- Rakefile
+- bin/github-merge
+- github-merge.gemspec
+- lib/github_merge.rb
+- lib/github_merge/cli.rb
+- lib/github_merge/local.rb
+- lib/github_merge/merge.rb
+- lib/github_merge/push.rb
+- spec/merge_spec.rb
+- spec/sample-merge-config.yml
+homepage: https://github.com/amaltson/github-merge
+licenses:
+- MIT
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
+specification_version: 3
+summary: Split your project into lots of small Git repos and finding yourself creating
+  cross repo Pull Requests? This is the gem for you.
+test_files:
+- spec/merge_spec.rb
+- spec/sample-merge-config.yml