mgit 0.2.6 → 0.2.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjNmMTI1NTJjZWIzMjNhNGUzODNhYTZjZThlZGU3N2M5NTI1NDQ1Mw==
-  data.tar.gz: !binary |-
-    MjMyZTNiYjBlMTgyMzg5ZWRmYzQ5YjQzYzAyY2VlZmYwZGRmODgxZA==
+SHA1:
+  metadata.gz: b52e092a056bf8964c6d7661f186d151a1d66ec5
+  data.tar.gz: d910c22cd816ae0fbf2565fb755f92b337986b85
 SHA512:
-  metadata.gz: !binary |-
-    M2EyYjBkYzg5ZDdiZjIwZWJjZDIyYzNkMTM0MTJlNzNjMjgxYTA0ZTcxZWIw
-    OTJhYWU2NDIzNjlmYzEzOGQ2NmY0M2UxN2Y3ZGMwZmEyMDViN2I4M2QxM2U1
-    ZTYxZWJmZGFiOGMyMjI2ZWNmMTFiMWMwZGFkNWI1ZThlYjUzN2U=
-  data.tar.gz: !binary |-
-    Y2RjNTlmMGYzMmI2MGU3YzMzYmMwZGYxNTljYTMxNjNkNTc0OTdiY2U5YWU4
-    NjJiZmMwMTc0ZDkxOWQzY2M0MGRkN2NiYmI5NmE2NDNiYTg2ZDdhN2VlN2Jh
-    ZDYyOTNjMDcxNWZlNmRjYTlkMmExZDQxODgwZGZhODBiNWUwNTU=
+  metadata.gz: 741ea187d1be95382071a051f0cae9a541ffc82370764e41572b383255fd7d07e1e05951abcd370b17f02d79f9941345cdee3a637199f60e294ff9b0ceb0cbf7
+  data.tar.gz: e9835cc422832de5abb6ca17e7770bb7af423bb202882e6ca767d8b500232eac2b93bade7e8d9e4d7644b24fdd8da790419945defec9d2bf257184e42ed1af26

data/lib/mgit/cli.rb

@@ -1,12 +1,14 @@
 module MGit
   class CLI
+    include Output
+
     def start
       raise NoCommandError if ARGV.size == 0
       command = Command.execute(ARGV.shift, ARGV)
     rescue UsageError => e
-      $stderr.puts e
+      perror e.to_s
     rescue GitError => e
-      $stderr.puts e
+      perror e.to_s
     end
   end
 end

data/lib/mgit/commands/add.rb

@@ -2,9 +2,13 @@ module MGit
   class AddCommand < Command
     def execute(args)
       path = File.expand_path(args[0])
+      raise CommandUsageError.new('First argument must be a path to a directory.', self) unless File.directory?(path)
       raise CommandUsageError.new('First argument must be a path to a git repository.', self) unless is_git_dir?(path)
+      raise CommandUsageError.new('Sorry, mgit can not handle bare repositories.', self) if is_bare?(path)
 
-      name = (args.size == 2) ? args[1] : (ask('Name of the repository? ') { |q| q.default = File.basename(path) })
+      # NOTE: The to_s to the HighLine::String is needed due to a bug in YAML/Psych in Ruby 2.0.0.
+      # https://github.com/JEG2/highline/issues/69
+      name = (args.size == 2) ? args[1] : (ask('Name of the repository? ') { |q| q.default = File.basename(path) }).to_s
       raise CommandUsageError.new("Repository named #{name} already exists with different path.", self) unless is_new_or_same?(name, path)
       
       Registry.add(name, path)
@@ -32,7 +36,11 @@ module MGit
     end
 
     def is_git_dir?(path)
-      File.directory?(path) && (File.directory?(File.join(path, '.git')) || File.file?(File.join(path, 'HEAD')))
+      Dir.chdir(path) { `git status 2>&1` !~ /fatal: Not a git repository/ }
+    end
+
+    def is_bare?(path)
+      Dir.chdir(path) { `git status 2>&1` =~ /fatal: This operation must be run in a work tree/}
     end
   end
 end

data/lib/mgit/commands/ffmerge.rb

@@ -34,7 +34,7 @@ module MGit
     end
 
     def description
-      'merge all upstream tracking branches that can be fast-forwardeded'
+      'merge all upstream tracking branches that can be fast-forwarded'
     end
 
     register_command :ffmerge

data/lib/mgit/commands/foreach.rb

@@ -5,7 +5,7 @@ module MGit
 
       Registry.chdir_each do |repo|
         pinfo "Executing command in repository #{repo.name}..."
-        if !system(command) && !ask("Executing command '#{command}' in repository '#{repo.name}' failed. Would you like to continue anyway?".red)
+        if !system(command) && !agree("Executing command '#{command}' in repository '#{repo.name}' failed. Would you like to continue anyway?".red)
           break
         end
       end

data/lib/mgit/subcommand.rb

@@ -0,0 +1,5 @@
+module MGit
+  class Subcommand < Command
+
+  end
+end

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xdg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: M[eta]Git let's you manage multiple git repositories simultaneously
@@ -73,26 +73,28 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/mgit/exceptions.rb
+- lib/mgit.rb
 - lib/mgit/output.rb
-- lib/mgit/cli.rb
-- lib/mgit/command.rb
-- lib/mgit/commands/clone.rb
-- lib/mgit/commands/add.rb
+- lib/mgit/repository.rb
+- lib/mgit/version.rb
+- lib/mgit/subcommand.rb
+- lib/mgit/registry.rb
+- lib/mgit/exceptions.rb
 - lib/mgit/commands/list.rb
+- lib/mgit/commands/grep.rb
+- lib/mgit/commands/config.rb
+- lib/mgit/commands/version.rb
+- lib/mgit/commands/fetch.rb
+- lib/mgit/commands/status.rb
+- lib/mgit/commands/remove.rb
 - lib/mgit/commands/help.rb
 - lib/mgit/commands/foreach.rb
-- lib/mgit/commands/remove.rb
-- lib/mgit/commands/fetch.rb
+- lib/mgit/commands/add.rb
 - lib/mgit/commands/log.rb
-- lib/mgit/commands/grep.rb
 - lib/mgit/commands/ffmerge.rb
-- lib/mgit/commands/version.rb
-- lib/mgit/commands/status.rb
-- lib/mgit/repository.rb
-- lib/mgit/registry.rb
-- lib/mgit/version.rb
-- lib/mgit.rb
+- lib/mgit/commands/clone.rb
+- lib/mgit/command.rb
+- lib/mgit/cli.rb
 - bin/mgit
 homepage: http://github.com/flavoursys/mgit
 licenses:
@@ -104,17 +106,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: MGit meta repository tool