lib/railsthemes/ensurer.rb in railsthemes-2.0.3 vs lib/railsthemes/ensurer.rb in railsthemes-2.1.0
- old
+ new
@@ -47,11 +47,12 @@
end
logger.warn "Done checking version control."
end
def self.ensure_rails_version_is_valid
- unless File.exists?('Gemfile.lock') && Gem::Version.new('3.1') <= rails_version
+ unless File.exists?('Gemfile.lock') &&
+ Gem::Version.new('3.1') <= Railsthemes::GemfileUtils.rails_version
ask_to_install_unsupported
end
end
def self.ensure_installer_is_up_to_date server
@@ -130,16 +131,9 @@
#{result}
Please run `bundle` and try installing again.
EOS
end
logger.warn "Done checking bundle."
- end
-
- def self.rails_version gemfile_contents = nil
- gemfile_contents ||= Utils.read_file('Gemfile.lock')
- specs = Utils.gemspecs(gemfile_contents)
- rails = specs.select{ |x| x.name == 'rails' }.first
- rails.version if rails && rails.version
end
def self.ensure_railsthemes_is_not_in_gemfile gemfile_contents = nil
gemfile_contents ||= Utils.read_file('Gemfile.lock')
specs = Utils.gemspecs(gemfile_contents)