mgit 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 522c90f1b3a1838184ab1732822d42c9620680e7
-  data.tar.gz: 64747029b401daf6e77793068a3dcac64ff17915
+  metadata.gz: 712d93ce29c8c64e4b37cd820a6216205edd2746
+  data.tar.gz: da97e60a84ab1fc96fb272ad095f6b0eedaedc10
 SHA512:
-  metadata.gz: ec1440f74ea09f063c36c8b40bf40948446a5c9f2898d5b172e66793c52635745ac200d6458e864442ee8c555d68a99482095f954c86cbbad08086af1b1839c8
-  data.tar.gz: 818b07fa2a1761bfae74b78672c27b34834d4140cd182a27410b6bd15c971dae58cc446cabe747f90ffb65d995ffb9ab9099186ce335a017501c660a3e5189e3
+  metadata.gz: d2d964c20c6b1c1daef35f4774b008c965b60ec7c610d9228ff588ee452d854ee9ea6c71101649bf417606f14417e79b6fc168eb2908e4aa951433fdd3746c4c
+  data.tar.gz: 1f24ca99c54e9b41e0d8ce6d1231cd95c7aa3c23669f395f1ce1e98218632983ad6c07ab796ced72af18b6c80eaf61c72fecb6715b21bf503ed8ae5a27561d7b

data/lib/mgit/appdata.rb

@@ -12,7 +12,7 @@ module MGit
       if AppDataVersion.active
         AppDataVersion.updates.each { |u| u.migrate! }
       else
-        AppDataVersion.latest.setup
+        AppDataVersion.latest.setup!
       end
     end
 
@@ -78,21 +78,21 @@ module MGit
         File.file?(repofile)
       end
 
+      def setup!
+        FileUtils.touch(repofile)
+      end
+
       def load(key, default)
-        raise ImplementationError.new('LegacyAppData::load called with unknown key.') if key != :repositories
+        raise ImplementationError.new("LegacyAppData::load called with unknown key #{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
+        raise ImplementationError.new("LegacyAppData::save! called with unknown key #{key}.") if key != :repositories
         File.open(repofile, 'w') { |fd| fd.write value.to_yaml }
       end
 
-      def setup
-        FileUtils.touch(repofile)
-      end
-
     private
 
       def repofile
@@ -100,5 +100,67 @@ module MGit
       end
     end
 
+    class AppDataVersion1 < AppDataVersion
+      def version
+        1
+      end
+
+      def active?
+        File.directory?(config_dir) && (load(:version, nil) == '1')
+      end
+
+      def migrate!
+        setup!
+
+        old_repofile = LegacyAppData.new.send(:repofile)
+        FileUtils.mv(old_repofile, repo_file) if File.file?(old_repofile)
+      end
+
+      def setup!
+        FileUtils.mkdir_p(config_dir)
+        File.open(config_file, 'w') { |fd| fd.write ({ :version => '1' }.to_yaml) }
+        FileUtils.touch(repo_file)
+      end
+
+      def load(key, default)
+        case key
+        when :repositories
+          repos = YAML.load_file(repo_file)
+          repos ? repos : default
+        when *Configuration::KEYS.keys, :version
+          config = YAML.load_file(config_file)
+          (config && config.has_key?(key)) ? config[key] : default
+        else
+          raise ImplementationError.new("AppDataVersion1::load called with unknown key #{key}.")
+        end
+      end
+
+      def save!(key, value)
+        case key
+        when :repositories
+          File.open(repo_file, 'w') { |fd| fd.write value.to_yaml }
+        when *Configuration::KEYS.keys
+          config = YAML.load_file(config_file)
+          config[key] = value
+          File.open(config_file, 'w') { |fd| fd.write config.to_yaml }
+        else
+          raise ImplementationError.new("AppDataVersion1::save! called with unknown key #{key}.")
+        end
+      end
+
+    private
+
+      def config_dir
+        XDG['CONFIG_HOME'].to_path.join('mgit')
+      end
+
+      def repo_file
+        File.join(config_dir, 'repositories.yml')
+      end
+
+      def config_file
+        File.join(config_dir, 'config.yml')
+      end
+    end
   end
 end

data/lib/mgit/commands/config.rb

@@ -0,0 +1,26 @@
+module MGit
+  class ConfigCommand < Command
+    def execute(args)
+      key = args[0]
+      value = args[1]
+
+      Configuration.set(key, value)
+    rescue ConfigurationError => e
+      raise CommandUsageError.new(e.to_s, self)
+    end
+
+    def arity
+      [2, 2]
+    end
+
+    def usage
+      'config <key> <value>'
+    end
+
+    def description
+      'configure MGit'
+    end
+
+    register_command :config
+  end
+end

data/lib/mgit/commands/fetch.rb

@@ -3,25 +3,11 @@ require 'open3'
 module MGit
   class FetchCommand < Command
     def execute(args)
+      thread_class = Configuration.threads ? Thread : NullThread
       threads = []
       Registry.each do |repo|
-        threads << Thread.new do
-          remotes, st = Open3.capture2('git remote', :chdir => repo.path)
-
-          if st.exitstatus != 0
-            perror "Failed to read remotes for repository #{repo.name}! Abort." 
-            Thread.exit
-          end
-
-          remotes.split.each do |remote|
-            sout, st = Open3.capture2("git fetch #{remote}", :chdir => repo.path)
-            if st.exitstatus == 0
-              pinfo "Fetched #{remote} in repository #{repo.name}."
-            else
-              perror "Failed to fetch #{remote} in repository #{repo.name}! Abort."
-              break
-            end
-          end
+        threads << thread_class.new do
+          fetch(repo)
         end
       end
 
@@ -41,5 +27,35 @@ module MGit
     end
 
     register_command :fetch
+
+  private
+
+    def fetch(repo)
+      remotes, st = Open3.capture2('git remote', :chdir => repo.path)
+
+      if st.exitstatus != 0
+        perror "Failed to read remotes for repository #{repo.name}! Abort."
+        Thread.exit
+      end
+
+      remotes.split.each do |remote|
+        sout, st = Open3.capture2("git fetch #{remote}", :chdir => repo.path)
+        if st.exitstatus == 0
+          pinfo "Fetched #{remote} in repository #{repo.name}."
+        else
+          perror "Failed to fetch #{remote} in repository #{repo.name}! Abort."
+          break
+        end
+      end
+    end
+
+    class NullThread
+      def initialize
+        yield
+      end
+
+      def join
+      end
+    end
   end
 end

data/lib/mgit/configuration.rb

@@ -0,0 +1,45 @@
+module MGit
+  module Configuration
+    KEYS = {
+      :threads => {
+        :default => true,
+        :description => 'set to true if you want the fetch command to be threaded'
+      }
+    }
+
+    class << self
+      KEYS.each do |k, v|
+        define_method(k.to_s) do
+          AppData.load(k, v[:default])
+        end
+      end
+    end
+
+    def self.set(key, value)
+      case key
+      when 'threads'
+        unless ['true', 'false', 'on', 'off'].include?(value)
+          raise ConfigurationError.new("Illegal value for key threads.")
+        end
+
+        if ['true', 'on'].include?(value)
+          self.threads = true
+        else
+          self.threads = false
+        end
+      else
+        raise ConfigurationError.new("Unknown key: #{key}.")
+      end
+    end
+
+  private
+
+    class << self
+      KEYS.each do |k, v|
+        define_method("#{k.to_s}=") do |value|
+          AppData.save!(k, value)
+        end
+      end
+    end
+  end
+end

data/lib/mgit/exceptions.rb

@@ -51,4 +51,6 @@ module MGit
       super('Too many arguments.', cmd)
     end
   end
+
+  class ConfigurationError < StandardError; end
 end

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

data/lib/mgit.rb

@@ -4,6 +4,7 @@ require 'xdg'
 
 require 'mgit/version'
 require 'mgit/appdata'
+require 'mgit/configuration'
 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.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -79,9 +79,11 @@ files:
 - lib/mgit/version.rb
 - lib/mgit/appdata.rb
 - lib/mgit/registry.rb
+- lib/mgit/configuration.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/statistics.rb
 - lib/mgit/commands/version.rb