Class: GitUp

Inherits:
Object
  • Object
show all
Defined in:
lib/git-up.rb,
lib/git-up/version.rb

Defined Under Namespace

Classes: GitError

Constant Summary collapse

VERSION = 
"0.5.11"

Instance Method Summary collapse

Instance Method Details

#branches ⇒ Object 



144
145
146
 
# File 'lib/git-up.rb', line 144

def branches
  @branches ||= repo.branches.select { |b| remote_map.has_key?(b.name) }.sort_by { |b| b.name }
end

#check_bundler ⇒ Object 



227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
 
# File 'lib/git-up.rb', line 227

def check_bundler
  return unless use_bundler?

  begin
    require 'bundler'
    ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile')
    Gem.loaded_specs.clear
    Bundler.setup
  rescue Bundler::GemNotFound, Bundler::GitError
    puts
    print 'Gems are missing. '.yellow

    if config("bundler.autoinstall") == 'true'
      puts "Running `bundle install`.".yellow
      system "bundle", "install"
    else
      puts "You should `bundle install`.".yellow
    end
  end
end

#checkout(branch_name) ⇒ Object 



202
203
204
205
206
207
208
 
# File 'lib/git-up.rb', line 202

def checkout(branch_name)
  output = repo.git.checkout({}, branch_name)

  unless on_branch?(branch_name)
    raise GitError.new("Failed to checkout #{branch_name}", output)
  end
end

#get_repo ⇒ Object 



133
134
135
136
137
138
139
140
141
142
 
# File 'lib/git-up.rb', line 133

def get_repo
  repo_dir = `git rev-parse --show-toplevel`.chomp

  if $? == 0
    Dir.chdir repo_dir
    @repo = Grit::Repo.new(repo_dir)
  else
    raise GitError, "We don't seem to be in a git repository."
  end
end

#is_fast_forward?(a, b) ⇒ Boolean

Returns:

  • (Boolean) 


248
249
250
 
# File 'lib/git-up.rb', line 248

def is_fast_forward?(a, b)
  merge_base(a.name, b.name) == b.commit.sha
end

#log(branch, remote) ⇒ Object 



210
211
212
213
214
 
# File 'lib/git-up.rb', line 210

def log(branch, remote)
  if log_hook = config("rebase.log-hook")
    system('sh', '-c', log_hook, 'git-up', branch.name, remote.name)
  end
end

#merge_base(a, b) ⇒ Object 



252
253
254
 
# File 'lib/git-up.rb', line 252

def merge_base(a, b)
  repo.git.send("merge-base", {}, a, b).strip
end

#on_branch?(branch_name = nil) ⇒ Boolean

Returns:

  • (Boolean) 


256
257
258
 
# File 'lib/git-up.rb', line 256

def on_branch?(branch_name=nil)
  repo.head.respond_to?(:name) and repo.head.name == branch_name
end

#process_args(argv) ⇒ Object 



33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
 
# File 'lib/git-up.rb', line 33

def process_args(argv)
  banner = <<BANNER
Fetch and rebase all remotely-tracked branches.

  $ git up
  master         #{"up to date".green}
  development    #{"rebasing...".yellow}
  staging        #{"fast-forwarding...".yellow}
  production     #{"up to date".green}

  $ git up --version    # print version info
  $ git up --help       # print this message

There are no interesting command-line options, but
there are a few `git config` variables you can set.
For info on those and more, check out the man page:

  $ git up man

Or install it to your system, so you can get to it with
`man git-up` or `git help up`:

  $ git up install-man

BANNER

  man_path = File.expand_path('../../man/git-up.1', __FILE__)

  case argv
  when []
    return
  when ["-v"], ["--version"]
    $stdout.puts "git-up #{GitUp::VERSION}"
    exit
  when ["man"]
    system "man", man_path
    exit
  when ["install-man"]
    destination = "/usr/local/share/man"
    print "Destination to install man page to [#{destination}]: "
    override = $stdin.gets.strip
    destination = override if override.length > 0

    dest_dir  = File.join(destination, "man1")
    dest_path = File.join(dest_dir, File.basename(man_path))

    exit(1) unless system "mkdir", "-p", dest_dir
    exit(1) unless system "cp", man_path, dest_path

    puts "Installed to #{dest_path}"

    exit
  when ["-h"], ["--help"]
    $stderr.puts(banner)
    exit
  else
    $stderr.puts(banner)
    exit 1
  end
end

#rebase(target_branch) ⇒ Object 



216
217
218
219
220
221
222
223
224
225
 
# File 'lib/git-up.rb', line 216

def rebase(target_branch)
  current_branch = repo.head
  arguments = config("rebase.arguments")

  output, err = repo.git.sh("#{Grit::Git.git_binary} rebase #{arguments} #{target_branch.name}")

  unless on_branch?(current_branch.name) and is_fast_forward?(current_branch, target_branch)
    raise GitError.new("Failed to rebase #{current_branch.name} onto #{target_branch.name}", output+err)
  end
end

#rebase_all_branches ⇒ Object 



94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
 
# File 'lib/git-up.rb', line 94

def rebase_all_branches
  col_width = branches.map { |b| b.name.length }.max + 1

  branches.each do |branch|
    remote = remote_map[branch.name]

    print branch.name.ljust(col_width)

    if remote.commit.sha == branch.commit.sha
      puts "up to date".green
      next
    end

    base = merge_base(branch.name, remote.name)

    if base == remote.commit.sha
      puts "ahead of upstream".green
      next
    end

    if base == branch.commit.sha
      puts "fast-forwarding...".yellow
    elsif config("rebase.auto") == 'false'
      puts "diverged".red
      next
    else
      puts "rebasing...".yellow
    end

    log(branch, remote)
    checkout(branch.name)
    rebase(remote)
  end
end

#remote_for_branch(branch) ⇒ Object 



162
163
164
165
166
167
 
# File 'lib/git-up.rb', line 162

def remote_for_branch(branch)
  remote_name   = repo.config["branch.#{branch.name}.remote"] || "origin"
  remote_branch = repo.config["branch.#{branch.name}.merge"] || branch.name
  remote_branch.sub!(%r{^refs/heads/}, '')
  repo.remotes.find { |r| r.name == "#{remote_name}/#{remote_branch}" }
end

#remote_map ⇒ Object 



152
153
154
155
156
157
158
159
160
 
# File 'lib/git-up.rb', line 152

def remote_map
  @remote_map ||= repo.branches.inject({}) { |map, branch|
    if remote = remote_for_branch(branch)
      map[branch.name] = remote
    end

    map
  }
end

#remotes ⇒ Object 



148
149
150
 
# File 'lib/git-up.rb', line 148

def remotes
  @remotes ||= remote_map.values.map { |r| r.name.split('/', 2).first }.uniq
end

#repo ⇒ Object 



129
130
131
 
# File 'lib/git-up.rb', line 129

def repo
  @repo ||= get_repo
end

#returning_to_current_branch ⇒ Object 



186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
 
# File 'lib/git-up.rb', line 186

def returning_to_current_branch
  unless repo.head.respond_to?(:name)
    puts "You're not currently on a branch. I'm exiting in case you're in the middle of something.".red
    return
  end

  branch_name = repo.head.name

  yield

  unless on_branch?(branch_name)
    puts "returning to #{branch_name}".magenta
    checkout(branch_name)
  end
end

#run(argv) ⇒ Object 



7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
 
# File 'lib/git-up.rb', line 7

def run(argv)
  process_args(argv)

  command = ['git', 'fetch', '--multiple']
  command << '--prune' if prune?
  command += config("fetch.all") ? ['--all'] : remotes

  # puts command.join(" ") # TODO: implement a 'debug' config option
  system(*command)
  raise GitError, "`git fetch` failed" unless $? == 0
  @remote_map = nil # flush cache after fetch

  Grit::Git.with_timeout(0) do
    with_stash do
      returning_to_current_branch do
        rebase_all_branches
      end
    end
  end

  check_bundler
rescue GitError => e
  puts e.message
  exit 1
end

#with_stash ⇒ Object 



169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
 
# File 'lib/git-up.rb', line 169

def with_stash
  stashed = false

  if change_count > 0
    puts "stashing #{change_count} changes".magenta
    repo.git.stash
    stashed = true
  end

  yield

  if stashed
    puts "unstashing".magenta
    repo.git.stash({}, "pop")
  end
end