git-multirepo 1.0.0.beta40 → 1.0.0.beta42

data/lib/multirepo/multirepo-exception.rb

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

data/lib/multirepo/utility/console.rb

@@ -1,52 +1,52 @@
-require "colored"
-
-module MultiRepo
-  class Console
-    def self.log_step(message)
-      print_prefix
-      puts $stdout.isatty ? message.bold.green : message
-    end
-    
-    def self.log_substep(message)
-      print_prefix
-      puts $stdout.isatty ? message.blue : message
-    end
-    
-    def self.log_info(message)
-      print_prefix
-      puts $stdout.isatty ? message.white : message
-    end
-    
-    def self.log_warning(message)
-      print_prefix
-      puts $stdout.isatty ? message.yellow : message
-    end
-    
-    def self.log_error(message)
-      print_prefix
-      puts $stdout.isatty ? message.red : message
-    end
-    
-    def self.ask_yes_no(message)
-      answered = false
-      while !answered
-        print_prefix
-        print message
-        print " (y/n) "
-        
-        case $stdin.gets.strip.downcase
-        when "y", "yes"
-          answered = true
-          return true
-        when "n", "no"
-          answered = true
-          return false
-        end
-      end
-    end
-    
-    def self.print_prefix
-      print $stdout.isatty ? "> ".white : "[multirepo] "
-    end
-  end
+require "colored"
+
+module MultiRepo
+  class Console
+    def self.log_step(message)
+      print_prefix
+      puts $stdout.isatty ? message.bold.green : message
+    end
+    
+    def self.log_substep(message)
+      print_prefix
+      puts $stdout.isatty ? message.blue : message
+    end
+    
+    def self.log_info(message)
+      print_prefix
+      puts $stdout.isatty ? message.white : message
+    end
+    
+    def self.log_warning(message)
+      print_prefix
+      puts $stdout.isatty ? message.yellow : message
+    end
+    
+    def self.log_error(message)
+      print_prefix
+      puts $stdout.isatty ? message.red : message
+    end
+    
+    def self.ask_yes_no(message)
+      answered = false
+      while !answered
+        print_prefix
+        print message
+        print " (y/n) "
+        
+        case $stdin.gets.strip.downcase
+        when "y", "yes"
+          answered = true
+          return true
+        when "n", "no"
+          answered = true
+          return false
+        end
+      end
+    end
+    
+    def self.print_prefix
+      print $stdout.isatty ? "> ".white : "[multirepo] "
+    end
+  end
 end

data/lib/multirepo/utility/runner.rb

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

data/lib/multirepo/utility/utils.rb

@@ -1,82 +1,95 @@
-require "fileutils"
-
-module MultiRepo
-  class Utils
-    def self.path_for_resource(resource_name)
-      gem_path = Gem::Specification.find_by_name("git-multirepo").gem_dir
-      File.join(gem_path, "resources/#{resource_name}")
-    end
-    
-    def self.is_multirepo_enabled(path)
-      File.exists?(File.join(path, ".multirepo"))
-    end
-
-    def self.is_multirepo_tracked(path)
-      is_multirepo_enabled(path) && File.exists?(File.join(path, ".multirepo.lock"))
-    end
-    
-    def self.install_hook(name, path)
-      destination_path = File.join(path, ".git/hooks")
-      destination_file = File.join(destination_path, name)
-      FileUtils.cp(path_for_resource(name), destination_file)
-      FileUtils.chmod(0755, destination_file) # -rwxr-xr-x
-    end
-    
-    def self.sibling_repos
-      sibling_directories = Dir['../*/']
-      sibling_repos = sibling_directories.map{ |d| Repo.new(d) }.select{ |r| r.exists? }
-      sibling_repos.delete_if{ |r| Pathname.new(r.path).realpath == Pathname.new(".").realpath }
-    end
-    
-    def self.ensure_dependencies_clean(config_entries)
-      clean = true
-      config_entries.each do |e|
-        next unless e.repo.exists?
-        dependency_clean = e.repo.clean?
-        clean &= dependency_clean
-        Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes") unless dependency_clean
-      end
-      return clean
-    end
-    
-    def self.ensure_working_copies_clean(repos)
-      clean = true
-      repos.each do |repo|
-        dependency_clean = repo.clean?
-        clean &= dependency_clean
-        Console.log_warning("Repo '#{repo.path}' contains uncommitted changes") unless dependency_clean
-      end
-      return clean
-    end
-
-    def self.convert_to_windows_path(unix_path)
-      components = Pathname.new(unix_path).each_filename.to_a
-      components.join(File::ALT_SEPARATOR)
-    end
-    
-    def self.reveal_in_default_file_browser(unix_path)
-      if OS.osx?
-        system %{open "#{unix_path}"}
-      elsif OS.windows?
-        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}"}
-      elsif OS.windows?
-        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
-        string_located = File.readlines(path).grep(pattern).any?
-        File.open(path, 'a') { |f| f.puts(string_to_append) } unless string_located
-      end
-    end
-  end
+require "multirepo/multirepo-exception"
+require "fileutils"
+
+module MultiRepo
+  class Utils
+    def self.path_for_resource(resource_name)
+      gem_path = Gem::Specification.find_by_name("git-multirepo").gem_dir
+      File.join(gem_path, "resources/#{resource_name}")
+    end
+    
+    def self.is_multirepo_enabled(path)
+      File.exists?(File.join(path, ".multirepo"))
+    end
+
+    def self.is_multirepo_tracked(path)
+      is_multirepo_enabled(path) && File.exists?(File.join(path, ".multirepo.lock"))
+    end
+    
+    def self.install_hook(name, path)
+      destination_path = File.join(path, ".git/hooks")
+      destination_file = File.join(destination_path, name)
+      FileUtils.cp(path_for_resource(name), destination_file)
+      FileUtils.chmod(0755, destination_file) # -rwxr-xr-x
+    end
+    
+    def self.sibling_repos
+      sibling_directories = Dir['../*/']
+      sibling_repos = sibling_directories.map{ |d| Repo.new(d) }.select{ |r| r.exists? }
+      sibling_repos.delete_if{ |r| Pathname.new(r.path).realpath == Pathname.new(".").realpath }
+    end
+    
+    def self.dependencies_clean?(config_entries)
+      clean = true
+      missing = false
+      config_entries.each do |e|
+        # Ensure the dependency exists
+        unless e.repo.exists?
+          Console.log_error("Dependency '#{e.path}' does not exist on disk")
+          missing |= true
+          next
+        end
+        
+        # Ensure it contains no uncommitted changes
+        dependency_clean = e.repo.clean?
+        clean &= dependency_clean
+        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
+      
+      return clean
+    end
+    
+    def self.ensure_working_copies_clean(repos)
+      clean = true
+      repos.each do |repo|
+        dependency_clean = repo.clean?
+        clean &= dependency_clean
+        Console.log_warning("Repo '#{repo.path}' contains uncommitted changes") unless dependency_clean
+      end
+      return clean
+    end
+    
+    def self.convert_to_windows_path(unix_path)
+      components = Pathname.new(unix_path).each_filename.to_a
+      components.join(File::ALT_SEPARATOR)
+    end
+    
+    def self.reveal_in_default_file_browser(unix_path)
+      if OS.osx?
+        system %{open "#{unix_path}"}
+      elsif OS.windows?
+        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}"}
+      elsif OS.windows?
+        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
+        string_located = File.readlines(path).grep(pattern).any?
+        File.open(path, 'a') { |f| f.puts(string_to_append) } unless string_located
+      end
+    end
+  end
 end

data/resources/.gitconfig

@@ -1,3 +1,3 @@
-[merge "ours"]
-	name = "Always keep ours"
+[merge "ours"]
+	name = "Always keep ours"
 	driver = true

data/resources/post-commit

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "git-multirepo"
-
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "git-multirepo"
+
 MultiRepo::PostCommitHook.run

data/resources/pre-commit

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "git-multirepo"
-
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "git-multirepo"
+
 MultiRepo::PreCommitHook.run

data/spec/integration/init_spec.rb

@@ -1,19 +1,19 @@
-require "multirepo/commands/init"
-
-RSpec.describe("Init") do
-  it "creates the config file" do
-    pending
-  end
-  
-  it "adds only specified repos to the config file" do
-    pending
-  end
-  
-  it "installs the hooks" do
-    pending
-  end
-  
-  it "fails when there are uncommitted changes in dependencies" do
-    pending
-  end
+require "multirepo/commands/init"
+
+RSpec.describe("Init") do
+  it "creates the config file" do
+    pending
+  end
+  
+  it "adds only specified repos to the config file" do
+    pending
+  end
+  
+  it "installs the hooks" do
+    pending
+  end
+  
+  it "fails when there are uncommitted changes in dependencies" do
+    pending
+  end
 end

data/spec/spec_helper.rb

@@ -1,89 +1,89 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    # be_bigger_than(2).and_smaller_than(4).description
-    #   # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #   # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is recommended.
-  # For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
-end
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end