right_scraper 1.0.22 → 1.0.23

Sign up to get free protection for your applications and to get access to all the features.
@@ -32,7 +32,10 @@ module RightScale
32
32
  # incremental updates
33
33
  # false:: Otherwise
34
34
  def incremental_update?
35
- return false unless File.directory?(@current_repo_dir)
35
+ # FIX: current version of msysgit crashes attempting "git pull" on 64-bit
36
+ # servers. we will avoid incremental for now in hopes of getting a fix for
37
+ # msysgit or else a native Windows implementation such as Git#
38
+ return false if (is_windows? || !File.directory?(@current_repo_dir))
36
39
  Dir.chdir(@current_repo_dir) do
37
40
  remote_url = `git config --get remote.origin.url`.chomp
38
41
  $?.success? && remote_url == @repo.url
@@ -146,7 +149,7 @@ module RightScale
146
149
  # === Return
147
150
  # ssh(String):: Code to initialize GIT_SSH environment variable with path to SSH wrapper script
148
151
  def ssh_command
149
- return win32_ssh_command if RUBY_PLATFORM=~/mswin/
152
+ return win32_ssh_command if is_windows?
150
153
  ssh_dir = File.join(@scrape_dir_path, '.ssh')
151
154
  FileUtils.mkdir_p(ssh_dir)
152
155
  key_content = @repo.first_credential
@@ -261,5 +264,15 @@ module RightScale
261
264
  res = { :tag => is_tag, :branch => is_branch, :on_branch => on_branch }
262
265
  end
263
266
 
267
+ private
268
+
269
+ # Check for windows.
270
+ #
271
+ # === Return
272
+ #
273
+ def is_windows?
274
+ return !!(RUBY_PLATFORM =~ /mswin/)
275
+ end
276
+
264
277
  end
265
278
  end
@@ -23,7 +23,7 @@ require 'rubygems'
23
23
 
24
24
  spec = Gem::Specification.new do |spec|
25
25
  spec.name = 'right_scraper'
26
- spec.version = '1.0.22'
26
+ spec.version = '1.0.23'
27
27
  spec.authors = ['Raphael Simon']
28
28
  spec.email = 'raphael@rightscale.com'
29
29
  spec.homepage = 'https://github.com/rightscale/right_scraper'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: right_scraper
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.22
4
+ version: 1.0.23
5
5
  platform: ruby
6
6
  authors:
7
7
  - Raphael Simon
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2010-07-20 00:00:00 -07:00
12
+ date: 2010-08-02 00:00:00 -07:00
13
13
  default_executable:
14
14
  dependencies: []
15
15