iniparse 0.2.1 → 1.0.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2009 Anthony Williams
+Copyright (c) 2008-2010 Anthony Williams
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.rdoc

@@ -10,6 +10,8 @@ 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.
+
 === Main features
 
 * <b>Support for duplicate options.</b> While not common, some INI files

data/Rakefile

@@ -1,102 +1,75 @@
-require 'rubygems'
 require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rubygems/specification'
-require 'date'
+require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
-begin
-  require 'hanna/rdoctask'
-rescue LoadError
-  require 'rake/rdoctask'
-end
-
-require 'lib/iniparse/version'
-
-GEM = 'iniparse'
-GEM_VERSION = IniParse::VERSION
-
 ##############################################################################
-# Packaging & Installation
+# Packaging & Installation.
 ##############################################################################
 
 CLEAN.include ['pkg', '*.gem', 'doc', 'coverage']
 
-spec = Gem::Specification.new do |s|
-  s.name        = GEM
-  s.version     = GEM_VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.summary     = "A pure Ruby library for parsing INI documents."
-  s.description = s.summary
-  s.author      = 'Anthony Williams'
-  s.email       = 'anthony@ninecraft.com'
-  s.homepage    = 'http://github.com/anthonyw/iniparse'
-
-  # rdoc
-  s.has_rdoc = true
-  s.extra_rdoc_files = %w(README.rdoc LICENSE)
-
-  # Dependencies
-  s.add_dependency 'extlib', '>= 0.9.9'
-
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*")
-  
-  s.rubyforge_project = 'iniparse'
-end
-
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Run :package and install the resulting .gem"
-task :install => :package do
-  sh %(gem install --local pkg/#{GEM}-#{GEM_VERSION}.gem)
-end
-
-desc "Run :clean and uninstall the .gem"
-task :uninstall => :clean do
-  sh %(gem uninstall #{GEM})
-end
-
-desc "Create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
+begin
+  require 'jeweler'
+
+  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'
+
+    gem.files       = %w(LICENSE README.rdoc Rakefile VERSION) +
+                      Dir.glob("{lib,spec}/**/*")
+
+    # rdoc
+    gem.has_rdoc = true
+    gem.extra_rdoc_files = %w(README.rdoc LICENSE VERSION)
+
+    # Dependencies
+    gem.add_dependency 'extlib', '>= 0.9.9'
+    gem.add_development_dependency 'rspec', '>= 1.2.0'
   end
+
+  Jeweler::GemcutterTasks.new
+  Jeweler::RubyforgeTasks.new
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem ' \
+       'install jeweler'
 end
 
 ##############################################################################
 # Documentation
 ##############################################################################
-task :doc => ['doc:rdoc']
-namespace :doc do
 
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_files.add(%w(LICENSE README.rdoc lib/**/*.rb))
-    rdoc.main = "README.rdoc"
-    rdoc.title = "IniParse API Documentation"
-    rdoc.options << "--line-numbers" << "--inline-source"
-    rdoc.rdoc_dir = 'doc'
-  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*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 ##############################################################################
-# rSpec & rcov
+# Tests & Metrics.
 ##############################################################################
 
 desc "Run all examples"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-  t.spec_opts = ['-c -f s']
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_opts = ['-c -f s']
 end
 
 desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('spec:rcov') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-  t.spec_opts = ['-c -f s']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << '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/VERSION

@@ -0,0 +1 @@
+1.0.0

data/lib/iniparse.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'extlib'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'iniparse'
@@ -8,9 +7,12 @@ require dir / 'generator'
 require dir / 'line_collection'
 require dir / 'lines'
 require dir / 'parser'
-require dir / 'version'
 
 module IniParse
+  VERSION = File.read(
+    Pathname(__FILE__).dirname.expand_path / '..' / 'VERSION'
+  ).strip
+
   # A base class for IniParse errors.
   class IniParseError < StandardError; end
 

data/lib/iniparse/document.rb

@@ -1,6 +1,8 @@
 module IniParse
   # Represents an INI document.
   class Document
+    include Enumerable
+
     attr_reader   :lines
     attr_accessor :path
 

data/lib/iniparse/generator.rb

@@ -197,4 +197,4 @@ module IniParse
       @opt_stack.last.empty? ? given_opts : @opt_stack.last.merge(given_opts)
     end
   end
-end
+end

data/lib/iniparse/line_collection.rb

@@ -90,7 +90,7 @@ module IniParse
     # Returns this collection as a hash. Does not contain blank and comment
     # lines.
     def to_hash
-      Hash[ map { |line| [line.key, line] } ]
+      Hash[ *(map { |line| [line.key, line] }).flatten ]
     end
 
     alias_method :to_h, :to_hash

data/lib/iniparse/lines.rb

@@ -287,4 +287,4 @@ module IniParse
       end
     end
   end # Lines
-end # IniParse
+end # IniParse

data/lib/iniparse/parser.rb

@@ -88,5 +88,5 @@ module IniParse
         [line, opts]
       end
     end
-  end
-end
+  end # Parser
+end # IniParse

data/spec/document_spec.rb

@@ -1,12 +1,14 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "IniParse::Document" do
-  it 'should have a +sections+ reader' do
-    IniParse::Document.instance_methods.should include('lines')
+  it 'should have a +lines+ reader' do
+    methods = IniParse::Document.instance_methods.map { |m| m.to_sym }
+    methods.should include(:lines)
   end
 
-  it 'should not have a +sections+ writer' do
-    IniParse::Document.instance_methods.should_not include('lines=')
+  it 'should not have a +lines+ writer' do
+    methods = IniParse::Document.instance_methods.map { |m| m.to_sym }
+    methods.should_not include(:lines=)
   end
 
   it 'should delegate #[] to +lines+' do
@@ -21,6 +23,20 @@ describe "IniParse::Document" do
     doc.each { |l| }
   end
 
+  it 'should be enumerable' do
+    IniParse::Document.included_modules.should include(Enumerable)
+
+    sections = [
+      IniParse::Lines::Section.new('first section'),
+      IniParse::Lines::Section.new('second section')
+    ]
+
+    doc = IniParse::Document.new
+    doc.lines << sections[0] << sections[1]
+
+    doc.map { |line| line }.should == sections
+  end
+
   describe '#has_section?' do
     before(:all) do
       @doc = IniParse::Document.new

data/spec/generator/method_missing_spec.rb

@@ -101,4 +101,4 @@ describe 'When generating a document using Generator with section blocks using m
   # Comments and blanks are added in the same way as in the
   # 'with_section_block_spec.rb' specification.
 
-end
+end

data/spec/generator/with_section_blocks_spec.rb

@@ -319,4 +319,4 @@ describe 'When generating a document using Generator with section blocks,' do
     end
   end
 
-end
+end

data/spec/generator/without_section_blocks_spec.rb

@@ -133,4 +133,4 @@ describe 'When generating a document using Generator without section blocks,' do
     end
   end
 
-end
+end

data/spec/parser/document_parsing_spec.rb

@@ -47,4 +47,4 @@ describe 'Parsing a document' do
     lambda { IniParse::Parser.new(fixture(:invalid_line)).parse }.should \
       raise_error(IniParse::ParseError)
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'rubygems'
 require 'iniparse'
 require File.join(File.dirname(__FILE__), 'spec_fixtures')
 

data/spec/spec_helper_spec.rb

@@ -198,4 +198,4 @@ describe 'Line tuple [:comment, "A comment", {:opt => "val"}]' do
   it 'should fail be_comment_tuple("A comment", {:opt => "invalid"})' do
     @tuple.should_not be_comment_tuple("A comment", {:opt => "invalid"})
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iniparse
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Anthony Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 +00:00
+date: 2010-01-05 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
 description: A pure Ruby library for parsing INI documents.
 email: anthony@ninecraft.com
 executables: []
@@ -29,44 +39,43 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE
+- README.rdoc
+- VERSION
 files: 
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/iniparse
+- VERSION
+- lib/iniparse.rb
 - lib/iniparse/document.rb
 - lib/iniparse/generator.rb
 - lib/iniparse/line_collection.rb
 - lib/iniparse/lines.rb
 - lib/iniparse/parser.rb
-- lib/iniparse/version.rb
-- lib/iniparse.rb
 - spec/document_spec.rb
 - spec/fixture_spec.rb
-- spec/fixtures
 - spec/fixtures/openttd.ini
 - spec/fixtures/race07.ini
 - spec/fixtures/smb.ini
-- spec/generator
 - 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
 - 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
 has_rdoc: true
-homepage: http://github.com/anthonyw/iniparse
-post_install_message: 
-rdoc_options: []
+homepage: http://github.com/antw/iniparse
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -83,10 +92,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: iniparse
-rubygems_version: 1.3.0
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A pure Ruby library for parsing INI documents.
-test_files: []
-
+test_files: 
+- spec/document_spec.rb
+- spec/fixture_spec.rb
+- 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

data/lib/iniparse/version.rb

@@ -1,3 +0,0 @@
-module IniParse
-  VERSION = '0.2.1'
-end