mvg-live 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4222555070fcead2af8588e50084b092c3f74c
-  data.tar.gz: 650901a3113cf6a99866dec667a994ba3a967211
+  metadata.gz: bf43ceefc66c8be51152687efde6f2902a6d60be
+  data.tar.gz: 2a0406e6b58f103321c9d137cd2bf15b0a9b10f5
 SHA512:
-  metadata.gz: b5c391a00ca12b82a902caf94d54542112185c3a8bece7db8da08b38956dda03d32e0aae97952b5c414121a25f28d7b349f9f196b4dfd50e85473d734a1548f7
-  data.tar.gz: 45f4191c56946bc2901a5c5e5b0e9d056781188b319164631dd07b34d2498c277c408229c38438ea38fdd627d5ea19f17277b719f2497cee868ca380a6a732ab
+  metadata.gz: a3b343843c424e1b9612ebdff13e7663ab6f4aeffed8c5b7da355c5c5d4492262422dcc5607a75dd00db99d5a2ff9a90fd9ae8758b922dd8f777058b360af161
+  data.tar.gz: 311e55fe5c8a574ea0afda6eb44648ab9b769da867078e66f50142c7265049f9234150a545f3fa6b2abebb2d611251a3bded677e3b7f4c42437bd9ae1b565e5a

data/.travis.yml

@@ -1,9 +1,8 @@
 sudo: false
 language: ruby
+before_install: gem install bundler
 rvm:
-  - 2.2.4
-  - 2.3.0
-  - jruby-19mode
+  - 2.5
+  - 2.4
   - ruby-head
-  - jruby-head
 script: bundle exec rake test

data/Dockerfile

@@ -1,12 +1,22 @@
-FROM ruby:2.3-alpine
+FROM ruby:2.5-alpine
+
+COPY . /usr/src/mvg-live
+WORKDIR /usr/src/mvg-live
+
+RUN rm -rf .bundle
+RUN rm -rf Gemfile.lock
 
 RUN apk --update add --virtual build_deps \
-    build-base ruby-dev libc-dev linux-headers \
-    openssl-dev postgresql-dev libxml2-dev libxslt-dev && \
-    bundle config build.nokogiri --use-system-libraries && \
-    gem install mvg-live && \
-    apk del build_deps
+    build-base git ruby-dev \
+    libxml2 libxml2-dev libxslt libxslt-dev && \
+    gem install nokogiri && \
+    bundle install --without development && \
+    rake install:local && \
+    apk del build_deps git
+
 
+WORKDIR /
+RUN rm -rf /usr/src/mvg-live
 RUN adduser -Ss /bin/sh mvg
 USER mvg
 

data/Gemfile.lock

@@ -1,41 +1,42 @@
 PATH
   remote: .
   specs:
-    mvg-live (2.2.0)
-      activemodel (~> 5.0)
-      activesupport (~> 5.0)
-      faraday (~> 0.9)
+    mvg-live (2.3.0)
+      activemodel (~> 5.2)
+      activesupport (~> 5.2)
+      faraday (~> 0.15)
       multi_json
-      nokogiri (~> 1.6)
+      nokogiri (~> 1.8.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.0.0)
-      activesupport (= 5.0.0)
-    activesupport (5.0.0)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     ansi (1.5.0)
-    builder (3.2.2)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.2)
-    docile (1.1.5)
-    factory_girl (4.1.0)
+    builder (3.2.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    docile (1.3.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.15.0)
       multipart-post (>= 1.2, < 3)
-    i18n (0.7.0)
-    json (2.0.1)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
     metaclass (0.0.4)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
+    method_source (0.9.0)
+    mini_portile2 (2.3.0)
     minispec-metadata (2.0.0)
       minitest
-    minitest (5.9.0)
-    minitest-reporters (1.1.9)
+    minitest (5.11.3)
+    minitest-reporters (1.2.0)
       ansi
       builder
       minitest (>= 5.0)
@@ -44,44 +45,40 @@ GEM
       minispec-metadata (~> 2.0)
       minitest (>= 4.7.5)
       vcr (>= 2.9)
-    mocha (1.1.0)
+    mocha (1.4.0)
       metaclass (~> 0.0.1)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    pkg-config (1.1.7)
-    pry (0.10.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (11.2.2)
-    ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (12.3.1)
+    ruby-progressbar (1.9.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    simplecov-html (0.10.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    vcr (3.0.3)
+    vcr (4.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  factory_girl (~> 4.1.0)
+  factory_bot (~> 4.8)
   minitest
   minitest-reporters
   minitest-vcr (~> 1.4)
-  mocha (~> 1.1)
+  mocha (~> 1.4.0)
   mvg-live!
   pry
   rake
   simplecov
 
 BUNDLED WITH
-   1.11.2
+   1.15.4

data/Rakefile

@@ -6,3 +6,5 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['spec/*_spec.rb']
   t.warning = false
 end
+
+task default: [:test]

data/lib/mvg/live.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+
 require 'active_model'
 require 'mvg/live/version'
 require 'mvg/live/encoding'
@@ -14,7 +14,7 @@ module MVG
     include MVG::Live::Parser
     include MVG::Live::CLI
 
-    ALL_TRANSPORTS = [:u, :bus, :tram, :s].freeze
+    ALL_TRANSPORTS = %i[u bus tram s].freeze
 
     validates :station, presence: true
     validates :transports, presence: true

data/lib/mvg/live/cli.rb

@@ -37,7 +37,7 @@ module MVG
         txt = ''
 
         txt += if @using_config_file
-                 '=[ ' + sprintf('%42s', @using_config_file) + " ]=\n"
+                 '=[ ' + format('%42s', @using_config_file) + " ]=\n"
                else
                  '=' * 48 + "\n"
                end
@@ -55,7 +55,7 @@ module MVG
           txt += '=' * 38 + "[ #{@server_time} ]=\n"
 
           @result_sorted.each do |e|
-            txt += sprintf "%-4s| %-30s|%3d Minuten\n", e[:line], e[:destination], e[:minutes]
+            txt += format "%-4s| %-30s|%3d Minuten\n", e[:line], e[:destination], e[:minutes]
           end
         end
 

data/lib/mvg/live/parser.rb

@@ -53,7 +53,7 @@ module MVG
           end
         else
           @result_display = results
-          @result_sorted  = results.sort_by.with_index { |i,| [i[:minutes], i[:line], i[:destination]] }
+          @result_sorted  = results.sort_by { |i,| [i[:minutes], i[:line], i[:destination]] }
           @result_sorted
         end
       end

data/lib/mvg/live/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 module MVG
   class Live
-    VERSION = '2.2.0'.freeze
+    VERSION = '2.3.0'.freeze
   end
 end

data/mvg-live.gemspec

@@ -1,5 +1,5 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'mvg/live/version'
 
 Gem::Specification.new do |s|
@@ -22,18 +22,18 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
 
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'factory_bot', '~> 4.8'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-reporters'
-  s.add_development_dependency 'factory_girl', '~> 4.1.0'
   s.add_development_dependency 'minitest-vcr', '~> 1.4'
+  s.add_development_dependency 'mocha', '~> 1.4.0'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'mocha', '~> 1.1'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
 
-  s.add_runtime_dependency 'activesupport', '~> 5.0'
-  s.add_runtime_dependency 'activemodel',   '~> 5.0'
-  s.add_runtime_dependency 'faraday',       '~> 0.9'
-  s.add_runtime_dependency 'nokogiri',      '~> 1.6'
+  s.add_runtime_dependency 'activemodel',   '~> 5.2'
+  s.add_runtime_dependency 'activesupport', '~> 5.2'
+  s.add_runtime_dependency 'faraday',       '~> 0.15'
   s.add_runtime_dependency 'multi_json'
+  s.add_runtime_dependency 'nokogiri', '~> 1.8.2'
 end

data/spec/factories.rb

@@ -1,17 +1,15 @@
-# encoding: UTF-8
-
-FactoryGirl.define do
+FactoryBot.define do
   factory :live do
   end
 
   factory :westfriedhof, class: MVG::Live do
     station 'Westfriedhof'
-    transports [:u, :tram, :bus]
+    transports %i[u tram bus]
   end
 
   factory :hackerbruecke, class: MVG::Live do
-    station "Hackerbrücke"
-    transports [:tram, :s]
+    station 'Hackerbrücke'
+    transports %i[tram s]
   end
 
   factory :goethe_institut, class: MVG::Live do
@@ -21,6 +19,6 @@ FactoryGirl.define do
 
   factory :leonrodplatz, class: MVG::Live do
     station 'Leonrodplatz'
-    transports [:tram, :bus]
+    transports %i[tram bus]
   end
 end

data/spec/mvg_live_spec.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+
 require 'spec_helper'
 
 describe MVG::Live, vcr: { record: :new_episodes } do
@@ -24,7 +24,7 @@ describe MVG::Live, vcr: { record: :new_episodes } do
     end
 
     it 'can be created for a specific transports' do
-      transports = [:u, :bus, :tram, :s]
+      transports = %i[u bus tram s]
       mvglive = MVG::Live.new 'Westfriedhof', transports: transports
       mvglive.transports.must_be_same_as transports
     end
@@ -43,7 +43,7 @@ describe MVG::Live, vcr: { record: :new_episodes } do
     end
 
     it 'should not be valid with invalid transports' do
-      transports = [:transrapid, :express_s_bahn_zum_flughafen]
+      transports = %i[transrapid express_s_bahn_zum_flughafen]
       mvglive = MVG::Live.new 'Vom äh Hauptbahnof äh abfliegen', transports: transports
       mvglive.valid?.must_equal false
       mvglive.errors.keys.must_include :transports
@@ -64,7 +64,7 @@ describe MVG::Live, vcr: { record: :new_episodes } do
     it 'should build the right query' do
       mvglive = build(:westfriedhof)
       mvglive.retrieve.env[:url].to_s
-                                .must_equal 'http://www.mvg-live.de' \
+             .must_equal 'http://www.mvg-live.de' \
                     '/ims/dfiStaticAuswahl.svc' \
                     '?bus=checked&haltestelle=Westfriedhof' \
                     '&tram=checked&ubahn=checked'
@@ -105,25 +105,25 @@ describe MVG::Live, vcr: { record: :new_episodes } do
           @mvglive.result_display.map do |e|
             [e[:line], e[:destination], e[:minutes]]
           end.must_equal [
-            ['17', "Schwanseestraße", 0],
-            ['17', "Amalienburgstraße", 0],
+            ['17', 'Schwanseestraße', 0],
+            ['17', 'Amalienburgstraße', 0],
             ['16', 'St. Emmeram', 3],
             ['16', 'Romanplatz', 7],
-            ['17', "Schwanseestraße", 7],
-            ['17', "Amalienburgstraße", 11],
+            ['17', 'Schwanseestraße', 7],
+            ['17', 'Amalienburgstraße', 11],
             ['16', 'St. Emmeram', 13],
             ['S4', 'Grafrath', 0],
-            ['S1', "München Flughafen Terminal", 2],
-            ['S7', "Kreuzstraße", 3],
+            ['S1', 'München Flughafen Terminal', 2],
+            ['S7', 'Kreuzstraße', 3],
             ['S8', 'Herrsching', 4],
-            ['S6', "München Ost", 6],
+            ['S6', 'München Ost', 6],
             ['S2', 'Erding', 7],
             ['S2', 'Petershausen(Obb)', 8],
-            ['S8', "München Flughafen Terminal", 10],
+            ['S8', 'München Flughafen Terminal', 10],
             ['S6', 'Starnberg', 10],
-            ['S7', "Höllriegelskreuth", 12],
-            ['S1', "München Ost", 13],
-            ['S1', "München Ost", 13],
+            ['S7', 'Höllriegelskreuth', 12],
+            ['S1', 'München Ost', 13],
+            ['S1', 'München Ost', 13],
             ['S4', 'Grafing Bahnhof', 15]
           ]
         end
@@ -139,24 +139,24 @@ describe MVG::Live, vcr: { record: :new_episodes } do
           @mvglive.result_sorted.map { |e| [e[:line], e[:destination], e[:minutes]] }.must_equal [
             ['S2', 'Erding', 1],
             ['16', 'St. Emmeram', 2],
-            ['17', "Schwanseestraße", 2],
-            ['S2', "Altomünster", 2],
+            ['17', 'Schwanseestraße', 2],
+            ['S2', 'Altomünster', 2],
             ['S2', 'Petershausen(Obb)', 2],
-            ['17', "Amalienburgstraße", 4],
+            ['17', 'Amalienburgstraße', 4],
             ['S6', 'Tutzing', 4],
-            ['S8', "München Flughafen Terminal", 4],
+            ['S8', 'München Flughafen Terminal', 4],
             ['S7', 'Wolfratshausen', 6],
             ['16', 'St. Emmeram', 7],
-            ['S1', "München Ost", 7],
-            ['S1', "München Ost", 7],
+            ['S1', 'München Ost', 7],
+            ['S1', 'München Ost', 7],
             ['S4', 'Grafing Bahnhof', 9],
             ['16', 'Romanplatz', 10],
             ['S3', 'Mammendorf', 10],
-            ['17', "Schwanseestraße", 12],
+            ['17', 'Schwanseestraße', 12],
             ['S3', 'Holzkirchen', 12],
             ['S4', 'Geltendorf', 14],
-            ['17', "Amalienburgstraße", 15],
-            ['S1', "München Flughafen Terminal", 16]
+            ['17', 'Amalienburgstraße', 15],
+            ['S1', 'München Flughafen Terminal', 16]
           ]
         end
       end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'minitest/autorun'
 require 'minitest-vcr'
 require 'mocha/test_unit'
 require 'vcr'
-require 'factory_girl'
+require 'factory_bot'
 
 SimpleCov.start
 SimpleCov.command_name 'test'
@@ -13,16 +13,16 @@ SimpleCov.command_name 'test'
 require 'mvg/live'
 
 class MiniTest::Spec
-  include FactoryGirl::Syntax::Methods
+  include FactoryBot::Syntax::Methods
 end
 
-FactoryGirl.find_definitions
+FactoryBot.find_definitions
 
 VCR.configure do |c|
   c.cassette_library_dir = 'fixtures/vcr_cassettes'
   c.hook_into :faraday
   c.default_cassette_options = { record: :new_episodes, serialize_with: :json, preserve_exact_body_bytes: true }
-  c.debug_logger = STDERR
+  # c.debug_logger = STDERR
 end
 
 MinitestVcr::Spec.configure!

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mvg-live
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: minitest-vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: minitest-vcr
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -123,75 +123,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
 description: A CLI and ruby client for mvg-live.de, the real-time interface to Munich's
   public transport
 email:
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mvg-live
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A CLI and ruby client for mvg-live.de