rsr_group 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2a45368e54e3b8aedd99bddb3a28e2dfa6c4a9
-  data.tar.gz: 408a49ce7b4edac8ea58fa7e2cab24f2c3de8dd0
+  metadata.gz: 60077c8e965e51a98ec7c77d7cfaf1c5869745a3
+  data.tar.gz: b7b1ba2099f3c0d6266ca5f1e308f428b624009a
 SHA512:
-  metadata.gz: b956bae5b4532b16be9b623b45be4f175279759f2762726172b6c6d310cd95c1e788f7527a6ccba88969ff49e0748cf9574343d0512eabda59a1a5a8f0e5bd34
-  data.tar.gz: 9a98d1c44176f3b619873d159a75f5428f6e60b413a874a68926d6b544464a94fddffd0cf6a691a60b239a243a8da885251a1d86a1d833c8ad92fde2f209e530
+  metadata.gz: f38996136bb58a2b5538a632636da40269514c6d7968ee1dd43942d0e5f38bd4618603f4016f4117ccc10c59f192ae7c5f18b9f0796c32dd76cd4a913de210fe
+  data.tar.gz: f0735f15fb151e9f37330bc1f8f7a9c875849fb4628849ff565fa475cda6d9ba02b65a8adf20e8d9ad42c5da356560310b6b69f38b63c3df717236e14ce79f53

data/lib/rsr_group/inventory.rb

@@ -1,8 +1,10 @@
 module RsrGroup
   class Inventory < Base
 
+    KEYDEALER_DIR = 'keydealer'
     INVENTORY_DIR = 'ftpdownloads'
     INVENTORY_FILENAME = 'rsrinventory-new.txt'
+    KEYDEALER_FILENAME = 'rsrinventory-keydlr-new.txt'
 
     def initialize(options = {})
       requires!(options, :username, :password)
@@ -18,9 +20,13 @@ module RsrGroup
       items = []
 
       connect(@options) do |ftp|
-        ftp.chdir(INVENTORY_DIR)
-
-        lines = ftp.gettextfile(INVENTORY_FILENAME, nil)
+        if ftp.nlst.include?(KEYDEALER_DIR)
+          ftp.chdir(KEYDEALER_DIR)
+          lines = ftp.gettextfile(KEYDEALER_FILENAME, nil)
+        else
+          ftp.chdir(INVENTORY_DIR)
+          lines = ftp.gettextfile(INVENTORY_FILENAME, nil)
+        end
 
         # Use a zero-byte char as `quote_char` since the data has no quote character.
         CSV.parse(lines, col_sep: ';', quote_char: "\x00") do |row|

data/lib/rsr_group/version.rb

@@ -1,3 +1,3 @@
 module RsrGroup
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsr_group
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler