git-multirepo 1.0.0.beta5 → 1.0.0.beta6

data/lib/multirepo/git/repo.rb

@@ -1,67 +1,67 @@
-require_relative "branch"
-require_relative "remote"
-require_relative "change"
-
-module MultiRepo
-  class Repo
-    attr_accessor :path
-    attr_accessor :basename
-    
-    def initialize(path)
-      @path = path
-      @basename = Pathname.new(path).basename.to_s
-    end
-    
-    # Inspection
-    
-    def exists?
-      Git.is_inside_git_repo(@path)
-    end
-    
-    def current_branch
-      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", false).strip
-      branch != "HEAD" ? branch : nil
-    end
-    
-    def head_hash
-      Git.run_in_working_dir(@path, "rev-parse HEAD", false).strip
-    end
-    
-    def changes
-      output = Git.run_in_working_dir(@path, "status --porcelain", false)
-      lines = output.split("\n").each{ |f| f.strip }.delete_if{ |f| f == "" }
-      lines.map { |l| Change.new(l) }
-    end
-    
-    def is_clean?
-      return changes.count == 0
-    end
-    
-    # Operations
-    
-    def fetch
-      Git.run_in_working_dir(@path, "fetch --progress", true)
-      Runner.last_command_succeeded
-    end
-    
-    def clone(url)
-      Git.run_in_current_dir("clone #{url} #{@path} --progress", true)
-      Runner.last_command_succeeded
-    end
-    
-    def checkout(ref)
-      Git.run_in_working_dir(@path, "checkout #{ref}", false)
-      Runner.last_command_succeeded
-    end
-    
-    # Remotes and branches
-    
-    def branch(name)
-      Branch.new(self, name)
-    end
-    
-    def remote(name)
-      Remote.new(self, name)
-    end
-  end
+require_relative "branch"
+require_relative "remote"
+require_relative "change"
+
+module MultiRepo
+  class Repo
+    attr_accessor :path
+    attr_accessor :basename
+    
+    def initialize(path)
+      @path = path
+      @basename = Pathname.new(path).basename.to_s
+    end
+    
+    # Inspection
+    
+    def exists?
+      Git.is_inside_git_repo(@path)
+    end
+    
+    def current_branch
+      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", false).strip
+      branch != "HEAD" ? branch : nil
+    end
+    
+    def head_hash
+      Git.run_in_working_dir(@path, "rev-parse HEAD", false).strip
+    end
+    
+    def changes
+      output = Git.run_in_working_dir(@path, "status --porcelain", false)
+      lines = output.split("\n").each{ |f| f.strip }.delete_if{ |f| f == "" }
+      lines.map { |l| Change.new(l) }
+    end
+    
+    def is_clean?
+      return changes.count == 0
+    end
+    
+    # Operations
+    
+    def fetch
+      Git.run_in_working_dir(@path, "fetch --progress", true)
+      Runner.last_command_succeeded
+    end
+    
+    def clone(url)
+      Git.run_in_current_dir("clone #{url} #{@path} --progress", true)
+      Runner.last_command_succeeded
+    end
+    
+    def checkout(ref)
+      Git.run_in_working_dir(@path, "checkout #{ref}", false)
+      Runner.last_command_succeeded
+    end
+    
+    # Remotes and branches
+    
+    def branch(name)
+      Branch.new(self, name)
+    end
+    
+    def remote(name)
+      Remote.new(self, name)
+    end
+  end
 end

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

@@ -1,25 +1,25 @@
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PreCommitHook
-    def self.run
-      Config.instance.running_git_hook = true
-
-      entries =  ConfigFile.load
-      uncommitted = Utils.warn_of_uncommitted_changes(entries)
-      
-      if uncommitted
-        Console.log_error("You must commit changes to your dependencies before you can commit the main repo")
-        exit 1
-      end
-      
-      LockFile.update
-      Console.log_info("Updated and staged lock file with current HEAD revisions for all dependencies")
-      
-      exit 0 # Success!
-    end
-  end
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PreCommitHook
+    def self.run
+      Config.instance.running_git_hook = true
+
+      entries =  ConfigFile.load
+      uncommitted = Utils.warn_of_uncommitted_changes(entries)
+      
+      if uncommitted
+        Console.log_error("You must commit changes to your dependencies before you can commit the main repo")
+        exit 1
+      end
+      
+      LockFile.update
+      Console.log_info("Updated and staged lock file with current HEAD revisions for all dependencies")
+      
+      exit 0 # Success!
+    end
+  end
 end

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_arrow
-      puts $stdout.isatty ? message.bold.green : message
-    end
-    
-    def self.log_substep(message)
-      print_arrow
-      puts $stdout.isatty ? message.blue : message
-    end
-    
-    def self.log_info(message)
-      print_arrow
-      puts $stdout.isatty ? message.white : message
-    end
-    
-    def self.log_warning(message)
-      print_arrow
-      puts $stdout.isatty ? message.yellow : message
-    end
-    
-    def self.log_error(message)
-      print_arrow
-      puts $stdout.isatty ? message.red : message
-    end
-    
-    def self.ask_yes_no(message)
-      answered = false
-      while !answered
-        print_arrow
-        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_arrow
-      print $stdout.isatty ? "> ".white : ""
-    end
-  end
+require "colored"
+
+module MultiRepo
+  class Console
+    def self.log_step(message)
+      print_arrow
+      puts $stdout.isatty ? message.bold.green : message
+    end
+    
+    def self.log_substep(message)
+      print_arrow
+      puts $stdout.isatty ? message.blue : message
+    end
+    
+    def self.log_info(message)
+      print_arrow
+      puts $stdout.isatty ? message.white : message
+    end
+    
+    def self.log_warning(message)
+      print_arrow
+      puts $stdout.isatty ? message.yellow : message
+    end
+    
+    def self.log_error(message)
+      print_arrow
+      puts $stdout.isatty ? message.red : message
+    end
+    
+    def self.ask_yes_no(message)
+      answered = false
+      while !answered
+        print_arrow
+        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_arrow
+      print $stdout.isatty ? "> ".white : ""
+    end
+  end
 end

data/lib/multirepo/utility/runner.rb

@@ -1,21 +1,21 @@
-require "open3"
-
-module MultiRepo
-  class Runner
-    class << self
-      attr_accessor :last_command_succeeded
-    end
-    
-    def self.run(cmd, show_output)
-      output = []
-      Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
-        stdout_and_stderr.each do |line|
-          puts line if show_output
-          output << line
-        end
-        @last_command_succeeded = thread.value.success?
-      end
-      output.join("")
-    end
-  end
+require "open3"
+
+module MultiRepo
+  class Runner
+    class << self
+      attr_accessor :last_command_succeeded
+    end
+    
+    def self.run(cmd, show_output)
+      output = []
+      Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
+        stdout_and_stderr.each do |line|
+          puts line if show_output
+          output << line
+        end
+        @last_command_succeeded = thread.value.success?
+      end
+      output.join("")
+    end
+  end
 end

data/lib/multirepo/utility/utils.rb

@@ -1,37 +1,37 @@
-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.install_pre_commit_hook
-      FileUtils.cp(path_for_resource("pre-commit"), ".git/hooks")
-    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.warn_of_uncommitted_changes(config_entries)
-      uncommitted = false
-      config_entries.each do |e|
-        next unless e.repo.exists?
-        unless e.repo.is_clean?
-          Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes")
-          uncommitted = true
-        end
-      end
-      return uncommitted
-    end
-
-    def self.convert_to_windows_path(unix_path)
-      components = Pathname.new(unix_path).each_filename.to_a
-      components.join(File::ALT_SEPARATOR)
-    end
-  end
+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.install_pre_commit_hook
+      FileUtils.cp(path_for_resource("pre-commit"), ".git/hooks")
+    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.warn_of_uncommitted_changes(config_entries)
+      uncommitted = false
+      config_entries.each do |e|
+        next unless e.repo.exists?
+        unless e.repo.is_clean?
+          Console.log_warning("Dependency '#{e.repo.path}' contains uncommitted changes")
+          uncommitted = true
+        end
+      end
+      return uncommitted
+    end
+
+    def self.convert_to_windows_path(unix_path)
+      components = Pathname.new(unix_path).each_filename.to_a
+      components.join(File::ALT_SEPARATOR)
+    end
+  end
 end

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 → init_spec.rb}

@@ -1,23 +1,23 @@
-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 "stages the config file" do
-    pending
-  end
-  
-  it "installs the pre-commit hook" 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 "stages the config file" do
+    pending
+  end
+  
+  it "installs the pre-commit hook" do
+    pending
+  end
+  
+  it "fails when there are uncommitted changes in dependencies" do
+    pending
+  end
 end