git-up 0.5.4 → 0.5.5

data/lib/git-up.rb

@@ -100,9 +100,6 @@ class GitUp
   def with_stash
     stashed = false
 
-    status = repo.status
-    change_count = status.added.length + status.changed.length + status.deleted.length
-
     if change_count > 0
       puts "stashing #{change_count} changes".magenta
       repo.git.stash
@@ -244,6 +241,19 @@ EOS
     end
   end
 
+  def change_count
+    @change_count ||= begin
+      diff_status   = repo.status
+      actual_status = repo.git.status(:porcelain => true).split("\n").map {|l| l[3..-1]}
+    
+      added         = diff_status.added.select { |(x,y)| actual_status.include? x }
+      changed       = diff_status.changed.select { |(x,y)| actual_status.include? x }
+      deleted       = diff_status.deleted.select { |(x,y)| actual_status.include? x }
+    
+      added.length + changed.length + deleted.length
+    end
+  end
+
   def config(key)
     repo.config["git-up.#{key}"]
   end

data/lib/git-up/version.rb

@@ -1,3 +1,3 @@
 class GitUp
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-up
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &70134838021440 !ruby/object:Gem::Requirement
+  requirement: &70332208938180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134838021440
+  version_requirements: *70332208938180
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70134838020640 !ruby/object:Gem::Requirement
+  requirement: &70332208937240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70134838020640
+  version_requirements: *70332208937240
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70134838019620 !ruby/object:Gem::Requirement
+  requirement: &70332208936000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +46,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134838019620
+  version_requirements: *70332208936000
 description: 
 email:
 - aanand.prasad@gmail.com