iniparse 1.1.3 → 1.1.4

data/History

@@ -1,3 +1,7 @@
+== 1.1.4 (2nd September 2010)
+
+* Fix parsing of lines which contains an equals in the value
+
 == 1.1.3 (4th March 2010)
 
 * Fix so that VERSION is correctly read on Windows.

data/README.rdoc

@@ -10,7 +10,7 @@ or you feed it an INI file which doesn't work as you'd expected, please mail
 me at +anthony at ninecraft dot com+, ideally with a copy of the INI file in
 question.
 
-IniParse tests pass on Ruby 1.8.6p383, 1.8.7p174, and 1.9.1p243.
+IniParse tests pass on Ruby 1.8.6p399, 1.8.7p249, and 1.9.1p378, JRuby 1.4.0 and Rubinius 1.0.0 RC2.
 
 === Main features
 

data/Rakefile

@@ -1,6 +1,43 @@
+require 'rubygems'
+require 'rake'
+require 'date'
+
 require 'rake/clean'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
+
+##############################################################################
+# Helpers
+##############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
 
 ##############################################################################
 # Packaging & Installation.
@@ -8,33 +45,67 @@ require 'spec/rake/spectask'
 
 CLEAN.include ['pkg', '*.gem', 'doc', 'coverage']
 
-begin
-  require 'jeweler'
+desc 'Build the gem, and push to Github'
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+
+  puts "Push to Rubygems.org with"
+  puts "  gem push pkg/#{name}-#{version}.gem"
+end
 
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'iniparse'
-    gem.platform    = Gem::Platform::RUBY
-    gem.summary     = 'A pure Ruby library for parsing INI documents.'
-    gem.description = gem.summary
-    gem.author      = 'Anthony Williams'
-    gem.email       = 'anthony@ninecraft.com'
-    gem.homepage    = 'http://github.com/antw/iniparse'
+desc 'Builds the IniParse gem'
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
 
-    gem.files       = %w(LICENSE README.rdoc Rakefile VERSION) +
-                      Dir.glob("{lib,spec}/**/*")
+desc 'Creates a fresh gemspec'
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
 
-    # rdoc
-    gem.has_rdoc = true
-    gem.extra_rdoc_files = %w(README.rdoc History LICENSE VERSION)
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
 
-    # Dependencies
-    gem.add_development_dependency 'rspec', '>= 1.2.0'
-  end
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem ' \
-       'install jeweler'
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
 end
 
 ##############################################################################
@@ -42,8 +113,6 @@ end
 ##############################################################################
 
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "iniparse #{version}"
   rdoc.rdoc_files.include('README*')
@@ -54,20 +123,6 @@ end
 # Tests & Metrics.
 ##############################################################################
 
-desc "Run all examples"
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['-c -f p']
-end
-
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new('spec') do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.spec_opts = ['-c -f s']
-  spec.rcov = true
-  spec.rcov_opts = ['--exclude', 'spec']
 end
-
-task :spec => :check_dependencies

data/TODO

@@ -0,0 +1,2 @@
+* Support multi-line options with backslashes (presumably with
+  OptionCollection).

data/iniparse.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = '1.3.5'
+
+  ## Leave these as is they will be modified for you by the rake gemspec task.
+  ## If your rubyforge_project name is different, then edit it and comment out
+  ## the sub! line in the Rakefile
+  s.name              = 'iniparse'
+  s.version           = '1.1.4'
+  s.date              = '2010-09-02'
+  s.rubyforge_project = 'iniparse'
+
+  s.summary           = 'A pure Ruby library for parsing INI documents.'
+  s.authors           = ['Anthony Williams']
+  s.email             = 'hi@antw.me'
+  s.homepage          = 'http://github.com/antw/iniparse'
+
+  s.require_paths     = %w(lib)
+
+  s.rdoc_options      = ['--charset=UTF-8']
+  s.extra_rdoc_files  = %w(History LICENSE README.rdoc)
+
+  # Dependencies.
+  s.add_development_dependency('rspec', '>= 2.0.0.beta.20')
+
+  # = MANIFEST =
+  s.files = %w[
+    History
+    LICENSE
+    README.rdoc
+    Rakefile
+    TODO
+    iniparse.gemspec
+    lib/iniparse.rb
+    lib/iniparse/document.rb
+    lib/iniparse/generator.rb
+    lib/iniparse/line_collection.rb
+    lib/iniparse/lines.rb
+    lib/iniparse/parser.rb
+    spec/document_spec.rb
+    spec/fixture_spec.rb
+    spec/fixtures/openttd.ini
+    spec/fixtures/race07.ini
+    spec/fixtures/smb.ini
+    spec/generator/method_missing_spec.rb
+    spec/generator/with_section_blocks_spec.rb
+    spec/generator/without_section_blocks_spec.rb
+    spec/iniparse_spec.rb
+    spec/line_collection_spec.rb
+    spec/lines_spec.rb
+    spec/parser/document_parsing_spec.rb
+    spec/parser/line_parsing_spec.rb
+    spec/spec_fixtures.rb
+    spec/spec_helper.rb
+    spec/spec_helper_spec.rb
+  ]
+  # = MANIFEST =
+
+  s.test_files = s.files.select { |path| path =~ /^spec\/.*\.rb/ }
+end

data/lib/iniparse.rb

@@ -7,7 +7,7 @@ require File.join(dir, 'lines')
 require File.join(dir, 'parser')
 
 module IniParse
-  VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
+  VERSION = '1.1.4'
 
   # A base class for IniParse errors.
   class IniParseError < StandardError; end

data/lib/iniparse/lines.rb

@@ -200,9 +200,9 @@ module IniParse
     class Option
       include Line
 
-      @regex = /^(.*)     # Key
+      @regex = /^\s*([^=]+)  # Option
                  =
-                 (.*?)$   # Value
+                 (.*?)$      # Value
                /x
 
       attr_accessor :key, :value

data/spec/document_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "IniParse::Document" do
   it 'should have a +lines+ reader' do

data/spec/fixture_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "IniParse" do
   describe 'openttd.ini fixture' do

data/spec/generator/method_missing_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Tests use of the Generator when used like so:
 #

data/spec/generator/with_section_blocks_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Tests use of the Generator when used like so:
 #

data/spec/generator/without_section_blocks_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Tests use of the Generator when used like so:
 #

data/spec/iniparse_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 
 describe "IniParse" do

data/spec/line_collection_spec.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 # ----------------------------------------------------------------------------
 # Shared specs for all Collection types...
 # ----------------------------------------------------------------------------
 
-describe "LineCollection", :shared => true do
+share_examples_for "LineCollection" do
   before(:each) do
     @collection << (@c1 = IniParse::Lines::Comment.new)
     @collection <<  @i1
@@ -180,6 +180,7 @@ describe 'IniParse::OptionCollection' do
 
   describe '#keys' do
     it 'should handle duplicates' do
+      @collection << @i1 << @i2 << @i3
       @collection << IniParse::Lines::Option.new('first', 'v5')
       @collection.keys.should == ['first', 'second', 'third']
     end
@@ -205,6 +206,7 @@ describe 'IniParse::SectionCollection' do
 
     it 'should add merge Section with the other, if it is a duplicate' do
       new_section = IniParse::Lines::Section.new('first')
+      @collection << @i1
       @i1.should_receive(:merge!).with(new_section).once
       @collection << new_section
     end

data/spec/lines_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 module IniParse::Test
   class FakeLine

data/spec/parser/document_parsing_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Tests parsing of multiple lines, in context, using #parse.
 

data/spec/parser/line_parsing_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Tests parsing of individual, out of context, line types using #parse_line.
 
@@ -154,6 +154,21 @@ describe 'Parsing a line' do
     end
   end
 
+
+  describe 'with "key = EEjDDJJjDJDJD233232=="' do
+    it 'should include the "equals" in the option value' do
+      IniParse::Parser.parse_line('key = EEjDDJJjDJDJD233232==').should \
+        be_option_tuple('key', 'EEjDDJJjDJDJD233232==')
+    end
+  end
+
+  describe 'with "key = ==EEjDDJJjDJDJD233232"' do
+    it 'should include the "equals" in the option value' do
+      IniParse::Parser.parse_line('key = ==EEjDDJJjDJDJD233232').should \
+        be_option_tuple('key', '==EEjDDJJjDJDJD233232')
+    end
+  end
+
   describe 'with "key.two = value"' do
     it 'should return an option tuple with the correct key' do
       IniParse::Parser.parse_line('key.two = value').should \

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
+require 'rspec'
+
 require 'iniparse'
 require File.join(File.dirname(__FILE__), 'spec_fixtures')
 
@@ -161,6 +163,6 @@ module IniParse
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(IniParse::Test::Helpers)
 end

data/spec/spec_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 # --
 # ============================================================================

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: iniparse
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Anthony Williams
@@ -14,25 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +00:00
+date: 2010-09-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196427
         segments: 
-        - 1
         - 2
         - 0
-        version: 1.2.0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
   type: :development
   version_requirements: *id001
-description: A pure Ruby library for parsing INI documents.
-email: anthony@ninecraft.com
+description: 
+email: hi@antw.me
 executables: []
 
 extensions: []
@@ -41,12 +46,13 @@ extra_rdoc_files:
 - History
 - LICENSE
 - README.rdoc
-- VERSION
 files: 
+- History
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
+- TODO
+- iniparse.gemspec
 - lib/iniparse.rb
 - lib/iniparse/document.rb
 - lib/iniparse/generator.rb
@@ -69,7 +75,6 @@ files:
 - spec/spec_fixtures.rb
 - spec/spec_helper.rb
 - spec/spec_helper_spec.rb
-- History
 has_rdoc: true
 homepage: http://github.com/antw/iniparse
 licenses: []
@@ -80,25 +85,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: iniparse
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: A pure Ruby library for parsing INI documents.
 test_files: 
 - spec/document_spec.rb

data/VERSION

@@ -1 +0,0 @@
-1.1.3