gitmore 0.3.0.pre.rc → 0.3.5.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89aa32035524ef0708667a3e6b92f45ca2922da9ae193b35a703f40c798c8f9
-  data.tar.gz: 30135156da1a27c225cf2f665a561789c05e590b94a4f8b5180b065bb764153e
+  metadata.gz: 865fa4252f0a284fbc1b73b4d8b64621d328b0e3bbfe332de9ee126454d54e9f
+  data.tar.gz: 6d06b59216b74d3c6881f9fb3edcdb3ce23f372a219979538e74b74587028a76
 SHA512:
-  metadata.gz: f42c56e61a60929ce788dd6e7242515088093113626a78b908a1890fd4334e89029a9c7f749dac8c1d75b6b1b7b10db3299c93f846d6360336da8f7741485b61
-  data.tar.gz: 2dd9f11709b9c81be5cdc97e4a5a911d615140383651a218e5f1efa76815b22f82a8837aec335efb9eb8dc46b6dbb6bfa4ba36c949b2d929e50f5fd4fddb1de1
+  metadata.gz: d232f4c37078cb3a7190f4791caecd02d16c0237fdb0fab4231b3ac323a8afe149f8c72f8a63b41fc83acbb4a77a40f6faf64c48fbf54fa55a91989661e0883f
+  data.tar.gz: fc67acb0c39f8fc12b3a8fdd83db7de9a77f5e5a255a031057fd632b27bb0afa4e08b54517250e0f6b6cce92f3d408e4369d3ddc3be1ae03aaa9f7c92e2a4888

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+debug.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitmore (0.3.0.pre.rc)
+    gitmore (0.3.5.pre.alpha)
       colorize
 
 GEM

data/README.org

@@ -0,0 +1,65 @@
+* Gitmore
+
+  Get more out of git! This library provides extra git commands that make 
+  handling multiple repositories at one time much easier. Let's say you
+  have a microservice architecture, organized locally as multiple git
+  repositories in a single directory. The feature you are currently working
+  on requires changes in a handful of them. You have created branches by the
+  same name in the associated repositories. You have finished your work and
+  need to switch back to master for the entire system. Instead of trying to
+  remember the 5 (or was it 6?) different services you made changes in...
+
+  Try ~git branches feature/my-cool-feature~ to print out all repos in the current
+  directory that are checked out to the branch.
+
+  #+BEGIN_SRC text
+  my-cool-service-repo
+    bug/thing-was-broken
+    feature/cool-new-thing
+  * feature/my-cool-feature
+    some-other-branch
+
+  another-cool-service-repo
+    some-branch
+    some-other-branch
+  * feature/my-cool-feature
+  #+END_SRC
+
+  Other gitmore commands to try:
+
+  ~git checkouts <branch-name>~ (default: master) - Check out all branches that have a branch
+  by the given name. Warns and prints unstaged changes when applicable, does not check out branch
+  on that repo.
+
+  ~git diffs~ - Print diffs on all repos in current directory
+
+  ~git fetches~ - Run ~git fetch~ on all repos in current directory
+
+  ~git pulls~ - Pulls changes on all repos in current directory
+
+  ~git gems~ - Print names of repos that are ruby gem projects
+
+  ~git logf~ - Alias for ~git log --name-status --graph~
+
+  ~git rollback~ - Alias for ~git reset HEAD~1~
+
+  ~git save <name>~ - Alias for ~git stash save <name>~
+
+  ~git sstash <filename>~ - Stash a single file
+
+  ~git statuses~ - Print ~git status~ for each repo in directory
+
+  ~git versions ruby~ - Print version of ruby being used on each repo in the 
+  current directory containing ~.ruby-version~
+
+  More features documentation forthcoming! I whipped these up when working
+  on a project with at least 30 repositories that I found I needed an easier
+  way to manage. Much work is yet to be done, so please create an issue
+  for problems, suggestions, or feature requests. And of course, feel free
+  to contribute! Fork, play and create a pull request!
+
+* Install
+
+  ~gem install gitmore~
+
+

data/bin/console

@@ -10,5 +10,7 @@ require "gitmore"
 # require "pry"
 # Pry.start
 
+require 'byebug'
+
 require "irb"
 IRB.start(__FILE__)

data/exe/git-branches

@@ -2,7 +2,8 @@
 
 require 'gitmore'
 
-branch_matcher = ARGV[0]
+branch_string = ARGV[0]
 option = ARGV[1]
+matcher = Gitmore::Matcher.new(branch_string, option)
 
-Gitmore.branches(branch_matcher, option)
+matcher.branches

data/exe/git-checkouts

@@ -3,5 +3,6 @@
 require 'gitmore'
 
 branch_matcher = ARGV[0]
+matcher = Gitmore::Matcher.new(branch_string)
 
-Gitmore.checkouts(branch_matcher)
+matcher.checkouts

data/exe/git-diffs

@@ -2,4 +2,4 @@
 
 require 'gitmore'
 
-Gitmore.diffs
+Gitmore::Matcher.new.diffs

data/exe/git-fetches

@@ -2,4 +2,4 @@
 
 require 'gitmore'
 
-Gitmore.fetches
+Gitmore::Matcher.new.fetches

data/exe/git-gems

@@ -2,4 +2,4 @@
 
 require 'gitmore'
 
-Gitmore.gems
+Gitmore::Matcher.new.gems

data/exe/git-pulls

@@ -2,4 +2,4 @@
 
 require 'gitmore'
 
-Gitmore.pulls
+Gitmore::Matcher.new.pulls

data/exe/git-statuses

@@ -2,4 +2,4 @@
 
 require 'gitmore'
 
-Gitmore.statuses
+Gitmore::Matcher.new.statuses

data/exe/git-updates

@@ -0,0 +1,3 @@
+#!/usr/bin/ruby
+
+`git fetches && git pulls`

data/exe/git-versions

@@ -3,4 +3,4 @@
 require 'gitmore'
 
 language = ARGV[0]
-Gitmore.versions(language)
+Gitmore::Matcher.new.versions(language)

data/lib/gitmore.rb

@@ -1,49 +1,53 @@
 require 'gitmore/version'
-
-require 'helpers/branch_helper.rb'
-require 'helpers/ruby_helper.rb'
-require 'branch_matcher.rb'
-require 'statustician.rb'
+require 'gitmore/utils'
 
 module Gitmore
   class Error < StandardError; end
-  def self.branches(branch_string, option=nil)
-    repositories = Gitmore::BranchMatcher.new(branch_string, option)
-    repositories.branches
-  end
 
-  def self.checkouts(branch_string=nil)
-    repositories = Gitmore::BranchMatcher.new(branch_string)
-    repositories.checkout
-  end
+  class Matcher
+    attr_reader :branch_string, :option
 
-  def self.statuses(branch_string=nil)
-    repositories = Gitmore::BranchMatcher.new(branch_string)
-    repositories.status
-  end
+    def initialize(branch_string=nil, option=nil)
+      @branch_string = branch_string
+      @option = option
+    end
 
-  def self.diffs(branch_string=nil)
-    repositories = Gitmore::BranchMatcher.new(branch_string)
-    repositories.diffs
-  end
+    def branches
+      repositories.branches
+    end
 
-  def self.gems(branch_string=nil)
-    repositories = Gitmore::BranchMatcher.new(branch_string)
-    repositories.gems
-  end
+    def checkouts
+      repositories.checkout
+    end
 
-  def self.versions( language)
-    repositories = Gitmore::BranchMatcher.new
-    repositories.versions(language)
-  end
+    def statuses
+      repositories.status
+    end
 
-  def self.fetches
-    repositories = Gitmore::BranchMatcher.new
-    repositories.fetches
-  end
+    def diffs
+      repositories.diffs
+    end
+
+    def gems
+      repositories.gems
+    end
+
+    def versions(language)
+      repositories.versions(language)
+    end
+
+    def fetches
+      repositories.fetches
+    end
+
+    def pulls
+      repositories.pulls
+    end
+
+    private
 
-  def self.pulls
-    repositories = Gitmore::BranchMatcher.new
-    repositories.pulls
+    def repositories
+      Gitmore::Repositories.get_for(branch_string, option)
+    end
   end
 end

data/lib/gitmore/helpers.rb

@@ -0,0 +1,3 @@
+require_relative './helpers/branch_helper'
+require_relative './helpers/ruby_helper'
+

data/lib/{helpers → gitmore/helpers}/branch_helper.rb

@@ -6,9 +6,10 @@ module Gitmore
       !`git rev-parse --verify --quiet #{matcher}`.to_s.empty?
     end
 
-    def format_branch_info(repository, result)
+    def format_branch_info(repository, result, color=:on_green)
       return unless result
-      puts repository.colorize(:black).on_green
+      # puts repository.colorize(:black).on_green
+      puts repository.colorize(:black).send(color)
       puts puts result
     end
 

data/lib/gitmore/utils.rb

@@ -0,0 +1,6 @@
+require_relative './helpers'
+
+require_relative './utils/repositories'
+require_relative './utils/branches'
+require_relative './utils/statustician'
+require_relative './utils/branch_matcher'

data/lib/{branch_matcher.rb → gitmore/utils/branch_matcher.rb}

@@ -1,9 +1,3 @@
-require_relative 'helpers/branch_helper.rb'
-require_relative 'helpers/ruby_helper.rb'
-require_relative 'repositories.rb'
-require_relative 'branches.rb'
-require_relative 'statustician.rb'
-
 module Gitmore
   class BranchMatcher
     attr_accessor :matcher, :option, :repositories

data/lib/{branches.rb → gitmore/utils/branches.rb}

@@ -28,6 +28,14 @@ module Gitmore
         non_matching_repositories.each do  |name|
           puts name.colorize(:red)
         end
+
+        puts puts
+
+        non_matching_repositories.each do  |repository|
+          Dir.chdir(repository) do
+            format_branch_info(repository, `git branch --color`, :on_red)
+          end
+        end
       end
     end
 

data/lib/{repositories.rb → gitmore/utils/repositories.rb}

@@ -1,5 +1,9 @@
 module Gitmore
   module Repositories
+    def self.get_for(branch_string, option)
+      Gitmore::BranchMatcher.new(branch_string, option)
+    end
+
     def self.get
       directories.select { |dir| Dir.entries(dir).include?('.git') }
     end

data/lib/gitmore/version.rb

@@ -1,3 +1,3 @@
 module Gitmore
-  VERSION = '0.3.0-rc'
+  VERSION = '0.3.5-alpha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitmore
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.rc
+  version: 0.3.5.pre.alpha
 platform: ruby
 authors:
 - son1112
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ executables:
 - git-save
 - git-sstash
 - git-statuses
+- git-updates
 - git-versions
 extensions: []
 extra_rdoc_files: []
@@ -107,6 +108,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- README.org
 - Rakefile
 - bin/console
 - bin/setup
@@ -121,16 +123,19 @@ files:
 - exe/git-save
 - exe/git-sstash
 - exe/git-statuses
+- exe/git-updates
 - exe/git-versions
 - gitmore.gemspec
-- lib/branch_matcher.rb
-- lib/branches.rb
 - lib/gitmore.rb
+- lib/gitmore/helpers.rb
+- lib/gitmore/helpers/branch_helper.rb
+- lib/gitmore/helpers/ruby_helper.rb
+- lib/gitmore/utils.rb
+- lib/gitmore/utils/branch_matcher.rb
+- lib/gitmore/utils/branches.rb
+- lib/gitmore/utils/repositories.rb
+- lib/gitmore/utils/statustician.rb
 - lib/gitmore/version.rb
-- lib/helpers/branch_helper.rb
-- lib/helpers/ruby_helper.rb
-- lib/repositories.rb
-- lib/statustician.rb
 homepage: https://github.com/son1112/gitmore
 licenses:
 - MIT