smart_proxy_dynflow_core 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 467f03a2c2c0ad4e3b168039abdb8e9a465a46b8ecf44aade57c5a09bbeafbfc
-  data.tar.gz: e966e14e4a95f42af61b5bcf47595ad6afa241271656b6724e5000b3e2cd354d
+  metadata.gz: 0e1f105cbe477f78311c82772782b16c82bd50c22f7c8aee89b7a29afd3e247d
+  data.tar.gz: e0fd26ed1d6f54996752255c5d57182b0d9556a18ff2555e47d782fbe10bde28
 SHA512:
-  metadata.gz: e6a3b2b7b4dc313c1b6cc215c2de6cda4f49ad9f901bc7ab949b0ed4a16521e021b9c39a0fc371091e54172610787f968a2bb8577f68086ef15308bd805fc970
-  data.tar.gz: 7cbfc949016d5d824ebbb421093c8ef687c24d33c6699e7ef0c875145e035e8233317ff64c7757597bd0e76c9186566dec4e407397e32803b6d42ea26602fb6f
+  metadata.gz: 8e29ff97a07bb940fa2a7d5b121f90ac249b11083309fd8b013f2fe1e2f4facb806b1717680054b33b760de6d1f4621c3c24c8b56add7d1e13f1131c07cb6626
+  data.tar.gz: 0a6bc60a9e6f93a0955c76e338262399df7681f210ed15dde1e1695f7acf313e60ea72964bd5f5ddaf599f57dd623062c74417c6204be72aa6cc2bb96ff58740

data/Gemfile

@@ -15,15 +15,10 @@ group :test do
   gem 'rubocop', '~> 0.52.1'
 end
 
-gem 'logging-journald', '~> 2.0', :platforms => [:ruby]
+gem 'logging-journald', '~> 2.0', :platforms => [:ruby], :require => false
 gem 'rack', '>= 1.1'
 gem 'sinatra'
 
-# load bundler.d
-Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle|
-  self.instance_eval(Bundler.read_file(bundle))
-end
-
 # load local gemfile
 local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local.rb')
 self.instance_eval(Bundler.read_file(local_gemfile)) if File.exist?(local_gemfile)

data/lib/smart_proxy_dynflow_core.rb

@@ -1,19 +1,13 @@
-require 'dynflow'
-require 'smart_proxy_dynflow_core/request_id_middleware'
-require 'smart_proxy_dynflow_core/logger_middleware'
-require 'smart_proxy_dynflow_core/middleware/keep_current_request_id'
+# Whatever is here is just a compatibility layer
+# Once all the _core have been migrated, this can be dropped.
+
+require 'smart_proxy_dynflow'
+
+# REX core explicitly requires this file, otherwise we could use the trick we
+# use with callback
 require 'smart_proxy_dynflow_core/task_launcher_registry'
-require 'foreman_tasks_core'
-require 'smart_proxy_dynflow_core/log'
-require 'smart_proxy_dynflow_core/settings'
-require 'smart_proxy_dynflow_core/core'
-require 'smart_proxy_dynflow_core/helpers'
-require 'smart_proxy_dynflow_core/callback'
-require 'smart_proxy_dynflow_core/api'
 
 module SmartProxyDynflowCore
-  Core.after_initialize do |dynflow_core|
-    ForemanTasksCore.dynflow_setup(dynflow_core.world)
-  end
-  Core.register_silencer_matchers ForemanTasksCore.silent_dead_letter_matchers
+  Callback = Proxy::Dynflow::Callback
+  Log = Proxy::Dynflow::Log
 end

data/lib/smart_proxy_dynflow_core/task_launcher_registry.rb

@@ -1,31 +1,3 @@
 module SmartProxyDynflowCore
-  class TaskLauncherRegistry
-    class << self
-      def register(name, launcher)
-        registry[name] = launcher
-      end
-
-      def fetch(name, default = nil)
-        if default.nil?
-          registry.fetch(name)
-        else
-          registry.fetch(name, default)
-        end
-      end
-
-      def key?(name)
-        registry.key?(name)
-      end
-
-      def operations
-        registry.keys
-      end
-
-      private
-
-      def registry
-        @registry ||= {}
-      end
-    end
-  end
+  TaskLauncherRegistry = Proxy::Dynflow::TaskLauncherRegistry
 end

data/lib/smart_proxy_dynflow_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyDynflowCore
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/smart_proxy_dynflow_core.gemspec

@@ -13,10 +13,8 @@ Gem::Specification.new do |gem|
     Use the Dynflow inside Foreman smart proxy
   EOS
 
-  gem.executables   = ['smart_proxy_dynflow_core']
-  gem.files         = Dir['lib/smart_proxy_dynflow_core.rb', 'config/settings.yml.example',
-                          'lib/smart_proxy_dynflow_core/*', 'LICENSE', 'Gemfile',
-                          'bin/smart_proxy_dynflow_core', 'deploy/*', 'smart_proxy_dynflow_core.gemspec']
+  gem.files         = Dir['lib/smart_proxy_dynflow_core.rb', 'lib/smart_proxy_dynflow_core/**/*',
+                          'LICENSE', 'Gemfile', 'smart_proxy_dynflow_core.gemspec']
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.license = 'GPL-3.0'
@@ -24,19 +22,5 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '~> 2.5'
 
   gem.add_development_dependency "bundler", ">= 1.7"
-  gem.add_development_dependency('minitest')
-  gem.add_development_dependency('mocha', '~> 1')
-  gem.add_development_dependency('rack-test', '~> 0')
-  gem.add_development_dependency "rake", "~> 10.0"
-  gem.add_development_dependency('webmock', '~> 1')
-
-  gem.add_runtime_dependency('dynflow', "~> 1.1")
-  gem.add_runtime_dependency('foreman-tasks-core', '>= 0.3.3')
-  gem.add_runtime_dependency('logging')
-  gem.add_runtime_dependency('rack')
-  gem.add_runtime_dependency('rest-client')
-  gem.add_runtime_dependency('sd_notify', '~> 0.1')
-  gem.add_runtime_dependency('sequel')
-  gem.add_runtime_dependency('sinatra')
-  gem.add_runtime_dependency('sqlite3')
+  gem.add_runtime_dependency('smart_proxy_dynflow', '~> 0.5')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,228 +25,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: dynflow
+  name: smart_proxy_dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: foreman-tasks-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.3
-- !ruby/object:Gem::Dependency
-  name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sd_notify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: "    Use the Dynflow inside Foreman smart proxy\n"
 email:
 - inecas@redhat.com
-executables:
-- smart_proxy_dynflow_core
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
-- bin/smart_proxy_dynflow_core
-- config/settings.yml.example
-- deploy/smart_proxy_dynflow_core.init
-- deploy/smart_proxy_dynflow_core.service
 - lib/smart_proxy_dynflow_core.rb
-- lib/smart_proxy_dynflow_core/api.rb
-- lib/smart_proxy_dynflow_core/bundler_helper.rb
-- lib/smart_proxy_dynflow_core/callback.rb
-- lib/smart_proxy_dynflow_core/core.rb
-- lib/smart_proxy_dynflow_core/helpers.rb
-- lib/smart_proxy_dynflow_core/launcher.rb
-- lib/smart_proxy_dynflow_core/log.rb
-- lib/smart_proxy_dynflow_core/logger_middleware.rb
-- lib/smart_proxy_dynflow_core/request_id_middleware.rb
-- lib/smart_proxy_dynflow_core/settings.rb
 - lib/smart_proxy_dynflow_core/task_launcher_registry.rb
-- lib/smart_proxy_dynflow_core/testing.rb
 - lib/smart_proxy_dynflow_core/version.rb
 - smart_proxy_dynflow_core.gemspec
 homepage: https://github.com/theforeman/smart_proxy_dynflow

data/bin/smart_proxy_dynflow_core

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-require 'dynflow'
-require 'rack'
-require 'smart_proxy_dynflow_core/launcher'
-require 'yaml'
-require 'optparse'
-
-options = {}
-OptionParser.new do |opts|
-  opts.on('-c', '--config-dir CONFIG_DIR', String, 'Directory to load settings from') do |value|
-    options[:config_dir] = value
-  end
-
-  opts.on('-1', '--one-config', 'Do not load more than 1 config') do |value|
-    options[:one_config] = true
-  end
-
-  opts.on('-d', '--[no-]daemonize', 'Fork to background after start') do |value|
-    options[:daemonize] = value
-  end
-
-  opts.on('-p', '--pid-file PID_FILE', String, 'Write pid to this file') do |value|
-    options[:pid_file] = value
-  end
-
-  opts.on_tail('-h', '--help', 'Show usage help') do
-    puts opts
-    exit
-  end
-end.parse!
-
-SmartProxyDynflowCore::Launcher.launch! options

data/config/settings.yml.example

@@ -1,66 +0,0 @@
----
-# Path to dynflow database, leave blank for in-memory non-persistent database
-:database:
-
-# URL of the foreman, used for reporting back
-:foreman_url: 'http://localhost:3000'
-
-# SSL settings for client authentication against Foreman
-# :foreman_ssl_ca: ssl/foreman_ca.pem
-# :foreman_ssl_key: ssl/foreman_key.pem
-# :foreman_ssl_cert: ssl/foreman_cert.pem
-
-:console_auth: false
-
-# Set to true to make the core fork to background after start
-# :daemonize: false
-# :pid_file: /var/run/foreman-proxy/smart_proxy_dynflow_core.pid
-
-# Listen on address
-:listen: 127.0.0.1
-
-# Listen on port
-:port: 8008
-
-# SSL settings for running core as https service
-# :use_https: false
-# :ssl_ca_file: ssl/ca.pem
-# :ssl_private_key: ssl/localhost.pem
-# :ssl_certificate: ssl/certs/localhost.pem
-
-# Use this option only if you need to disable certain cipher suites.
-# Note: we use the OpenSSL suite name, take a look at:
-# https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-SUITE-NAMES
-# for more information.
-#:ssl_disabled_ciphers: [CIPHER-SUITE-1, CIPHER-SUITE-2]
-
-# Use this option only if you need to strictly specify TLS versions to be
-# disabled. SSLv3 and TLS v1.0 are always disabled and cannot be configured.
-# Specify versions like: '1.1', or '1.2'
-#:tls_disabled_versions: []
-
-# File to log to, leave empty for stdout or use STDOUT, STDERR, SYSLOG or JOURNAL
-#:log_file: /var/log/foreman-proxy/smart_proxy_dynflow_core.log
-
-# Log level, one of UNKNOWN, FATAL, ERROR, WARN, INFO, DEBUG
-#:log_level: ERROR
-
-# The maximum size of a log file before it's rolled (in MiB) or zero to disable file rolling
-# and rely on logrotate or similar tool
-#:file_rolling_size: 0
-
-# The maximum age of a log file before it's rolled (in seconds). Also accepts 'daily', 'weekly', or 'monthly'.
-#:file_rolling_age: weekly
-
-# Number of log files to keep
-#:file_rolling_keep: 6
-
-# Logging pattern for file-based loging
-#:file_logging_pattern: '%d %.8X{request} [%.1l] %m'
-
-# Logging pattern for syslog or journal loging
-#:system_logging_pattern: '%.8X{request} [%.1l] %m'
-
-# Maximum age of execution plans to keep before having them cleaned
-# by the execution plan cleaner (in seconds), defaults to 24 hours
-# :execution_plan_cleaner_age: 86400