git-multirepo 1.0.0.beta11 → 1.0.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a516af9dddd49b976920b98a8a4445570950c3dd
-  data.tar.gz: 5208a8d30f9300e81e1fa617642bece5c8481434
+  metadata.gz: 8e012e689d7399508df4528f204ae16c4bf9229c
+  data.tar.gz: 8d7e3be3d4584401559ab47683acb8158a388dfb
 SHA512:
-  metadata.gz: 69fbd3cb2f3c35863bde7e49890c8e9956435ef6b1dcb0c766c51b84f72499ecbd1aa3c9eb7744494a0a874e5d71a25e40583274e80f021a0a7dace247a126e5
-  data.tar.gz: c7d216c8bb43c02fcd46665506a6a42b148e70c0bed16e67b4cb1bf7baeaa4863acacaca957bc2259ef2eb11c56ebd5829e8eca51128ca27ad2fd854951f7c2c
+  metadata.gz: 2aacad378edef41a3bce28869b916ad88257973948ba65fc1801750af35a8c1128861bc0fafa022dc000b185bb308e4cc993fb5fb487634f6e685b4d555d3a07
+  data.tar.gz: be89879c9d7dc518094b13f56af07584886b4ce7ec4f40ad4b4a51c8ddab70f31a5d15ccd2202150aa10ebd92051a8df19c54e1f733e597d8b4350820ab4ec90

data/lib/info.rb

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

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

@@ -9,13 +9,15 @@ module MultiRepo
     def self.options
       [
         ['[branch name]', 'The name of the branch to create and checkout.'],
-        ['--force', 'Force creating the branch even if the repos contain uncommmitted changes.']
+        ['--force', 'Force creating the branch even if the repos contain uncommmitted changes.'],
+        ['--no-track', 'Do not configure as a remote-tracking branch on creation.']
       ].concat(super)
     end
     
     def initialize(argv)
       @branch_name = argv.shift_argument
       @force = argv.flag?("force")
+      @remote_tracking = !argv.flag?("no-track")
       super
     end
     
@@ -39,7 +41,7 @@ module MultiRepo
 
       repos.each do |repo|
         branch = repo.branch(@branch_name)
-        branch.create unless branch.exists?
+        branch.create(@remote_tracking) unless branch.exists?
         branch.checkout
       end
 

data/lib/multirepo/files/config-file.rb

@@ -32,7 +32,7 @@ module MultiRepo
     end
 
     def self.stage
-      Git.run_in_current_dir("add -A -f #{FILE.to_s}", false)
+      Git.run_in_current_dir("add -A -f #{FILE.to_s}", Runner::Verbosity::NEVER_OUTPUT)
     end
   end
 end

data/lib/multirepo/files/lock-file.rb

@@ -23,11 +23,11 @@ module MultiRepo
       
       File.write(FILE.to_s, Psych.dump(lock_entries))
       
-      Git.run_in_current_dir("add -A #{FILE.to_s}", false)
+      Git.run_in_current_dir("add -A #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
     end
 
     def self.commit
-      Git.run_in_current_dir("commit -m \"Updated multirepo lock file with the latest version of all dependencies\" -o -- #{FILE.to_s}", false)
+      Git.run_in_current_dir("commit -m \"Updated multirepo lock file with the latest version of all dependencies\" -o -- #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
     end
     
     def self.validate_components(line, components)

data/lib/multirepo/git/branch.rb

@@ -10,18 +10,18 @@ module MultiRepo
     end
 
     def exists?
-      lines = Git.run_in_working_dir(@repo.path, "branch", false).split("\n")
+      lines = Git.run_in_working_dir(@repo.path, "branch", Runner::Verbosity::NEVER_OUTPUT).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
+      Git.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", Runner::Verbosity::OUTPUT_ON_ERROR) if remote_tracking
     end
     
     def checkout
-      Git.run_in_working_dir(@repo.path, "checkout #{@name}", false)
+      Git.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
       Git.last_command_succeeded
     end
   end

data/lib/multirepo/git/git.rb

@@ -8,12 +8,17 @@ module MultiRepo
       attr_accessor :last_command_succeeded
     end
     
-    def self.run_in_current_dir(git_command, show_output)
+    def self.is_inside_git_repo(path)
+      return false unless Dir.exist?("#{path}/.git")
+      return Git.run_in_working_dir(path, "rev-parse --is-inside-work-tree", Runner::Verbosity::NEVER_OUTPUT).strip == "true"
+    end
+    
+    def self.run_in_current_dir(git_command, verbosity)
       full_command = "git #{git_command}"
-      run(full_command, show_output)
+      run(full_command, verbosity)
     end
     
-    def self.run_in_working_dir(path, git_command, show_output)
+    def self.run_in_working_dir(path, git_command, verbosity)
       full_command = "git -C \"#{path}\" #{git_command}";
       
       # True fix for the -C flag issue in pre-commit hook where the status command would
@@ -21,19 +26,14 @@ module MultiRepo
       # http://thread.gmane.org/gmane.comp.version-control.git/263319/focus=263323
       full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" if Config.instance.running_git_hook
       
-      run(full_command, show_output)
+      run(full_command, verbosity)
     end
     
-    def self.run(full_command, show_output)
+    def self.run(full_command, verbosity)
       Console.log_info(full_command) if Config.instance.verbose
-      result = Runner.run(full_command, show_output)
+      result = Runner.run(full_command, verbosity)
       @last_command_succeeded = Runner.last_command_succeeded
       return result
     end
-    
-    def self.is_inside_git_repo(path)
-      return false unless Dir.exist?("#{path}/.git")
-      return Git.run_in_working_dir(path, "rev-parse --is-inside-work-tree", false).strip == "true"
-    end
   end
 end

data/lib/multirepo/git/remote.rb

@@ -10,7 +10,7 @@ module MultiRepo
     end
     
     def url
-      Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", false).strip
+      Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::NEVER_OUTPUT).strip
     end
   end
 end

data/lib/multirepo/git/repo.rb

@@ -19,16 +19,16 @@ module MultiRepo
     end
     
     def current_branch
-      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", false).strip
+      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", Runner::Verbosity::NEVER_OUTPUT).strip
       branch != "HEAD" ? branch : nil
     end
     
     def head_hash
-      Git.run_in_working_dir(@path, "rev-parse HEAD", false).strip
+      Git.run_in_working_dir(@path, "rev-parse HEAD", Runner::Verbosity::NEVER_OUTPUT).strip
     end
     
     def changes
-      output = Git.run_in_working_dir(@path, "status --porcelain", false)
+      output = Git.run_in_working_dir(@path, "status --porcelain", Runner::Verbosity::NEVER_OUTPUT)
       lines = output.split("\n").each{ |f| f.strip }.delete_if{ |f| f == "" }
       lines.map { |l| Change.new(l) }
     end
@@ -40,17 +40,17 @@ module MultiRepo
     # Operations
     
     def fetch
-      Git.run_in_working_dir(@path, "fetch --progress", true)
+      Git.run_in_working_dir(@path, "fetch --progress", Runner::Verbosity::ALWAYS_OUTPUT)
       Runner.last_command_succeeded
     end
     
     def clone(url)
-      Git.run_in_current_dir("clone #{url} #{@path} --progress", true)
+      Git.run_in_current_dir("clone #{url} #{@path} --progress", Runner::Verbosity::ALWAYS_OUTPUT)
       Runner.last_command_succeeded
     end
     
     def checkout(ref)
-      Git.run_in_working_dir(@path, "checkout #{ref}", false)
+      Git.run_in_working_dir(@path, "checkout #{ref}", Runner::Verbosity::OUTPUT_ON_ERROR)
       Runner.last_command_succeeded
     end
     

data/lib/multirepo/utility/runner.rb

@@ -1,21 +1,33 @@
 require "open3"
+require "multirepo/utility/console"
 
 module MultiRepo
   class Runner
+    class Verbosity
+      NEVER_OUTPUT = 0
+      ALWAYS_OUTPUT = 1
+      OUTPUT_ON_ERROR = 2
+    end
+    
     class << self
       attr_accessor :last_command_succeeded
     end
     
-    def self.run(cmd, show_output)
-      output = []
+    def self.run(cmd, verbosity)
+      lines = []
       Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
         stdout_and_stderr.each do |line|
-          puts line if show_output
-          output << line
+          Console.log_info(line) if verbosity == Verbosity::ALWAYS_OUTPUT || Config.instance.verbose
+          lines << line
         end
         @last_command_succeeded = thread.value.success?
       end
-      output.join("")
+      
+      output = lines.join("").rstrip
+      
+      Console.log_error(output) if !@last_command_succeeded && verbosity == Verbosity::OUTPUT_ON_ERROR
+      
+      return output
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta11
+  version: 1.0.0.beta12
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler