git-multirepo 1.0.0.beta12 → 1.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e012e689d7399508df4528f204ae16c4bf9229c
-  data.tar.gz: 8d7e3be3d4584401559ab47683acb8158a388dfb
+  metadata.gz: 7e82b1d4dc7e0ce39b4b686b972ca4d71668129b
+  data.tar.gz: 0d7ea7821b543a7378d387105b694106683bcd45
 SHA512:
-  metadata.gz: 2aacad378edef41a3bce28869b916ad88257973948ba65fc1801750af35a8c1128861bc0fafa022dc000b185bb308e4cc993fb5fb487634f6e685b4d555d3a07
-  data.tar.gz: be89879c9d7dc518094b13f56af07584886b4ce7ec4f40ad4b4a51c8ddab70f31a5d15ccd2202150aa10ebd92051a8df19c54e1f733e597d8b4350820ab4ec90
+  metadata.gz: 8b96fd301dcf1160ce12f981a056f3a369972af9a1bf14741fc00bfed880f2ca2babbcc42a255bdfdb9416697b81cc069a5885fbbbf2870b8132ceae659c238a
+  data.tar.gz: e190376df8033efb5ebd67f302a0ea1243cbd30159c936969c25097db3406503411d5de24d90ffeac858791a5b16247103a45d45139942a2aedc479be2542064

data/lib/commands.rb

@@ -2,6 +2,7 @@ require_relative "multirepo/commands/command"
 require_relative "multirepo/commands/add-command"
 require_relative "multirepo/commands/branch-command"
 require_relative "multirepo/commands/checkout-command"
+require_relative "multirepo/commands/clone-command"
 require_relative "multirepo/commands/edit-command"
 require_relative "multirepo/commands/fetch-command"
 require_relative "multirepo/commands/init-command"

data/lib/info.rb

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

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

@@ -21,7 +21,7 @@ module MultiRepo
     end
     
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       ensure_repo_exists
       

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

@@ -27,7 +27,7 @@ module MultiRepo
     end
     
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       
       Console.log_step("Branching and checking out #{@branch_name}...")

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

@@ -27,7 +27,7 @@ module MultiRepo
     end
     
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       
       main_repo = Repo.new(".")

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

@@ -0,0 +1,54 @@
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/git/repo"
+require_relative "install-command"
+
+module MultiRepo
+  class CloneCommand < Command
+    self.command = "clone"
+    self.summary = "Clones the specified repository in a subfolder, then installs it."
+    
+    def self.options
+      [
+        ['[url]', 'The repository to clone.'],
+        ['[name]', 'The name of the containing folder that will be created.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @url = argv.shift_argument
+      @name = argv.shift_argument
+      super
+    end
+
+    def validate!
+      super
+      help! "You must specify a repository to clone" unless @url
+      help! "You must specify a containing folder name" unless @name
+    end
+
+    def run
+      Console.log_step("Cloning #{@url} ...")
+
+      raise MultiRepoException, "A directory named #{@name} already exists" if Dir.exists?(@name)
+
+      main_repo_path = "#{@name}/#{@name}"
+
+      FileUtils.mkpath(main_repo_path)
+
+      main_repo = Repo.new(main_repo_path)
+      main_repo.clone(@url)
+      
+      original_path = Dir.pwd
+      Dir.chdir(main_repo_path)
+      
+      InstallCommand.new(CLAide::ARGV.new([])).install_internal
+      
+      Dir.chdir(original_path)
+            
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
+end

data/lib/multirepo/commands/command.rb

@@ -16,10 +16,6 @@ module MultiRepo
       super
     end
     
-    def run
-      validate_in_work_tree
-    end
-    
     def validate_in_work_tree
       raise MultiRepoException, "Not a git repository" unless Git.is_inside_git_repo(".")
     end

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

@@ -6,7 +6,7 @@ module MultiRepo
     self.summary = "Opens the .multirepo file in the default text editor."
     
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       
       if OS.posix?

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

@@ -6,7 +6,7 @@ module MultiRepo
     self.summary = "Performs a git fetch on all dependencies."
     
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       
       Console.log_step("Fetching dependencies...")

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

@@ -10,7 +10,7 @@ module MultiRepo
     self.summary = "Initialize the current repository as a multirepo project."
     
     def run
-      super
+      validate_in_work_tree
       Console.log_step("Initializing new multirepo config...")
       
       if ConfigFile.exists?

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

@@ -8,22 +8,26 @@ module MultiRepo
     self.summary = "Clones and checks out dependencies as defined in the .multirepo file, and installs git-multirepo's local pre-commit hook."
     
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       
       Console.log_step("Cloning dependencies and installing hook...")
       
+      install_internal
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def install_internal
       config_entries = ConfigFile.load
 
-      Console.log_info("There are #{config_entries.count} dependencies to install");
+      Console.log_substep("Installing #{config_entries.count} dependencies...");
       
       config_entries.each { |e| install(e) }
       
       self.install_pre_commit_hook
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
     end
     
     def install(entry)

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

@@ -9,7 +9,7 @@ module MultiRepo
     self.summary = "Opens all dependencies in the current OS's file explorer."
     
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       
       ConfigFile.load.each do |entry|

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

@@ -6,7 +6,7 @@ module MultiRepo
     self.summary = "Removes all traces of multirepo in the current multirepo repository."
     
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       
       File.delete(".multirepo")

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

@@ -19,7 +19,7 @@ module MultiRepo
     end
 
     def run
-      super
+      validate_in_work_tree
       ensure_multirepo_initialized
       
       Console.log_step("Updating...")

data/lib/multirepo/utility/runner.rb

@@ -17,7 +17,7 @@ module MultiRepo
       lines = []
       Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
         stdout_and_stderr.each do |line|
-          Console.log_info(line) if verbosity == Verbosity::ALWAYS_OUTPUT || Config.instance.verbose
+          Console.log_info(line.rstrip) if verbosity == Verbosity::ALWAYS_OUTPUT || Config.instance.verbose
           lines << line
         end
         @last_command_succeeded = thread.value.success?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta12
+  version: 1.0.0.beta15
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,6 +126,7 @@ files:
 - lib/multirepo/commands/add-command.rb
 - lib/multirepo/commands/branch-command.rb
 - lib/multirepo/commands/checkout-command.rb
+- lib/multirepo/commands/clone-command.rb
 - lib/multirepo/commands/command.rb
 - lib/multirepo/commands/edit-command.rb
 - lib/multirepo/commands/fetch-command.rb