weighflow_cli 0.2.5 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f43616755fac94a4e1b1afc3095bdfd03ac5dc50dd2b42ee5ae838cf6023f37
-  data.tar.gz: 4710b9900bca368eb76a530a15e15681357f513efdb2bdf559ce29e36393f7ba
+  metadata.gz: 93ff8b4ee53a8072ca02fba4d89306b6fa79e267acf5cef3b1b19e7f3026b513
+  data.tar.gz: 852410b8061d467471b9115a50ce9e9314c4cada5be144f2f7dfce1e207a757c
 SHA512:
-  metadata.gz: 8afc73d0d13f07e9f1b893f80040b4dd4d5fa02ad664e7dc55e3567eb9430687cfe9ab956aac8c93bcef93fa80cceb0aa1940010203c2fdc67fbb2fb0f34c7a8
-  data.tar.gz: ce913eb0ba65a20389c685c1a5aa4a4f51cd90f2d036949c9ae40930da53b49eecb9ec7bcc1e1dc2dd3ef64666841ba71a18117888daac1309b6f4a69d94c72b
+  metadata.gz: 553708867bc04f2ffe9287be500c07c5c22e7baf5e2a44a4504637dbff7b62f758abb99c245a47a36c3c447342f1fcbc8f7d01981320f4d77d43ec82eb458e46
+  data.tar.gz: b7fb62070b2028f027e630574f0c1903ab64bb13fc0b3ccef2e2a183ea44c27566f4ad09cf52b049e302ca6bd9b8c26b0c89fb1c0d91109738d63641da71c00f

data/.byebug_history

@@ -1,3 +1,22 @@
+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

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,25 +1,32 @@
 PATH
   remote: .
   specs:
-    weighflow_cli (0.2.4)
+    weighflow_cli (0.2.9)
       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)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    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

@@ -6,25 +6,35 @@ require 'httparty'
 require_relative "weighflow_cli/version"
 require_relative 'weighflow_cli/rendering'
 require_relative 'weighflow_cli/client'
+#require_relative 'weighflow_cli/cli_weights'
 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)

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

@@ -64,7 +64,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 +85,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/rendering.rb

@@ -4,7 +4,7 @@ module WeighflowCli
       if options[:yaml]
         puts result.to_yaml
       else
-        puts result.to_json     
+        puts JSON.pretty_generate(result)
       end
     end
   end 

data/lib/weighflow_cli/version.rb

@@ -3,7 +3,7 @@
 
 
 module WeighflowCli
-  VERSION = "0.2.5"
+  VERSION = "0.2.10"
 
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weighflow_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.10
 platform: ruby
 authors:
 - Bruce Martin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-26 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