zvv-cli 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 777c903a2c90173b69cd59862ca8c003b71444c5
-  data.tar.gz: 00ede3ddf90dc5cdde3e534dd9a6c7229a78d8d0
+SHA256:
+  metadata.gz: 8beaff8e2a23d5324dbbc699caecec6952d9add84a0fba9ad7f646d092f53f82
+  data.tar.gz: b904773ebd70ec0db4aea799b2faeab3f0fe4d726e9e8619bc51d13238e737ee
 SHA512:
-  metadata.gz: f719422c9297a4c32f9f2d55f42f83dacf7ec4429bc0d207507b9bde89f6f01308f27c4f14f158833fb8ebf5062a2d726e63900bd3035a091ba576aaffb201e5
-  data.tar.gz: 718013646b054953415be891f577714010fec8515682e78af74bc30dd6e9df092af4feec248ca4886f98a623ec2dbf8aa549477b11bc133dafef40d3a94dc8dd
+  metadata.gz: 40f2955c405bd8dcf0c392fd57768ac3dcdb9d48b7285dfad38a4818dd3b59d2efc9c2b311f00d6dedfcb62d32b8f47d5e75aa5308105fb7ad1056d01b732190
+  data.tar.gz: 75f2feb32a96f75d0f27bf7eda25c05fe38f29fa4f9603a294c16c900d226d7c3cfffcb2f14ea23d1c607c75a186b15288ebc6c7db863dca0e249814d8fd4a4f

data/.gitignore

@@ -1,4 +1,6 @@
 .idea
 .ruby-version
 Gemfile.lock
-.byebug_history
+.byebug_history
+pkg
+.DS_Store

data/Gemfile

@@ -1,10 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in zvv-cli.gemspec
-gemspec group: :development
-
-group :runtime do
-	gem 'commander'
-	gem 'transprt'
-	gem 'colorize'
-end
+gemspec

data/exe/zvv

@@ -5,6 +5,7 @@ require 'rubygems'
 require 'commander'
 require 'transprt'
 require 'colorize'
+require 'debug'
 
 require 'zvv/cli'
 require 'ostruct'
@@ -15,16 +16,6 @@ module Patches
 		def strftime
 			DateTime.iso8601(self).strftime('%H:%M')
 		end
-
-		def subzh
-			gsub('Zürich', 'Zh').
-					gsub('Bahnhof', 'Bhf')
-		end
-
-		def subcon
-			tokens = split(' ')
-			tokens[0][-1] + ' ' + tokens[1]
-		end
 	end
 
 	refine Hash do
@@ -63,7 +54,7 @@ class App
 			c.action do |args, options|
 				time = args[2] || Time.now.to_s
 
-				isArrivalTime = time.start_with?('@') || time.end_with?('@') ? 1 : 0
+				isArrivalTime = time.start_with?('@') || time.end_with?('@') ? '1' : '0'
 				time = time.gsub('@', '')
 
 				time += ':00' unless time.include? ':'
@@ -71,7 +62,7 @@ class App
 				time += 24 * 60 ** 2 if time < Time.now # Look up tomorrow's connections
 
 
-				connections = Transprt.connections(
+				connections = Transprt::Client.new.connections(
 					from: args[0],
 					to: args[1],
 					date: time.strftime('%Y-%m-%d'),
@@ -79,13 +70,16 @@ class App
 					isArrivalTime: isArrivalTime
 				)
 
+				# pp connections[0]
+
 				connections.to_ostruct.each_with_index do |c, i|
-					puts ("%s %s ---> %s %s" % [c.from.station.name, c.from.departure.strftime, c.to.station.name, c.to.arrival.strftime]).subzh
+					duration_sec = (DateTime.iso8601(c.to.arrival).to_time - DateTime.iso8601(c.from.departure).to_time).to_int
+					puts ("%-20s %5s   %2d:%02d   %-20s %5s" % [c.from.station.name, c.from.departure.strftime, duration_sec / 60 ** 2, (duration_sec % 60 ** 2) / 60, c.to.station.name, c.to.arrival.strftime])
 					c.sections.each do |s|
 						if s.walk
-							puts ("Walk (%s) to %s" % [s.walk.duration, s.departure.station.name]).subzh.light_black
+							puts ("Walk (%sm) to %s" % [s.walk.duration, s.departure.station.name]).light_black
 						else
-							puts ("%s %s -- %s --> %s %s" % [s.departure.station.name, s.departure.departure.strftime, s.journey.name.subcon, s.arrival.station.name, s.arrival.arrival.strftime]).subzh.light_black
+							puts ("%-20s %5s   %2s%-3s   %-20s %5s" % [s.departure.station.name, s.departure.departure.strftime, s.journey.category, s.journey.number[0..2], s.arrival.station.name, s.arrival.arrival.strftime]).light_black
 						end
 					end
 					puts unless i == connections.length - 1

data/lib/zvv/cli/version.rb

@@ -1,5 +1,5 @@
 module Zvv
   module Cli
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
   end
 end

data/lib/zvv/cli.rb

@@ -4,9 +4,3 @@ if ENV['ZVV_DEBUG']
 	require 'byebug'
 	require 'pry-byebug'
 end
-
-module Zvv
-  module Cli
-    # Your code goes here...
-  end
-end

data/zvv-cli.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
 
   # TODO fork & update
   spec.add_dependency "commander"
-  spec.add_dependency "transprt"
+  spec.add_dependency "transprt", "~> 0.2.2"
   spec.add_dependency "colorize"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zvv-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - PJK
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,16 +112,16 @@ dependencies:
   name: transprt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ homepage: https://github.com/PJK/zvv-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: CLI for Swiss public transport network
 test_files: []