gitup 0.0.1 → 0.0.2

data/README.markdown

@@ -0,0 +1,49 @@
+# Gitup
+
+We want our team members to be working in their own branches locally and
+push to origin/master every once in a while. Gitup is a tool to make that
+easier and avoid a lot of unnecessary conflicts during that time.
+
+This gem is developed for use on Mac OS X, but should work on any *nix type system.
+There is a port for Windows using Python developed by [eriik](https://github.com/eriik/gitup-py)
+
+## Installation
+
+	sudo gem install gitup
+
+in your console should do it. You need git installed locally 
+and added to your path (which you probably already have).
+
+
+## Usage
+
+The gem has two basic functions, 'gitup' and 'gitdown'. Both should be added automatically to your path
+when you install the gem.
+
+Let's say you clone a new project in Git:
+
+	git clone git@example.com:repository.git
+
+Then you check out your local branch, since working directly in the
+master branch usually gives you a lot of conflicts if you are
+more than one working on the project:
+
+	git checkout -b new_feature
+
+Now whenever you need to update your branch from the origin/master repository
+you could just run the following command:
+
+	gitdown
+
+Or when you want to push your changes to the server:
+
+	gitup
+
+Easy enough?
+
+## Copyright
+
+This was developed by David Svensson of [Standout solutions](http://standout.se/ "Ruby on Rails developers in Växjö, Sweden") and
+you could use it in any way you wish. A link to our webpage or a reference to who created it would be appreciated, though. 
+Happy gitup-ing! :)
+

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/gitup.gemspec

@@ -5,24 +5,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gitup}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Svensson"]
-  s.date = %q{2010-11-30}
+  s.date = %q{2010-12-04}
   s.description = %q{Easily push and pull from remote repositories without running into conflicts.}
   s.email = %q{david@standout.se}
   s.executables = ["gitdown", "gitup"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.markdown"
   ]
   s.files = [
     ".document",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.markdown",
     "Rakefile",
     "VERSION",
     "bin/gitdown",

data/lib/gitup.rb

@@ -66,11 +66,17 @@ class Gitup
   
   def self.run_gitup_commands(branch)
     puts "Branch: #{branch}"
-    system "git checkout master"
-    system "git merge #{branch}"
+    unless branch == 'master'
+      system "git checkout master"
+      system "git merge #{branch}"
+    end
     system "git push origin master"
-    system "git checkout #{branch}"
-    system "git rebase master"
+    unless branch == 'master'
+      system "git checkout #{branch}"
+      system "git rebase master"
+    else
+      puts "You should really consider doing development locally in a branch that is not the master branch."
+    end
   end
   
   def self.run_gitdown_commands(branch)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitup
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Svensson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 +01:00
+date: 2010-12-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,13 +87,13 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
-- README.rdoc
+- README.markdown
 files: 
 - .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.markdown
 - Rakefile
 - VERSION
 - bin/gitdown

data/README.rdoc

@@ -1,32 +0,0 @@
-= Gitup
-
-We want our team members to be working in their own branches locally and
-push to origin/master every once in a while. Gitup is a tool to make that
-easier and avoid a lot of unnecessary conflicts during that time.
-
-== Installation
-
-'sudo gem install gitup' in your console should do it. You need git installed locally 
-and added to your path (which you probably already have).
-
-== Usage
-
-gitup to sync your changes upstream to master repository
-gitdown to get changes from 
-
-
-== Contributing to gitup
- 
-* 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
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* 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
-
-Copyright (c) 2010 David Svensson. See LICENSE.txt for
-further details.
-