git-multirepo 1.0.0.beta47 → 1.0.0.beta48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4049f70b0eb447de770ad97c5a0f48a834be84ce
-  data.tar.gz: 3e4de942d39a715163954ad0e194499d8eac5102
+  metadata.gz: b62e381f56fa28e1019ec5ee90f527e3d6c0caf9
+  data.tar.gz: c3a9718b7a7bf951b3c7ff3e7f4b41e80c010a0e
 SHA512:
-  metadata.gz: 21db70176b2b8adfc1750c1b823961e12bd6aabd20d5faa9913d1d83326ecc2ce4b162889258fa7d08925a890b13dc015bb3cd4e048044e6959c330e47dac610
-  data.tar.gz: e7811eac91c7ca9bda47968158ec1e3ac1a6ae02f3e5c82713caf4e5a851e8b7216dbd4f108378d9702f5280c66cc9564dbd182af862cd2055aa0362422e3903
+  metadata.gz: e0595de8789ec53bccb911f904a5f86ab53530f15db76b2986ffb14f11dd2a150912d063cb191573eb760ff0a98191dcd1d90ff6befd813f25df0de54ea2db6e
+  data.tar.gz: 7c97e0eba324fee9bead97e3928919986b94575103b8aacb5fa885080062a114c1d2da18e5094af254af97f775296d72a4af043d918c0b62202f9aece2e8c534

data/.multirepo.meta

@@ -1,2 +1,2 @@
 --- !ruby/object:MultiRepo::MetaFile
-version: 1.0.0.beta46
+version: 1.0.0.beta47

data/.rubocop.yml

@@ -0,0 +1,79 @@
+# This is the configuration used to check the rubocop source code.
+
+AllCops:
+  DisplayCopNames: true
+  Exclude:
+    - 'resources/*'
+    - 'pkg/*'
+    - 'docs/*'
+    - 'spec/spec_helper.rb'
+    - 'spec/fixtures/**/*'
+
+Style/RescueModifier:
+  Enabled: false
+
+Lint/EndAlignment:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/RedundantReturn:
+  Enabled: false
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/TrailingWhitespace:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Style/ElseAlignment:
+  Enabled: false
+
+Style/HashSyntax:
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+Style/Semicolon:
+  AllowAsExpressionSeparator: true
+
+Style/IndentationWidth:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/PerceivedComplexity:
+  Max: 8
+
+Style/FileName:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Enabled: false

data/Rakefile

@@ -1,2 +1 @@
 require "bundler/gem_tasks"
-

data/bin/multi

@@ -8,4 +8,4 @@ trap("INT") do
   exit
 end
 
-MultiRepo::Command.run(ARGV)
+MultiRepo::Command.run(ARGV)

data/git-multirepo.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = MultiRepo::VERSION
   spec.authors       = ["Michaël Fortin"]
   spec.email         = ["fortinmike@irradiated.net"]
-  spec.summary       = %q{Track multiple Git repositories side-by-side}
+  spec.summary       = "Track multiple Git repositories side-by-side"
   spec.description   = MultiRepo::DESCRIPTION
   spec.homepage      = "https://github.com/fortinmike/git-multirepo"
   spec.license       = "MIT"

data/lib/commands.rb

@@ -12,4 +12,4 @@ require_relative "multirepo/commands/merge-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"
+require_relative "multirepo/commands/update-command"

data/lib/git-multirepo.rb

@@ -1,3 +1,3 @@
 require "multirepo/utility/console"
 require "multirepo/hooks/pre-commit-hook"
-require "multirepo/hooks/post-commit-hook"
+require "multirepo/hooks/post-commit-hook"

data/lib/info.rb

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

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

@@ -37,9 +37,9 @@ module MultiRepo
     end
     
     def ensure_repo_valid
-      raise MultiRepoException, "The provided path is not a direct sibling of the main repository" unless validate_is_sibling_repo(@path)
-      raise MultiRepoException, "There is no folder at path '#{@path}'" unless Dir.exists?(@path)
-      raise MultiRepoException, "'#{@path}' is not a repository" unless Repo.new(@path).exists?
+      fail MultiRepoException, "The provided path is not a direct sibling of the main repository" unless validate_is_sibling_repo(@path)
+      fail MultiRepoException, "There is no folder at path '#{@path}'" unless Dir.exist?(@path)
+      fail MultiRepoException, "'#{@path}' is not a repository" unless Repo.new(@path).exists?
     end
     
     def validate_is_sibling_repo(path)
@@ -48,4 +48,4 @@ module MultiRepo
       return parent_dir == path
     end
   end
-end
+end

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

@@ -39,12 +39,12 @@ module MultiRepo
       main_repo = Repo.new(".")
       
       # Ensure the main repo is clean
-      raise MultiRepoException, "Main repo is not clean; multi branch aborted" unless main_repo.clean?
+      fail MultiRepoException, "Main repo is not clean; multi branch aborted" unless main_repo.clean?
       
       # Ensure dependencies are clean
       config_entries = ConfigFile.new(".").load_entries
       unless Utils.dependencies_clean?(config_entries)
-        raise MultiRepoException, "Dependencies are not clean; multi branch aborted"
+        fail MultiRepoException, "Dependencies are not clean; multi branch aborted"
       end
       
       # Branch dependencies
@@ -66,17 +66,17 @@ module MultiRepo
       branch.create unless branch.exists?
       branch.checkout
       
-      if Utils.is_multirepo_enabled(repo.path)
+      if Utils.multirepo_enabled?(repo.path)
         Console.log_info("Updating and committing tracking files")
         tracking_files = TrackingFiles.new(repo.path)
         tracking_files.update
         tracking_files.commit("[multirepo] Post-branch tracking files update")
       end
       
-      if @remote_tracking
-        Console.log_info("Pushing #{@branch_name} to origin/#{@branch_name}")
-        repo.branch(@branch_name).push
-      end
+      return unless @remote_tracking
+      
+      Console.log_info("Pushing #{@branch_name} to origin/#{@branch_name}")
+      repo.branch(@branch_name).push
     end
   end
-end
+end

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

@@ -42,7 +42,7 @@ module MultiRepo
       main_repo = Repo.new(".")
       
       unless proceed_if_merge_commit?(main_repo, @ref_name, mode)
-        raise MultiRepoException, "Aborting checkout"
+        fail MultiRepoException, "Aborting checkout"
       end
       
       checkout_core(main_repo, mode)
@@ -56,7 +56,7 @@ module MultiRepo
         # Checkout first because the current ref might not be multirepo-enabled
         checkout_main_repo_step(main_repo)
         # Only then can we check for dependencies and make sure they are clean
-        ensure_dependencies_clean_step(main_repo)
+        ensure_dependencies_clean_step
       rescue MultiRepoException => e
         Console.log_warning("Restoring working copy to #{initial_revision}")
         main_repo.checkout(initial_revision)
@@ -69,9 +69,9 @@ module MultiRepo
       Performer.perform_main_repo_checkout(main_repo, @ref_name)
     end
     
-    def ensure_dependencies_clean_step(main_repo)
+    def ensure_dependencies_clean_step
       unless Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
-        raise MultiRepoException, "Dependencies are not clean!"
+        fail MultiRepoException, "Dependencies are not clean!"
       end
     end
     
@@ -84,7 +84,7 @@ module MultiRepo
     end
     
     def proceed_if_merge_commit?(main_repo, ref_name, mode)
-      return true unless main_repo.ref(ref_name).is_merge?
+      return true unless main_repo.ref(ref_name).merge_commit?
       
       case mode
       when RevisionSelectionMode::AS_LOCK
@@ -113,8 +113,8 @@ module MultiRepo
       if config_entry.repo.checkout(revision)
         Console.log_substep("Checked out #{dependency_name} '#{revision}'")
       else
-        raise MultiRepoException, "Couldn't check out the appropriate version of dependency #{dependency_name}"
+        fail MultiRepoException, "Couldn't check out the appropriate version of dependency #{dependency_name}"
       end
     end
   end
-end
+end

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

@@ -32,7 +32,7 @@ module MultiRepo
     def run
       Console.log_step("Cloning #{@url} ...")
 
-      raise MultiRepoException, "A directory named #{@name} already exists" if Dir.exists?(@name)
+      fail MultiRepoException, "A directory named #{@name} already exists" if Dir.exist?(@name)
 
       main_repo_path = "#{@name}/#{@name}"
       main_repo = Repo.new(main_repo_path)
@@ -41,18 +41,18 @@ module MultiRepo
       FileUtils.mkpath(main_repo_path)
       
       # Clone the specified remote in the just-created directory
-      raise MultiRepoException, "Could not clone repo from #{@url}" unless main_repo.clone(@url)
+      fail MultiRepoException, "Could not clone repo from #{@url}" unless main_repo.clone(@url)
       
       # Checkout the specified main repo ref so that install reads the proper config file
       unless main_repo.checkout(@ref_name)
-        raise MultiRepoException, "Couldn't perform checkout of main repo #{@ref_name}!"
+        fail MultiRepoException, "Couldn't perform checkout of main repo #{@ref_name}!"
       end
       
       Console.log_substep("Checked out main repo #{@ref_name}")
       
       # Make sure the ref we just checked out is tracked by multirepo
-      unless Utils.is_multirepo_tracked(main_repo_path)
-        raise MultiRepoException, "Ref #{@ref_name} is not tracked by multirepo"
+      unless Utils.multirepo_tracked?(main_repo_path)
+        fail MultiRepoException, "Ref #{@ref_name} is not tracked by multirepo"
       end
       
       # Install
@@ -65,4 +65,4 @@ module MultiRepo
       Console.log_step("Done!")
     end
   end
-end
+end

data/lib/multirepo/commands/command.rb

@@ -18,7 +18,7 @@ module MultiRepo
         Console.log_error(exception.message)
         exit 1
       end
-      raise exception
+      fail exception
     end
     
     def initialize(argv)
@@ -36,7 +36,7 @@ module MultiRepo
       super
       path = Config.instance.git_executable
       is_git_exe = path =~ /.*(git)|(git.exe)$/
-      file_exists = path == "git" || File.exists?(path)
+      file_exists = path == "git" || File.exist?(path)
       help! "Invalid git executable '#{path}'" unless is_git_exe && file_exists
     end
     
@@ -63,7 +63,7 @@ module MultiRepo
     end
     
     def multirepo_enabled_dependencies
-      ConfigFile.new(".").load_entries.select { |e| Utils.is_multirepo_enabled(e.repo.path) }
+      ConfigFile.new(".").load_entries.select { |e| Utils.multirepo_enabled?(e.repo.path) }
     end
 
     def validate_only_one_flag(*flags)
@@ -72,19 +72,19 @@ module MultiRepo
     
     def ensure_in_work_tree
       repo = Repo.new(".")
-      raise MultiRepoException, "Not a git repository" unless repo.exists?
-      raise MultiRepoException, "HEAD is unborn (you must perform at least one commit)" unless repo.head_born?
+      fail MultiRepoException, "Not a git repository" unless repo.exists?
+      fail MultiRepoException, "HEAD is unborn (you must perform at least one commit)" unless repo.head_born?
     end
     
     def ensure_multirepo_enabled
-      raise MultiRepoException, "multirepo is not initialized in this repository." unless Utils.is_multirepo_enabled(".")
+      fail MultiRepoException, "multirepo is not initialized in this repository." unless Utils.multirepo_enabled?(".")
     end
 
     def ensure_multirepo_tracked
-      raise MultiRepoException, "Revision is not tracked by multirepo." unless Utils.is_multirepo_tracked(".")
+      fail MultiRepoException, "Revision is not tracked by multirepo." unless Utils.multirepo_tracked?(".")
       
       lock_file_valid = LockFile.new(".").validate!
-      raise MultiRepoException, "Revision is multirepo-enabled but contains a corrupted lock file!" unless lock_file_valid
+      fail MultiRepoException, "Revision is multirepo-enabled but contains a corrupted lock file!" unless lock_file_valid
     end
   end
-end
+end

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

@@ -80,14 +80,14 @@ module MultiRepo
     def confirm_main_repo_operation
       unless main_repo_clean?
         Console.log_warning("Main repo contains uncommitted changes")
-        raise MultiRepoException, "Aborted" unless Console.ask_yes_no("Proceed anyway?")
+        fail MultiRepoException, "Aborted" unless Console.ask_yes_no("Proceed anyway?")
       end
     end
     
     def confirm_dependencies_operation
       unless dependencies_clean?
         Console.log_warning("Some dependencies contain uncommitted changes")
-        raise MultiRepoException, "Aborted" unless Console.ask_yes_no("Proceed anyway?")
+        fail MultiRepoException, "Aborted" unless Console.ask_yes_no("Proceed anyway?")
       end
     end
     
@@ -100,4 +100,4 @@ module MultiRepo
       return Utils.dependencies_clean?(config_entries)
     end
   end
-end
+end

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

@@ -40,4 +40,4 @@ module MultiRepo
       end
     end
   end
-end
+end

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

@@ -37,11 +37,11 @@ module MultiRepo
     def full_initialize_step
       if ConfigFile.new(".").exists?
         reinitialize = Console.ask_yes_no(".multirepo file already exists. Reinitialize?")
-        raise MultiRepoException, "Initialization aborted" unless reinitialize
+        fail MultiRepoException, "Initialization aborted" unless reinitialize
       end
       
       unless add_sibling_repos_step
-        raise MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
+        fail MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
       end
 
       initialize_extras_step
@@ -56,7 +56,7 @@ module MultiRepo
       valid_repos = find_valid_repos(sibling_repos)
       entries = create_entries(valid_repos)
       
-      raise MultiRepoException, "No sibling repositories were added as dependencies; init aborted" unless entries.any?
+      fail MultiRepoException, "No sibling repositories were added as dependencies; init aborted" unless entries.any?
       
       ConfigFile.new(".").save_entries(entries)
       return true
@@ -100,21 +100,22 @@ module MultiRepo
         origin_url = repo.remote('origin').url
         current_branch_name = repo.current_branch.name
         
-        if Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || "NONE"}, branch: #{current_branch_name}]")
-          unless origin_url
-            Console.log_warning("Repo 'origin' remote url is not set; skipping")
-            next
-          end
-          entries.push(ConfigEntry.new(repo))
-          Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
+        next unless Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || 'NONE'}, branch: #{current_branch_name}]")
+        
+        unless origin_url
+          Console.log_warning("Repo 'origin' remote url is not set; skipping")
+          next
         end
+        
+        entries.push(ConfigEntry.new(repo))
+        Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
       end
       return entries
     end
     
     def check_repo_exists
-      raise MultiRepoException, "There is no folder at path '#{@repo.path}'" unless Dir.exists?(@repo.path)
-      raise MultiRepoException, "'#{@repo.path}' is not a repository" unless @repo.exists?
+      fail MultiRepoException, "There is no folder at path '#{@repo.path}'" unless Dir.exist?(@repo.path)
+      fail MultiRepoException, "'#{@repo.path}' is not a repository" unless @repo.exists?
     end
   end
-end
+end

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

@@ -32,8 +32,8 @@ module MultiRepo
       if @version
         puts MetaFile.new(".").load.version
       elsif @tracked
-        puts Utils.is_multirepo_tracked(".").to_s
+        puts Utils.multirepo_tracked?(".").to_s
       end
     end
   end
-end
+end

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

@@ -82,7 +82,7 @@ module MultiRepo
     def install_dependencies_step
       # Read config entries as-is on disk, without prior checkout
       config_entries = ConfigFile.new(".").load_entries
-      Console.log_substep("Installing #{config_entries.count} dependencies...");
+      Console.log_substep("Installing #{config_entries.count} dependencies...")
       
       # Clone or fetch all configured dependencies to make sure nothing is missing locally
       Performer.dependencies.each { |d| clone_or_fetch(d) }
@@ -127,13 +127,13 @@ module MultiRepo
     
     def fetch_repo(dependency)
       unless dependency.config_entry.repo.fetch
-        raise MultiRepoException, "Could not fetch from remote #{dependency.config_entry.repo.remote('origin').url}"
+        fail MultiRepoException, "Could not fetch from remote #{dependency.config_entry.repo.remote('origin').url}"
       end
     end
     
     def clone_repo(dependency)
       unless dependency.config_entry.repo.clone(dependency.config_entry.url, dependency.lock_entry.branch)
-        raise MultiRepoException, "Could not clone remote #{dependency.config_entry.url} with branch #{dependency.config_entry.branch}"
+        fail MultiRepoException, "Could not clone remote #{dependency.config_entry.url} with branch #{dependency.config_entry.branch}"
       end
     end
     
@@ -141,8 +141,8 @@ module MultiRepo
     
     def check_repo_validity(dependency)
       unless dependency.config_entry.repo.remote("origin").url == dependency.config_entry.url
-        raise MultiRepoException, "'#{dependency.config_entry.path}' origin URL (#{dependency.config_entry.repo.remote('origin').url}) does not match entry (#{dependency.config_entry.url})!"
+        fail MultiRepoException, "'#{dependency.config_entry.path}' origin URL (#{dependency.config_entry.repo.remote('origin').url}) does not match entry (#{dependency.config_entry.url})!"
       end
     end
   end
-end
+end

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

@@ -74,14 +74,13 @@ module MultiRepo
     
     def merge_core(main_repo, initial_revision, mode)
       config_file = ConfigFile.new(".")
-      lock_file = LockFile.new(".")
       
       # Ensure the main repo is clean
-      raise MultiRepoException, "Main repo is not clean; merge aborted" unless main_repo.clean?
+      fail MultiRepoException, "Main repo is not clean; merge aborted" unless main_repo.clean?
       
       # Ensure dependencies are clean
       unless Utils.dependencies_clean?(config_file.load_entries)
-        raise MultiRepoException, "Dependencies are not clean; merge aborted"
+        fail MultiRepoException, "Dependencies are not clean; merge aborted"
       end
       
       ref_name = @ref_name
@@ -98,20 +97,20 @@ module MultiRepo
         
         case result.outcome
         when MergeValidationResult::ABORT
-          raise MultiRepoException, result.message
+          fail MultiRepoException, result.message
         when MergeValidationResult::PROCEED
-          raise MultiRepoException, "Merge aborted" unless Console.ask_yes_no("Proceed?")
+          fail MultiRepoException, "Merge aborted" unless Console.ask_yes_no("Proceed?")
           Console.log_warning(result.message) if result.message
           break
         when MergeValidationResult::MERGE_UPSTREAM
           Console.log_warning(result.message)
-          raise MultiRepoException, "Merge aborted" unless Console.ask_yes_no("Merge upstream instead of local branches?")
+          fail MultiRepoException, "Merge aborted" unless Console.ask_yes_no("Merge upstream instead of local branches?")
           # TODO: Modify operations!
-          raise MultiRepoException, "Fallback behavior not implemented. Please merge manually."
+          fail MultiRepoException, "Fallback behavior not implemented. Please merge manually."
           next
         end
         
-        raise MultiRepoException, "Merge aborted" unless Console.ask_yes_no("Proceed?")
+        fail MultiRepoException, "Merge aborted" unless Console.ask_yes_no("Proceed?")
       end
       
       Console.log_step("Performing merge...")
@@ -163,13 +162,13 @@ module MultiRepo
     
     def ensure_dependencies_match(our_dependencies, their_dependencies)
       our_dependencies.zip(their_dependencies).each do |our_dependency, their_dependency|
-        if their_dependency == nil || their_dependency.config_entry.id != our_dependency.config_entry.id
-          raise MultiRepoException, "Dependencies differ, please merge manually"
+        if their_dependency.nil? || their_dependency.config_entry.id != our_dependency.config_entry.id
+          fail MultiRepoException, "Dependencies differ, please merge manually"
         end
       end
       
       if their_dependencies.count > our_dependencies.count
-        raise MultiRepoException, "There are more dependencies in the specified ref, please merge manually"
+        fail MultiRepoException, "There are more dependencies in the specified ref, please merge manually"
       end
     end
     
@@ -223,4 +222,4 @@ module MultiRepo
       end
     end
   end
-end
+end

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

@@ -54,4 +54,4 @@ module MultiRepo
       end
     end
   end
-end
+end

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

@@ -41,8 +41,8 @@ module MultiRepo
           Console.log_step("Deleted '#{@path}' from disk")
         end
       else
-        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
+        fail MultiRepoException, "'#{@path}' isn't tracked by multirepo"
       end
     end
   end
-end
+end

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

@@ -15,4 +15,4 @@ module MultiRepo
       Console.log_step("All traces of multirepo have been removed from this repository")
     end
   end
-end
+end

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

@@ -1,4 +1,5 @@
 require "multirepo/utility/console"
+require "multirepo/logic/performer"
 require "multirepo/files/tracking-files"
 
 module MultiRepo
@@ -26,31 +27,40 @@ module MultiRepo
       Console.log_step("Updating...")
       
       dependencies_clean = Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
-      if dependencies_clean
-        update_lock_file_step("Updated tracking files")
-      elsif !dependencies_clean && @force
-        update_lock_file_step("Force-updated tracking files (ignoring uncommitted changes)")
+      if dependencies_clean || @force
+        update_tracking_files_step
       else
-        raise MultiRepoException, "Can't update because not all dependencies are clean"
+        fail MultiRepoException, "Can't update because not all dependencies are clean"
       end
       
       Console.log_step("Done!")
     end
     
-    def update_lock_file_step(log_message)
-      tracking_files = TrackingFiles.new(".")
+    def update_tracking_files_step
+      Performer.dependencies.each do |dependency|
+        path = dependency.config_entry.path
+        name = dependency.config_entry.name
+        update_tracking_files(path, name) if Utils.multirepo_enabled?(path)
+      end
+      update_tracking_files(".", "main repo")
+    end
+    
+    def update_tracking_files(path, name)
+      Console.log_substep("Updating tracking files in #{name}")
+      
+      tracking_files = TrackingFiles.new(path)
       changed = tracking_files.update
       
       if changed
-        Console.log_substep("Updated tracking files")
+        Console.log_info("Updated tracking files")
       else
-        Console.log_substep("Tracking files are already up-to-date")
+        Console.log_info("Tracking files are already up-to-date")
       end
       
       if @commit
         committed = tracking_files.commit("[multirepo] Updated tracking files manually")
-        Console.log_substep("Committed tracking files") if committed
+        Console.log_info("Committed tracking files") if committed
       end
     end
   end
-end
+end

data/lib/multirepo/config.rb

@@ -13,4 +13,4 @@ module MultiRepo
     attr_accessor :git_executable
     @git_executable = nil
   end
-end
+end

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

@@ -22,10 +22,10 @@ module MultiRepo
       @url = repo.exists? ? repo.remote('origin').url : nil
     end
     
-    def ==(entry)
-      entry_path = Pathname.new(entry.path)
-      self_path = Pathname.new(self.path)
-      entry_path.exist? && self_path.exist? && entry_path.realpath == self_path.realpath
+    def ==(other)
+      other_path = Pathname.new(other.path)
+      self_path = Pathname.new(path)
+      other_path.exist? && self_path.exist? && other_path.realpath == self_path.realpath
     end
     
     def repo
@@ -36,4 +36,4 @@ module MultiRepo
       repo.basename
     end
   end
-end
+end

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

@@ -20,7 +20,7 @@ module MultiRepo
     end
     
     def exists?
-      File.exists?(file)
+      File.exist?(file)
     end
     
     def load_entries
@@ -43,4 +43,4 @@ module MultiRepo
       save_entries(load_entries.delete_if { |e| e == entry })
     end
   end
-end
+end

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

@@ -26,4 +26,4 @@ module MultiRepo
       @branch = current_branch ? current_branch.name : nil
     end
   end
-end
+end

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

@@ -22,7 +22,7 @@ module MultiRepo
     end
     
     def exists?
-      File.exists?(file)
+      File.exist?(file)
     end
     
     def load_entries
@@ -53,4 +53,4 @@ module MultiRepo
       return valid
     end
   end
-end
+end

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

@@ -38,4 +38,4 @@ module MultiRepo
       return update_internal(file, content)
     end
   end
-end
+end

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

@@ -1,9 +1,9 @@
 module MultiRepo
   class TrackingFile
     def update_internal(file, new_content)
-      old_content = File.exists?(file) ? File.read(file) : nil
+      old_content = File.exist?(file) ? File.read(file) : nil
       File.write(file, new_content)
       return new_content != old_content
     end
   end
-end
+end

data/lib/multirepo/files/tracking-files.rb

@@ -44,4 +44,4 @@ module MultiRepo
       files.map{ |f| File.basename(f.file) }.join(" ")
     end
   end
-end
+end

data/lib/multirepo/git/branch.rb

@@ -5,7 +5,7 @@ module MultiRepo
   class Branch < Ref
     def exists?
       lines = GitRunner.run(@repo.path, "branch", Verbosity::OUTPUT_NEVER).split("\n")
-      branch_names = lines.map { |line| line.tr("* ", "")}
+      branch_names = lines.map { |line| line.tr("* ", "") }
       branch_names.include?(@name)
     end
     
@@ -29,4 +29,4 @@ module MultiRepo
       GitRunner.last_command_succeeded
     end
   end
-end
+end

data/lib/multirepo/git/change.rb

@@ -8,4 +8,4 @@ module MultiRepo
       @path = line[3..-1]
     end
   end
-end
+end

data/lib/multirepo/git/commit.rb

@@ -4,4 +4,4 @@ require_relative "git-runner"
 module MultiRepo
   class Commit < Ref
   end
-end
+end

data/lib/multirepo/git/git-runner.rb

@@ -19,8 +19,6 @@ module MultiRepo
       runner_system(command)
     end
     
-    private
-    
     def self.build_command(path, git_command)
       if path == "."
         # It is always better to skip -C when running git commands in the
@@ -30,7 +28,7 @@ module MultiRepo
         return "#{git_executable} #{git_command}"
       end
       
-      full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
+      full_command = "#{git_executable} -C \"#{path}\" #{git_command}"
       if Config.instance.running_git_hook
         # True fix for the -C flag issue in pre-commit hook where the status command would
         # fail to provide correct results if a pathspec was provided when performing a commit.
@@ -55,4 +53,4 @@ module MultiRepo
       Config.instance.git_executable || "git"
     end
   end
-end
+end

data/lib/multirepo/git/git.rb

@@ -7,4 +7,4 @@ module MultiRepo
       GitRunner.last_command_succeeded
     end
   end
-end
+end

data/lib/multirepo/git/ref.rb

@@ -22,7 +22,7 @@ module MultiRepo
       GitRunner.run(@repo.path, "rev-parse --short #{@name}", Verbosity::OUTPUT_NEVER).strip
     end
     
-    def is_merge?
+    def merge_commit?
       lines = GitRunner.run(@repo.path, "cat-file -p #{@name}", Verbosity::OUTPUT_NEVER).split("\n")
       parents = lines.grep(/^parent /)
       return parents.count > 1
@@ -35,4 +35,4 @@ module MultiRepo
       return merge_base_output == rev_parse_output
     end
   end
-end
+end

data/lib/multirepo/git/remote.rb

@@ -14,4 +14,4 @@ module MultiRepo
       return output == "" ? nil : output
     end
   end
-end
+end

data/lib/multirepo/git/repo.rb

@@ -34,16 +34,16 @@ module MultiRepo
     end
     
     def local_branches
-      branches_by_removing_prefix(/^refs\/heads\//)
+      branches_by_removing_prefix(%r{^refs/heads/})
     end
     
     def remote_branches
-      branches_by_removing_prefix(/^refs\/remotes\//)
+      branches_by_removing_prefix(%r{^refs/remotes/})
     end
     
     def changes
       output = GitRunner.run(@path, "status --porcelain", Verbosity::OUTPUT_NEVER)
-      lines = output.split("\n").each{ |f| f.strip }.delete_if{ |f| f == "" }
+      lines = output.split("\n").each(&:strip).delete_if{ |f| f == "" }
       lines.map { |l| Change.new(l) }
     end
     
@@ -55,7 +55,7 @@ module MultiRepo
     end
     
     def clone(url, branch = nil)
-      if branch != nil
+      if !branch.nil?
         GitRunner.run_as_system(".", "clone #{url} -b #{branch} #{@path} --progress")
       else
         GitRunner.run_as_system(".", "clone #{url} #{@path} --progress")
@@ -116,8 +116,8 @@ module MultiRepo
       all_refs = all_refs.map { |l| l.sub(/^\'/, "").sub(/\'$/, "") }
 
       full_names = all_refs.select { |r| r =~ prefix_regex }
-      names = full_names.map{ |f| f.sub(prefix_regex, "") }.delete_if{ |n| n =~ /HEAD$/}
+      names = full_names.map{ |f| f.sub(prefix_regex, "") }.delete_if{ |n| n =~ /HEAD$/ }
       names.map { |b| Branch.new(self, b) }
     end
   end
-end
+end

data/lib/multirepo/hooks/post-commit-hook.rb

@@ -20,4 +20,4 @@ module MultiRepo
       exit 1
     end
   end
-end
+end

data/lib/multirepo/hooks/pre-commit-hook.rb

@@ -32,4 +32,4 @@ module MultiRepo
       exit 1
     end
   end
-end
+end

data/lib/multirepo/logic/dependency.rb

@@ -3,4 +3,4 @@ module MultiRepo
     attr_accessor :config_entry
     attr_accessor :lock_entry
   end
-end
+end

data/lib/multirepo/logic/merge-descriptor.rb

@@ -35,20 +35,20 @@ module MultiRepo
     
     def merge_description
       case @state
-      when TheirState::NON_EXISTENT; "No revision named #{@their_revision}".red
+      when TheirState::NON_EXISTENT then "No revision named #{@their_revision}".red
       else; "Merge '#{@state == TheirState::EXACT_REF ? @short_commit_id : @their_revision}' into '#{@our_revision}'"
       end
     end
 
     def upstream_description
       case @state
-      when TheirState::NON_EXISTENT; "--"
-      when TheirState::EXACT_REF; "Exact ref".yellow
-      when TheirState::LOCAL_NO_UPSTREAM; "Not remote-tracking".yellow
-      when TheirState::UPSTREAM_NO_LOCAL; "Branch is upstream".green
-      when TheirState::LOCAL_UP_TO_DATE; "Local up-to-date with upstream".green
-      when TheirState::LOCAL_OUTDATED; "Local outdated compared to upstream".yellow
-      when TheirState::LOCAL_UPSTREAM_DIVERGED; "Local and upstream have diverged!".red
+      when TheirState::NON_EXISTENT then "--"
+      when TheirState::EXACT_REF then "Exact ref".yellow
+      when TheirState::LOCAL_NO_UPSTREAM then "Not remote-tracking".yellow
+      when TheirState::UPSTREAM_NO_LOCAL then "Branch is upstream".green
+      when TheirState::LOCAL_UP_TO_DATE then "Local up-to-date with upstream".green
+      when TheirState::LOCAL_OUTDATED then "Local outdated compared to upstream".yellow
+      when TheirState::LOCAL_UPSTREAM_DIVERGED then "Local and upstream have diverged!".red
       end
     end
     
@@ -57,8 +57,8 @@ module MultiRepo
     def determine_merge_state(repo, their_ref)
       return TheirState::NON_EXISTENT unless their_ref.exists?
       
-      remote_branch = repo.remote_branches.select{ |b| b.name == their_ref.name }.first
-      local_branch = repo.local_branches.select{ |b| b.name == their_ref.name }.first
+      remote_branch = repo.remote_branches.find { |b| b.name == their_ref.name }
+      local_branch = repo.local_branches.find { |b| b.name == their_ref.name }
       
       # If no local branch nor remote branch exist for their_ref, this is an exact ref
       return TheirState::EXACT_REF unless remote_branch || local_branch
@@ -92,4 +92,4 @@ module MultiRepo
       return state
     end
   end
-end
+end

data/lib/multirepo/logic/node.rb

@@ -17,7 +17,7 @@ module MultiRepo
     end
     
     def children
-      return [] unless Utils.is_multirepo_enabled(@path)
+      return [] unless Utils.multirepo_enabled?(@path)
       config_entries = ConfigFile.new(@path).load_entries
       return config_entries.map { |e| Node.new(e.path, self, @depth + 1) }
     end
@@ -29,13 +29,13 @@ module MultiRepo
     def ordered_descendants
       descendants = find_descendants_recursive(self)
       
-      unique_paths = descendants.map{ |d| d.path }.uniq
+      unique_paths = descendants.map(&:path).uniq
       unique_nodes = unique_paths.collect do |path|
         nodes_for_path = descendants.select { |d| d.path == path }
-        next nodes_for_path.sort{ |n| n.depth }.first
+        next nodes_for_path.sort_by(&:depth).first
       end
       
-      return unique_nodes.sort_by{ |d| d.depth }.reverse
+      return unique_nodes.sort_by(&:depth).reverse
     end
     
     def find_descendants_recursive(node)
@@ -58,15 +58,15 @@ module MultiRepo
             description = "itself" if visited.count == 1
             Console.log_warning("'#{n.path}' depends on #{description}")
           end
-          raise MultiRepoException, "Dependency cycles are not supported by multirepo."
+          fail MultiRepoException, "Dependency cycles are not supported by multirepo."
         end
         parent = parent.parent # Will eventually be nil (root node), which will break out of the loop
       end
     end
     
-    def ==(object)
-      object.class == self.class &&
-      object.path == @path
+    def ==(other)
+      other.class == self.class &&
+      other.path == @path
     end
   end
-end
+end

data/lib/multirepo/logic/performer.rb

@@ -8,19 +8,19 @@ module MultiRepo
     def self.perform_main_repo_checkout(main_repo, ref_name, message = nil)
       # Make sure the main repo is clean before attempting a checkout
       unless main_repo.clean?
-        raise MultiRepoException, "Can't checkout #{ref_name} because the main repo contains uncommitted changes"
+        fail MultiRepoException, "Can't checkout #{ref_name} because the main repo contains uncommitted changes"
       end
       
       # Checkout the specified ref
       unless main_repo.checkout(ref_name)
-        raise MultiRepoException, "Couldn't perform checkout of main repo #{ref_name}!"
+        fail MultiRepoException, "Couldn't perform checkout of main repo #{ref_name}!"
       end
       
       Console.log_substep(message || "Checked out main repo #{ref_name}")
       
       # After checkout, make sure we're working with a multirepo-enabled ref
-      unless Utils.is_multirepo_tracked(".")
-        raise MultiRepoException, "Revision #{ref_name} is not tracked by multirepo!"
+      unless Utils.multirepo_tracked?(".")
+        fail MultiRepoException, "Revision #{ref_name} is not tracked by multirepo!"
       end
     end
     
@@ -32,12 +32,10 @@ module MultiRepo
       dependency_ordered_nodes = Node.new(".").ordered_descendants
       
       return dependency_ordered_nodes.map do |node|
-        pair = dependencies.find { |d| d.config_entry.path == node.path }
+        dependencies.find { |d| d.config_entry.path == node.path }
       end
     end
     
-    private
-    
     def self.build_dependencies(config_entries, lock_entries)
       lock_entries.map do |lock_entry|
         config_entry = config_entry_for_lock_entry(config_entries, lock_entry)
@@ -54,4 +52,4 @@ module MultiRepo
       config_entries.find { |config_entry| config_entry.id == lock_entry.id }
     end
   end
-end
+end

data/lib/multirepo/logic/revision-selector.rb

@@ -6,18 +6,18 @@ module MultiRepo
     
     def self.name_for_mode(mode)
       case mode
-      when AS_LOCK; "as-lock"
-      when LATEST; "latest"
-      when EXACT; "exact"
+      when AS_LOCK then "as-lock"
+      when LATEST then "latest"
+      when EXACT then "exact"
       end
     end
   end
   
   class RevisionSelector
     def self.mode_for_args(checkout_latest, checkout_exact)
-      if checkout_latest then
+      if checkout_latest
         RevisionSelectionMode::LATEST
-      elsif checkout_exact then
+      elsif checkout_exact
         RevisionSelectionMode::EXACT
       else
         RevisionSelectionMode::AS_LOCK
@@ -26,10 +26,10 @@ module MultiRepo
     
     def self.revision_for_mode(mode, ref_name, lock_entry)
       case mode
-      when RevisionSelectionMode::AS_LOCK; lock_entry.head
-      when RevisionSelectionMode::LATEST; lock_entry.branch
-      when RevisionSelectionMode::EXACT; ref_name
+      when RevisionSelectionMode::AS_LOCK then lock_entry.head
+      when RevisionSelectionMode::LATEST then lock_entry.branch
+      when RevisionSelectionMode::EXACT then ref_name
       end
     end
   end
-end
+end

data/lib/multirepo/multirepo-exception.rb

@@ -3,4 +3,4 @@ require "claide/informative_error"
 module MultiRepo
   class MultiRepoException < StandardError
   end
-end
+end

data/lib/multirepo/utility/console.rb

@@ -29,7 +29,7 @@ module MultiRepo
     
     def self.ask_yes_no(message)
       answered = false
-      while !answered
+      until answered
         print_prefix
         print message
         print " (y/n) "
@@ -49,4 +49,4 @@ module MultiRepo
       print $stdout.isatty ? "> ".white : "[multirepo] "
     end
   end
-end
+end

data/lib/multirepo/utility/popen-runner.rb

@@ -9,7 +9,7 @@ module MultiRepo
       
       lines = []
       last_command_succeeded = false
-      Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
+      Open3.popen2e(cmd) do |_stdin, stdout_and_stderr, thread|
         stdout_and_stderr.each do |line|
           print line if Config.instance.verbose
           lines << line
@@ -24,4 +24,4 @@ module MultiRepo
       return output, last_command_succeeded
     end
   end
-end
+end

data/lib/multirepo/utility/system-runner.rb

@@ -11,4 +11,4 @@ module MultiRepo
       return output, last_command_succeeded
     end
   end
-end
+end

data/lib/multirepo/utility/utils.rb

@@ -8,12 +8,12 @@ module MultiRepo
       File.join(gem_path, "resources/#{resource_name}")
     end
     
-    def self.is_multirepo_enabled(path)
-      File.exists?(File.join(path, ".multirepo"))
+    def self.multirepo_enabled?(path)
+      File.exist?(File.join(path, ".multirepo"))
     end
 
-    def self.is_multirepo_tracked(path)
-      is_multirepo_enabled(path) && File.exists?(File.join(path, ".multirepo.lock"))
+    def self.multirepo_tracked?(path)
+      multirepo_enabled?(path) && File.exist?(File.join(path, ".multirepo.lock"))
     end
     
     def self.install_hook(name, path)
@@ -25,7 +25,7 @@ module MultiRepo
     
     def self.sibling_repos
       sibling_directories = Dir['../*/']
-      sibling_repos = sibling_directories.map{ |d| Repo.new(d) }.select{ |r| r.exists? }
+      sibling_repos = sibling_directories.map{ |d| Repo.new(d) }.select(&:exists?)
       sibling_repos.delete_if{ |r| Pathname.new(r.path).realpath == Pathname.new(".").realpath }
     end
     
@@ -46,8 +46,8 @@ module MultiRepo
         Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes") unless dependency_clean
       end
       
-      raise MultiRepoException, "Some dependencies are not present on this machine." +
-                                " Run \"multi install\" to clone missing dependencies." if missing
+      fail MultiRepoException, "Some dependencies are not present on this machine." \
+        " Run \"multi install\" to clone missing dependencies." if missing
       
       return clean
     end
@@ -69,27 +69,27 @@ module MultiRepo
     
     def self.reveal_in_default_file_browser(unix_path)
       if OS.osx?
-        system %{open "#{unix_path}"}
+        system %(open "#{unix_path}")
       elsif OS.windows?
-        system %{explorer "#{Utils.convert_to_windows_path(unix_path)}"}
+        system %(explorer "#{Utils.convert_to_windows_path(unix_path)}")
       end
     end
     
     def self.open_in_default_app(unix_path)
       if OS.osx?
-        system %{open "#{unix_path}"}
+        system %(open "#{unix_path}")
       elsif OS.windows?
-        system %{cmd /c "start C:\\#{Utils.convert_to_windows_path(unix_path)}"}
+        system %(cmd /c "start C:\\#{Utils.convert_to_windows_path(unix_path)}")
       end
     end
     
     def self.append_if_missing(path, pattern, string_to_append)
-      unless File.exists?(path)
-        File.open(path, 'w') { |f| f.puts(string_to_append) }
-      else
+      if File.exist?(path)
         string_located = File.readlines(path).grep(pattern).any?
         File.open(path, 'a') { |f| f.puts(string_to_append) } unless string_located
+      else
+        File.open(path, 'w') { |f| f.puts(string_to_append) }
       end
     end
   end
-end
+end

data/lib/multirepo/utility/verbosity.rb

@@ -3,4 +3,4 @@ module MultiRepo
     OUTPUT_NEVER = 0
     OUTPUT_ON_ERROR = 1
   end
-end
+end

data/resources/post-commit

@@ -3,4 +3,4 @@
 require "rubygems"
 require "git-multirepo"
 
-MultiRepo::PostCommitHook.run
+MultiRepo::PostCommitHook.run

data/resources/pre-commit

@@ -3,4 +3,4 @@
 require "rubygems"
 require "git-multirepo"
 
-MultiRepo::PreCommitHook.run
+MultiRepo::PreCommitHook.run

data/spec/integration/init_spec.rb

@@ -16,4 +16,4 @@ RSpec.describe("Init") do
   it "fails when there are uncommitted changes in dependencies" do
     pending
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta47
+  version: 1.0.0.beta48
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - .multirepo.lock
 - .multirepo.meta
 - .rspec
+- .rubocop.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE