[#20]For the new auto dependency stuff, make sure we skip system gems

iron-io · Jan 20, 2012 · a72f904 · a72f904
1 parent e813f21
commit a72f904
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/iron_worker/config.rb b/lib/iron_worker/config.rb
@@ -31,6 +31,9 @@ class Config
                   :force_upload,
                   :beta # for setting beta feature flags
 
+    def self.system_gems
+       ['bson_ext','curb','em-http-request','eventmachine','mysql2','net-scp','net-sftp','net-ssh','nokogiri','rmagick','sqlite3','typhoeus']
+    end
 
     def initialize
       @global_attributes = {}

diff --git a/lib/iron_worker/service.rb b/lib/iron_worker/service.rb
@@ -125,7 +125,7 @@ def gem_dependencies(list_of_gems)
       Gem::Specification.all.collect { |s| index<<s }
       list = Bundler::Resolver.resolve(filtered_deps, index)
       list.each do |gemspec|
-        next if list_of_gems.keys.include?(gemspec.name)
+        next if list_of_gems.keys.include?(gemspec.name) || Config.system_gems.include?(gemspec.name)
         gi = IronWorker::MergeHelper.create_gem_info(gemspec.name, gemspec.version.version)
         dependendent_gems[gemspec.name] = gi
       end