rawbotz 0.1.5 → 0.2.0

data/exe/bcrypt_pw

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'bcrypt'
+
+if ARGV.length != 1
+  STDERR.puts "Please provide an argument to #{$PROGRAMNAME}"
+  exit 1
+end
+
+puts BCrypt::Password.create ARGV[0]

data/exe/rawbotz_abort_orders

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+require "rawbotz"
+require "rawbotz/option_parser"
+
+optparse = Rawbotz::OptionParser.new do |opts, options|
+  opts.banner = "Usage: #{$PROGRAM_NAME} [OPTIONS]"
+  opts.separator ""
+end
+
+optparse.parse!
+options = optparse.options
+
+logger = Logger.new(STDOUT)
+logger.level = optparse.options[:verbose] ? Logger::DEBUG : Logger::INFO
+
+logger.debug "#{$PROGRAM_NAME} #{Rawbotz::VERSION}"
+
+logger.info("Setting all orders in processing state in 'aborted' state")
+
+orders = RawgentoModels::Order.where(state: 'processing')
+logger.info("Found #{orders.count} orders")
+
+orders.update_all(state: 'aborted')
+
+logger.info("done")
+
+exit 0

data/exe/rawbotz_process_order_queue

@@ -8,7 +8,6 @@ require "rawbotz"
 require 'rawbotz/option_parser'
 require 'rawbotz/cli/order_result_table'
 
-
 optparse = Rawbotz::OptionParser.new do |opts, options|
   opts.banner = "Usage: #{$PROGRAM_NAME} [OPTIONS] ORDER_ID"
   opts.separator ""
@@ -22,6 +21,8 @@ options = optparse.options
 
 include RawgentoModels
 
+STDOUT.sync = true # helps in shell redirection logging situations
+
 def main options
   logger = Logger.new(STDOUT)
   logger.level = options[:verbose] ? Logger::DEBUG : Logger::INFO
@@ -49,13 +50,14 @@ def main options
 
   logger.info ("#{order.order_items.processible.count} products to order.")
 
-  mech = Rawbotz.new_mech
-  mech.login
-
-  order_processor = Rawbotz::OrderProcessor.new(order, logger)
-  order_processor.process!
-
-  order.update(state: :ordered)
+  begin
+    order_processor = Rawbotz::OrderProcessor.new(order, logger)
+    order_processor.process!
+    order.update(state: :ordered)
+  rescue
+    logger.error("Hit error during order")
+    order.update(state: :error)
+  end
 
   logger.info("Finished order")
 
@@ -66,6 +68,8 @@ def main options
   diff_table = Rawbotz::CLI::OrderResultTable.tables diffs
   puts diff_table
 
+  order.update(order_result: diff_table)
+
   if options[:mail]
     logger.debug("Sending mail")
     mail = Rawbotz::mail("rawbotz order finished",

data/exe/rawbotz_stock_update

@@ -22,6 +22,10 @@ optparse = OptionParser.new do |opts|
     options[:config] = c
   end
 
+  opts.on("-f", "--fake VALUE", 'Fake value. If quantity is higher than 0.9*VALUE, subtract VALUE.') do |f|
+    options[:fake_value] = f
+  end
+
   opts.separator ""
   opts.separator "Output options"
   opts.on("-v", "--verbose", 'print debug output (WARNING: including PASSWORD)') do |v|
@@ -73,7 +77,12 @@ def main options
     if product.nil?
       logger.info("No such product #{s.product_id}")
     else
-      product.stock_items.create(qty: s.qty, date: now)
+      qty = s.qty
+      if options[:fake_value].to_i > 0 && options[:fake_value].to_i * 0.9 < s.qty.to_i
+        qty = qty - options[:fake_value].to_i
+        logger.info("Fake value (#{options[:fake_value]}) applies for product_id #{product.product_id}: #{s.qty}")
+      end
+      product.stock_items.create(qty: qty, date: now)
       logger.info("Updated stock for #{s.product_id}")
     end
   end

data/exe/rawbotz_update_local_products

@@ -11,6 +11,10 @@ optparse = Rawbotz::OptionParser.new do |opts, options|
           "send mail with result") do |v|
     options[:mail] = v
   end
+  opts.on("-d", "--[no-]dry-run",
+          "simulate, log potential changes but do not save them") do |d|
+    options[:dry_run] = d
+  end
 end
 optparse.parse!
 options = optparse.options
@@ -34,7 +38,7 @@ end
 product_count = RawgentoModels::LocalProduct.unscoped.count
 
 updater = Rawbotz::ProductUpdater.new logger
-updater.sync
+updater.sync(options[:dry_run])
 
 logger.info("Finished updating local products.")
 
@@ -42,8 +46,12 @@ logger.info("Found #{RawgentoModels::LocalProduct.unscoped.count - product_count
 
 if options[:mail]
   logger.debug("Sending mail")
-  Rawbotz::mail("rawbotz local product update",
-                "Found #{RawgentoModels::LocalProduct.unscoped.count - product_count} new local products")
+  if updater.change_text.present?
+    Rawbotz::mail("rawbotz local product update",
+                  "Found #{RawgentoModels::LocalProduct.unscoped.count - product_count} new local products\n\nOther changes:\n#{updater.change_text}")
+  else
+    Rawbotz::mail("rawbotz local product update: no changes", "Nothing changed in magento")
+  end
 end
 
 exit 0

data/exe/rawbotz_update_remote_products

@@ -5,6 +5,7 @@ require "rawbotz"
 require 'magento_remote'
 
 require 'optparse'
+STDOUT.sync = true
 
 options = { sleep_time: 1,
             start_pid: 0,
@@ -29,6 +30,7 @@ optparse = OptionParser.new do |opts|
   opts.separator "Configuration file (remote shop info, local db info)"
   opts.on("-c", "--config FILE", 'file path to YAML config file.') do |c|
     options[:config] = c
+    Rawbotz.conf_file_path = c
   end
   opts.separator ""
   opts.separator "Parsing/scraping options"
@@ -52,9 +54,9 @@ optparse = OptionParser.new do |opts|
           "try LIMIT products #{options.print_default(:limit)}") do |v|
     options[:limit] = v
   end
-  opts.on("-n", "--check-new", Integer,
+  opts.on("-n", "--[no-]check-new",
           "check only for new products") do |v|
-    options[:check_new] = true
+    options[:check_new] = v
   end
 
   opts.separator ""
@@ -77,6 +79,8 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!
 
+STDOUT.sync = true
+
 if options[:check_new] && options[:start_pid] != 0
   STDERR.puts "Cannot define both check-new and start-pid options"
   exit 1
@@ -91,6 +95,7 @@ def main options
 
   mech_config = (YAML.load_file options[:config])["remote_shop"]
   logger.debug(mech_config)
+
   mech = MagentoMech.from_config(mech_config)
   mech.log_to! logger
 
@@ -104,6 +109,7 @@ def main options
   number_dead = 0
   product_count = RawgentoModels::RemoteProduct.count
 
+  changes = []
 
   current_pid = options[:start_pid]
   if options[:check_new]
@@ -120,8 +126,24 @@ def main options
     p = mech.scrape_products(current_pid, 1, options[:sleep_time])
     if !p.empty?
       logger.info "Found #{p[0].inspect}"
+
       product_db = RawgentoModels::RemoteProduct.find_or_initialize_by(product_id: p[0][1].to_i, supplier: supplier)
-      product_db.update!(name: p[0][0], product_id: p[0][1].to_i, supplier: supplier)
+      product_db.name = p[0][0]
+      product_db.product_id = p[0][1].to_i
+      product_db.supplier = supplier
+
+      if product_db.persisted?
+        logger.debug "Product #{product_db.product_id} already existed"
+      else
+        logger.debug "Product #{product_db.product_id} is new!"
+      end
+
+      if product_db.changed?
+        change_line = "Changes for #{product_db.product_id} (#{product_db.name}): #{product_db.changes}"
+        logger.info(change_line)
+        changes << change_line
+      end
+
       product_db.save!
       number_dead = 0
     else
@@ -151,7 +173,8 @@ def main options
   if options[:mail]
     logger.debug("Sending mail")
     Rawbotz::mail("rawbotz remote product update",
-                  "Found #{RawgentoModels::RemoteProduct.count - product_count} remote products")
+                  "Found #{RawgentoModels::RemoteProduct.count - product_count} new remote products\n"\
+                  "#{changes.join('\n')}")
   end
 end
 

data/lib/rawbotz.rb

@@ -1,15 +1,23 @@
+require 'rawgento_models'
+require 'rawgento_db'
+
 require "rawbotz/version"
 require "rawbotz/remote_shop"
 require "rawbotz/local_shop"
-require "rawbotz/order_processor"
+require "rawbotz/processors/stock_processor"
+require "rawbotz/processors/order_processor"
+require "rawbotz/processors/order_linker"
+require "rawbotz/processors/organic_product_deliveries_csv"
 require "rawbotz/datapolate"
+require "rawbotz/sales_data"
+require "rawbotz/models/sales"
+require "rawbotz/models/stock"
+require "rawbotz/models/stock_product"
+require "rawbotz/models/stock_product_factory"
 require "rawbotz/chart_month_dataset"
-require "rawbotz/product_updater"
+require "rawbotz/processors/product_updater"
 require "rawbotz/mail_template"
 
-require 'rawgento_models'
-require 'rawgento_db'
-
 require "rawbotz/routes"
 
 require 'ostruct'

data/lib/rawbotz/app.rb

@@ -4,9 +4,13 @@ require 'action_view' # Workaround https://github.com/haml/haml/issues/695
 require 'haml'
 require 'rawbotz/helpers/icon_helper'
 require 'rawbotz/helpers/flash_helper'
+require 'rawbotz/helpers/format_helper'
 require 'rawbotz/helpers/resource_link_helper'
+require 'rawbotz/helpers/order_item_color_helper'
 require 'tilt/haml'
 
+require 'bcrypt'
+
 class RawbotzApp < Sinatra::Base
   include RawgentoModels
 
@@ -29,24 +33,44 @@ class RawbotzApp < Sinatra::Base
     set :supplier, Supplier.find_by(name:
                                     conf["supplier_name"])
     set :conf, conf
+
+    if conf["authentication"] && !conf["authentication"].empty?
+      use Rack::Auth::Basic, "Protected Area, no robots allowed" do |username, password|
+        if username.nil? || password.nil? || conf["authentication"][username].nil?
+          nil
+        else
+          BCrypt::Password.new(conf["authentication"][username]) == password
+        end
+      end
+    end
   end
 
   helpers do ; end
   helpers Rawbotz::Helpers::IconHelper
   helpers Rawbotz::Helpers::FlashHelper
+  helpers Rawbotz::Helpers::FormatHelper
   helpers Rawbotz::Helpers::ResourceLinkHelper
+  helpers Rawbotz::Helpers::OrderItemColorHelper
 
   get '/' do
     haml :index
   end
 
+  # routes:
   # get  '/orders'
   # get  '/order/new'
   # get  '/order/:id'
   # post '/order/:id/'
   # get  '/order/:id/packlist'
+  # get  '/order/:id/packlist/pdf'
   register Rawbotz::RawbotzApp::Routing::Orders
 
+  # get  '/order/:id/stock
+  # post '/order/:id/stock'
+  # get  '/order/:id/link_to_remote'
+  # post '/order/:id/link_to_remote'
+  register Rawbotz::RawbotzApp::Routing::Orders::Stock
+
   # get  '/products'
   # post '/products/search'
   # get  '/product/:id'
@@ -74,9 +98,19 @@ class RawbotzApp < Sinatra::Base
   # post '/supplier/:id'
   register Rawbotz::RawbotzApp::Routing::Suppliers
 
+  # get  '/suppliers/orders'
+  # get  '/suppliers/orders.csv'
+  register Rawbotz::RawbotzApp::Routing::Suppliers::Orders
+
+  # get '/stock'
+  # get '/stock/alerts'
+  # get '/stock/warnings'
+  register Rawbotz::RawbotzApp::Routing::Stock
+
   # get  '/orders/non_remote'
-  # get  '/order/non_remote/:supplier_id'
-  # post '/order/non_remote/:supplier_id'
+  # get  '/order/non_remote/:order_id'
+  # post '/order/non_remote/:order_id'
+  # get  '/order/non_remote/:supplier_id/new'
   register Rawbotz::RawbotzApp::Routing::NonRemoteOrders
 
   get '/maintenance' do

data/lib/rawbotz/cli/order_result_table.rb

@@ -2,6 +2,17 @@ module Rawbotz::CLI
   module OrderResultTable
     def self.tables diffs
       out = ""
+      if !diffs[:error].empty?
+        error_items = diffs[:error].map do |p|
+          [p[0][0..35]]
+        end
+        out << Terminal::Table.new(title: "With error",
+          headings: ['Product'],
+          rows:     error_items,
+          style:    {width: 60}).to_s
+        out << "\n\n"
+      end
+
       if !diffs[:perfect].empty?
         perfect_items = diffs[:perfect].map do |p, q|
           [p.local_product.remote_product.name[0..35], q]
@@ -55,6 +66,8 @@ module Rawbotz::CLI
           rows:     extra_items,
           style:    {width:60}).to_s
       end
+
+      out
     end
   end
 end

data/lib/rawbotz/helpers/format_helper.rb

@@ -0,0 +1,14 @@
+module Rawbotz
+  module Helpers
+    module FormatHelper
+      # makes 1.7923 -> 1.79
+      # 200.00 -> 200
+      def friendly_float value
+        if value.nil?
+          return nil
+        end
+        "%g" % ("%.2f" % value )
+      end
+    end
+  end
+end

data/lib/rawbotz/helpers/icon_helper.rb

@@ -1,38 +1,124 @@
 module Rawbotz
   module Helpers
     module IconHelper
-      def error_icon
-        '<i class="fa fa-flash"></i>'
+      def add_icon tooltip_text: nil
+        icon "plus", tooltip_text: tooltip_text
       end
-      def index_icon
-        '<i class="fa fa-th-list"></i>'
+      def delete_icon tooltip_text: nil
+        icon "remove", tooltip_text: tooltip_text
       end
-      def info_icon
-        '<i class="fa fa-info-circle"></i>'
+      def error_icon tooltip_text: nil
+        icon "flash", tooltip_text: tooltip_text
       end
-      def link_icon
-        '<i class="fa fa-link"></i>'
+      def external_link_icon tooltip_text: nil
+        icon "external-link", tooltip_text: tooltip_text
       end
-      def order_icon
-        '<i class="fa fa-shopping-cart"></i>'
+      def false_icon tooltip_text: nil
+        icon "close", tooltip_text: tooltip_text
       end
-      def product_icon
-        '<i class="fa fa-cube"></i>'
+      def index_icon tooltip_text: nil
+        icon "th-list", tooltip_text: tooltip_text
       end
-      def products_icon
-        '<i class="fa fa-cubes"></i>'
+      def info_icon tooltip_text: nil
+        icon "info-circle", tooltip_text: tooltip_text
       end
-      def remote_icon
-        '<i class="fa fa-globe"></i>'
+      def link_icon tooltip_text: nil
+        icon "info-link", tooltip_text: tooltip_text
       end
-      def settings_icon
-        '<i class="fa fa-wrench"></i>'
+      def mail_icon tooltip_text: nil
+        icon "envelope-o", tooltip_text: tooltip_text
       end
-      def success_icon
-        '<i class="fa fa-smile-o"></i>'
+      def order_icon tooltip_text: nil
+        icon "shopping-cart", tooltip_text: tooltip_text
       end
-      def warning_icon
-        '<i class="fa fa-warning"></i>'
+      def pack_icon tooltip_text: nil
+        icon "square-o", tooltip_text: tooltip_text
+      end
+      def packlist_icon tooltip_text: nil
+        icon "paperclip", tooltip_text: tooltip_text
+      end
+      def packsize_icon tooltip_text: nil
+        icon "cube", tooltip_text: tooltip_text
+      end
+      def product_icon tooltip_text: nil
+        icon "cube", tooltip_text: tooltip_text
+      end
+      def products_icon tooltip_text: nil
+        icon "cubes", tooltip_text: tooltip_text
+      end
+      def remote_icon tooltip_text: nil
+        icon "globe", tooltip_text: tooltip_text
+      end
+      def sales_icon tooltip_text: nil
+        icon "shopping-cart", tooltip_text: tooltip_text
+      end
+      def save_icon tooltip_text: nil
+        icon "envelope", tooltip_text: tooltip_text
+      end
+      def settings_icon tooltip_text: nil
+        icon "wrench", tooltip_text: tooltip_text
+      end
+      def shelve_icon tooltip_text: nil
+        icon "map-signs", tooltip_text: tooltip_text
+      end
+      def stock_empty_icon tooltip_text: nil
+        icon "battery-0", tooltip_text: tooltip_text
+      end
+      def stock_icon tooltip_text: nil
+        icon "battery-2", tooltip_text: tooltip_text
+      end
+      def stock_full_icon tooltip_text: nil
+        icon "battery-4", tooltip_text: tooltip_text
+      end
+      def success_icon tooltip_text: nil
+        icon "smile-o", tooltip_text: tooltip_text
+      end
+      def supplier_icon tooltip_text: nil
+        icon "truck", tooltip_text: tooltip_text
+      end
+      def true_icon tooltip_text: nil
+        icon "check-circle-o", tooltip_text: tooltip_text
+      end
+      def view_icon tooltip_text: nil
+        icon "eye", tooltip_text: tooltip_text
+      end
+      def warning_icon tooltip_text: nil
+        icon "warning", tooltip_text: tooltip_text
+      end
+
+      def bool_icon attr
+        if attr
+          true_icon
+        else
+          false_icon
+        end
+      end
+
+      def order_state_icon order
+        case order.state
+        when 'new'
+          icon "star"
+        when 'mailed'
+          icon "envelope-o"
+        when 'ordered'
+          icon "arrow-right"
+        when 'deleted'
+          icon "remove"
+        when 'stocked'
+          icon "thumbs-o-up"
+        else
+          icon "question"
+        end
+      end
+
+      private
+      def icon fa_name, tooltip_text: nil
+        "<i class=\"fa fa-#{fa_name}\"%s></i>" % tooltip(tooltip_text)
+      end
+      def tooltip tooltip_text
+        if tooltip_text
+          " title=\"#{tooltip_text}\""
+        end
       end
     end
   end