lib/negroku/config.rb in negroku-2.7.0 vs lib/negroku/config.rb in negroku-2.7.1

- old
+ new

@@ -11,58 +11,58 @@ end class Negroku::ConfigFactory include Virtus.model - def self.loaded_in_bundler(name) - Bundler.locked_gems.specs.any? {|a| a.name == name} + def self.loaded_in_bundler(*names) + Bundler.locked_gems.dependencies.any? { |a| names.include?(a.name) } end attribute :bower, Negroku::Feature, default: { - name: "bower", enabled: File.exists?('bower.json') + name: 'bower', enabled: File.exist?('bower.json') } attribute :bundler, Negroku::Feature, default: { - name: "bundler", enabled: File.exists?('Gemfile') + name: 'bundler', enabled: File.exist?('Gemfile') } attribute :delayed_job, Negroku::Feature, default: { - name: "delayed_job", enabled: loaded_in_bundler('delayed_job') + name: 'delayed_job', + enabled: loaded_in_bundler('delayed_job', 'delayed_job_active_record') } attribute :nginx, Negroku::Feature, default: { - name: "nginx", enabled: true, required: true + name: 'nginx', enabled: true, required: true } attribute :nodenv, Negroku::Feature, default: { - name: "nodenv", enabled: true, required: true + name: 'nodenv', enabled: true, required: true } attribute :rails, Negroku::Feature, default: { - name: "rails", enabled: loaded_in_bundler('rails') + name: 'rails', enabled: loaded_in_bundler('rails') } attribute :rbenv, Negroku::Feature, default: { - name: "rbenv", enabled: true, required: true + name: 'rbenv', enabled: true, required: true } attribute :sphinx, Negroku::Feature, default: { - name: "sphinx", enabled: loaded_in_bundler('thinking-sphinx') + name: 'sphinx', enabled: loaded_in_bundler('thinking-sphinx') } attribute :unicorn, Negroku::Feature, default: { - name: "unicorn", enabled: loaded_in_bundler('unicorn') + name: 'unicorn', enabled: loaded_in_bundler('unicorn') } attribute :puma, Negroku::Feature, default: { - name: "puma", enabled: loaded_in_bundler('puma') + name: 'puma', enabled: loaded_in_bundler('puma') } attribute :whenever, Negroku::Feature, default: { - name: "whenever", enabled: File.exists?('config/schedule.rb') + name: 'whenever', enabled: File.exist?('config/schedule.rb') } # private - end Negroku::Config = Negroku::ConfigFactory.new