omnirepo 0.5.0.0.pre → 0.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de193035ffbc63293ac558163fa9bc6519e0597
-  data.tar.gz: 5597b8bfa5d0ac31564a58fc2444884ed1c24ff3
+  metadata.gz: fc5da9a8b9dbe6fba15de1c4f8ab54319d7b2479
+  data.tar.gz: ec5480bd3fc4e18c705a7c4d0f6c2318634c34e0
 SHA512:
-  metadata.gz: 98f40124f15c5be9e75017e11446788d1cc1882f396b228218065b1412e3ee57defdac1efb33f5ddd476707729ed923852d6a9fc11a90e4d5ab6d9188b050912
-  data.tar.gz: ebb92830746b0dbd4dceae34bcd51ef6a57abfcc637be28b349e2371a20f2eb7c66ecfdef4f1a84d3c9de731ad9dd3dafc61d016fa678be5d1ca8e2e634e28fc
+  metadata.gz: 0bbc96254859106e2912a2c116e03239ede7f250e08ce2ae140d3bf78f5a815a8438be7000e73d929c1a49af7c06a03d1b91a5cdb738b2051704190b1c336cd2
+  data.tar.gz: 0a949382b5b5249a375cbc035eaf00dc047b9111b33beecff35c85744959b01b26aab33aa7f8fc68ea446ca7fe2cf88e641ba2a33113989f1172fa61108be267

data/CHANGES.md

@@ -4,4 +4,5 @@ HEAD
 * Added `.omnirepo` configuration file support. YAML file with these options:
   * [required, if using .omnirepo] `repositories` array, of individual repositories.
   * [optional] `submodules` if `remove` will remove submodules from repositories.
-  * [optional] `merging` can be `skip` and it will just prepare but not merge.
+  * [optional] `merging` can be `skip` and it will just prepare but not merge.
+* Primarily supports `GitHub` ... but now also other git servers.

data/Gemfile

@@ -2,3 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
+gem 'colorize'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2014 Donovan Keme
+Copyright (c) 2015 Donovan Keme
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,13 +1,6 @@
 # omnirepo
 
-Create a new omnibus repository out of a collection of existing GitHub repositories.
-
-
-## Installation:
-
-```
-gem install omnirepo
-```
+Create a new omnibus repository out of a collection of existing git repositories.
 
 ## What exactly does it do with repositories?!
 
@@ -17,19 +10,27 @@ gem install omnirepo
   0. It immediately removes any  remote `origin` detected.
 0. Preserves the git history for each repository.
   0. (optional) If desired, it removes any submodules present first.
-  0. It also renames all branches and tags to be `<repository>/<name>`.
+  0. It also renames all branches and tags to be `standalone/<repository>/<name>`.
 0. Does garbage collection on the repository being migrated.
 0. Imports each source repository as a sub-directory of the omnibus repository.
 0. Does garbage collection on the new omnibus repository.
 0. **Does not push the new omnibus repository live.**
 
-### System Requirements:
+---
+
+#### Installation:
+
+```
+gem install omnirepo
+```
+
+#### System Requirements:
 
 * Unix-based operating system, with `ruby` and `git` preinstalled.
 * Prefers `tmpfs` partition located at `/dev/shm` for temporary storage.
 * Read access to all remote repositories involed.
 
-### Usage:
+# Use without a configuration file:
 
 ```sh
 omnirepo <username/organization> <destination-omnibus> <source-repository> [...]
@@ -52,6 +53,7 @@ This would be your command:
 ```sh
 omnirepo org9 repo0 repoA repoB repoC
 ```
+
 # Use with a configuration file:
 
 For the scenario above, you can create a configuration file as follows:
@@ -65,7 +67,7 @@ repositories:
 
 Save that file as `repo0/.omnirepo`
 
-Then you can run this command:
+Then run this command:
 
 ```sh
 omnirepo org9 repo0
@@ -85,6 +87,7 @@ omnirepo org9 repo0
 
 ## License
 
-Copyright (c) 2015 Donovan Keme.
+Distributed under the MIT License.
+See [LICENSE.txt](https://github.com/digitalextremist/omnirepo/blob/master/LICENSE.txt) for further details.
 
-Distributed under the MIT License. See [LICENSE.txt](https://github.com/digitalextremist/omnirepo/LICENSE.txt) for further details.
+Copyright (c) 2015 Donovan Keme.

data/bin/omnirepo

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 
+require 'colorize'
+
 start = Time.now #de Not monotonic, but bah.
-puts "Omnibus repository unification tool..."
+
+puts LINE = "-----------------------------------------------------------------------------------".cyan.bold.freeze
+puts "[ #{"omnirepo".green.bold} ] Omnibus repository unification tool..."
 
 def omnirepo?
   if File.exists?(File.join("#{Dir.pwd}/#{ARGV[1]}", ".omnirepo"))
@@ -11,8 +15,8 @@ def omnirepo?
   false
 end
 
-def urandom_id
-  `cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`
+def urandom_id(length=24)
+  `cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w #{length} | head -n 1`.strip.chomp
 end
 
 def success?(results)
@@ -22,6 +26,12 @@ def success?(results)
   results.first == true
 end
 
+bad_bullet = "*".red.bold
+good_bullet = "*".green.bold
+humble_bullet = "*".cyan
+
+instance = urandom_id(5)
+
 begin
 
   #de TODO: Validate owner.
@@ -33,17 +43,17 @@ begin
     OMNIBUS = "#{Dir.pwd}/#{ARGV.shift}"
     CONFIG = Psych.load_file(File.join(OMNIBUS, ".omnirepo"))
     unless CONFIG.is_a?(Hash) && CONFIG["repositories"].is_a?(Array)
-      puts "Onmirepo configuration file invalid."
+      puts "#{bad_bullet} Onmirepo configuration file invalid."
       exit!
     end
     REPOSITORIES = CONFIG['repositories'].uniq
     GIT = CONFIG["git"] if CONFIG["git"].is_a?(String)
   elsif ARGV.length <= 3
     puts "Usage: omnirepo <owner org/user> <destination-omnibus-dir> <source-repo1> <source-repo2> [...]"
-    puts "No owner organization/username supplied." unless ARGV.any?
-    puts "No destination omnibus directory supplied." unless ARGV.length >= 2
-    puts "No source repositories supplied." unless ARGV.length == 3
-    puts "Only one source repository supplied." if ARGV.length == 3
+    puts "#{bad_bullet} No owner organization/username supplied." unless ARGV.any?
+    puts "#{bad_bullet} No destination omnibus directory supplied." unless ARGV.length >= 2
+    puts "#{bad_bullet} No source repositories supplied." unless ARGV.length == 3
+    puts "#{bad_bullet} Only one source repository supplied." if ARGV.length == 3
     exit!
   else
     OWNER = ARGV.shift
@@ -54,58 +64,60 @@ begin
 
   GIT = "git@github.com".freeze unless defined? GIT
 
+  object_prefix = CONFIG["object_prefix"] || "standalone/"
   tmp='/dev/shm'
   tmp='/tmp' unless Dir.exists?(tmp)
   TMP="#{tmp}/omnirepo.#{urandom_id}".chomp.strip
 
   unless Dir.mkdir(TMP)
-    STDERR.puts "ERROR: Unable to make the temporary working directory: #{TMP}"
+    STDERR.puts "#{"ERROR".red.bold}: Unable to make the temporary working directory: #{TMP}"
     exit!
   end
 
-  puts LINE = "-----------------------------------------------------------------------------------".freeze
+  puts LINE
 
   unless Dir.exists?(OMNIBUS)
     puts "Destination omnibus directory does not exist: #{OMNIBUS}"
     exit!
   end
 
-  puts "Owner organization/user: #{OWNER}"
-  puts "Destination omnibus: #{OMNIBUS}"
-  puts "Working directory: #{TMP}"
-  puts LINE
+  puts "\t#{good_bullet} Instance: #{instance.green}"
+  puts "\t#{good_bullet} Owner organization/user: #{OWNER.green}"
+  puts "\t#{good_bullet} Destination omnibus: #{OMNIBUS.green}"
+  puts "\t#{good_bullet} Working directory: #{TMP}"
 
   Dir.chdir(OMNIBUS)
 
   if `git show 2> /dev/null | grep "commit" | wc -l`.to_i != 1
     puts LINE
-    STDERR.puts "ERROR: Destination omnibus directory is not a git repository, or not ready."
+    STDERR.puts "#{"ERROR".red.bold}: Destination omnibus directory is not a git repository, or not ready."
     exit!
   end
 
+  puts LINE
+
   #de TODO: Further validate omnibus repository.
 
+  branches = {}
   failures = []
+  repos = []
 
   REPOSITORIES.each { |repo|
-    
-    puts "\n\n\n#{LINE}"
-    puts "Adding the #{repo} repository..."
-    puts "Source: #{GIT}:#{OWNER}/#{repo}.git"
-    puts LINE
+
+    puts "\n\n#{LINE}\n#{humble_bullet} Adding the #{repo.bold} repository from #{"#{GIT}:#{OWNER}/#{repo}.git".bold}\n#{LINE}"
 
     unless Dir.chdir(TMP)
-      STDERR.puts "ERROR: Failure to change to the temporary working directory."
+      STDERR.puts "#{"ERROR".red.bold}: Failure to change to the temporary working directory."
       exit!
     end
 
     unless system("git clone --mirror '#{GIT}:#{OWNER}/#{repo}.git' #{repo}")
-      puts "FERROR: ailed to clone: #{repo}"
+      puts "F#{"ERROR".red.bold}: ailed to clone: #{repo}"
       exit!
     end
 
     unless Dir.chdir(repo_bare = File.join(TMP, repo))
-      STDERR.puts "ERROR: Failed to mirror the #{repo} repository."
+      STDERR.puts "#{"ERROR".red.bold}: Failed to mirror the #{repo} repository."
       exit!
     end
 
@@ -113,138 +125,150 @@ begin
       `git remote rm origin > /dev/null 2> /dev/null`
     end
 
-    branches = []
-    `git branch | grep -v master | grep -v "refs/"`.split("\n").each { |branch|
-      begin
-        result = nil
-        branches << (branch = branch.strip.chomp)
-        result = system("git branch -m '#{branch}' '#{repo}/#{branch}")
-      rescue => ex
-        STDERR.puts "WARN: Could not migrate the #{branch} branch.\nReason: #{ex}"
-      ensure
-        failures << "#{repo} / branch: #{branch}" unless result == true
-      end
-    }
-
-    repo_clone = "../#{repo}.clone"
-    unless cloned = system("git clone . #{repo_clone} > /dev/null")
-      STDERR.puts "ERROR: Failed to make local clone of #{repo}."
+    repo_clone = "#{repo_bare}.clone"
+    unless system("git clone -q . #{repo_clone}")
+      STDERR.puts "#{"ERROR".red.bold}: Failed to make local clone of #{repo}."
       failures << "#{repo} / locally clone"
       next
     end
-    
+
     Dir.chdir(repo_clone)
 
     begin
       if CONFIG['submodules'] == 'remove'
-        if File.exists?(module_config = File.join(repo_bare, repo_clone, ".gitmodules"))
+        if File.exists?(module_config = File.join(repo_clone, ".gitmodules"))
           submodules = File.read(module_config)
                         .split("\n")
                         .map { |line|
                           if line.include?("path =")
                             submodule = line.sub("path =", "").chomp.strip
                             unless submodule.empty?
-                              `git rm -rf ./#{submodule}`
-                               submodule
+                              submodule
                             end
                           else
                             nil
                           end
                         }.compact
-          result = []
-          result << system("git rm -rf .gitmodules")
-          result << system("git commit -am '[omnirepo] removing submodules: #{submodules.join(', ')}'")
-          result << system("git push")
-          failures << "#{repo} / submodules: remove .gitmodules, then commit/push" unless success?(result)
-          puts "#{LINE}\nRemoved submodules first: #{submodules.join(', ')}"
+
+          puts "\n\n#{LINE}\n#{humble_bullet} Removing submodules: #{submodules.join(', ')}\n#{LINE}"
+          unless system("git filter-branch --tag-name-filter cat --tree-filter 'rm -rf #{submodules.join(' ')} .gitmodules' -- --all")
+            failures << "#{repo} / submodules: remove .gitmodules, then commit/push"
+          end
         end
       end
     rescue => ex
-      STDERR.puts "WARN: Could not remove associated submodules.\nReason: #{ex}"
+      STDERR.puts "#{bad_bullet} #{"WARN:".red} Could not remove associated submodules.\nReason: #{ex}"
       failures << "#{repo} / remove submodules"
-    ensure
-      Dir.chdir(repo_bare)
     end
 
-    puts "#{LINE}\nPreserving change history and files, but making the repository a sub-directory..."
+    puts "\n\n#{LINE}\n#{humble_bullet} Preserving change history and files, but making the repository a sub-directory...\n#{LINE}"
     print "... please wait: "
 
-    unless system("git filter-branch --tree-filter " +
-            "'mkdir #{repo}; " +
-            "find -maxdepth 1 " +
-                "-not -name . " +
-                "-not -name .git " +
-                "-not -name #{repo} " +
-            "| xargs -I{} mv {} #{repo}' " +
-            "-d #{TMP}/#{urandom_id} -- --all")
-      failures << "#{repo} / repository tree-filter"
-    end
+    filtering = "git filter-branch -f --tag-name-filter cat --index-filter 'SHA=$(git write-tree); " +
+                "rm $GIT_INDEX_FILE && git read-tree --prefix=#{repo}/ $SHA' -- --all"
 
-    unless system("git commit -am '[omnirepo] merging the rearranged file structure'")
-      failures << "#{repo} / merge rearranged file structure"
-      STDERR.puts "ERROR: Could not merge-in rearranged file structure."
-      next
-    end
+    failures << "#{repo} / repository tree-filter" unless system(filtering)
 
     tags = []
     `git tag`.split("\n").each { |tag|
       begin
         result = []
         tags << (tag = tag.chomp.strip)
-        result << system("git tag '#{repo}/#{tag}' '#{tag}' > /dev/null")
-        result << system("git tag -d '#{tag}' > /dev/null")
+        result << system("git tag '#{object_prefix}#{repo}/#{tag}' '#{tag}' > /dev/null")
+        result << system("git tag -d '#{tag}'")
       rescue => ex
-        STDERR.puts "WARN: Could not migrate the #{tag} tag.\nReason: #{ex}"
+        STDERR.puts "#{bad_bullet} #{"WARN:".red} Could not migrate the #{tag} tag.\nReason: #{ex}"
         result << false
       ensure
         failures << "#{repo} / tag: #{tag}" unless success?(result)
       end
     }
 
-    puts "#{LINE}\nGarbage collection of source repository...\n#{LINE}"
-    failures << "#{repo} / garbage collection" unless `git gc --aggressive`
-
-    if CONFIG['merging'] == 'skip'
-      puts "Skipping actual merge into omnibus..."
-      next
-    end
-
-    puts "#{LINE}\nMerging the prepared repository into the omnibus...\n#{LINE}"
+    Dir.chdir(repo_bare)
+    system("git remote add clone #{repo_clone}")
+    system("git tag | xargs git tag -d")
+    puts "\n\n#{LINE}\n#{humble_bullet} Synchronizing all changes to working repository...\n#{LINE}"
+    failures << "synchronize working repos" unless system("git fetch -u --tags clone +refs/heads/*:refs/heads/*")
 
-    result = []
-    Dir.chdir(OMNIBUS)
-    result << system("git remote add #{repo} #{repo_bare}")
-    result << system("git fetch #{repo}")
-    result << system("git merge --no-ff #{repo}/master --commit '[omnirepo] merging in the #{repo} repository.'")
-    result << system("git remote rm #{repo}")
+    branches[repo] = []
+    `git branch | grep -v "refs/"`.split("\n").each { |branch|
+      begin
+        result = nil
+        branch = branch.gsub("* ", "").strip.chomp
+        b = "#{object_prefix}#{repo}/#{branch}"
+        result = system("git branch -m '#{branch}' '#{b}'")
+        branches[repo] << b
+      rescue => ex
+        STDERR.puts "#{bad_bullet} #{"WARN:".red} Could not migrate the #{branch} branch.\nReason: #{ex}"
+      ensure
+        unless result
+          failures << "#{repo} / branch: #{branch}"
+        end
+      end
+    }
 
-    unless success?(result)
-      failures << "#{repo} / merge into omnibus"
-      next
+    unless CONFIG['merging'] == 'skip'
+      result = []
+      Dir.chdir(OMNIBUS)
+      result << system("git remote add #{repo}.#{instance} #{repo_bare}")
+      unless success?(result)
+        failures << "#{repo} / attach remote to omnibus"
+        next
+      end
     end
+    repos << repo
+  }
 
-    if branches.any?
-      puts "#{LINE}\nThese branches were migrated:\n#{LINE}"
-      branches.each { |branch| puts "#{branch.rjust(35)} is now #{repo}/#{branch}\n" }
-    end
-    
-    if tags.any?
-      puts "#{LINE}\nThese tags were migrated:\n#{LINE}"
-      tags.each { |tag| puts "#{tag.rjust(35)} is now #{repo}/#{tag}\n" }
+  unless CONFIG['merging'] == 'skip'
+    puts "\n\n#{LINE}\n#{humble_bullet} Merging the prepared standalone repositories into the omnibus...\n#{LINE}"
+    if repos.any?
+      if system("git fetch --all")
+        repos.each { |repo|
+
+          if branches[repo].any?
+            puts "#{good_bullet} Merge branch into master: #{"#{repo}.#{instance}/#{object_prefix}#{repo}/master".cyan}"
+            unless system("git merge --no-ff --commit -m '[omnirepo] merging #{object_prefix}#{repo}/master into origin/master' #{repo}.#{instance}/#{object_prefix}#{repo}/master")
+              failures << "#{repo} / merging in master branch"
+            end
+            branches[repo].each { |branch|
+              failures << "#{repo} / merging in branch: #{branch}" unless system("git fetch '#{repo}.#{instance}' '#{branch}:#{branch}'")
+            }
+          else
+            failures << "#{repo} / no branches"
+          end
+
+          failures << "#{repo} / removing temporary remote" unless system("git remote rm #{repo}.#{instance}")
+
+        }
+      else
+        failures << "fetching all repositories"
+      end
+    else
+      failures << "no repositories to merge in"
     end
+  end
 
-  }
+  puts "\n\n#{LINE}\n#{humble_bullet} Garbage collection of the omnibus repository...\n#{LINE}"
+  failures << "omnibus garbage collection" unless system("git gc --aggressive")
 
   puts "\n\n\n"
   #de TODO: Delete working directory, or at least give config or command line option to do so.
-  puts "#{LINE}\nThere were the following failures:\n#{LINE}\n#{failures.join("\n")}" if failures.any?
-  puts "\n\n\n#{LINE}"
-  puts "Omnibus unification of repositories finished in #{"%0.4f" % (Time.now.to_f - start.to_f)} seconds."
-  puts "#{LINE}\nRemove your temporary working directory when you are ready:"
+
+  if failures.any?
+    puts "#{LINE}\nThere were the following failures:\n#{LINE}\n\t#{bad_bullet} #{failures.join("\n\t#{bad_bullet} ")}"
+  end
+
+  puts "\n\n\n#{LINE}\n#{humble_bullet} Remove your temporary working directory when you are ready:"
   puts "         #{TMP}"
-  puts "#{LINE}\nWARNING: Be sure to check over the new omnibus repository before pushing it!"
-  puts "         Each repository has been committed into it."
-  puts LINE
+  puts "#{LINE}\n#{humble_bullet} #{"WARNING:".bold} Be sure to check over the new omnibus repository before pushing it!"
+  puts "         Each repository has been committed into it.\n\n"
+
+  if repos.any?
+    puts LINE
+    puts "The following repositories were combined into one omnibus repository:\n#{LINE}\n\t#{good_bullet} #{repos.join("\n\t#{good_bullet} ")}"
+  end
+
+  puts "#{LINE}\n[ #{"omnirepo".green.bold} ] Omnibus unification of repositories finished in #{"%0.4f" % (Time.now.to_f - start.to_f)} seconds.\n#{LINE}\n\n"
 
 rescue => ex
   puts "Exiting prematurely. Re-run to make an intact omnibus repository."

data/omnirepo.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "omnirepo"
-  gem.version       = '0.5.0.0.pre'
+  gem.version       = '0.9.pre'
   gem.licenses      = ['MIT']
   gem.required_ruby_version = ">= 1.9.2"
   gem.required_rubygems_version = ">= 1.3.6"

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: omnirepo
 version: !ruby/object:Gem::Version
-  version: 0.5.0.0.pre
+  version: 0.9.pre
 platform: ruby
 authors:
 - Donovan Keme
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies: []
-description: Create a new omnibus repository out of collections of existing GitHub
-  repositories.
+description: Create a new omnibus repository out of collections of existing GitHub repositories.
 email:
 - code@extremist.digital
 executables:
@@ -19,7 +18,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -31,24 +30,24 @@ homepage: https://github.com/digitalextremist/omnirepo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.4.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Unify GitHub repositories as one repository containing them all as sub-directories.
 test_files: []