smart_proxy_dynflow 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 23e6132a792409de0a63851c335a1cbbbbe6c539
-  data.tar.gz: d9eeb7b70c68915fc84b36008e043942cbbcddd9
+SHA256:
+  metadata.gz: 0e7c4b7a5345d0fea21625215d19a42ec7a541c5978d2291a2fb8e8cb7ecc378
+  data.tar.gz: c7b4448023317d8c5e72afc6ea835ca2bf40bceec8a2ab30f426a2f7c990be7a
 SHA512:
-  metadata.gz: 38be1713aabfeea11b229752bd65fe925b30bf05f1bf15a9105bc70066f3181bdedef45a966c377874efae42e8fa01abb2aefcc1c6caa93b1ba00ca6365bccca
-  data.tar.gz: 740e626094df5c0f64580bb94159a03dc1b075409f5b602be0dd8ed1490c6a3efe9e79b439c497056bfc4a6ba3998137a7d7edaf8d54a830126e20fd917f01ae
+  metadata.gz: 0e86febbe3ca408556048ec71330272836f04425ef3c45bc619bb0dd9f53403af23d6b653d3d0f6e84237e6068e7ddc9fe3231e33923ea77dff639d017aa7966
+  data.tar.gz: c73d982c4ec17251509b5ec1aa967893597a391bc529b09f2aaec3d2736c213e69706d1f64a7bfc23e7faf4dfe72bf0a06ad1c833ca6d47ec9748b4e29e86d13

data/Gemfile

@@ -13,7 +13,6 @@ group :test do
   if RUBY_VERSION < '2.1'
     gem 'public_suffix', '< 3'
     gem 'rainbow', '< 3'
-    gem 'rubocop', '< 0.51.0'
   else
     gem 'public_suffix'
     gem 'rubocop', '~> 0.52.1'

data/lib/smart_proxy_dynflow/http_config.ru

@@ -1,7 +1,21 @@
-require 'smart_proxy_dynflow/api'
+# Internal core will be used if external core is either disabled or unset
+# and the core gem can be loaded
 
-map "/dynflow" do
-  map '/' do
-    run Proxy::Dynflow::Api
+if !::Proxy::Dynflow::Plugin.settings.external_core && Proxy::Dynflow::Plugin.internal_core_available?
+  require 'smart_proxy_dynflow_core/api'
+  require 'smart_proxy_dynflow_core/launcher'
+
+  SmartProxyDynflowCore::Settings.load_from_proxy(p)
+
+  map "/dynflow" do
+    SmartProxyDynflowCore::Launcher.route_mapping(self)
+  end
+else
+  require 'smart_proxy_dynflow/api'
+
+  map "/dynflow" do
+    map '/' do
+      run Proxy::Dynflow::Api
+    end
   end
 end

data/lib/smart_proxy_dynflow/plugin.rb

@@ -4,29 +4,28 @@ require 'proxy/plugin'
 
 class Proxy::Dynflow
   class Plugin < Proxy::Plugin
-    rackup_path = begin
-      require 'smart_proxy_dynflow_core'
-      'http_config_with_executor.ru'
-    rescue LoadError
-      'http_config.ru'
-    end
-    http_rackup_path File.expand_path(rackup_path, File.expand_path("../", __FILE__))
-    https_rackup_path File.expand_path(rackup_path, File.expand_path("../", __FILE__))
+    rackup_path = File.expand_path('http_config.ru', __dir__)
+    http_rackup_path rackup_path
+    https_rackup_path rackup_path
 
     settings_file "dynflow.yml"
     requires :foreman_proxy, ">= 1.12.0"
     default_settings :core_url => 'http://localhost:8008'
     plugin :dynflow, Proxy::Dynflow::VERSION
 
-    # rubocop:disable Lint/HandleExceptions
     after_activation do
-      begin
-        require 'smart_proxy_dynflow_core'
-      rescue LoadError
-        # Dynflow core is not available in the proxy, will be handled
-        # by standalone Dynflow core
+      # Ensure the core gem is loaded, if configure NOT to use the external core
+      if Proxy::Dynflow::Plugin.settings.external_core == false && !internal_core_available?
+        raise "'smart_proxy_dynflow_core' gem is required, but not available"
       end
     end
-    # rubocop:enable Lint/HandleExceptions
+
+    def self.internal_core_available?
+      @core_available ||= begin
+                            require 'smart_proxy_dynflow_core'
+                            true
+                          rescue LoadError # rubocop:disable Lint/HandleExceptions
+                          end
+    end
   end
 end

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   class Dynflow
-    VERSION = '0.2.2'.freeze
+    VERSION = '0.2.3'.freeze
   end
 end

data/settings.d/dynflow.yml.example

@@ -2,3 +2,8 @@
 :enabled: true
 :database: /var/lib/foreman-proxy/dynflow/dynflow.sqlite
 :core_url: 'http://127.0.0.1:8008'
+
+# If true, external core will be used even if the core gem is available
+# If false, the feature will be disabled if the core gem is not available
+# If unset, the process will fallback to external core if the core gem is not available
+# :external_core: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,6 @@ files:
 - lib/smart_proxy_dynflow/callback.rb
 - lib/smart_proxy_dynflow/helpers.rb
 - lib/smart_proxy_dynflow/http_config.ru
-- lib/smart_proxy_dynflow/http_config_with_executor.ru
 - lib/smart_proxy_dynflow/plugin.rb
 - lib/smart_proxy_dynflow/proxy_adapter.rb
 - lib/smart_proxy_dynflow/version.rb
@@ -134,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy

data/lib/smart_proxy_dynflow/http_config_with_executor.ru

@@ -1,8 +0,0 @@
-require 'smart_proxy_dynflow_core/api'
-require 'smart_proxy_dynflow_core/launcher'
-
-SmartProxyDynflowCore::Settings.load_from_proxy(p)
-
-map "/dynflow" do
-  SmartProxyDynflowCore::Launcher.route_mapping(self)
-end