git_fetcher 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmZlNDQ3YzUzOGQzMzBlNTU4ZGRlYjMyZWY5NjYxMTJlZGM1MTEwOA==
+    MmEyYjQ5ODRhMzk3NWE1ZjVmYjUxZTNmZTJmMmIwNDU3YjE1MDM3Yg==
   data.tar.gz: !binary |-
-    YTUwNzEzMmY5ZWVkN2FhMmRiMTI3YzgyNjBkNjY4MTM3OTY5YjVlNA==
+    ZjdmNzIxYTlkZWI3ODcwZTI3YjllNzUxMjUzYjdjOTI4NmY3ODNhNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGE0ZWZlY2NkZWIwNWE3ODAwZDdkNzU1ZGM4ZWVhZjY4ODg2NzhkMjBjYzE4
-    YTdjYTkwZGMzMTdlYTZiYjVlYjBkNTdlZWJjMGI1MjQ4NjllYWFiMmI0NGJl
-    ZjVjNGIwY2ZiNDM1MzEwYTY4ZTVmZTQ5Yjk5ZWQxYmJkZTRmNTY=
+    Y2Y3ZDEyNDE4MGUyZDFmZDkzNzkwZmFhMDlhNjQxMDQ0ZDM1MjA2ZTQ3NjNk
+    YjRiMmNhZmM2YTIwZDk0ZmQ2NjM5OWFmZGRjODIxNTllNWIzYzEyNjAyNjdh
+    NmZjYWMzYzY3MDUyODZjNThjMGNhNGZjNGYyNGRiZWVhMTQzMTM=
   data.tar.gz: !binary |-
-    NGQxMmFhZDJlZDRkN2Y3ODZmM2Q4MWIzZjRiMDRlZTBkYTA5NzNjMjUxMzA1
-    NmUxZWQ0M2FlOGU2MDdlNzJjMjEzZmM0MDZmYmJmNTgwYjU1YjlhYmNmNjVm
-    YWJmZDcxMDkxYTZkOGY5ODZlYTNiNzUxZDA1YTFhOGMwMGNjMTA=
+    OGE1Mjk5NTNkOGFjNmY0M2Y5NmZiYTMyOGZkNjZiOTdmMzkxZTEyZTZjMWZk
+    Yjk4YTIxNjU5MWU3ZjQyYzhmOGU0Mzc1YmJhOWIyY2VjOGY2MDZlN2ZkNjAw
+    MmRlOWJmOTFhODQ4OWI1MTJlYzdlYmRiMmVhNDM2MWIyNzEzZTc=

data/README.md

@@ -1,18 +1,20 @@
-= git_fetcher
+# git_fetcher
 
   [http://blog.yurikoval.com/git_fetcher](http://blog.yurikoval.com/git_fetcher)
 
-== Installation
+  [![Gem Version](https://badge.fury.io/rb/git_fetcher.png)](http://badge.fury.io/rb/git_fetcher)
+
+## Installation
 
     gem install git_fetcher
 
-== Usage
+## Usage
 
     git-fetcher /path/to/your/development/directory
 
 This will fetch from all remote sources for git repos in that directory. Essentially the same as going into every directory and running `git remote update` or `git fetch --all`.
 
-== Contributing to git_fetcher
+## Contributing to git_fetcher
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
@@ -22,6 +24,6 @@ This will fetch from all remote sources for git repos in that directory. Essenti
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## License
 
-Copyright (c) 2013 Yuri Kovalov. MIT License
+MIT

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://blog.yurikoval.com/git_fetcher"
   gem.license = "MIT"
   gem.summary = %Q{Run git fetch on all your projects.}
-  gem.description = %Q{Crawl and find git repos in your directory and perform a fetch on all remote sources.}
+  gem.description = %Q{Perform git fetch on all remote sources in multiple git repos.}
   gem.email = "yuri@yurikoval.com"
   gem.authors = ["Yuri Kovalov"]
   gem.require_paths = ["lib"]

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/git_fetcher.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "git_fetcher"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Kovalov"]
-  s.date = "2013-11-13"
-  s.description = "Crawl and find git repos in your directory and perform a fetch on all remote sources."
+  s.date = "2013-11-14"
+  s.description = "Perform git fetch on all remote sources in multiple git repos."
   s.email = "yuri@yurikoval.com"
   s.executables = ["git-fetcher"]
   s.extra_rdoc_files = [

data/lib/git_fetcher/runner.rb

@@ -1,10 +1,13 @@
 module GitFetcher
   module Runner
     def self.execute(cmd_arg = '.', *args)
-      if cmd_arg.match /^\-+h/
+      case cmd_arg
+      when /^\-+h/
         send('help', *args)
+      when /^\-+p/
+        send('fetch', true, *args)
       else
-        send('fetch', cmd_arg)
+        send('fetch', false, cmd_arg)
       end
     end
 
@@ -13,7 +16,13 @@ module GitFetcher
       $?.exitstatus == 0
     end
 
-    def self.fetch(*args)
+    def self.current_branch_name
+      branch_name = %x[git symbolic-ref -q HEAD].chomp
+      branch_name.slice!("refs/heads/")
+      branch_name
+    end
+
+    def self.fetch(perform_stash_rebase = false, *args)
       dir_to_scan = if args[0]
         if args[0] !~ /^\//
           File.join(Dir.pwd, args[0])
@@ -26,12 +35,51 @@ module GitFetcher
 
       repos = Dir.entries(dir_to_scan).select {|f| File.directory?(File.join(dir_to_scan, f)) && !f.match(/^\.+$/) }
 
+      failed_rebase_repos = []
+      failed_stash_pop_repos = []
       repos.each do |d|
         repo_to_update = File.join(dir_to_scan, d)
         Dir.chdir repo_to_update
         if is_git_repo
-          puts "Updating #{d}."
+          puts perform_stash_rebase ? "Updating #{d} and performing stash + pull/rebase on #{current_branch_name}." : "Updating #{d}."
           %x[git remote update]
+          if perform_stash_rebase
+            %x[git diff --exit-code]
+            has_diff = $?.exitstatus != 0
+
+            %x[git diff --exit-code]
+            has_diff_cached = $?.exitstatus != 0
+
+            %x[git stash 2>&1] if (has_diff || has_diff_cached)
+            %x[git pull --rebase 2>&1]
+            if $?.exitstatus == 0
+              if (has_diff || has_diff_cached)
+                %x[git stash pop 2>&1]
+                unless $?.exitstatus == 0
+                  failed_stash_pop_repos << [d, current_branch_name]
+                  puts "Failed to stash pop #{d} on #{current_branch_name}."
+                end
+              end
+            else
+              failed_rebase_repos << [d, current_branch_name]
+              puts "Failed to rebase #{d} on #{current_branch_name}."
+            end
+          end
+        end
+      end
+
+      if perform_stash_rebase && failed_rebase_repos.any?
+        puts ""
+        puts "Failed to rebase:"
+        failed_rebase_repos.each do |repo|
+          puts "  #{repo[0]} on #{repo[1]}"
+        end
+      end
+      if perform_stash_rebase && failed_stash_pop_repos.any?
+        puts ""
+        puts "Failed to stash pop:"
+        failed_stash_pop_repos.each do |repo|
+          puts "  #{repo[0]} on #{repo[1]}"
         end
       end
     end
@@ -41,9 +89,13 @@ module GitFetcher
 git-fetcher #{VERSION} is installed.
 
   Usage:
-          git-fetcher [DIRECTORY]
+          git-fetcher [OPTION] [DIRECTORY]
 
 git-fetcher will crawl through your directory and find any repos and perform a fetch on all remote sources.
+
+    -h    Display this help.
+    -p    Perform `git stash` followed by `git pull --rebase` with `git stash pop` after updating all remote sources.
+
       HELP
     end
   end

data/lib/git_fetcher/version.rb

@@ -1,3 +1,3 @@
 module GitFetcher
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuri Kovalov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -66,8 +66,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.7
-description: Crawl and find git repos in your directory and perform a fetch on all
-  remote sources.
+description: Perform git fetch on all remote sources in multiple git repos.
 email: yuri@yurikoval.com
 executables:
 - git-fetcher