gitup 0.0.2 → 0.0.3

data/gitup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gitup}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Svensson"]
-  s.date = %q{2010-12-04}
+  s.date = %q{2010-12-05}
   s.description = %q{Easily push and pull from remote repositories without running into conflicts.}
   s.email = %q{david@standout.se}
   s.executables = ["gitdown", "gitup"]

data/lib/gitup.rb

@@ -6,6 +6,7 @@ class Gitup
       puts "You are on the master branch. Gitdown is intended to be used in local branches."
       puts "git checkout -b yournewbranch to create a new local branch"
       puts "or git checkout yourexistingbranch to checkout an existing one."
+      system "git pull origin master"
       exit
     end
     
@@ -34,14 +35,23 @@ class Gitup
     
     unless everything_commited?
       system "git status"
-      raise "Hold your horses! You must commit your changes first."
+      puts "Warning: You have uncommitted changes. Continue? (y/n)"
+      input = gets.chomp
+      
+      if input.downcase == 'y'
+        # Stash the changes, do the push and then apply our stash
+        system "git stash"
+        self.run_gitup_commands(current_branch)      
+        system "git stash apply"
+      else
+        puts 'Good girl.'
+        exit
+      end
+    else
+      # Push it!
+      self.run_gitup_commands(current_branch)      
+      exit
     end
-    
-    # Push it!
-    self.run_gitup_commands(current_branch)
-    
-    puts "Finished."
-    exit
   end
   
   def self.on_master?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitup
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Svensson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 +01:00
+date: 2010-12-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency