github 0.1.0 → 0.1.1

data/README

@@ -12,12 +12,37 @@ Getting started
   $ gem install github
 
 Run it:
+
   $ github <command> <args>
 
 
-===========
+=============
+Pulling Changes
+=============
+
+Let's say you just forked `github-gem` on GitHub from defunkt.
+
+  $ git clone git://github.com/YOU/github-gem.git
+  $ cd github-gem
+  $ github pull defunkt
+
+This will setup a remote and branch for defunkt's repository at master. 
+In this case, a 'defunkt/master' branch.
+
+If defunkt makes some changes you want, simply `github pull defunkt`.  This will
+leave you in the 'defunkt/master' branch after pulling changes from defunkt's
+remote.  After confirming that defunkt's changes were what you wanted, run `git
+checkout master` and then `git merge defunkt/master` to merge defunkt's changes
+into your own master branch.  In summary:
+
+  $ github pull defunkt
+  $ git checkout master
+  $ git merge defunkt/master
+
+
+==========
 Contributors
-===========
+==========
 
 - defunkt
 - maddox

data/commands/commands.rb

@@ -35,7 +35,7 @@ GitHub.register :track do |user|
   git "remote add #{user} #{helper.public_url_for(user)}"
 end
 
-GitHub.describe :pull => 'Pull from a remote.'
+GitHub.describe :pull => "Pull from a remote.  Pass --merge to automatically merge remote's changes into your master."
 GitHub.register :pull do |user, branch|
   die "Specify a user to pull from" if user.nil?
   GitHub.invoke(:track, user) unless helper.tracking?(user)
@@ -43,5 +43,12 @@ GitHub.register :pull do |user, branch|
 
   puts "Switching to #{user}/#{branch}"
   git "checkout #{user}/#{branch}" if git("checkout -b #{user}/#{branch}").error? 
-  git_exec "pull #{user} #{branch}"
+  
+  if options[:merge]
+    git "pull #{user} #{branch}"
+    git "checkout master"
+    git_exec "merge #{user}/#{branch}"
+  else
+    git_exec "pull #{user} #{branch}"
+  end
 end

data/github.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Github-0.1.0
+# Gem::Specification for Github-0.1.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{github}
-  s.version = "0.1.0"
-  s.date = %q{2008-03-03}
+  s.version = "0.1.1"
+  s.date = %q{2008-03-26}
   s.summary = %q{The official `github` command line helper for simplifying your GitHub experience.}
   s.email = %q{chris@ozmm.org}
   s.homepage = %q{http://github.com/}
@@ -27,7 +27,7 @@ end
 # begin
 #   require 'echoe'
 # 
-#   Echoe.new('github', '0.1.0') do |p|
+#   Echoe.new('github', '0.1.1') do |p|
 #     p.rubyforge_name = 'github'
 #     p.summary      = "The official `github` command line helper for simplifying your GitHub experience."
 #     p.description  = "The official `github` command line helper for simplifying your GitHub experience."

data/lib/github.rb

@@ -35,7 +35,7 @@ module GitHub
   end
 
   def activate(args)
-    @debug = args.delete('--debug')
+    @options = parse_options(args)
     load 'helpers.rb'
     load 'commands.rb'
     invoke(args.shift, *args)
@@ -55,6 +55,25 @@ module GitHub
     @descriptions ||= {}
   end
 
+  def options
+    @options
+  end
+
+  def parse_options(args)
+    @debug = args.delete('--debug')
+    args.inject({}) do |memo, arg|
+      if arg =~ /^--([^=]+)=(.+)/
+        args.delete(arg)
+        memo.merge($1.to_sym => $2)
+      elsif arg =~ /^--(.+)/
+        args.delete(arg)
+        memo.merge($1.to_sym => true)
+      else
+        memo
+      end
+    end
+  end
+
   def load(file)
     file[0] == ?/ ? super : super(BasePath + "/commands/#{file}")
   end

data/lib/github/command.rb

@@ -16,6 +16,10 @@ module GitHub
       @helper ||= Helper.new
     end
 
+    def options
+      GitHub.options
+    end
+
     def pgit(*command)
       puts git(*command)
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: github
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2008-03-03 00:00:00 -08:00
+  version: 0.1.1
+date: 2008-03-26 00:00:00 -04:00
 summary: The official `github` command line helper for simplifying your GitHub experience.
 require_paths: 
 - lib