iron_worker_ng 0.12.1 → 0.12.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -36,17 +36,27 @@ module IronWorkerNG
36
36
  if @spec.extensions.length == 0 || IronWorkerNG::Feature::Ruby::MergeGem.merge_binary?
37
37
  IronCore::Logger.debug 'IronWorkerNG', "Bundling ruby gem with name='#{@spec.name}' and version='#{@spec.version}'"
38
38
 
39
+ full_gem_path = @spec.full_gem_path
40
+ loaded_from = @spec.loaded_from
41
+
42
+ # yet another bundler fix
43
+
44
+ if loaded_from.end_with?("/gems/bundler-#{@spec.version}/lib/bundler")
45
+ full_gem_path = gem_path
46
+ loaded_from = loaded_from.gsub("/gems/bundler-#{@spec.version}/lib/bundler", "/specifications/bundler-#{@spec.version}.gemspec")
47
+ end
48
+
39
49
  if File.exists?(@spec.full_gem_path)
40
50
  container_add(container, '__gems__/gems/' + @spec.full_name, gem_path)
41
51
  else
42
- from_dir = File.dirname(@spec.loaded_from)
52
+ from_dir = File.dirname(loaded_from)
43
53
 
44
54
  @spec.files.each do |fname|
45
55
  container_add(container, '__gems__/gems/' + @spec.full_name + '/' + fname, from_dir + '/' + fname) if File.file?(from_dir + '/' + fname)
46
56
  end
47
57
  end
48
58
 
49
- container_add(container, "__gems__/specifications/#{@spec.full_name}.gemspec", @spec.loaded_from)
59
+ container_add(container, "__gems__/specifications/#{@spec.full_name}.gemspec", loaded_from)
50
60
  else
51
61
  IronCore::Logger.warn 'IronWorkerNG', "Skipping ruby gem with name='#{@spec.name}' and version='#{@spec.version}' as it contains native extensions, switching to full remote build should fix this"
52
62
  end
@@ -1,5 +1,5 @@
1
1
  module IronWorkerNG
2
- VERSION = '0.12.1'
2
+ VERSION = '0.12.2'
3
3
 
4
4
  def self.version
5
5
  VERSION
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: iron_worker_ng
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.1
4
+ version: 0.12.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-10-29 00:00:00.000000000 Z
13
+ date: 2012-11-01 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: iron_core