gpx 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 77fe925f54ad3eb792f09dc5ac6eba67e39052c9
-  data.tar.gz: f7a763dd97b5f38921254ae6d3ffaae2ce3d3fe8
+SHA256:
+  metadata.gz: 4aa764ea01fcc4255a69ff9bad6d1c159fc8ae8a1b29c0e54d05b9fe2b0e0bc9
+  data.tar.gz: 699edd3b9dec8cc83ac136c90b81f428a60ed8359aa01445ef3aead1a343c0d1
 SHA512:
-  metadata.gz: 442bb28b647d15cbb22fc9fe79aabb9ebcf37c2ae30b9dc510573b88f8d8867f693484d00ab2495820c74d892abc3be062e6bc5bd1b548504fb72b1ad36635ea
-  data.tar.gz: b9f1a61107b41768feee72c1aeb89b2cac7758a112576095f62f2cfe70947e680796a46b75999e61e33c69876b03c508d785a700649dca3b9cf71e85b127b469
+  metadata.gz: 43dc778d82e3b044ef872c219a60a703a6e4e53845817e783c464b36b37b60647eb5c390e2b16df1f1bb51b5359d2eae5a05e39fdb352ee3e2eaec179e007b9e
+  data.tar.gz: a6aa72c84b2ff150569506a27889835b818057a549a72d44ad163e81ef5000dd936ca91b8da7faf3a44150ec66bdbe6bb1630291dbeeca5c3416f676130c368a

data/.gitignore

@@ -1,3 +1,7 @@
 tests/output/*
 .*.swp
 Gemfile.lock
+pkg
+
+# RubyMine files
+/.idea

data/.rubocop.yml

@@ -0,0 +1,165 @@
+AllCops:
+  TargetRubyVersion: 2.2
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylealias
+
+Style/AsciiComments:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleasciicomments
+
+Style/BeginBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylebeginblock
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
+
+Style/CommentAnnotation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
+
+Style/Documentation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledocumentation
+
+Layout/DotPosition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#layoutdotposition
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
+
+Style/EndBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleendblock
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylelambda
+
+Style/ModuleFunction:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemodulefunction
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/PerlBackrefs:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleperlbackrefs
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
+
+Style/SignalException:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesignalexception
+
+Style/SingleLineBlockParams:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelineblockparams
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#layoutspacebeforeblockbraces
+
+Layout/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#layoutspaceinsideparens
+
+Style/SpecialGlobalVars:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars
+
+Style/StringLiterals:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylestringliterals
+
+Style/WhileUntilModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
+
+Style/WordArray:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewordarray
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
+Style/DateTime:
+  Enabled: false
+
+Performance/Caller:
+  Enabled: false

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.1
   - 2.2
-  - 2.3.3
-  - 2.4.0
+  - 2.3
+  - 2.4
+  - 2.5
 script: "bundle exec rake ci:build"

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.0.0] - 2018-03-06
+
+  * Fix duplication of points on appending segment to track (#20 via @niborg)
+  * Remove pythagorean distance (#28 fixing #27, via @moveson)
+  * Ignore empty segments (#29 via @nathanvda)
+  * Introduce Rubocop (#31)
+  * Explicit test support for Ruby 2.5 (#30)
+
 ## [0.9.0] - 2017-01-05
 
   * Upgrade Nokogiri deps to be more explicit, then explicitly bump the Ruby

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) [year] [fullname]
+Copyright (c) 2006 Doug Fales
 
 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.md

@@ -17,7 +17,7 @@ etc).
 
 ## Requirements
 
-As of `0.9.0`, `gpx` requires at least Ruby 2.1 to run.
+As of `1.0.0`, `gpx` requires at least Ruby 2.2 to run.
 
 ## Examples
 

data/Rakefile

@@ -1,31 +1,34 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rdoc/task'
+require 'rubocop/rake_task'
 
-desc "Default Task"
-task :default => [ :test ]
+RuboCop::RakeTask.new
+
+desc 'Default Task'
+task default: %i[test rubocop]
 
 namespace :ci do
   task :build do
-    puts "Creating tests/output directory..."
-    FileUtils.mkdir_p "tests/output"
+    puts 'Creating tests/output directory...'
+    FileUtils.mkdir_p 'tests/output'
     Rake::Task[:test].invoke
   end
 end
 
 # Run the unit tests
-desc "Run all unit tests"
-Rake::TestTask.new("test") { |t|
-  t.libs << "lib"
+desc 'Run all unit tests'
+Rake::TestTask.new('test') do |t|
+  t.libs << 'lib'
   t.pattern = 'tests/*_test.rb'
   t.verbose = true
-}
+end
 
 # Genereate the RDoc documentation
-desc "Create documentation"
-Rake::RDocTask.new("doc") { |rdoc|
-  rdoc.title = "Ruby GPX API"
+desc 'Create documentation'
+Rake::RDocTask.new('doc') do |rdoc|
+  rdoc.title = 'Ruby GPX API'
   rdoc.rdoc_dir = 'html'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
-}
+end

data/bin/gpx_distance

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
- 
-require File.expand_path('../../lib/gpx', __FILE__)
+
+require File.expand_path('../lib/gpx', __dir__)
 
 filename = ARGV[0]
-gpx =  GPX::GPXFile.new(:gpx_file => filename)
+gpx = GPX::GPXFile.new(gpx_file: filename)
 puts "read track with distance #{gpx.distance}"
-
-
-

data/bin/gpx_smooth

@@ -1,63 +1,59 @@
 #!/usr/bin/env ruby
- 
-require File.expand_path('../../lib/gpx', __FILE__)
-require 'optparse'
 
+require File.expand_path('../lib/gpx', __dir__)
+require 'optparse'
 
 def str_to_int_or_time(str)
   if str =~ /\A\d{10}\Z/
-    return Time.at(str.to_i)
+    Time.at(str.to_i)
   elsif str =~ /\A\d+\Z/
-    return str.to_i
+    str.to_i
   else
-    return DateTime.strptime(str, '%Y%m%d-%H:%M:%S').to_time
+    DateTime.strptime(str, '%Y%m%d-%H:%M:%S').to_time
   end
 end
 
-
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage: smooth [options]"
+  opts.banner = 'Usage: smooth [options]'
 
-  opts.on("-i", "--input-file FILE", "Input file to read gpx data from (if omitted, data will be read from stdin)") do |v|
+  opts.on('-i', '--input-file FILE', 'Input file to read gpx data from (if omitted, data will be read from stdin)') do |v|
     options[:infile] = v
   end
-  opts.on("-o", "--output-file FILE", "Output file to write smoothed gpx data to (if omitted, data will be written to stdout)") do |v|
+  opts.on('-o', '--output-file FILE', 'Output file to write smoothed gpx data to (if omitted, data will be written to stdout)') do |v|
     options[:outfile] = v
   end
-  opts.on("-s", "--start-time [YYYYMMDD-HH:MM:SS|EPOCH|OFFSET]", "Start smoothing from time or offset specified (if omitted start from the start of the file)") do |v|
+  opts.on('-s', '--start-time [YYYYMMDD-HH:MM:SS|EPOCH|OFFSET]', 'Start smoothing from time or offset specified (if omitted start from the start of the file)') do |v|
     options[:start] = v
   end
-  opts.on("-e", "--end-time [YYYYMMDD-HH:MM:SS|EPOCH|OFFSET]", "Finish smoothing from time or offset specified (if omitted finish at the end of the file)") do |v|
+  opts.on('-e', '--end-time [YYYYMMDD-HH:MM:SS|EPOCH|OFFSET]', 'Finish smoothing from time or offset specified (if omitted finish at the end of the file)') do |v|
     options[:end] = v
   end
 end.parse!
 
-
-if options[:infile]
-  input = File.open(options[:infile])
-else
-  input = $stdin
-end
+input = if options[:infile]
+          File.open(options[:infile])
+        else
+          $stdin
+        end
 
 options[:start] = str_to_int_or_time(options[:start]) if options[:start]
 options[:end] = str_to_int_or_time(options[:end]) if options[:end]
 
-gpx =  GPX::GPXFile.new(:gpx_data => input)
-$stderr.puts "read track with distance #{gpx.distance}"
+gpx = GPX::GPXFile.new(gpx_data: input)
+warn "read track with distance #{gpx.distance}"
 
-#1419062980
+# 1419062980
 gpx.tracks.each do |track|
   track.segments.each do |segment|
-    segment.smooth_location_by_average({:end => options[:end], :start => options[:start]})
+    segment.smooth_location_by_average(end: options[:end], start: options[:start])
   end
 end
 gpx.recalculate_distance
-$stderr.puts "smoothed distance #{gpx.distance}"
+warn "smoothed distance #{gpx.distance}"
 
 if options[:outfile]
   gpx.write(options[:outfile], false)
 else
   puts gpx.to_s(false)
 end
-

data/gpx.gemspec

@@ -1,26 +1,27 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gpx/version'
 
 Gem::Specification.new do |s|
   s.name = 'gpx'
   s.version = GPX::VERSION
-  s.authors = ["Guillaume Dott", "Doug Fales", "Andrew Hao"]
-  s.email = ["guillaume+github@dott.fr", "doug.fales@gmail.com", "andrewhao@gmail.com"]
-  s.summary = %q{A basic API for reading and writing GPX files.}
-  s.description = %q{A basic API for reading and writing GPX files.}
+  s.authors = ['Guillaume Dott', 'Doug Fales', 'Andrew Hao']
+  s.email = ['guillaume+github@dott.fr', 'doug.fales@gmail.com', 'andrewhao@gmail.com']
+  s.summary = 'A basic API for reading and writing GPX files.'
+  s.description = 'A basic API for reading and writing GPX files.'
 
-  s.required_ruby_version = '~>2.1'
+  s.required_ruby_version = '~>2.2'
 
-  s.files = `git ls-files`.split($/)
+  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
   s.has_rdoc = true
 
-  s.homepage = "http://www.github.com/dougfales/gpx"
-  s.add_dependency 'rake'
+  s.homepage = 'http://www.github.com/dougfales/gpx'
   s.add_dependency 'nokogiri', '~>1.7'
+  s.add_dependency 'rake'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rubocop'
 end

data/lib/gpx.rb

@@ -1,38 +1,15 @@
-#--
-# Copyright (c) 2006  Doug Fales
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
 require 'time'
 require 'nokogiri'
 
-require File.expand_path('../gpx/version', __FILE__)
+require File.expand_path('gpx/version', __dir__)
 
-require File.expand_path('../gpx/gpx', __FILE__)
-require File.expand_path('../gpx/gpx_file', __FILE__)
-require File.expand_path('../gpx/bounds', __FILE__)
-require File.expand_path('../gpx/track', __FILE__)
-require File.expand_path('../gpx/route', __FILE__)
-require File.expand_path('../gpx/segment', __FILE__)
-require File.expand_path('../gpx/point', __FILE__)
-require File.expand_path('../gpx/trackpoint', __FILE__)
-require File.expand_path('../gpx/waypoint', __FILE__)
-require File.expand_path('../gpx/magellan_track_log', __FILE__)
+require File.expand_path('gpx/gpx', __dir__)
+require File.expand_path('gpx/gpx_file', __dir__)
+require File.expand_path('gpx/bounds', __dir__)
+require File.expand_path('gpx/track', __dir__)
+require File.expand_path('gpx/route', __dir__)
+require File.expand_path('gpx/segment', __dir__)
+require File.expand_path('gpx/point', __dir__)
+require File.expand_path('gpx/track_point', __dir__)
+require File.expand_path('gpx/waypoint', __dir__)
+require File.expand_path('gpx/magellan_track_log', __dir__)