weighflow_cli 0.2.6 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c003dbce7d10d625735cafea74cdf9deee25abc1c98efc66439a437c7070d918
-  data.tar.gz: 21778039bbb29a51798a296f04e98c6bbc7d3d437633bc68370a738b6de9ae88
+  metadata.gz: '0880ba4d3668b12210a21ab60ca40dc37cbefe0e2b18a5cca4465bdda5ca28ba'
+  data.tar.gz: d0bfc91c553fbe48c1f77d1de71ea6427c925ab3300ade47f2a16ba00a2b09ad
 SHA512:
-  metadata.gz: b65df818087d76d495e53c346617f32182444d254bd3794332205eb3e78bf1bbae8469ad486cfae31f74e8b59d2a7384b998b56728f6cae7c6bbdab98dea5257
-  data.tar.gz: 721899efee2b692248458c01e75ff21e3f859b46ed8a45e5704e35fcb24809ed100022bc15caf1b95a20aadaeede59d3db51e94343adb91f8b65edee8fb5d355
+  metadata.gz: 62f8a787fcd636f2c9dde240d282bec123d558ab7c72a24680a2e1c03a2a9e206779553c2676154b6f8034e4b6516855581fb6192d12dc8b056eb87001973306
+  data.tar.gz: 7a88511b284eadaf3387642a5ee4fb08ece3b8a870f98fb52a9ed357903ac123266670d596ecbdc5da6197a56e75a771b4ec0b1c22bcc0d38291d0b2dcd97791

data/.byebug_history

@@ -1,4 +1,87 @@
 c
+results.first.value
+results.first.status
+results.first.methods
+ap results.first.methods
+ap results.first.mehtods
+ap results
+c
+ap orders.size
+n
+c
+q
+c
+ap results[:commodity_outbounds][:orders]
+ap results[:commodity_outbounds]
+ap results.keys
+ap results.flatten
+ap results.keys
+ap results
+c
+q
+c
+find_orders(selection: 'OI')
+find_orders(selection: 'OC')
+self
+ap auth_headers
+self
+c
+results
+c
+ap response.body
+c
+ap response.body
+c
+ap selection
+c
+ap selection
+c
+Array[inventory_outbounds[:orders]].compact
+Array[inventory_outbounds[:orders]]
+Array.new(inventory_outbounds[:orders])
+ap inventory_outbounds[:orders]
+c
+e
+n
+c
+Array.new(commodity_outbounds[:orders])
+Array.new(ommodity_outbounds[:orders])
+Array(ommodity_outbounds[:orders])
+commodity_outbounds[:orders]
+ap commodity_outbounds[:orders]
+Array[commodity_outbounds[:orders]]
+ap commodity_outbounds[:orders]
+c
+ap inventory_outbounds
+require 'awesome_print'
+ap inventory_outbounds
+c
+ap inventory_outbounds
+ap commodity_inbounds
+ap commodity_outbounds
+require 'awesome_print'
+ap commodity_outbounds
+commodity_outbounds
+q
+C
+WeighflowCli::ROOT_PATH
+c
+WeighflowCli::_ROOT_PATH
+WeighflowCli
+_ROOT_PATH
+c
+ap result.first.keys
+ap keys
+q
+c
+uri
+uri.port = 80
+uri.methods
+ap uri
+c
+result.class
+ap result
+c
 weight_params
 c
 weight_params

data/.gitignore

@@ -7,6 +7,8 @@
 /spec/reports/
 /tmp/
 /.data/*
+/spec/data
+
 # rspec failure tracking
 .rspec_status
 .secret.key

data/Gemfile

@@ -10,4 +10,6 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem 'awesome_print'
 gem 'byebug'
-gem 'gem-release'
+gem 'gem-release'
+gem 'vcr'
+gem 'webmock'

data/Gemfile.lock

@@ -1,17 +1,22 @@
 PATH
   remote: .
   specs:
-    weighflow_cli (0.2.5)
+    weighflow_cli (0.2.10)
       httparty
       thor (~> 1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     awesome_print (1.8.0)
     byebug (11.1.3)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.4)
     gem-release (2.2.1)
+    hashdiff (1.0.1)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -19,7 +24,9 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
     multi_xml (0.6.0)
+    public_suffix (4.0.6)
     rake (13.0.3)
+    rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -34,6 +41,11 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     thor (1.1.0)
+    vcr (6.0.0)
+    webmock (3.12.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -45,6 +57,8 @@ DEPENDENCIES
   gem-release
   rake (~> 13.0)
   rspec (~> 3.0)
+  vcr
+  webmock
   weighflow_cli!
 
 BUNDLED WITH

data/exe/weighflow_cli

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
 require "weighflow_cli"
- 
+
+
 WeighflowCli::Cli.start(ARGV)

data/lib/weighflow_cli.rb

@@ -3,6 +3,16 @@
 require 'thor'
 require 'httparty'
 
+ 
+## 
+# Development mode only
+#
+if ENV['RUBY_ENV'] == 'development'
+  require 'byebug'
+  require 'awesome_print'
+end
+#
+#
 require_relative "weighflow_cli/version"
 require_relative 'weighflow_cli/rendering'
 require_relative 'weighflow_cli/client'
@@ -10,21 +20,30 @@ require_relative 'weighflow_cli/cli'
 require_relative 'weighflow_cli/credentials'
 require_relative 'weighflow_cli/order_handler'
 
+ 
 
 module WeighflowCli 
 
   class Error < StandardError; end
   # 
-  _ROOT_PATH = File.expand_path('~/.weighflow_cli').freeze
+  ROOT_PATH = File.expand_path('~/.weighflow_cli').freeze
   #
-  Dir.mkdir(_ROOT_PATH) unless Dir.exists?(_ROOT_PATH)
+  Dir.mkdir(ROOT_PATH) unless Dir.exists?(ROOT_PATH)
   #
+   
   # Provide an override to relocate data directory
-  DATA_PATH = ENV['WEIGHFLOW_CLI_PATH'] || File.join(_ROOT_PATH, 'data')
-  #
-  #
+  def self.data_path     
+    return @data_path if defined?(@data_path)
+    @data_path ||= ENV.fetch('WEIGHFLOW_CLI_PATH') { File.join(WeighflowCli::ROOT_PATH, 'data') }
+    ensure_data_path
+    @data_path
+  end
+
+  ##
   # Ensure data path
-  Dir.mkdir(DATA_PATH) unless Dir.exists?(DATA_PATH)
+  def self.ensure_data_path
+    Dir.mkdir(data_path) unless Dir.exists?(data_path)
+  end
    #
   
    Configuration = Struct.new(:secret, :url)

data/lib/weighflow_cli/cli.rb

@@ -1,123 +1,17 @@
- require 'byebug'
+ require_relative 'cli_weights'
  
  module WeighflowCli 
 
-  class Weights < Thor
-    include Rendering
-
-    desc 'from_index [INDEX ID]', 'create weight from index'
-    #option :index, required: true, banner: 'ie. CommodityOrder-T-I-002-3340455-01'
-    option :gross, aliases: '-g', type: :numeric, required: true
-    option :tare, aliases: '-t', type: :numeric, required: true
-    option :certificate, aliases: '-c', required: true
-    def from_index(index_id)
-      raise 'index_id required' unless index_id
-      index = WeighflowCli.find_order(index_id)
-      raise 'index not found for id' unless index && index.data
-      #
-      # parse external id parts
-      order_type, transport, io, location, order_num, lin =  index.data[:external_unique_id].to_s.split('-')
-      #
-      # correct for diff in type between order and weight processor
-      order_type = 'Inventory' if order_type == 'BulkInventory'
-      #
-      weight_params = {
-        io: index.data[:i_o],
-        order_id: index.data[:order_id],
-        order_type: order_type,
-        gross_weight: options[:gross].to_i,
-        tare_weight: options[:tare].to_i,
-        weighed_at: Time.now.round,
-        certificate_number: options[:certificate].to_s
-      }
-
-      options_renderer(WeighflowCli.create_weight(params: weight_params), options) 
-    end
-  
-
-    desc 'template [INDEX_ID]', 'create weight template'
-    def template(index_id)
-      aise 'index_id required' unless index_id
-      index = WeighflowCli.find_order(index_id)
-      raise 'index not found for id' unless index && index.data
-       #
-      # parse external id parts
-      order_type, transport, io, location, order_num, lin =  index.data[:external_unique_id].to_s.split('-')
-      #
-      # correct for diff in type between order and weight processor
-      order_type = 'Inventory' if order_type == 'BulkInventory'
-      #
-      weight_params = {
-        io: index.data[:i_o],
-        order_id: index.data[:order_id],
-        order_type: order_type,
-        gross_weight: 0,
-        tare_weight: 0,
-        weighed_at: Time.now.round,
-        certificate_number: "{cert number}"
-      }
-      options_renderer(weight_params, options) 
-    end
-
-    
-    desc 'list', 'List weights within the last 24 hours'    
-    def list
-      options_renderer(WeighflowCli.weights, options) 
-    end
-
-
-
-    desc 'create', 'Create a weight given an order'   
-    long_desc <<~DESC
-
-      weighflow_cli --file weight.json
-
-      This file should contain a minimum of :
-
-       { 
-         order_type: "Commodity", 
-        io: "O", 
-        order_id: "{integer}", 
-        gross_weight: "75000", 
-        tare_weight: "25444", 
-        weighed_at: "2021-02-26 10:15:41 am", 
-        release_number: "", 
-        truck_license_number: "", 
-        trailer1_license_number: "", 
-        trailer2_license_number: "", 
-        truck_number: "", 
-        driver_name: "", 
-        driver_number: "" 
-      }
-    
-    --
-    DESC
-    option :file, aliases: '-f',  required: true, banner: '[File name] json format'
-    def create 
-      weight_params = JSON.parse(File.read(options[:file]), symbolize_names: true)
-      puts weight_params
-       
-      options_renderer(WeighflowCli.create_weight(params: weight_params), options) 
-      #options_renderer(options, options) 
-    end
-
-
-    desc 'void', 'Voided a weight within 24 hours'
-    option :weight_id, required: true
-    option :reason, required: true
-    def void 
-      options_renderer(WeighflowCli.void_weight(options[:weight_id], options[:reason]), options) 
-    end
-    
-  end
-
+ 
   class Cli < Thor
     include Rendering
+   
+
     package_name "WeighflowCli"
     class_option :yaml, type: :boolean
  
     desc 'weights', 'weights commands'
-    subcommand 'weights', Weights
+    subcommand 'weights', CliWeights
 
     def self.exit_on_failure?
       false
@@ -131,7 +25,7 @@
 
     desc 'data_path', "Current data path"
     def data_path
-      puts DATA_PATH
+      puts WeighflowCli.data_path
     end
 
 
@@ -139,17 +33,13 @@
     def login
       Credentials.login      
     end
-
-
-
+ 
 
     desc "pull", "Pull Orders from Weighflow"     
     def pull 
       options_renderer(WeighflowCli.pull, options)
     end
- 
-
-
+  
 
     desc 'list', "List currently pulled orders"     
     def list
@@ -160,14 +50,6 @@
     def indexes
       options_renderer(WeighflowCli.list(indexes_only: true), options) 
     end
-
-
-
-
-   
-
-
-
   
 
     desc 'find_order', 'Find order details'    

data/lib/weighflow_cli/cli_weights.rb

@@ -0,0 +1,111 @@
+
+module WeighflowCli 
+  class CliWeights < Thor
+    include Rendering
+
+    desc 'from_index [INDEX ID]', 'create weight from index'
+    #option :index, required: true, banner: 'ie. CommodityOrder-T-I-002-3340455-01'
+    option :gross, aliases: '-g', type: :numeric, required: true
+    option :tare, aliases: '-t', type: :numeric, required: true
+    option :certificate, aliases: '-c', required: true
+    def from_index(index_id)
+      raise 'index_id required' unless index_id
+      index = WeighflowCli.find_order(index_id)
+      raise 'index not found for id' unless index && index.data
+      #
+      # parse external id parts
+      order_type, transport, io, location, order_num, lin =  index.data[:external_unique_id].to_s.split('-')
+      #
+      # correct for diff in type between order and weight processor
+      order_type = 'Inventory' if order_type == 'BulkInventory'
+      #
+      weight_params = {
+        io: index.data[:i_o],
+        order_id: index.data[:order_id],
+        order_type: order_type,
+        gross_weight: options[:gross].to_i,
+        tare_weight: options[:tare].to_i,
+        weighed_at: Time.now.round,
+        certificate_number: options[:certificate].to_s
+      }
+
+      options_renderer(WeighflowCli.create_weight(params: weight_params), options) 
+    end
+
+
+    desc 'template [INDEX_ID]', 'create weight template'
+    def template(index_id)
+      aise 'index_id required' unless index_id
+      index = WeighflowCli.find_order(index_id)
+      raise 'index not found for id' unless index && index.data
+      #
+      # parse external id parts
+      order_type, transport, io, location, order_num, lin =  index.data[:external_unique_id].to_s.split('-')
+      #
+      # correct for diff in type between order and weight processor
+      order_type = 'Inventory' if order_type == 'BulkInventory'
+      #
+      weight_params = {
+        io: index.data[:i_o],
+        order_id: index.data[:order_id],
+        order_type: order_type,
+        gross_weight: 0,
+        tare_weight: 0,
+        weighed_at: Time.now.round,
+        certificate_number: "{cert number}"
+      }
+      options_renderer(weight_params, options) 
+    end
+
+    
+    desc 'list', 'List weights within the last 24 hours'    
+    def list
+      options_renderer(WeighflowCli.weights, options) 
+    end
+
+
+
+    desc 'create', 'Create a weight given an order'   
+    long_desc <<~DESC
+
+      weighflow_cli --file weight.json
+
+      This file should contain a minimum of :
+
+      { 
+        order_type: "Commodity", 
+        io: "O", 
+        order_id: "{integer}", 
+        gross_weight: "75000", 
+        tare_weight: "25444", 
+        weighed_at: "2021-02-26 10:15:41 am", 
+        release_number: "", 
+        truck_license_number: "", 
+        trailer1_license_number: "", 
+        trailer2_license_number: "", 
+        truck_number: "", 
+        driver_name: "", 
+        driver_number: "" 
+      }
+    
+    --
+    DESC
+    option :file, aliases: '-f',  required: true, banner: '[File name] json format'
+    def create 
+      weight_params = JSON.parse(File.read(options[:file]), symbolize_names: true)
+      puts weight_params
+      
+      options_renderer(WeighflowCli.create_weight(params: weight_params), options) 
+      #options_renderer(options, options) 
+    end
+
+
+    desc 'void', 'Voided a weight within 24 hours'
+    option :weight_id, required: true
+    option :reason, required: true
+    def void 
+      options_renderer(WeighflowCli.void_weight(options[:weight_id], options[:reason]), options) 
+    end
+    
+  end
+end

data/lib/weighflow_cli/client.rb

@@ -21,7 +21,7 @@ module WeighflowCli
 
     def create_weight(params: {})
       response = self.class.post('/weights', body: params)    
-      render_json(response)
+      render_json(response)     
     end
 
     def void_weight(weight_id, reason)
@@ -35,7 +35,7 @@ module WeighflowCli
     end
 
 
-    def commodity_outbound_truck
+    def commodity_outbound_truck       
       find_orders(selection: 'OC')    
     end
 
@@ -56,7 +56,7 @@ module WeighflowCli
     private
 
     def find_orders(selection: 'OC')
-      response = self.class.get('/orders', query: { s: selection })    
+      response = self.class.get('/orders', query: { s: selection })           
       render_json(response)
     end
  

data/lib/weighflow_cli/credentials.rb

@@ -5,7 +5,7 @@ module WeighflowCli
  
 
     def self.key_store_config 
-      File.join(DATA_PATH, '.config.yaml')
+      File.join(WeighflowCli.data_path, '.config.yaml')
     end
 
 

data/lib/weighflow_cli/order_handler.rb

@@ -1,30 +1,41 @@
 require 'digest'
+
  
 
 module WeighflowCli
 
   module OrderHandler
-
     #
     # Pull order data from Weighflow and store in local repository
     def self.pull
-      commodity_outbounds = WeighflowCli.client.commodity_outbound_truck
-      commodity_inbounds = WeighflowCli.client.commodity_inbound_truck
+      ##
+      # api methods to collect orders
+      method_names = [:commodity_outbound_truck, 
+                      :commodity_inbound_truck,
+                      :bulk_inventory_outbound_truck, 
+                      :bulk_inventory_inbound_truck]
       #
-      inventory_outbounds = WeighflowCli.client.bulk_inventory_outbound_truck
-      inventory_inbounds = WeighflowCli.client.bulk_inventory_inbound_truck     
+      # collect orders using threads
+      results = threaded_api_query(method_names)
       #
-      # combine
- 
-      orders = commodity_outbounds[:orders] + commodity_inbounds[:orders] + inventory_outbounds[:orders] + inventory_inbounds[:orders]
+      # flatten order array of hashes       
+      orders = results.map { |orders| orders[:orders] }.flatten 
       #
+      # Store in repository
       diff = OrderRepository.new(orders)      
       diff.perform      
-     
     end
 
 
+    ##
+    # Process multiple api calls in threads
+    def self.threaded_api_query(method_names)
+      method_names.map do |name|
+        Thread.new { WeighflowCli.client.send(name) }
+      end.map(&:value)
+    end
 
+ 
     #
     #
     # Find a single order with details from the stored repository
@@ -64,7 +75,7 @@ module WeighflowCli
       #
       # Data index file name
       def index_file_name 
-        @index_file_name ||= File.join(DATA_PATH, 'orders_index_cache')
+        @index_file_name ||= File.join(WeighflowCli.data_path, 'orders_index_cache')
       end
         
 
@@ -85,7 +96,7 @@ module WeighflowCli
       #
       # Build the file name from the checksum
       def build_detail_file_name(order)
-        File.join(DATA_PATH, 'order_' + create_checksum(order) + '.json')
+        File.join(WeighflowCli.data_path, 'order_' + create_checksum(order) + '.json')
       end
  
 

data/lib/weighflow_cli/version.rb

@@ -3,7 +3,7 @@
 
 
 module WeighflowCli
-  VERSION = "0.2.6"
+  VERSION = "0.2.11"
 
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weighflow_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.11
 platform: ruby
 authors:
 - Bruce Martin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -60,6 +60,7 @@ files:
 - exe/weighflow_cli
 - lib/weighflow_cli.rb
 - lib/weighflow_cli/cli.rb
+- lib/weighflow_cli/cli_weights.rb
 - lib/weighflow_cli/client.rb
 - lib/weighflow_cli/credentials.rb
 - lib/weighflow_cli/order_handler.rb