inat-get 0.8.0.11 → 0.8.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd46b6875ef0b9feaa0a8632c86ad0a72d234958452bd04c7e879f433324c53f
-  data.tar.gz: 91b31159aba05e86a5f5fd154bb197267a55b3ccbf6b14781fb399bd249a27ed
+  metadata.gz: df7509aed95fafc1944ec83113fff7f22e4d0ae6ec8f5f9326c2db57a257ccd2
+  data.tar.gz: dd7eff7e9ef9052bb88b329cdcc0c2beb944595f318a507809f74749a020d559
 SHA512:
-  metadata.gz: 1cf679179ea4e548ea3ced47bb7e6cd9039d6a5c79404f5a944b2fb098bb4520b23d77e3116628e59acdd25bd359877ff60a9c81fcda84d4a0a53faba0354c49
-  data.tar.gz: 0606f69e8a4fac67df1382fd67f3bda21bd678e5f8655b58deb4355018be4ba29f3dfb0bce7411b51fc05e8c5be34227c361cf2fe2810afe6b059b7606ccad37
+  metadata.gz: 373b8050cfcb590324af92dcbe8add0cc182b1a6210aba67870692b9f3d4547906055bd3e47cdd107ce0ac83d20614e5cb59b812d4991af2b0d65c678b9704b7
+  data.tar.gz: 689eabfd32e1dd385208a27b4e2ac7eec58cfaebf2d9a51e8c2e2cf3569f4223d74e0aa8dc1f031058739893ea8fcbc37cb7a960f57016fcf693f74e1adb21d5

data/.yardopts

@@ -0,0 +1,6 @@
+--no-private
+--title "INat::Get"
+--hide-void-return
+--private
+--asset docs/ doc/docs/
+lib/**/*.rb

data/bin/inat-get

@@ -12,7 +12,7 @@ require 'inat/data/entity/request'
 require 'inat/data/db'
 require 'inat/data/query'
 
-app = Application.new
+app = INat::Application.new
 app.run
 # PP::pp Globals.config, $>, 64
 

data/inat-get.gemspec

@@ -4,18 +4,18 @@ require_relative 'lib/inat/app/info'
 
 Gem::Specification.new do |spec|
   spec.name = "inat-get"
-  spec.version = AppInfo::VERSION
-  spec.authors = [ AppInfo::AUTHOR ]
-  spec.email = [ AppInfo::EMAIL ]
+  spec.version = INat::App::Info::VERSION
+  spec.authors = [ INat::App::Info::AUTHOR ]
+  spec.email = [ INat::App::Info::EMAIL ]
 
   spec.summary = "Client for iNaturalist API."
   # spec.description = "TODO: Write a longer description or delete this line."
-  spec.homepage = AppInfo::HOMEPAGE
-  spec.license = "GPL-3.0"
+  spec.homepage = INat::App::Info::HOMEPAGE
+  spec.license = "GPL-3.0-or-later"
   spec.required_ruby_version = ">= 3.1.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = AppInfo::SOURCE_URL
+  spec.metadata["source_code_uri"] = INat::App::Info::SOURCE_URL
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|

data/lib/extra/enum.rb

@@ -12,6 +12,7 @@ class Enum
 
     private :new
 
+    # @!scope class
     private def item name, order = nil, description: nil, data: nil
       raise TypeError, "Name of enum value must be a Symbol!", caller unless Symbol === name
       raise TypeError, "Order of enum value must be a Integer!", caller unless nil === order || Integer === order
@@ -35,6 +36,7 @@ class Enum
       return value
     end
 
+    # @!scope class
     private def items *names, **names_with_order
       names.each do |name|
         item name
@@ -45,6 +47,7 @@ class Enum
       return values
     end
 
+    # @!scope class
     private def item_alias **params
       @aliases ||= {}
       params.each do |name, value|
@@ -94,6 +97,7 @@ class Enum
       end
     end
 
+    # @!scope class
     private def get name_or_order
       return nil if name == nil
       result = @by_name[name_or_order] || @by_order[name_or_order]

data/lib/extra/period.rb

@@ -185,6 +185,7 @@ class Period
     self.class.make(seconds: (@value / num).to_i)
   end
 
+  # @private
   class Num
 
     attr_reader :value
@@ -199,6 +200,8 @@ class Period
 
   end
 
+  private_constant :Num
+
   def coerce num
     case num
     when Integer, Float, Rational
@@ -212,7 +215,9 @@ end
 
 class Time
 
+  # @private
   alias :preperiod_plus :+
+  # @private
   alias :preperiod_minus :-
 
   def + arg
@@ -229,22 +234,32 @@ end
 
 class Numeric
 
+  #
+  # @return [Period]
   def weeks
     Period::make(weeks: 1) * self
   end
 
+  #
+  # @return [Period]
   def days
     Period::make(days: 1) * self
   end
 
+  #
+  # @return [Period]
   def hours
     Period::make(hours: 1) * self
   end
 
+  #
+  # @return [Period]
   def minutes
     Period::make(minutes: 1) * self
   end
 
+  #
+  # @return [Period]
   def seconds
     Period::make(seconds: 1) * self
   end

data/lib/inat/app/application.rb

@@ -6,9 +6,10 @@ require_relative 'preamble'
 require_relative 'globals'
 require_relative 'task'
 
-class Application
+class INat::Application
 
-  include AppPreamble
+  include INat::App
+  include INat::App::Preamble
 
   def logger
     G.logger
@@ -17,7 +18,7 @@ class Application
   def initialize
     setup!
     G.config = @config.freeze
-    G.logger = DualLogger::new self
+    G.logger = INat::App::Logger::new self
   end
 
   private def tasks!

data/lib/inat/app/config/messagelevel.rb

@@ -2,7 +2,9 @@
 
 require 'extra/enum'
 
-class MessageLevel < Enum
+module INat::App::Config; end
+
+class INat::App::Config::MessageLevel < Enum
 
   item :TRACE, -1
   item :DEBUG,   data: 0

data/lib/inat/app/config/shiftage.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ShiftAge
+module INat::App::Config::ShiftAge
 
   class << self
 

data/lib/inat/app/config/updatemode.rb

@@ -2,7 +2,7 @@
 
 require 'extra/enum'
 
-class UpdateMode < Enum
+class INat::App::Config::UpdateMode < Enum
 
   items :UPDATE,
         :FORCE,

data/lib/inat/app/config.rb

@@ -10,9 +10,13 @@ require_relative 'config/messagelevel'
 require_relative 'config/updatemode'
 require_relative 'config/shiftage'
 
-class Application
+# TODO: переделать в модуль INat::App::Config
+class INat::Application
 
-  include AppInfo
+  using DeepMerge
+
+  include INat::App::Info
+  include INat::App::Config
 
   API_DEFAULT = 'https://api.inaturalist.org/v1/'
   DEFAULT_LOG = "./#{ NAME }.log"

data/lib/inat/app/globals.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Globals
+module INat::App::Globals
 
   class << self
 
@@ -40,10 +40,13 @@ module Globals
 
 end
 
-G = Globals
+G = INat::App::Globals
 
-module LogDSL
+module INat::App::Logger::DSL
 
+  include INat::App::Config
+
+  # @private
   def included mod
     mod.extend LogDSL
   end

data/lib/inat/app/info.rb

@@ -1,21 +1,26 @@
 # frozen_string_literal: true
 
-module AppInfo
+module INat
 
-  AUTHOR = 'Ivan Shikhalev'
-  EMAIL = 'shkikhalev@gmail.com'
+  module App
 
-  VERSION = '0.8.0.11'
-  HOMEPAGE = 'https://github.com/shikhalev/inat-get'
-  SOURCE_URL = 'https://github.com/shikhalev/inat-get'
+    module Info
 
-  EXE = File.basename $0
-  NAME = File.basename $0, '.rb'
+      AUTHOR = "Ivan Shikhalev"
+      EMAIL = "shkikhalev@gmail.com"
 
-  USAGE = "\e[1mUsage $\e[0m #{EXE} [options] ‹task[, ...]›"
-  ABOUT = "\e[1mINat::Get v#{VERSION}\e[0m — A toolset for fetching and processing data from \e[4miNaturalist.org\e[0m.\n" +
-          "\n" +
-          "\e[1mSource:\e[0m \e[4m#{HOMEPAGE}\e[0m\n" +
-          "\e[1mAuthor:\e[0m #{AUTHOR} ‹\e[4m#{EMAIL}\e[0m›"
+      VERSION = "0.8.0.13"
+      HOMEPAGE = "https://github.com/shikhalev/inat-get"
+      SOURCE_URL = "https://github.com/shikhalev/inat-get"
 
+      EXE = File.basename $0
+      NAME = File.basename $0, ".rb"
+
+      USAGE = "\e[1mUsage $\e[0m #{EXE} [options] ‹task[, ...]›"
+      ABOUT = "\e[1mINat::Get v#{VERSION}\e[0m — A toolset for fetching and processing data from \e[4miNaturalist.org\e[0m.\n" +
+              "\n" +
+              "\e[1mSource:\e[0m \e[4m#{HOMEPAGE}\e[0m\n" +
+              "\e[1mAuthor:\e[0m #{AUTHOR} ‹\e[4m#{EMAIL}\e[0m›"
+    end
+  end
 end

data/lib/inat/app/logging.rb

@@ -2,7 +2,7 @@
 
 require 'logger'
 
-class DualLogger
+class INat::App::Logger
 
   def config
     @application.config
@@ -13,14 +13,14 @@ class DualLogger
     v_para = {
       level: config[:verbose].severity
     }
-    @verb = Logger::new STDERR, **v_para
+    @verb = ::Logger::new STDERR, **v_para
     if config[:log][:enable]
       f_para = {
         level: config[:log][:level].severity,
       }
       f_para[:shift_age] = config[:log][:shift][:age] if config[:log][:shift][:age]
       f_para[:shift_level] = config[:log][:shift][:level] if config[:log][:shift][:level]
-      @file = Logger::new config[:log][:file], **f_para
+      @file = ::Logger::new config[:log][:file], **f_para
     else
       @file = nil
     end

data/lib/inat/app/preamble.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module AppPreamble
+module INat::App::Preamble
 
   private def do_clean_requests
     # NEED: implement

data/lib/inat/app/status.rb

@@ -4,7 +4,7 @@ require_relative 'globals'
 
 # TODO: переделать на отдельный поток и очередь статусов. Ввести отдельно ключ, как идентификатор запроса, например.
 
-module Status
+module INat::App::Status
 
   class << self
 
@@ -17,12 +17,6 @@ module Status
       end
     end
 
-    # private def get_num
-    #   @num ||= 0
-    #   @num += 1
-    #   @num
-    # end
-
     def init
       @lines = {}
       @mutex = Mutex::new
@@ -70,5 +64,5 @@ module Status
 
 end
 
-Status::init
-G.status = Status
+INat::App::Status::init
+G.status = INat::App::Status

data/lib/inat/app/task/context.rb

@@ -2,11 +2,17 @@
 
 require_relative 'dsl'
 require_relative '../../report/table'
+require_relative '../../report/report_dsl'
 
-class Task::Context
+class INat::App::Task::Context
 
-  include Task::DSL
-  include TableDSL
+  include INat::App::Task::DSL
+  include INat::Report::DSL
+  include INat::Report::Table::DSL
+
+  include INat
+  include INat::App
+  include INat::Report
 
   attr_accessor :name
 

data/lib/inat/app/task/dsl.rb

@@ -8,11 +8,13 @@ require_relative '../../data/query'
 require_relative '../../data/sets/dataset'
 require_relative '../../data/sets/list'
 
-class Task; end
+class INat::App::Task; end
 
-module Task::DSL
+module INat::App::Task::DSL
 
-  include LogDSL
+  include INat
+  include INat::Report
+  include INat::App::Logger::DSL
 
   def select **params
     query = Query::new(**params)

data/lib/inat/app/task.rb

@@ -3,7 +3,7 @@
 require_relative 'globals'
 require_relative 'task/context'
 
-class Task
+class INat::App::Task
 
   CHECK_LIST = %w[ . .inat .rb ]
   FILE_CHECK_LIST = %w[ .inat .iNat .INat .INAT .rb .RB ]
@@ -64,7 +64,7 @@ class Task
     @application = application
     @basename, @path = get_names source
     raise ArgumentError, "File not found: #{source}!" if @path.nil?
-    @context = Task::Context::new self, @basename, @path
+    @context = Context::new self, @basename, @path
   end
 
   def execute