mgit 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjg1YmQxYjM1YTZkYTU5Yzg0N2E4MzAwNWZmYTU3ZDQ0MTRhY2I0Yg==
+    MjEzMDA0N2Y1ODg5MDZmMmJiYmY4YTMxNjkwOGY4NGE2NTVmYWE2Yw==
   data.tar.gz: !binary |-
-    MmJiYWNkNWNhYmUxMDQwYzBjYzg0Mjc0YjRhMDlkM2QxM2EzZWEzNQ==
+    YjA2NTMwODQ0MGQ5YjA1MmM1ZDhhOWMxYTY0MmY0ZjM0ZDQxN2NhOA==
 SHA512:
   metadata.gz: !binary |-
-    OWI0ZWRhMWJiYWNjYmM0YTgyMDQyYzkwMjA1OWViY2U1MTY0MDRiN2RjZWY3
-    NDQ2ZTIzY2YzODQ5YmI2ZmRiMTkzMmIyM2YxODhhMmZmOTcxMGNlZjBjZDY3
-    MTI2MGFjNWNiOGM0ZGQ2MmVjOTMwOGU1MGU0NzljN2UwZjJlNjg=
+    MzMwMDJmODQ1YTMyOTEyZjg3NmQwODY4ZjhiNWYwOTMxYmVjMDhjMDU3MjJh
+    NGYwNTNhYzA3NTRmZGQ0MTMwZmRhYTFmMGFjNTM1OGY4MjExYjUyY2VjZTg2
+    YTc1YmI5M2MxZDBkZWE2YTc5ZDE2MzI0YmJjOWQ5NjMxZTgzOTQ=
   data.tar.gz: !binary |-
-    NTQ1MmI2NTA4OGQ2NDRlMjc4YTFlNGY4NWNmNDcwNDY0NjFmMWNkZWI2MDkz
-    ZTdmNjNiOGRmMzlhY2RmNTZmODJiOGNiOTY4MjFmYmIyMTU0ZTA3YjJmNTlh
-    ZjM2NzhhNmZhNWE4MGFiMzIwNzc5YTBhMmE5YWRmMjBmZjlhODc=
+    OTIwMWFiMWIzMDQ2NjE4Nzk0YjQ5OWFhMTFiMmU0MmMxZWY4YTk3YmI1MTFl
+    MDI3OTE5NzNmMDhlMDliOGVhODRjNzU1MTcyM2M0NGVhZDdiZjcyNmE4NzNh
+    NDQ1YjNmYTA4ZDQ3NDE5Yzc2OWJmMGViNWI5YTViNTFiN2U1MjQ=

data/lib/mgit/cli.rb

@@ -2,10 +2,11 @@ module MGit
   class CLI
     def start
       raise NoCommandError if ARGV.size == 0
-      command = Command.create(ARGV.shift)
-      command.execute(ARGV)
+      command = Command.execute(ARGV.shift, ARGV)
     rescue UsageError => e
       $stderr.puts e
+    rescue GitError => e
+      $stderr.puts e
     end
   end
 end

data/lib/mgit/command.rb

@@ -3,14 +3,14 @@ module MGit
     @@commands = {}
     @@aliases = {}
 
-    def self.create(cmd)
-      cmd = cmd.downcase.to_sym
-      klass = @@commands[cmd] || @@aliases[cmd]
-      if klass
-        klass.new
-      else
-        raise UnknownCommandError.new(cmd)
-      end
+    def self.execute(name, args)
+      cmd = self.create(name)
+
+      arity_min, arity_max = cmd.arity
+      raise TooFewArgumentsError.new(cmd) if arity_min && args.size < arity_min
+      raise TooManyArgumentsError.new(cmd) if arity_max && args.size > arity_max
+
+      cmd.execute(args)
     end
 
     def self.register_command(cmd)
@@ -31,6 +31,10 @@ module MGit
       end
     end
 
+    def arity
+      raise ImplementationError.new("Command #{self.class.name} doesn't implement the arity method.")
+    end
+
     def usage
       raise ImplementationError.new("Command #{self.class.name} doesn't implement the usage method.")
     end
@@ -42,5 +46,17 @@ module MGit
     def description
       raise ImplementationError.new("Command #{self.class.name} doesn't implement the description method.")
     end
+
+  private
+
+    def self.create(cmd)
+      cmd = cmd.downcase.to_sym
+      klass = @@commands[cmd] || @@aliases[cmd]
+      if klass
+        klass.new
+      else
+        raise UnknownCommandError.new(cmd)
+      end
+    end
   end
 end

data/lib/mgit/commands/add.rb

@@ -1,17 +1,19 @@
 module MGit
   class AddCommand < Command
     def execute(args)
-      raise TooFewArgumentsError.new(self) if args.size == 0
-      raise TooManyArgumentsError.new(self) if args.size > 2
-
       path = File.expand_path(args[0])
       raise CommandUsageError.new('First argument must be a path to a git repository.', self) unless is_git_dir?(path)
 
       name = (args.size == 2) ? args[1] : (ask('Name of the repository? ') { |q| q.default = File.basename(path) })
-
+      raise CommandUsageError.new("Repository named #{name} already exists with different path.", self) unless is_new_or_same?(name, path)
+      
       Registry.add(name, path)
     end
 
+    def arity
+      [1, 2]
+    end
+
     def usage
       'add <path_to_git_repository> [name]'
     end
@@ -24,6 +26,11 @@ module MGit
 
   private
 
+    def is_new_or_same?(name, path)
+      repo = Registry.find { |r| r.name == name }
+      repo.nil? || repo.path == path
+    end
+
     def is_git_dir?(path)
       File.directory?(path) && (File.directory?(File.join(path, '.git')) || File.file?(File.join(path, 'HEAD')))
     end

data/lib/mgit/commands/clone.rb

@@ -0,0 +1,32 @@
+module MGit
+  class CloneCommand < Command
+    def execute(args)
+      log = `git clone #{args.join(' ')}`
+      raise GitError.new('Clone command failed.') if $?.exitstatus != 0
+
+      m = /Cloning into '(.*)'/.match(log.split("\n").first)
+      puts m[1]
+      Command.execute('add', [m[1]])
+    end
+
+    def arity
+      [1, nil]
+    end
+
+    def usage
+      'clone [options] <url> [<directory>]'
+    end
+
+    def description
+      'clone repository and add to mgit'
+    end
+
+    register_command :clone
+
+  private
+
+    def option?(arg)
+      arg.start_with?('-')
+    end
+  end
+end

data/lib/mgit/commands/fetch.rb

@@ -1,8 +1,6 @@
 module MGit
   class FetchCommand < Command
     def execute(args)
-      raise TooManyArgumentsError.new(self) if args.size != 0
-
       Registry.chdir_each do |repo|
         `git remote`.split.each do |remote|
           puts "Fetching #{remote} in repository #{repo.name}...".yellow
@@ -11,6 +9,10 @@ module MGit
       end
     end
 
+    def arity
+      [nil, 0]
+    end
+
     def usage
       'fetch'
     end

data/lib/mgit/commands/ffmerge.rb

@@ -1,8 +1,6 @@
 module MGit
   class FFMergeCommand < Command
     def execute(args)
-      raise TooManyArgumentsError.new(self) if args.size != 0
-
       Registry.chdir_each do |repo|
         if repo.dirty?
           puts "Skipping repository #{repo.name} since it's dirty.".red
@@ -20,6 +18,10 @@ module MGit
       end
     end
 
+    def arity
+      [nil, 0]
+    end
+
     def usage
       'ffmerge'
     end

data/lib/mgit/commands/foreach.rb

@@ -1,8 +1,6 @@
 module MGit
   class ForEachCommand < Command
     def execute(args)
-      raise TooFewArgumentsError.new(self) if args.size == 0
-
       command = args.join(' ')
 
       Registry.chdir_each do |repo|
@@ -13,6 +11,10 @@ module MGit
       end
     end
 
+    def arity
+      [1, nil]
+    end
+
     def usage
       'foreach <command...>'
     end

data/lib/mgit/commands/grep.rb

@@ -1,9 +1,6 @@
 module MGit
   class GrepCommand < Command
     def execute(args)
-      raise TooFewArgumentsError.new(self) if args.size == 0
-      raise TooManyArgumentsError.new(self) if args.size > 1
-
       ptrn = args[0]
 
       Registry.chdir_each do |repo|
@@ -13,6 +10,10 @@ module MGit
       end
     end
 
+    def arity
+      [1, 1]
+    end
+
     def usage
       'grep <pattern>'
     end

data/lib/mgit/commands/help.rb

@@ -1,8 +1,6 @@
 module MGit
   class HelpCommand < Command
     def execute(args)
-      raise TooManyArgumentsError.new(self) if args.size > 1
-
       if args.size == 0
         puts "M[eta]Git - manage multiple git repositories at the same time"
         puts
@@ -15,6 +13,10 @@ module MGit
       end
     end
 
+    def arity
+      [0, 1]
+    end
+
     def usage
       'help [command]'
     end

data/lib/mgit/commands/list.rb

@@ -1,8 +1,6 @@
 module MGit
   class ListCommand < Command
     def execute(args)
-      raise TooManyArgumentsError.new(self) if args.size != 0
-
       Registry.each do |repo|
         nc = 24
         display = (repo.name.size > nc) ? (repo.name[0..(nc - 3)] + '...') : repo.name.ljust(nc, ' ')
@@ -10,6 +8,10 @@ module MGit
       end
     end
 
+    def arity
+      [nil, 0]
+    end
+
     def usage
       'list'
     end

data/lib/mgit/commands/log.rb

@@ -15,6 +15,10 @@ module MGit
       end
     end
 
+    def arity
+      [nil, 0]
+    end
+
     def usage
       'log'
     end

data/lib/mgit/commands/remove.rb

@@ -1,9 +1,6 @@
 module MGit
   class RemoveCommand < Command
     def execute(args)
-      raise TooFewArgumentsError.new(self) if args.size == 0
-      raise TooManyArgumentsError.new(self) if args.size > 1
-
       ptrn = args[0]
 
       repo = Registry.find do |repo|
@@ -16,6 +13,10 @@ module MGit
       puts "Removed repository #{repo.name}.".yellow
     end
 
+    def arity
+      [1, 1]
+    end
+
     def usage
       'remove <name/path>'
     end

data/lib/mgit/commands/status.rb

@@ -3,8 +3,6 @@ require 'set'
 module MGit
   class StatusCommand < Command
     def execute(args)
-      raise TooManyArgumentsError.new(self) if args.size != 0
-
       Registry.chdir_each do |repo|
         nc = 36
         display = (repo.name.size > nc) ? (repo.name[0..(nc - 3)] + '...') : repo.name.ljust(nc, ' ')
@@ -12,6 +10,10 @@ module MGit
       end
     end
 
+    def arity
+      [nil, 0]
+    end
+
     def usage
       'status'
     end

data/lib/mgit/commands/version.rb

@@ -1,10 +1,13 @@
 module MGit
   class VersionCommand < Command
     def execute(args)
-      raise TooManyArgumentsError.new(self) if args.size != 0
       puts "mgit version #{MGit::VERSION}"
     end
 
+    def arity
+      [nil, 0]
+    end
+
     def usage
       'version'
     end

data/lib/mgit/exceptions.rb

@@ -1,6 +1,16 @@
 module MGit
   class ImplementationError < StandardError; end
 
+  class GitError < StandardError
+    def initialize(error)
+      @error = error
+    end
+
+    def to_s
+      "Git error: #{@error}"
+    end
+  end
+
   class UsageError < StandardError
     def initialize(error, usage)
       @error = error

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -62,6 +62,7 @@ files:
 - lib/mgit/exceptions.rb
 - lib/mgit/cli.rb
 - lib/mgit/command.rb
+- lib/mgit/commands/clone.rb
 - lib/mgit/commands/add.rb
 - lib/mgit/commands/list.rb
 - lib/mgit/commands/help.rb