@@ -166,15 +166,8 @@ module Externals return if empty raise "I was given no file_string" unless file_string - # if !externals_file && File.exists?('.externals') - # open('.externals', 'r') do |f| - # externals_file = f.read - # end - # end - - #externals_file ||= "" - - titles = file_string.grep SECTION_TITLE_REGEX + titles = [] + file_string.each_line {|line| titles << line if line =~ SECTION_TITLE_REGEX} bodies = file_string.split SECTION_TITLE_REGEX_NO_GROUPS if titles.size > 0 && bodies.size > 0 @@ -190,24 +183,6 @@ module Externals end end - # def projects - # retval = [] - # sections.each do |section| - # retval += section.projects - # end - # - # retval - # end - - # def subprojects - # retval = [] - # sections.each do |section| - # retval += section.projects unless section.main? - # end - # - # retval - # end - def write path # = ".externals" raise "no path given" unless path open(path, 'w') do |f| lib/externals/configuration/configuration.rb @@ -17,7 +17,7 @@ module Externals self.scm = scm self.title = SECTION_TITLE_REGEX.match(title_string)[1] - + self.scm ||= self.title raise "Invalid section title: #{title_string}" unless title @@ -87,12 +87,12 @@ module Externals title = title.to_s sections.detect {|section| section.title == title} end - + def add_empty_section title raise "Section already exists" if self[title] sections << Section.new("\n\n[#{title.to_s}]\n", "") end - + def self.new_empty new nil, true end @@ -102,7 +102,7 @@ module Externals self.file_string = '' return end - + if !externals_file && File.exists?('.externals') open('.externals', 'r') do |f| externals_file = f.read @@ -113,7 +113,8 @@ module Externals self.file_string = externals_file - titles = externals_file.grep SECTION_TITLE_REGEX + titles = [] + externals_file.each_line {|line| titles << line if line =~ SECTION_TITLE_REGEX} bodies = externals_file.split SECTION_TITLE_REGEX_NO_GROUPS if titles.size > 0 && bodies.size > 0 @@ -146,7 +147,7 @@ module Externals retval end - + def main_project sections.each do |section| return section.projects.first if section.main? lib/externals/configuration/old_configuration.rb fdc4533550cc278570fe01b818eeb71b053c4154 Miles Georgi azimux@gmail.com http://github.com/azimux/externals/commit/c85933ec8bba7d5f76fe83c0ac352462fa4217c6 c85933ec8bba7d5f76fe83c0ac352462fa4217c6 2009-10-29T15:19:15-07:00 2009-10-29T15:19:15-07:00 Fixed a compatibility issue with ruby 1.9 String no longer includes Enumerable in 1.9 addbda0dbcbd018dcf56219819647e352fdd10ad Miles Georgi azimux@gmail.com