mgit 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52e092a056bf8964c6d7661f186d151a1d66ec5
-  data.tar.gz: d910c22cd816ae0fbf2565fb755f92b337986b85
+  metadata.gz: 72da3e471054578d574fab47f09886ebdf696676
+  data.tar.gz: 889b8f08aa19321f4162aceddb7e9b0e4beca58c
 SHA512:
-  metadata.gz: 741ea187d1be95382071a051f0cae9a541ffc82370764e41572b383255fd7d07e1e05951abcd370b17f02d79f9941345cdee3a637199f60e294ff9b0ceb0cbf7
-  data.tar.gz: e9835cc422832de5abb6ca17e7770bb7af423bb202882e6ca767d8b500232eac2b93bade7e8d9e4d7644b24fdd8da790419945defec9d2bf257184e42ed1af26
+  metadata.gz: fe550448650a1c9cc3530e1cf583423771a7630b4c11069051ba8743c269abdc2f1dbfbc91db07bcd31049d8c66dab4f036f64047797d650461ddadeb60bd675
+  data.tar.gz: 6ca1f337596f69e8ec7f223857c8b2b1715bed676c9a3dc47849a138e9c7c57f169700b54ccbc6c6acf1a029ae250643377f29963eeef4667c4d00f9340297c2

data/lib/mgit/appdata.rb

@@ -0,0 +1,104 @@
+require 'fileutils'
+require 'yaml'
+
+module MGit
+  module AppData
+
+    ####################
+    # Module interface #
+    ####################
+
+    def self.update
+      if AppDataVersion.active
+        AppDataVersion.updates.each { |u| u.migrate! }
+      else
+        AppDataVersion.latest.setup
+      end
+    end
+
+    def self.load(key, default = {})
+      AppDataVersion.latest.load(key, default)
+    end
+
+    def self.save!(key, value)
+      AppDataVersion.latest.save!(key, value)
+    end
+
+    #########################################
+    # Base class for data storage versions. #
+    #########################################
+
+    class AppDataVersion
+      @@versions = []
+
+      def self.inherited(version)
+        @@versions << version.new
+        super
+      end
+
+      def self.sorted
+        @@versions.sort_by { |v| v.version }
+      end
+
+      def self.updates
+        self.sorted.drop_while { |v| !v.active? }.drop(1)
+      end
+
+      def self.active
+        self.sorted.find { |v| v.active? }
+      end
+
+      def self.latest
+        self.sorted.last
+      end
+
+      include Comparable
+
+      def <=>(other)
+        version <=> other.version
+      end
+
+      [:version, :active?, :load, :save!, :migrate!].each do |meth|
+        define_method(meth) do
+          raise ImplementationError.new("AppDataVersion #{self.class.name} doesn't implement the #{meth.to_s} method.")
+        end
+      end
+    end
+
+    #######################################################################
+    # Original version, plain YAML file containing the repositories hash. #
+    #######################################################################
+
+    class LegacyAppData < AppDataVersion
+      def version
+        0
+      end
+
+      def active?
+        File.file?(repofile)
+      end
+
+      def load(key, default)
+        raise ImplementationError.new('LegacyAppData::load called with unknown key.') if key != :repositories
+        repos = YAML.load_file(repofile)
+        repos ? repos : default
+      end
+
+      def save!(key, value)
+        raise ImplementationError.new('LegacyAppData::save! called with unknown key.') if key != :repositories
+        File.open(repofile, 'w') { |fd| fd.write value.to_yaml }
+      end
+
+      def setup
+        FileUtils.touch(repofile)
+      end
+
+    private
+
+      def repofile
+        XDG['CONFIG_HOME'].to_path.join('mgit.yml')
+      end
+    end
+
+  end
+end

data/lib/mgit/cli.rb

@@ -4,6 +4,11 @@ module MGit
 
     def start
       raise NoCommandError if ARGV.size == 0
+
+      # Initialize AppData and migrate if necessary.
+      AppData.update
+
+      # Run command, consuming its name from the list of arguments.
       command = Command.execute(ARGV.shift, ARGV)
     rescue UsageError => e
       perror e.to_s

data/lib/mgit/command.rb

@@ -7,11 +7,7 @@ module MGit
 
     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.check_arity(args)
       cmd.execute(args)
     end
 
@@ -33,6 +29,12 @@ module MGit
       end
     end
 
+    def check_arity(args)
+      arity_min, arity_max = self.arity
+      raise TooFewArgumentsError.new(self) if arity_min && args.size < arity_min
+      raise TooManyArgumentsError.new(self) if arity_max && args.size > arity_max
+    end
+
     [:arity, :usage, :help, :description].each do |meth|
       define_method(meth) do
         raise ImplementationError.new("Command #{self.class.name} doesn't implement the #{meth.to_s} method.")

data/lib/mgit/commands/head.rb

@@ -0,0 +1,23 @@
+module MGit
+  class ListCommand < Command
+    def execute(args)
+      t = []
+      Registry.each { |repo| t << [repo.name, repo.current_branch, repo.current_head] }
+      ptable t, :columns => [24, nil, nil]
+    end
+
+    def arity
+      [0, 0]
+    end
+
+    def usage
+      'head'
+    end
+
+    def description
+      'show repository HEADs'
+    end
+
+    register_command :head
+  end
+end

data/lib/mgit/commands/remove_all.rb

@@ -0,0 +1,24 @@
+module MGit
+  class RemoveAllCommand < Command
+    def execute(args)
+      if agree('This will delete all repositories from mgit. Are you sure?'.red)
+        Registry.clean
+      end
+    end
+
+    def arity
+      [0, 0]
+    end
+
+    def usage
+      'removeall'
+    end
+
+    def description
+      'removes all repositories from mgit (resets mgit\'s store)'
+    end
+
+    register_command :removeall
+    register_alias :remove_all
+  end
+end

data/lib/mgit/output.rb

@@ -28,8 +28,9 @@ module MGit
       end
 
       def to_s
+        return '' if table.empty?
+
         cw = column_widths
-        
         if options[:columns]
           options[:columns].each_with_index do |c, i|
             cw[i] = c if c

data/lib/mgit/registry.rb

@@ -1,5 +1,3 @@
-require 'yaml'
-
 module MGit
   module Registry
     def self.all
@@ -34,18 +32,18 @@ module MGit
       self.save! repos
     end
 
-  private
-
-    def self.repofile
-      XDG['CONFIG_HOME'].to_path.join('mgit.yml')
+    def self.clean
+      self.save!({})
     end
 
+  private
+
     def self.load
-      File.exists?(self.repofile) ? YAML.load_file(self.repofile) : {}
+      AppData.load(:repositories)
     end
 
     def self.save!(repos)
-      File.open(self.repofile, 'w') { |fd| fd.write repos.to_yaml }
+      AppData.save!(:repositories, repos)
     end
   end
 end

data/lib/mgit/repository.rb

@@ -16,6 +16,10 @@ module MGit
       }
     end
 
+    def current_head
+      in_repo { `git rev-parse --verify --short HEAD`.strip }
+    end
+
     def remote_tracking_branches(upstream_exists_only = true)
       rb = remote_branches
 

data/lib/mgit/version.rb

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

data/lib/mgit.rb

@@ -3,6 +3,7 @@ require 'highline/import'
 require 'xdg'
 
 require 'mgit/version'
+require 'mgit/appdata'
 require 'mgit/exceptions'
 require 'mgit/output'
 require 'mgit/registry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -77,14 +77,15 @@ files:
 - lib/mgit/output.rb
 - lib/mgit/repository.rb
 - lib/mgit/version.rb
-- lib/mgit/subcommand.rb
+- lib/mgit/appdata.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/remove_all.rb
 - lib/mgit/commands/version.rb
 - lib/mgit/commands/fetch.rb
+- lib/mgit/commands/head.rb
 - lib/mgit/commands/status.rb
 - lib/mgit/commands/remove.rb
 - lib/mgit/commands/help.rb
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: MGit meta repository tool

data/lib/mgit/subcommand.rb

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