git-multirepo 1.0.0.beta6 → 1.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f67417664ab6be98eeaa6008e1e964970a1c3cf7
-  data.tar.gz: 5d02a6929a3817a8f7fae72836a3b7a15122045b
+  metadata.gz: d2127f8584295f5fa8191a05f5a60db185c66cd3
+  data.tar.gz: 1c20bf8d7f7cb56f1f63cec417483f3c5187f51a
 SHA512:
-  metadata.gz: af1a7d3bff1461e9723f37af08c69caf031c66bea48d85ea8c064620ebd808095947be5b5d8108a19763806b650831d262720ad426d79aedb30a2742673a99b0
-  data.tar.gz: 8c9f17361401306e3f0f8b4ae81c8ca2f8e88c1e09aaf805773a85d31a071bed3aa6f8c019426a8f73060017f6fc44aa999a540d4985975e37582643e638a51e
+  metadata.gz: dd00c15d670129ee71c31fc85e2505ddcd803110714d5497baccfdb027e852e46d53b1249cacb40c339dce2e2569396894209fa0bedbc5b7f36b57c5ad6b77d7
+  data.tar.gz: 451904537126a065e54b4bad41c80b419992ae2ae6bccc6d75dba6b70bf4ac75d718c666817f960a674b157bc37545e7d5ec1d54dc94669b9bf2ea07d5e786e5

data/README.md

@@ -102,7 +102,7 @@ If you want to stop using git-multirepo, run `multi uninit`. This will remove al
 
 ## Limitations
 
-- git-multirepo should be considered alpha at the moment. All of the core features work as described, though. Suggestions and contributions are welcome.
+- git-multirepo should be considered beta at the moment. All of the core features work as described, though. Suggestions and contributions are welcome.
 - The project and its dependencies must live beside each other on disk (for now).
 - There are currently no features to facilitate branch-heavy workflows.
 - You must (ideally) install the tool on your CI server: `gem install git-multirepo`

data/git-multirepo.gemspec

@@ -6,7 +6,7 @@ require 'info'
 Gem::Specification.new do |spec|
   spec.name          = MultiRepo::NAME
   spec.version       = MultiRepo::VERSION
-  spec.authors       = ["Michaël Fortin"]
+  spec.authors       = ["Michaël Fortin"]
   spec.email         = ["fortinmike@irradiated.net"]
   spec.summary       = %q{Track multiple Git repositories side-by-side}
   spec.description   = MultiRepo::DESCRIPTION

data/lib/commands.rb

@@ -1,11 +1,12 @@
 require_relative "multirepo/commands/command"
-require_relative "multirepo/commands/add"
-require_relative "multirepo/commands/checkout"
-require_relative "multirepo/commands/edit"
-require_relative "multirepo/commands/fetch"
-require_relative "multirepo/commands/init"
-require_relative "multirepo/commands/install"
-require_relative "multirepo/commands/open"
-require_relative "multirepo/commands/remove"
-require_relative "multirepo/commands/uninit"
-require_relative "multirepo/commands/update"
+require_relative "multirepo/commands/add-command"
+require_relative "multirepo/commands/branch-command"
+require_relative "multirepo/commands/checkout-command"
+require_relative "multirepo/commands/edit-command"
+require_relative "multirepo/commands/fetch-command"
+require_relative "multirepo/commands/init-command"
+require_relative "multirepo/commands/install-command"
+require_relative "multirepo/commands/open-command"
+require_relative "multirepo/commands/remove-command"
+require_relative "multirepo/commands/uninit-command"
+require_relative "multirepo/commands/update-command"

data/lib/info.rb

@@ -1,5 +1,5 @@
 module MultiRepo
   NAME = "git-multirepo"
-  VERSION = "1.0.0.beta6"
+  VERSION = "1.0.0.beta7"
   DESCRIPTION = "Track multiple Git repositories side-by-side."
 end

data/lib/multirepo/commands/{add.rb → add-command.rb}

@@ -2,7 +2,7 @@ require "multirepo/utility/console"
 require "multirepo/files/config-file"
 
 module MultiRepo
-  class Add < Command
+  class AddCommand < Command
     self.command = "add"
     self.summary = "Track an additional dependency with multirepo."
     

data/lib/multirepo/commands/branch-command.rb

@@ -0,0 +1,51 @@
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class BranchCommand < Command
+    self.command = "branch"
+    self.summary = "Create and/or checkout a new branch for each dependency."
+    
+    def initialize(argv)
+      @branch_name = argv.shift_argument
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a branch name" unless @branch_name
+    end
+    
+    def run
+      super
+      ensure_multirepo_initialized
+
+      Console.log_step("Branching (\"#{@branch_name}\")...")
+
+      main_repo = main_repo = Repo.new(".")
+      repos = ConfigFile.load.map{ |entry| entry.repo }.push(main_repo)
+
+      unless ensure_working_copies_clean(repos)
+        raise MultiRepoException, "Can't branch because not all repos are clean"
+      end
+
+      repos.each do |repo|
+        branch = repo.branch(@branch_name)
+        branch.create unless branch.exists?
+        branch.checkout
+      end
+
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+
+    def ensure_working_copies_clean(repos)
+      repos.all? do |repo|
+        clean = repo.is_clean?
+        Console.log_warning("Repo #{entry.path} has uncommitted changes") unless clean
+        return clean
+      end
+    end
+  end
+end

data/lib/multirepo/commands/{checkout.rb → checkout-command.rb}

@@ -1,7 +1,7 @@
 require "multirepo/utility/console"
 
 module MultiRepo
-  class Checkout < Command
+  class CheckoutCommand < Command
     self.command = "checkout"
     self.summary = "Checks out the specified commit or branch of the main repo and checks out matching versions of all dependencies."
     

data/lib/multirepo/commands/{edit.rb → edit-command.rb}

@@ -1,7 +1,7 @@
 require "os"
 
 module MultiRepo
-  class Edit < Command
+  class EditCommand < Command
     self.command = "edit"
     self.summary = "Opens the .multirepo file in the default text editor."
     

data/lib/multirepo/commands/{fetch.rb → fetch-command.rb}

@@ -1,7 +1,7 @@
 require "multirepo/utility/console"
 
 module MultiRepo
-  class Fetch < Command
+  class FetchCommand < Command
     self.command = "fetch"
     self.summary = "Performs a git fetch on all dependencies."
     

data/lib/multirepo/commands/{init.rb → init-command.rb}

@@ -5,7 +5,7 @@ require "multirepo/files/lock-file"
 require "multirepo/commands/command"
 
 module MultiRepo
-  class Init < Command
+  class InitCommand < Command
     self.command = "init"
     self.summary = "Initialize the current repository as a multirepo project."
     

data/lib/multirepo/commands/{install.rb → install-command.rb}

@@ -3,7 +3,7 @@ require "multirepo/utility/utils"
 require "multirepo/git/repo"
 
 module MultiRepo
-  class Setup < Command
+  class InstallCommand < Command
     self.command = "install"
     self.summary = "Clones and checks out dependencies as defined in the .multirepo file, and installs git-multirepo's local pre-commit hook."
     

data/lib/multirepo/commands/{open.rb → open-command.rb}

@@ -4,7 +4,7 @@ require "multirepo/utility/console"
 require "multirepo/utility/utils"
 
 module MultiRepo
-  class Open < Command
+  class OpenCommand < Command
     self.command = "open"
     self.summary = "Opens all dependencies in the current OS's file explorer."
     

data/lib/multirepo/commands/{remove.rb → remove-command.rb}

@@ -2,7 +2,7 @@ require "multirepo/utility/console"
 require "multirepo/files/config-file"
 
 module MultiRepo
-  class Remove < Command
+  class RemoveCommand < Command
     self.command = "remove"
     self.summary = "Removes the specified dependency from multirepo."
     

data/lib/multirepo/commands/{uninit.rb → uninit-command.rb}

@@ -1,7 +1,7 @@
 require "multirepo/utility/console"
 
 module MultiRepo
-  class Uninit < Command
+  class UninitCommand < Command
     self.command = "uninit"
     self.summary = "Removes all traces of multirepo in the current multirepo repository."
     

data/lib/multirepo/commands/{update.rb → update-command.rb}

@@ -1,7 +1,7 @@
 require "multirepo/utility/console"
 
 module MultiRepo
-  class Update < Command
+  class UpdateCommand < Command
     self.command = "update"
     self.summary = "Force-updates the multirepo lock file."
     

data/lib/multirepo/git/branch.rb

@@ -8,6 +8,17 @@ module MultiRepo
       @repo = repo
       @name = name
     end
+
+    def exists?
+      lines = Git.run_in_working_dir(@repo.path, "branch", false).split("\n")
+      branch_names = lines.map { |line| line.tr("* ", "")}
+      branch_names.include?(@name)
+    end
+
+    def create(remote_tracking = false)
+      Git.run_in_working_dir(@repo.path, "branch #{@name}", false)
+      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", false) if remote_tracking
+    end
     
     def checkout
       Git.run_in_working_dir(@repo.path, "checkout #{@name}", false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta6
+  version: 1.0.0.beta7
 platform: ruby
 authors:
-- Michaël Fortin
+- Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,17 +123,18 @@ files:
 - lib/commands.rb
 - lib/git-multirepo.rb
 - lib/info.rb
-- lib/multirepo/commands/add.rb
-- lib/multirepo/commands/checkout.rb
+- lib/multirepo/commands/add-command.rb
+- lib/multirepo/commands/branch-command.rb
+- lib/multirepo/commands/checkout-command.rb
 - lib/multirepo/commands/command.rb
-- lib/multirepo/commands/edit.rb
-- lib/multirepo/commands/fetch.rb
-- lib/multirepo/commands/init.rb
-- lib/multirepo/commands/install.rb
-- lib/multirepo/commands/open.rb
-- lib/multirepo/commands/remove.rb
-- lib/multirepo/commands/uninit.rb
-- lib/multirepo/commands/update.rb
+- lib/multirepo/commands/edit-command.rb
+- lib/multirepo/commands/fetch-command.rb
+- lib/multirepo/commands/init-command.rb
+- lib/multirepo/commands/install-command.rb
+- lib/multirepo/commands/open-command.rb
+- lib/multirepo/commands/remove-command.rb
+- lib/multirepo/commands/uninit-command.rb
+- lib/multirepo/commands/update-command.rb
 - lib/multirepo/config.rb
 - lib/multirepo/files/config-entry.rb
 - lib/multirepo/files/config-file.rb