ext 1.1.3 → 2.1.0

data/lib/externals/configuration/configuration.rb

@@ -3,7 +3,6 @@ module Externals
     SECTION_TITLE_REGEX_NO_GROUPS = /^\s*\[(?:[^\]]*)\]\s*$/
     SECTION_TITLE_REGEX = /^\s*\[([^\]]*)\]\s*$/
 
-
     class Section
       attr_accessor :title_string, :body_string, :title, :rows
 
@@ -15,12 +14,11 @@ module Externals
 
         raise "Invalid section title: #{title_string}" unless title
 
-        self.rows = body_string.strip.split(/\n/)
+        self.rows = body_string.strip.split("\n")
       end
 
-
-      SETTING_REGEX = /^\s*([\.\w-]+)\s*=\s*([^#\n]*)(?:#[^\n]*)?$/
-      SET_SETTING_REGEX = /^(\s*(?:[\.\w-]+)\s*=\s*)(?:[^#\n]*)(#[^\n]*)?$/
+      SETTING_REGEX = /^\s*([.\w-]+)\s*=\s*([^#\n]*)(?:#[^\n]*)?$/
+      SET_SETTING_REGEX = /^(\s*(?:[.\w-]+)\s*=\s*)(?:[^#\n]*)(#[^\n]*)?$/
 
       def attributes
         retval = {}
@@ -31,6 +29,7 @@ module Externals
         end
         retval
       end
+
       def setting key
         rows.each do |row|
           if row =~ SETTING_REGEX && key.to_s == $1
@@ -39,6 +38,7 @@ module Externals
         end
         nil
       end
+
       def set_setting key, value
         key = key.to_s
         found = nil
@@ -46,18 +46,23 @@ module Externals
         rows.each_with_index do |row, index|
           if row =~ SETTING_REGEX && key == $1
             raise "found #{key} twice!" if found
+
             found = index
           end
         end
 
         if found
           if rows[found] !~ SET_SETTING_REGEX
+            # simplecov:disable
             raise "thought I found the row, but didn't"
+            # simplecov:enable
           end
+
           rows[found] = "#{$1}#{value}#{$2}"
         else
           rows << "#{key} = #{value}"
         end
+
         value
       end
 
@@ -69,6 +74,7 @@ module Externals
         rows.each_with_index do |row, index|
           if row =~ SETTING_REGEX && key == $1
             raise "found #{key} twice!" if found
+
             found = index
           end
         end
@@ -76,8 +82,11 @@ module Externals
         if found
           value = self[key]
           if rows[found] !~ SET_SETTING_REGEX
+            # simplecov:disable
             raise "thought I found the row, but didn't"
+            # simplecov:enable
           end
+
           rows.delete rows[found]
         end
         value
@@ -86,17 +95,11 @@ module Externals
       def [] key
         setting(key)
       end
+
       def []= key, value
         set_setting(key, value)
       end
 
-      def add_row(row)
-        rows << row
-
-        self.body_string = body_string.chomp + "\n#{row}\n"
-        #clear_caches
-      end
-
       def to_s
         "[#{title}]\n#{rows.join("\n")}"
       end
@@ -117,7 +120,7 @@ module Externals
       def []= title, hash
         add_empty_section title
         section = self[title]
-        hash.each_pair do |key,value|
+        hash.each_pair do |key, value|
           section[key] = value
         end
       end
@@ -126,12 +129,14 @@ module Externals
         sec = sections.detect{|section| section.title == sec}
 
         raise "No section found in config file for #{sec}" unless sec
+
         sections.delete(sec)
       end
 
-      def add_empty_section  title
+      def add_empty_section title
         raise "Section already exists" if self[title]
-        sections << Section.new("[#{title.to_s}]", "")
+
+        sections << Section.new("[#{title}]", "")
       end
 
       def removed_project_paths other_config
@@ -156,12 +161,14 @@ module Externals
         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
+        if !titles.empty? && !bodies.empty?
           if titles.size + 1 != bodies.size
+            # simplecov:disable
             raise "bodies and sections do not match up"
+            # simplecov:enable
           end
 
-          bodies = bodies[1..(bodies.size - 1)]
+          bodies = bodies[1..]
 
           (0...(bodies.size)).each do |index|
             sections << Section.new(titles[index], bodies[index])
@@ -171,13 +178,12 @@ module Externals
 
       def write path = ".externals"
         raise "no path given" unless path
-        open(path, 'w') do |f|
-          f.write to_s
-        end
+
+        File.write(path, to_s)
       end
 
       def to_s
-        sections.map(&:to_s).join("\n\n")
+        sections.join("\n\n")
       end
     end
   end