git-superproject 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77488a891a2ea164436a18c086dbcf6a6cf513a9
-  data.tar.gz: c3f27a89cae98a4a10321dd1ef1c2502ae77fe21
+  metadata.gz: 75cae9609ec54fe4995a92b362a638e116449cc1
+  data.tar.gz: 4fb1400df0a73442693593c51816af85b9c68c7a
 SHA512:
-  metadata.gz: 7e9abceba6edf0114c3617c0a59d0bc846de28ed246dcda94fbd3d6ff7c2a31d290e20e1841415dc65a244d784cb45661a832957a6a7df30d0ecd55c2c30f164
-  data.tar.gz: 110cd34163237523a33118436e60db3b5543fee03d9c292a1d6bff4b1179470630d7718079ca564ac2d689a878af50708b449fe25f768d88ab63874df70401e8
+  metadata.gz: 36777c3684f35cc9dc5b055122396ebfdf65ac62de58e22c6dcdfb8c3722dc907c1be5aff7d1238f1bd24abf2f4d40c8f3a9b72304fb7ec15d105de4f35f18a0
+  data.tar.gz: '08e03c351a822a72fb316af0700d8a96419685e3d863f78210e429892b5ebe3946bce199c26e17c41f9dbe9524822169bf1c07cb0e613031c595f626380f6a44'

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/bin/setup

@@ -3,6 +3,12 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
+[ -f Brewfile ] && brew bundle
+[ -f .ruby-version ] && rbenv install -s
+gem install --conservative bundler
+[ -f Gemfile ] && bundle install
 
-# Do any other automated setup that you need to do here
+set +vxeu
+echo
+
+# That's all Folks!

data/exe/git-superproject

@@ -27,8 +27,8 @@ when /\A--/
       end
       case command
       when '--list'   then puts config.list(name).to_json
-      when '--add'    then puts config.add(name, ARGV).to_json
-      when '--remove' then puts config.remove(name, ARGV).to_json
+      when '--add'    then puts config.add(name, *ARGV).to_json
+      when '--remove' then puts config.remove(name, *ARGV).to_json
       else
         abort \
           "Unknown 'git superproject' command: #{command}\n\n" \

data/lib/git/superproject/version.rb

@@ -1,6 +1,6 @@
 module Git
   module Superproject
     NAME = 'git-superproject'.freeze
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/git/superproject.rb

@@ -1,5 +1,6 @@
 require 'git/superproject/version'
 
+require 'set'
 require 'json'
 require 'English'
 require 'pathname'
@@ -26,50 +27,41 @@ module Git
 
       def initialize(key_value_pairs)
         @superprojects = Hash.new do |superprojects, name|
-          superprojects[name] = []
+          superprojects[name] = Set.new # guarantee uniqueness
         end
 
         key_value_pairs.each do |key_value|
           key, value = key_value.split('=')
-
-          key =~ /\Asuperproject\.(?<name>.*)\.repo\z/
-          raise "Invalid superproject key: #{key}" unless $LAST_MATCH_INFO
-
-          name = $LAST_MATCH_INFO[:name]
-
-          value =~ %r{\A[-\w]+/[-\w]+\z}
-          raise "Invalid repo name: #{value}" unless $LAST_MATCH_INFO
-
-          @superprojects[name] << value
+          process(key, value)
         end
       end
 
       def list(name)
-        @superprojects[name]
+        @superprojects[name].to_a.sort
       end
 
-      def add(name, repos)
+      def add(name, *repos)
         repos.each do |repo|
-          @superprojects[name] << repo
+          add_to(name, repo)
         end
-        @superprojects[name]
+        list(name)
       end
 
-      def remove(name, repos)
+      def remove(name, *repos)
         repos.each do |repo|
-          @superprojects[name].delete(repo)
+          remove_from(name, repo)
         end
-        @superprojects[name]
+        list(name)
       end
 
       def write_to(file)
         # create backup of original file
         FileUtils.mv(file, "#{file}~") if File.exist? file
 
-        @superprojects.each do |name, repos|
-          name = "superproject.#{name}.repo"
-          repos.each do |repo|
-            `git config --file #{file} --add #{name} #{repo}`
+        @superprojects.keys.each do |name|
+          key = "superproject.#{name}.repo"
+          list(name).each do |repo|
+            `git config --file #{file} --add #{key} #{repo}`
           end
         end
 
@@ -81,6 +73,26 @@ module Git
         @superprojects.to_json
       end
 
+      private
+
+      def process(key, repo)
+        key =~ /\Asuperproject\.(?<name>.*)\.repo\z/
+        raise "Invalid superproject key: #{key}" unless $LAST_MATCH_INFO
+
+        add_to($LAST_MATCH_INFO[:name], repo)
+      end
+
+      def add_to(name, repo)
+        repo =~ %r{\A[-.\w]+/[-.\w]+\z}
+        raise "Invalid repo name: #{repo}" unless $LAST_MATCH_INFO
+
+        @superprojects[name] << repo
+      end
+
+      def remove_from(name, repo)
+        @superprojects[name].delete(repo)
+      end
+
     end
 
     module Commands

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-superproject
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Vandenberk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-18 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler