gitcycle 0.1.18 → 0.1.19

data/README.md

@@ -23,7 +23,7 @@ Type `gitc` + your ticket URL to create a new branch:
 Pull Changes from Upstream
 --------------------------
 
-When you're developing, you may need to pull new changes from the upstream branch that you will eventually merge your feature into:
+When you're developing, you may need to pull new changes from an upstream branch:
 
 	gitc pull
 
@@ -124,4 +124,4 @@ Todo
 * Instead of detecting CONFLICT, use error status $? != 0
 * Label issues with ticket milestone?
 * gitc LH-ticket should not created a redis record right away, what happens if someone control-c
-* gitc -h or gitc help
+* gitc -h or gitc help

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.1.18'
+  s.version     = '0.1.19'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -126,9 +126,11 @@ class Gitcycle
   def pull
     require_git && require_config
 
+    current_branch = branches(:current => true)
+
     puts "\nRetrieving branch information from gitcycle.\n".green
     branch = get('branch',
-      'branch[name]' => branches(:current => true),
+      'branch[name]' => current_branch,
       'include' => [ 'repo' ],
       'create' => 0
     )
@@ -140,7 +142,13 @@ class Gitcycle
         :branch => branch['source']
       )
     else
-      puts "Branch not found.\n".red
+      puts "\nRetrieving repo information from gitcycle.".green
+      repo = get('repo')
+
+      add_remote_and_fetch(:owner => repo['owner'], :repo => repo['name'])
+
+      puts "\nPulling '#{repo['owner']}/#{current_branch}'.\n".green
+      run("git pull #{repo['owner']} #{current_branch}")
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 1
-  - 18
-  version: 0.1.18
+  - 19
+  version: 0.1.19
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 -08:00
+date: 2012-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency