git-multirepo 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc4fcacdeda46d9bd6dbaf5f70cfdfd1e9a42752
-  data.tar.gz: de1ffba314e943dcd1357dd7c23c8a0a5f9c4138
+  metadata.gz: 2a385cf0508d894743f411951c9c59f299339ff0
+  data.tar.gz: c87ad0b8f432703830a3c6355f216b9b053e9fc2
 SHA512:
-  metadata.gz: 4d06277c5724ddd505c7d41219ac947111e6c3184def6b05b7069ffe85378e0c77e4d267fdefdf81df366a2f55190a1ec318ef6b10701e55cd47acfcedaeaf69
-  data.tar.gz: e66429331d6bdd52a8c86010685fa803a20ff2cf261acba1679b4fc84f1f979c5ca3f0d1d53eaeae6b28d3b4ab136e7f8a8074e2d1ac95e0f9603f995293319e
+  metadata.gz: df7eab33e7bbd773aeb420fee0e752e650876531e685b15e7aba5b3d738be2eef119af3a11dfc3c8970b4fc18b7baee13a4fa92807ba817fce8c7d6b4d3879bf
+  data.tar.gz: 9c7f99a04596b8055b2437c6b207a2e89137459783350b61069df695dc6b4938f5250d487cb8bd0090c310ac28767cb6ef29c17fe61d955cc23b2bd3a577d123

data/README.md

@@ -1,3 +1,5 @@
+![git-multirepo](images/logo.png)
+
 # git-multirepo
 
 Track multiple Git repositories side-by-side.

data/lib/info.rb

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

data/lib/multirepo/commands/checkout.rb

@@ -11,6 +11,11 @@ module MultiRepo
       super
     end
     
+    def validate!
+      super
+      help! "You must specify a branch or commit id to checkout" unless @ref
+    end
+    
     def run
       super
       ensure_multirepo_initialized
@@ -21,7 +26,7 @@ module MultiRepo
       Console.log_step("Checking out #{@ref} and its dependencies...")
       
       unless main_repo.is_clean?
-        raise "Can't checkout #{@ref} because the main repo contains uncommitted changes"
+        raise MultiRepoException, "Can't checkout #{@ref} because the main repo contains uncommitted changes"
       end
       
       unless main_repo.checkout(@ref)
@@ -37,7 +42,7 @@ module MultiRepo
       
       if Utils.warn_of_uncommitted_changes(ConfigFile.load)
         main_repo.checkout(initial_revision)
-        raise "'#{e.path}' contains uncommitted changes. Checkout reverted."
+        raise MultiRepoException, "'#{e.path}' contains uncommitted changes. Checkout reverted."
       end
       
       config_entries = ConfigFile.load # Load the post-checkout config entries, which might be different than pre-checkout

data/lib/multirepo/commands/edit.rb

@@ -13,7 +13,7 @@ module MultiRepo
         editor = `echo ${FCEDIT:-${VISUAL:-${EDITOR:-vi}}}`.strip
         system(editor, ".multirepo")
       elsif OS.windows?
-        raise "The edit command is not implemented on Window yet."
+        raise MultiRepoException, "The edit command is not implemented on Window yet."
       end
     rescue MultiRepoException => e
       Console.log_error(e.message)

data/lib/multirepo/git/git.rb

@@ -32,8 +32,8 @@ module MultiRepo
     end
     
     def self.is_inside_git_repo(path)
-      Dir.exist?("#{path}/.git")
-      #return (Git.run_in_working_dir(path, "rev-parse --is-inside-work-tree", false).strip == "true") # Can't silence output?
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Michaël Fortin
@@ -119,6 +119,7 @@ files:
 - Rakefile
 - bin/multi
 - git-multirepo.gemspec
+- images/logo.png
 - lib/commands.rb
 - lib/git-multirepo.rb
 - lib/info.rb