src 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa034574b19a8beace39413a4022a28b38af997
-  data.tar.gz: f765c1e1ba1e83d16385b85408de5546b52285a0
+  metadata.gz: cbded57c54e70ec9ff4b05f74162cb27aaaf66aa
+  data.tar.gz: 0a073d23861b202d1609731fc79bf09d6d7cc1a6
 SHA512:
-  metadata.gz: d3ec821745c6461df5cbe1337b959e5cb7f1443a171e57f1fae277b19b31e0fca8cd162efe8c3cc01a7a268183484aa6c2b1562372cfc29eea1ece4ee684166b
-  data.tar.gz: c7d9c46d14e92a6942df657af4a61dc2df8ef88fee14f97d097be2a9fb071b36a652519a5cab7716ac844570e7956157800ad4b8571f47acb18d33f461369365
+  metadata.gz: 5852bfdb8dcf4275db417726b1ab74c37fabc4daa6f1cdb96250b9f25a20b92797e3b9bd432ebaa42e97234c67c9b67be166d7881c95f87f8537411a62815113
+  data.tar.gz: 241bb57f0282271f2a3e47201a798d9e347484734f730d8120619365c4889e8605072671bb00648fb360bf3bce964896bd47898f387d31808c7d1d589d43d70d

data/lib/src/git/branch.rb

@@ -2,6 +2,10 @@ module SRC::Git
   class Branch
     VERSION_FILE = 'version'
 
+    AHEAD    = /# Your branch is ahead/
+    BEHIND   = /# Your branch is behind/
+    DIVERGED = /# Your branch and .* have diverged/
+
     attr_reader :name
 
     class << self
@@ -91,6 +95,28 @@ module SRC::Git
       end
     end
 
+    def status
+      checked_out do
+        `git status -uno`.chomp
+      end
+    end
+
+    def remote_ahead?
+      status =~ AHEAD
+    end
+
+    def remote_behind?
+      status =~ BEHIND
+    end
+
+    def remote_diverged?
+      status =~ DIVERGED
+    end
+
+    def remote_up_to_date?
+      !(remote_diverged? || remote_behind? || remote_ahead?)
+    end
+
     def to_s
       name
     end

data/lib/src/git.rb

@@ -1,5 +1,7 @@
-module SRC::Git
-  def self.fetch
-    raise 'fetch failed' unless system('git fetch -q')
+module SRC
+  module Git
+    def self.fetch
+      raise 'fetch failed' unless system('git fetch -q')
+    end
   end
 end

data/lib/src.rb

@@ -1,3 +1,5 @@
+require 'src/git'
+
 module SRC
   BRANCHES = {
     master: nil,
@@ -17,13 +19,21 @@ module SRC
   }
 
   def self.check
+    SRC::Git.fetch
+
     report = []
+
     branches.each_with_index do |branch, i|
+
       branches[(i + 1)..-1].each do |superset|
         unless branch.subset_of?(superset)
           report << "#{branch} should be merged into #{superset}"
         end
       end
+
+      unless branch.remote_up_to_date?
+        report << "#{branch} is not up to date with its remote"
+      end
     end
 
     if report.empty?

data/version

@@ -1 +1 @@
-0.4.0
+0.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: src
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tyler Hartland