diff --git a/Gemfile b/Gemfile index 863adb4..cdd700b 100644 --- a/Gemfile +++ b/Gemfile @@ -4,5 +4,5 @@ group :development do gem "dbf", ">= 1.5.0" gem "rspec", ">= 2.3.0" gem "bundler", ">= 1.0.0" - gem "rcov", ">= 0" + #gem "rcov", ">= 0" end diff --git a/Gemfile.lock b/Gemfile.lock index f381a28..94d4ca7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,23 +1,16 @@ GEM remote: http://rubygems.org/ specs: - activesupport (3.0.5) - dbf (1.5.2) - activesupport (~> 3.0.0) - fastercsv (= 1.5.3) - i18n (~> 0.4.2) - diff-lcs (1.1.2) - fastercsv (1.5.3) - i18n (0.4.2) - rcov (0.9.9) - rspec (2.5.0) - rspec-core (~> 2.5.0) - rspec-expectations (~> 2.5.0) - rspec-mocks (~> 2.5.0) - rspec-core (2.5.1) - rspec-expectations (2.5.0) + dbf (1.7.3) + diff-lcs (1.1.3) + rspec (2.8.0) + rspec-core (~> 2.8.0) + rspec-expectations (~> 2.8.0) + rspec-mocks (~> 2.8.0) + rspec-core (2.8.0) + rspec-expectations (2.8.0) diff-lcs (~> 1.1.2) - rspec-mocks (2.5.0) + rspec-mocks (2.8.0) PLATFORMS ruby @@ -25,5 +18,4 @@ PLATFORMS DEPENDENCIES bundler (>= 1.0.0) dbf (>= 1.5.0) - rcov rspec (>= 2.3.0) diff --git a/Rakefile b/Rakefile index 1677526..b1dd62e 100644 --- a/Rakefile +++ b/Rakefile @@ -1,48 +1,33 @@ -require 'rubygems' -require 'rake' - -begin - require 'jeweler' - Jeweler::Tasks.new do |gem| - gem.name = "georuby" - gem.summary = "Ruby data holder for OGC Simple Features" - gem.description = "GeoRuby provides geometric data types from the OGC 'Simple Features' specification." - gem.email = "georuby@simplitex.com" - gem.homepage = "http://github.com/nofxx/georuby" - gem.authors = ["Guilhem Vellut", "Marcos Piccinini", "Marcus Mateus", "Doug Cole"] - gem.add_development_dependency "rspec", ">= 2.0.0" - gem.add_development_dependency "dbf", ">= 1.2.9" - end -rescue LoadError - puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" +require 'bundler' +Bundler.setup + +require "rspec" +require "rspec/core/rake_task" + +$LOAD_PATH.unshift File.expand_path("../lib", __FILE__) +require "geo_ruby/version" + +desc "Builds the gem" +task :gem => :build +task :build do + system "gem build georuby.gemspec" + Dir.mkdir("pkg") unless Dir.exists?("pkg") + system "mv georuby-#{GeoRuby::VERSION}.gem pkg/" +end + +task :install => :build do + system "sudo gem install pkg/georuby-#{GeoRuby::VERSION}.gem" +end + +task :release => :build do + system "git tag -a v#{GeoRuby::VERSION} -m 'Tagging #{GeoRuby::VERSION}'" + system "git push --tags" + system "gem push pkg/georuby-#{GeoRuby::VERSION}.gem" end -# require 'spec/rake/spectask' -# Spec::Rake::SpecTask.new(:spec) do |spec| -# spec.libs << 'lib' << 'spec' -# spec.spec_files = FileList['spec/**/*_spec.rb'] -# end - -# Spec::Rake::SpecTask.new(:rcov) do |spec| -# spec.libs << 'lib' << 'spec' -# spec.pattern = 'spec/**/*_spec.rb' -# spec.rcov = true -# end - -# task :default => :spec - -require 'rake/rdoctask' -Rake::RDocTask.new do |rdoc| - if File.exist?('VERSION.yml') - config = YAML.load(File.read('VERSION.yml')) - version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}" - else - version = "" - end - - rdoc.rdoc_dir = 'rdoc' - rdoc.title = "geo_ruby #{version}" - rdoc.rdoc_files.include('README*') - rdoc.rdoc_files.include('lib/**/*.rb') +RSpec::Core::RakeTask.new(:spec) do |spec| + spec.pattern = "spec/**/*_spec.rb" end +task :default => [:spec] + diff --git a/georuby.gemspec b/georuby.gemspec index 5efa4fb..d28c861 100644 --- a/georuby.gemspec +++ b/georuby.gemspec @@ -1,128 +1,29 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec' # -*- encoding: utf-8 -*- +lib = File.expand_path('../lib/', __FILE__) +$:.unshift lib unless $:.include?(lib) + +require 'geo_ruby/version' Gem::Specification.new do |s| s.name = %q{georuby} - s.version = "1.9.3" + s.version = GeoRuby::VERSION - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Guilhem Vellut", "Marcos Piccinini", "Marcus Mateus", "Doug Cole"] - s.date = %q{2011-06-30} s.description = %q{GeoRuby provides geometric data types from the OGC 'Simple Features' specification.} - s.email = %q{georuby@simplitex.com} - s.extra_rdoc_files = [ - "LICENSE", - "README.rdoc" - ] - s.files = [ - "Gemfile", - "Gemfile.lock", - "History.txt", - "LICENSE", - "README.rdoc", - "Rakefile", - "VERSION", - "georuby.gemspec", - "lib/geo_ruby.rb", - "lib/geo_ruby/geojson.rb", - "lib/geo_ruby/georss.rb", - "lib/geo_ruby/gpx.rb", - "lib/geo_ruby/gpx4r/gpx.rb", - "lib/geo_ruby/shp.rb", - "lib/geo_ruby/shp4r/dbf.rb", - "lib/geo_ruby/shp4r/shp.rb", - "lib/geo_ruby/simple_features/envelope.rb", - "lib/geo_ruby/simple_features/ewkb_parser.rb", - "lib/geo_ruby/simple_features/ewkt_parser.rb", - "lib/geo_ruby/simple_features/geometry.rb", - "lib/geo_ruby/simple_features/geometry_collection.rb", - "lib/geo_ruby/simple_features/geometry_factory.rb", - "lib/geo_ruby/simple_features/helper.rb", - "lib/geo_ruby/simple_features/line_string.rb", - "lib/geo_ruby/simple_features/linear_ring.rb", - "lib/geo_ruby/simple_features/multi_line_string.rb", - "lib/geo_ruby/simple_features/multi_point.rb", - "lib/geo_ruby/simple_features/multi_polygon.rb", - "lib/geo_ruby/simple_features/point.rb", - "lib/geo_ruby/simple_features/polygon.rb", - "nofxx-georuby.gemspec", - "spec/data/geojson/feature_collection.json", - "spec/data/georss/atom.xml", - "spec/data/georss/gml.xml", - "spec/data/georss/w3c.xml", - "spec/data/gpx/fells_loop.gpx", - "spec/data/gpx/long.gpx", - "spec/data/gpx/long.kml", - "spec/data/gpx/long.nmea", - "spec/data/gpx/short.gpx", - "spec/data/gpx/short.kml", - "spec/data/gpx/tracktreks.gpx", - "spec/data/multipoint.dbf", - "spec/data/multipoint.shp", - "spec/data/multipoint.shx", - "spec/data/point.dbf", - "spec/data/point.shp", - "spec/data/point.shx", - "spec/data/polygon.dbf", - "spec/data/polygon.shp", - "spec/data/polygon.shx", - "spec/data/polyline.dbf", - "spec/data/polyline.shp", - "spec/data/polyline.shx", - "spec/geo_ruby/geojson_spec.rb", - "spec/geo_ruby/georss.rb", - "spec/geo_ruby/georss_spec.rb", - "spec/geo_ruby/gpx4r/gpx_spec.rb", - "spec/geo_ruby/shp4r/shp_spec.rb", - "spec/geo_ruby/simple_features/envelope_spec.rb", - "spec/geo_ruby/simple_features/ewkb_parser_spec.rb", - "spec/geo_ruby/simple_features/ewkt_parser_spec.rb", - "spec/geo_ruby/simple_features/geometry_collection_spec.rb", - "spec/geo_ruby/simple_features/geometry_factory_spec.rb", - "spec/geo_ruby/simple_features/geometry_spec.rb", - "spec/geo_ruby/simple_features/line_string_spec.rb", - "spec/geo_ruby/simple_features/linear_ring_spec.rb", - "spec/geo_ruby/simple_features/multi_line_string_spec.rb", - "spec/geo_ruby/simple_features/multi_point_spec.rb", - "spec/geo_ruby/simple_features/multi_polygon_spec.rb", - "spec/geo_ruby/simple_features/point_spec.rb", - "spec/geo_ruby/simple_features/polygon_spec.rb", - "spec/geo_ruby_spec.rb", - "spec/spec_helper.rb" - ] + s.summary = %q{Ruby data holder for OGC Simple Features} + s.email = %q{x@nofxx.com} + + #s.extensions = ["ext/georuby/extconf.rb"] + s.files = Dir.glob("{lib,spec}/**/*") + %w(README.rdoc Rakefile) + s.homepage = %q{http://github.com/nofxx/georuby} s.require_paths = ["lib"] s.rubygems_version = %q{1.3.7} - s.summary = %q{Ruby data holder for OGC Simple Features} - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_development_dependency(%q, [">= 1.5.0"]) - s.add_development_dependency(%q, [">= 2.3.0"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 2.0.0"]) - s.add_development_dependency(%q, [">= 1.2.9"]) - else - s.add_dependency(%q, [">= 1.5.0"]) - s.add_dependency(%q, [">= 2.3.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 2.0.0"]) - s.add_dependency(%q, [">= 1.2.9"]) - end - else - s.add_dependency(%q, [">= 1.5.0"]) - s.add_dependency(%q, [">= 2.3.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 2.0.0"]) - s.add_dependency(%q, [">= 1.2.9"]) - end + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 1.2.9"]) + s.add_development_dependency(%q, [">= 2.0.0"]) end diff --git a/lib/geo_ruby/version.rb b/lib/geo_ruby/version.rb new file mode 100644 index 0000000..92a57a5 --- /dev/null +++ b/lib/geo_ruby/version.rb @@ -0,0 +1,3 @@ +module GeoRuby + VERSION = '1.9.5' +end