give 0.1.2 → 0.2.0

data/README.md

@@ -10,13 +10,13 @@ You must have set your git username and api token, if you not please follow [the
 
 ### Usage
 
-You will need the name of the GitHub user, and the repository name for the project in question.  In this example we'll the give gem itself.
+You will need the name of the GitHub user, and the repository name for the project in question.  In this example we'll use the give gem itself.
 
 First up, fork the project and check out your new copy of the repo with the `give setup` command.
 
 	give setup seenmyfate give
 	
-Next, create a feature branch to work in.
+Next `cd` into your newly created git repo, and create a feature branch to work in.
 
 	give start feature/my_awesome_feature
 
@@ -24,6 +24,11 @@ Commit away as usual, but be sure to keep your feature branch up to date with an
 
 	give update feature/my_awesome_feature
 
+Give assumes you will be contributing to the 'master' branch of the project you have forked.  If this is not case, add the name of the branch as a second argument when updating
+
+  give update feature/my_awesome_feature develop
+
+
 When the work is complete, push up the branch and send a pull request with `give finish`
 
 	give finish seenmyfate give feature/my_awesome_feature

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/give.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "give"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["seenmyfate"]
-  s.date = "2011-12-31"
+  s.date = "2012-01-17"
   s.description = "The aim of Give is to make contributing to open source projects on Github just that bit easier, by wrapping some simple commands around a common workflow."
   s.email = "seenmyfate@gmail.com"
   s.executables = ["give"]

data/lib/give.rb

@@ -28,9 +28,10 @@ module Give
       Give::Repo.new(:branch => branch).checkout_branch
     end
 
-    desc "update BRANCH", "Updates your master branch with upstream changes, then rebases your working branch"
-    def update(branch)
-      Give::Repo.new(:branch => branch).update
+    desc "update BRANCH [UPSTREAM_BRANCH]", "Updates your master branch with upstream changes, then rebases your working branch.  Specify an upstream branch if you are using anything other than master"
+    def update(branch,upstream_branch=:master)
+      Give::Repo.new(:branch => branch,
+                     :upstream_branch => upstream_branch).update
     end
 
     desc "finish OWNER PROJECT BRANCH", "Pushes up your working branch, then submits a pull request."
@@ -145,9 +146,10 @@ module Give
   #
   class Repo
     include Commands
-    attr_accessor :branch
+    attr_accessor :branch, :upstream_branch
     def initialize(opts={})
-      @branch = opts.fetch(:branch, 'master')
+      @branch = opts.fetch(:branch, :master)
+      @upstream_branch = opts.fetch(:upstream_branch, :master)
     end
 
     def push
@@ -156,10 +158,10 @@ module Give
 
     def update
       git('fetch upstream')
-      git('checkout master')
-      git('pull upstream master')
+      git("checkout #{upstream_branch}")
+      git("pull upstream #{upstream_branch}")
       git("checkout #{branch}")
-      git('rebase master')
+      git("rebase #{upstream_branch}")
     end
 
     def checkout_branch

data/spec/give_spec.rb

@@ -1,9 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Give::CLI do
-  let(:owner)   { 'seenmyfate' }
+  let(:owner)   { 'github_user' }
   let(:project)   { 'give' }
   let(:branch) { 'feaature/my_awesome_feature' }
+  let(:upstream_branch) { 'upstream_branch' }
   let(:give)   { Give::CLI.new }
   let(:project)    { stub }
   let(:repo) { stub }
@@ -30,7 +31,7 @@ describe Give::CLI do
     it "updates" do
       Give::Repo.should_receive(:new).and_return(repo)
       repo.should_receive(:update)
-      subject.update(branch)
+      subject.update(branch, upstream_branch)
     end
   end
   
@@ -46,18 +47,20 @@ describe Give::CLI do
 end
 
 describe Give::Project do
-  let(:owner)    { 'seenmyfate' }
+  let(:owner)    { 'github_owner' }
   let(:title)    { 'give' }
-  let(:reference) { 'seenmyfate/give' }
+  let(:github_login) { 'github_user' }
+  let(:reference) { 'github_owner/give' }
   let(:request_title) { 'awesome feature' }
   let(:request_body) { 'is awesome' } 
   subject { Give::Project.new(owner, title) }
     
   before do
+    Give::User.any_instance.stub(:github_login).and_return github_login
     Give::Project.any_instance.stub(:request_body).and_return request_body
     Give::Project.any_instance.stub(:request_title).and_return request_title
   end
-  
+
   context "#new" do
 
     it "should have an owner" do
@@ -90,8 +93,8 @@ describe Give::Project do
   
     it "forks with octokit" do
       subject.client.should_receive(:fork!).with(subject.reference) 
-      subject.should_receive(:git).with('clone git@github.com:seenmyfate/give.git')
-      subject.should_receive(:sh).with('cd give;git remote add upstream git://github.com/seenmyfate/give.git')
+      subject.should_receive(:git).with('clone git@github.com:github_user/give.git')
+      subject.should_receive(:sh).with('cd give;git remote add upstream git://github.com/github_owner/give.git')
       subject.fork
     end
   end
@@ -100,7 +103,7 @@ describe Give::Project do
     let(:local_repo) { stub(:branch => 'my_awesome_feature') }
     let(:title) { 'title' }
     let(:body) { 'body' }
-    let(:local_ref) { 'seenmyfate:my_awesome_feature' }
+    let(:local_ref) { 'github_user:my_awesome_feature' }
     let(:target_branch) { 'master' }
 
     before do
@@ -152,13 +155,14 @@ end
 describe Give::Repo do
 
   let(:branch) { 'feature/my_awesome_feature' }
+  let(:upstream_branch) { 'upstream_branch' }
   context "#new" do
 
     context "without a branch" do
       subject { Give::Repo.new }
 
       it "has master as the branch" do
-        subject.branch.should eq 'master'
+        subject.branch.should eq :master
       end
     end
 
@@ -169,18 +173,35 @@ describe Give::Repo do
         subject.branch.should eq branch
       end
     end
+    
+    context "with an upstream branch" do
+
+      subject { Give::Repo.new(:upstream_branch => upstream_branch) }
 
+      it "has the upstream branch" do
+        subject.upstream_branch.should eq upstream_branch
+      end
+    end
   end
 
-  context "#update" do
+  context "without an upstream branch" do
+
     subject { Give::Repo.new(:branch => branch) }
+
+    it "has the upstream as master" do
+      subject.upstream_branch.should eq :master
+    end
+  end
+
+  context "#update" do
+    subject { Give::Repo.new(:branch => branch, :upstream_branch => upstream_branch) }
    
     it "updates the branch" do
       subject.should_receive(:git).with('fetch upstream')
-      subject.should_receive(:git).with('checkout master') 
-      subject.should_receive(:git).with('pull upstream master') 
+      subject.should_receive(:git).with('checkout upstream_branch') 
+      subject.should_receive(:git).with('pull upstream upstream_branch') 
       subject.should_receive(:git).with("checkout #{branch}") 
-      subject.should_receive(:git).with('rebase master') 
+      subject.should_receive(:git).with('rebase upstream_branch') 
       subject.update
     end
   end

metadata

@@ -1,170 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: give
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - seenmyfate
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2012-01-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
+  requirement: &70149714051280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70149714051280
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: &70149714050340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.5.1
-  version_requirements: *id002
-  name: octokit
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
-  name: highline
   prerelease: false
+  version_requirements: *70149714050340
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70149714049480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70149714049480
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70149714048380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.7.0
-  version_requirements: *id004
-  name: rspec
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70149714048380
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70149714070680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  version_requirements: *id005
-  name: yard
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70149714070680
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70149714068840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id006
-  name: bundler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70149714068840
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70149714068000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  version_requirements: *id007
-  name: jeweler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
-  name: rcov
   prerelease: false
+  version_requirements: *70149714068000
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70149714067180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70149714067180
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: &70149714065960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 2
-        - 8
+      - !ruby/object:Gem::Version
         version: 1.2.8
-  version_requirements: *id009
-  name: reek
-  prerelease: false
   type: :development
-description: The aim of Give is to make contributing to open source projects on Github just that bit easier, by wrapping some simple commands around a common workflow.
+  prerelease: false
+  version_requirements: *70149714065960
+description: The aim of Give is to make contributing to open source projects on Github
+  just that bit easier, by wrapping some simple commands around a common workflow.
 email: seenmyfate@gmail.com
-executables: 
+executables:
 - give
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rspec
 - .rvmrc
@@ -183,37 +138,31 @@ files:
 - spec/reek_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/seenmyfate/give
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -659059737953798153
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Makes contributing to open source projects on Github just that bit easier
 test_files: []
-