foreman_chef 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b773fa035adf626fde30885aee0bef06f0d4ba46
-  data.tar.gz: 38d3baf59f382e1a26ccd24485b0bdb30a409cea
+  metadata.gz: 2d4855a9f4cdcc213a42b40d551c0b0a91cf7f4d
+  data.tar.gz: 114ed3cd40968c063e79b067c2aa997c34aedaf5
 SHA512:
-  metadata.gz: c555e4843a61e3b7d2ed2425b2697a39407fce06bebe8d208cd0c24e9986181c8460a50a241ca961c888c7441e4af4648af4cb34a56d8891d3ebdfecb19de7fc
-  data.tar.gz: 13c080d9e7980bb11f134d102f975f51169ce4663d21d5b9662e0f8334652398a551bd188fd3f52b80234d7187e88b5b686f8f59dec528fa8e123afc4cce8eb9
+  metadata.gz: 6b54f6e5e88bc389edc07c1f24d17e068fc750adc572b353d268a2ab1d5be4912144ac2e9c89236a23462b75b8ca91d078e96ba6d903f865ee795031cbf8e2bc
+  data.tar.gz: b494900b4d46b6ea4873c9557e0a3c2ab95fd12c90d4ef4b77635a1f3f480159d89a5b51a30a075d845af31f27dcbaad99e5e4b733eab9f66019d6445c811d31

data/README.md

@@ -4,6 +4,18 @@ This plugin adds a Chef fact importer to Foreman. It basically means that when y
 clients to use foreman handlers (https://github.com/theforeman/chef-handler-foreman) and install
 this plugin you receive nested facts from chef-client.
 
+# Installation
+
+If you want to use this in production I recommend to combine this plugin with foreman-background
+(https://github.com/ohadlevy/foreman-background) which runs report and facts import as a background
+tasks.
+
+## Foreman Installer (recommended)
+
+Follow the directions on: http://www.theforeman.org/plugins/foreman_chef/0.1/#2.Installation
+
+## Manual
+
 This plugin expects foreman to support nested facts which is was added in 1.4.
 To install this plugin you just have to add this line to your Gemfile.
 
@@ -13,10 +25,6 @@ gem 'foreman_chef'
 
 and run ```bundle install```. Don't forget to restart foreman after this change.
 
-If you want to use this in production I recommend to combine this plugin with foreman-background
-(https://github.com/ohadlevy/foreman-background) which runs report and facts import as a background
-tasks.
-
 ##  License
 
 Copyright (c) 2013-2014 Marek Hulán

data/app/controllers/foreman_chef/concerns/hosts_controller_rescuer.rb

@@ -0,0 +1,20 @@
+module ForemanChef
+  module Concerns
+    module HostsControllerRescuer
+      extend ActiveSupport::Concern
+
+      included do
+        rescue_from ForemanChef::ProxyException, :with => :chef_exception
+      end
+
+      module InstanceMethods
+        private
+
+        def chef_exception(exception)
+          flash[:error] = _(exception.message)
+          redirect_to :back
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/foreman_chef/client/destroy.rb

@@ -10,6 +10,10 @@ module Actions
               plan_self :chef_proxy_id => proxy.id, :fqdn => fqdn
             end
           end
+        rescue => e
+          Rails.logger.debug "Unable to communicate with Chef proxy, #{e.message}"
+          Rails.logger.debug e.backtrace.join("\n")
+          raise ::ForemanChef::ProxyException.new(N_('Unable to communicate with Chef proxy, %s' % e.message))
         end
 
         def run

data/app/lib/actions/foreman_chef/host/destroy.rb

@@ -15,6 +15,10 @@ module Actions
 
             plan_action Actions::ForemanChef::Client::Destroy, host.name, proxy
           end
+        rescue => e
+          Rails.logger.debug "Unable to communicate with Chef proxy, #{e.message}"
+          Rails.logger.debug e.backtrace.join("\n")
+          raise ::ForemanChef::ProxyException.new(N_('Unable to communicate with Chef proxy, %s' % e.message))
         end
 
         def run

data/app/models/foreman_chef/fact_parser.rb

@@ -5,7 +5,7 @@ module ForemanChef
 
     def operatingsystem
       os_name = facts['lsb::id'] || facts['platform']
-      release = facts['lsb::release'] || fact['platform_version']
+      release = facts['lsb::release'] || facts['platform_version']
       major, minor = release.split('.')
       description = facts['lsb::description']
       release_name = facts['lsb::codename']

data/app/services/foreman_chef/proxy_exception.rb

@@ -0,0 +1,4 @@
+module ForemanChef
+  class ProxyException < Foreman::Exception
+  end
+end

data/lib/foreman_chef/engine.rb

@@ -1,4 +1,5 @@
 require 'deface'
+require 'foreman_tasks'
 
 module ForemanChef
   #Inherit from the Rails module of the parent app (Foreman), not the plugin.
@@ -49,6 +50,7 @@ module ForemanChef
       ::FactImporter.register_fact_importer(:foreman_chef, ForemanChef::FactImporter)
       ::FactParser.register_fact_importer(:foreman_chef, ForemanChef::FactParser)
       ::Host::Base.send :include, ForemanChef::Concerns::HostActionSubject
+      ::HostsController.send :include, ForemanChef::Concerns::HostsControllerRescuer
     end
 
     config.after_initialize do

data/lib/foreman_chef/version.rb

@@ -1,3 +1,3 @@
 module ForemanChef
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_chef
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -73,66 +73,68 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/overrides/add_chef_proxy.rb
+- LICENSE
+- README.md
+- Rakefile
+- app/controllers/foreman_chef/concerns/hosts_controller_rescuer.rb
 - app/helpers/foreman_chef/chef_proxy_form.rb
-- app/models/foreman_chef/fact_parser.rb
-- app/models/foreman_chef/fact_name.rb
-- app/models/foreman_chef/smart_proxy_extensions.rb
-- app/models/foreman_chef/chef_proxy_association.rb
-- app/models/foreman_chef/hostgroup_extensions.rb
-- app/models/foreman_chef/host_extensions.rb
-- app/models/foreman_chef/fact_importer.rb
-- app/models/foreman_chef/concerns/renderer.rb
-- app/models/foreman_chef/concerns/host_action_subject.rb
-- app/models/setting/foreman_chef.rb
 - app/lib/actions/foreman_chef/client/destroy.rb
 - app/lib/actions/foreman_chef/host/destroy.rb
 - app/lib/proxy_api/foreman_chef/chef_proxy.rb
+- app/models/foreman_chef/chef_proxy_association.rb
+- app/models/foreman_chef/concerns/host_action_subject.rb
+- app/models/foreman_chef/concerns/renderer.rb
+- app/models/foreman_chef/fact_importer.rb
+- app/models/foreman_chef/fact_name.rb
+- app/models/foreman_chef/fact_parser.rb
+- app/models/foreman_chef/host_extensions.rb
+- app/models/foreman_chef/hostgroup_extensions.rb
+- app/models/foreman_chef/smart_proxy_extensions.rb
+- app/models/setting/foreman_chef.rb
+- app/overrides/add_chef_proxy.rb
+- app/services/foreman_chef/proxy_exception.rb
+- app/views/foreman/unattended/snippets/_chef_client_bootstrap.erb
 - app/views/foreman/unattended/snippets/_chef_client_gem_bootstrap.erb
 - app/views/foreman/unattended/snippets/_chef_client_omnibus_bootstrap.erb
-- app/views/foreman/unattended/snippets/_chef_client_bootstrap.erb
 - config/routes.rb
-- db/migrate/20140513144804_add_chef_proxy_id_to_hostgroup.rb
 - db/migrate/20140220145827_add_chef_proxy_id_to_host.rb
+- db/migrate/20140513144804_add_chef_proxy_id_to_hostgroup.rb
 - db/seeds.rb
+- lib/foreman_chef.rb
 - lib/foreman_chef/engine.rb
 - lib/foreman_chef/version.rb
-- lib/foreman_chef.rb
 - lib/tasks/foreman_chef.rake
-- LICENSE
-- Rakefile
-- README.md
-- test/test_helper.rb
-- test/integration/navigation_test.rb
-- test/foreman_chef_test.rb
-- test/dummy/app/helpers/application_helper.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/500.html
-- test/dummy/public/422.html
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/boot.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/application.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
 - test/dummy/script/rails
-- test/dummy/config.ru
+- test/foreman_chef_test.rb
+- test/integration/navigation_test.rb
+- test/test_helper.rb
 homepage: https://github.com/theforeman/foreman_chef
 licenses:
 - GPL-3
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Plugin for Chef integration with Foreman