smart_proxy_dynflow 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjE5MGRkNTE0ZGEwZmUyMmE2NzhkMDIwZDJjNWUwMzEwNDFmZThiZA==
-  data.tar.gz: !binary |-
-    ZTY3YmM5ZWY5YzhiZGMwNDRiN2I2YjI5ZDI2MzMwMzJhYzVmMGQyZA==
+SHA1:
+  metadata.gz: 578ba314b0d67d02439a6c13eea65295e3a27b64
+  data.tar.gz: 2dbe705400e06fc478500f2c4c7ea0cb0302c31f
 SHA512:
-  metadata.gz: !binary |-
-    ZmM3ZWQyNzZkM2M0ZGYwMmJkMTEyNzdjMDAyYWQ2MjNkYjJmZDVmYjlkMGE3
-    YmU5YTg2Yjc5NzZkMzhmNDVkMDBhNTE1OWU3ZTFmMjljNTFiZTJmY2E5NWM4
-    NDk0MWZkMTE0MDFkZTJlNGVkZDFiY2Q0MmFhMjQ4ZjcxZjUzM2M=
-  data.tar.gz: !binary |-
-    MTVjNDkxNDUwMDY1Njk4MmUxMTdkZWYzNzA4YmYxNWRmNTczM2MzNjliOWE3
-    MjJlZGQ0ZWJjNzBjYmEwZGJlNmE5NTZjNjVjMmUwYzVmZmZhNDJkMTY2YjU0
-    ZmM5YTcyYjgwMmFhYWIyYzNjNTFkODhlMGY2NTQ5ZmJhMDQ3NmE=
+  metadata.gz: 5b31a423d35a1c388d93b8a9f0d9e568ecbc60c68c3d3411203f20cf30adaa88497fac209d0180808d5e080f7b6cd1809422b7f1477654ad37fec3d7b45b4470
+  data.tar.gz: bb31dff6dba0ff22c5cd2fc8ea96652e3d81d0f578c397b60f17b81ca0091e5b15c636e4f8be6205f62f901bfa1d63aa90cdff005b5f41d7c62d072ef3f691d5

data/lib/smart_proxy_dynflow/plugin.rb

@@ -4,8 +4,7 @@ class Proxy::Dynflow
     https_rackup_path File.expand_path("http_config.ru", File.expand_path("../", __FILE__))
 
     settings_file "dynflow.yml"
-    default_settings(:dynflow_identity_key => '~/.vagrant.d/insecure_private_key',
-                     :dynflow_user => 'root')
+    default_settings :database => '/var/spool/foreman-proxy/dynflow/dynflow.sqlite'
     plugin :dynflow, Proxy::Dynflow::VERSION
   end
 end

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   class Dynflow
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/lib/smart_proxy_dynflow.rb

@@ -18,7 +18,16 @@ class Proxy::Dynflow
   end
 
   def persistence_conn_string
-    ENV['DYNFLOW_DB_CONN_STRING'] || 'sqlite:/'
+    db_conn_string = 'sqlite:/'
+
+    db_file = Proxy::Dynflow::Plugin.settings.database
+    if db_file.nil? || db_file.empty?
+      Proxy::Log.logger.warn "Could not open DB for dynflow at '#{db_file}', will keep data in memory. Restart will drop all dynflow data."
+    else
+      db_conn_string += "/#{db_file}"
+    end
+
+    ENV['DYNFLOW_DB_CONN_STRING'] || db_conn_string
   end
 
   def persistence_adapter

data/settings.d/dynflow.yml.example

@@ -1,2 +1,3 @@
 ---
 :enabled: true
+:database: /var/spool/foreman-proxy/dynflow/dynflow.sqlite

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !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: 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: 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: 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
@@ -112,47 +112,46 @@ dependencies:
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.4
 - !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: 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'
-description: ! '    Use the Dynflow inside Foreman smart proxy
-
-'
+description: |2
+      Use the Dynflow inside Foreman smart proxy
 email:
 - inecas@redhat.com
 executables: []
@@ -181,12 +180,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -196,4 +195,3 @@ signing_key:
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy
 test_files: []
-has_rdoc: