foreman_omaha 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40493ee95139d2621cc06d655b33f261e4f9fa5
-  data.tar.gz: 702a0818709f83f31d94f13e682565ca5d33105e
+  metadata.gz: d3ec4d257a6b23da8a778b2c6c7646bda239ed8a
+  data.tar.gz: 72996f1f0545e2c51e9bda9d0d1ec3c1765ff483
 SHA512:
-  metadata.gz: c5f4835601a8843d36e0381ff3c0b0d6c36be09ae9013a6a5ac9fe277aa7e5c015ed2f8077d3d73c057abbdfaab792452b3f238ac6c167e6bdedc80dd9ebdaae
-  data.tar.gz: 0c678a22af766c6cb3c1968ed3394e547efc9314f1e72bc32627ac7d5273fb406962bb9031b958c47c736fd57830f576d7c26eb2938559b63f36a0616673333f
+  metadata.gz: 49351ba242b536b61204bd5dde6f559a843e979c7de3e3fddb1a3e7c0e104bd5303fdcce6d7fcb4e3bb3a2d9639a6af872e14167289c5d02164b02a2b0acd314
+  data.tar.gz: afcc44fb7da39ece8712fd38d18d9dd1e7cff99e938284b90b5d2a4d0909924753f410a189b25f8b67ce8827ab64532917afa3677d73fb0084353f6bd24b3557

data/app/controllers/api/v2/omaha_reports_controller.rb

@@ -31,8 +31,7 @@ module Api
       api :GET, '/omaha_reports/:id/', N_('Show a omaha report')
       param :id, :identifier, :required => true
 
-      def show
-      end
+      def show; end
 
       api :POST, '/omaha_reports', N_('Create a omaha report')
       param_group :omaha_report, :as => :create

data/app/controllers/omaha_reports_controller.rb

@@ -14,9 +14,13 @@ class OmahaReportsController < ApplicationController
   def show
     # are we searching for the last report?
     if params[:id] == 'last'
-      conditions = {
-        :host_id => resource_finder(Host.authorized(:view_hosts), params[:host_id]).try(:id)
-      } if params[:host_id].present?
+      conditions = if params[:host_id].present?
+                     {
+                       :host_id => resource_finder(Host.authorized(:view_hosts), params[:host_id]).try(:id)
+                     }
+                   else
+                     {}
+                   end
       params[:id] = resource_base.where(conditions).maximum(:id)
     end
 

data/app/models/foreman_omaha/fact_name.rb

@@ -1,7 +1,7 @@
 module ForemanOmaha
   class FactName < ::FactName
     def origin
-      'Omaha'
+      'foreman_omaha/Omaha'
     end
   end
 end

data/app/models/foreman_omaha/omaha_report.rb

@@ -1,7 +1,7 @@
 module ForemanOmaha
   class OmahaReport < ::Report
     enum :status => [:unknown, :complete, :downloading, :downloaded,
-              :installed, :instance_hold, :error]
+                     :installed, :instance_hold, :error]
 
     scoped_search :on => :omaha_version, :rename => :version, :complete_value => true
     scoped_search :on => :status, :complete_value => statuses
@@ -34,7 +34,7 @@ module ForemanOmaha
     end
 
     def operatingsystem
-      return unless omaha_version.present?
+      return if omaha_version.blank?
       args = { :type => 'Coreos', :major => osmajor, :minor => osminor }
       Operatingsystem.find_by(args)
     end

data/app/views/api/v2/omaha_reports/create.json.rabl

@@ -1,3 +1,3 @@
 object @omaha_report
 
-extends "api/v2/omaha_reports/show"
+extends 'api/v2/omaha_reports/show'

data/app/views/api/v2/omaha_reports/index.json.rabl

@@ -1,3 +1,3 @@
 collection @omaha_reports
 
-extends "api/v2/omaha_reports/main"
+extends 'api/v2/omaha_reports/main'

data/app/views/api/v2/omaha_reports/main.json.rabl

@@ -1,5 +1,5 @@
 object @omaha_report
 
-extends "api/v2/omaha_reports/base"
+extends 'api/v2/omaha_reports/base'
 
 attributes :omaha_version, :created_at, :updated_at

data/app/views/api/v2/omaha_reports/show.json.rabl

@@ -1,3 +1,3 @@
 object @omaha_report
 
-extends "api/v2/omaha_reports/main"
+extends 'api/v2/omaha_reports/main'

data/app/views/api/v2/omaha_reports/update.json.rabl

@@ -1,3 +1,3 @@
 object @omaha_report
 
-extends "api/v2/omaha_reports/show"
+extends 'api/v2/omaha_reports/show'

data/lib/foreman_omaha/engine.rb

@@ -27,7 +27,7 @@ module ForemanOmaha
           permission :view_omaha_reports, :omaha_reports => [:index, :show, :auto_complete_search],
                                           :'api/v2/omaha_reports' => [:index, :show, :last]
           permission :destroy_omaha_reports, :omaha_reports => [:destroy],
-                                             :'api/v2/config_reports' => [:destroy]
+                                             :'api/v2/omaha_reports' => [:destroy]
           permission :upload_omaha_reports, :omaha_reports => [:create],
                                             :'api/v2/omaha_reports' => [:create]
         end
@@ -45,8 +45,8 @@ module ForemanOmaha
              after: :reports
       end
 
-      if respond_to?(:hosts_controller_action_scope)
-        hosts_controller_action_scope(:index) { |base_scope| base_scope.includes(:last_omaha_report_object) }
+      if respond_to?(:add_controller_action_scope)
+        add_controller_action_scope(HostsController, :index) { |base_scope| base_scope.includes(:last_omaha_report_object) }
       end
     end
 
@@ -63,6 +63,18 @@ module ForemanOmaha
       end
     end
 
+    initializer 'foreman_omaha.assets.precompile' do |app|
+      app.config.assets.precompile += %w[foreman_omaha/Omaha.png]
+    end
+
+    initializer 'foreman_omaha.configure_assets', :group => :assets do
+      SETTINGS[:foreman_omaha] = {
+        :assets => {
+          :precompile => ['foreman_omaha/Omaha.png']
+        }
+      }
+    end
+
     rake_tasks do
       Rake::Task['db:seed'].enhance do
         ForemanOmaha::Engine.load_seed

data/lib/foreman_omaha/version.rb

@@ -1,3 +1,3 @@
 module ForemanOmaha
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/test/functional/api/v2/omaha_reports_controller_test.rb

@@ -34,7 +34,7 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
       delete :destroy, :id => report.to_param
     end
     assert_response :success
-    refute Report.find_by_id(report.id)
+    refute Report.find_by(id: report.id)
   end
 
   test 'should get reports for given host only' do
@@ -85,15 +85,15 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
   end
 
   test 'cannot view the last report without hosts view permission' do
-    setup_user('view', 'omaha_reports')
     report = FactoryGirl.create(:report)
+    setup_user('view', 'omaha_reports')
     get :last, { :host_id => report.host.id }, set_session_user.merge(:user => User.current.id)
     assert_response :not_found
   end
 
   describe 'unpriveliged user' do
     def setup
-      User.current = users(:one)
+      User.current = FactoryGirl.create(:user, :admin)
     end
 
     test 'hosts with a registered smart proxy on should create a report successfully' do
@@ -103,7 +103,9 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
       proxy = FactoryGirl.create(:smart_proxy, :omaha)
       host = URI.parse(proxy.url).host
       Resolv.any_instance.stubs(:getnames).returns([host])
-      post :create, :omaha_report => create_report
+      as_user :one do
+        post :create, :omaha_report => create_report
+      end
       assert_equal proxy, @controller.detected_proxy
       assert_response :created
     end

data/test/unit/omaha_report_test.rb

@@ -2,57 +2,60 @@ require 'test_plugin_helper'
 
 class OmahaReportTest < ActiveSupport::TestCase
   setup do
-    User.current = User.find_by_login 'admin'
-    @report = FactoryGirl.create(:omaha_report)
+    User.current = FactoryGirl.create(:user, :admin)
   end
 
   context 'status' do
+    let(:report) { FactoryGirl.build(:omaha_report) }
+
     test 'should be complete' do
-      @report.status = 'complete'
-      assert_equal 'complete', @report.status
-      assert_equal 'Complete', @report.to_label
+      report.status = 'complete'
+      assert_equal 'complete', report.status
+      assert_equal 'Complete', report.to_label
     end
 
     test 'should be downloading' do
-      @report.status = 'downloading'
-      assert_equal 'downloading', @report.status
-      assert_equal 'Downloading', @report.to_label
+      report.status = 'downloading'
+      assert_equal 'downloading', report.status
+      assert_equal 'Downloading', report.to_label
     end
 
     test 'should be downloaded' do
-      @report.status = 'downloaded'
-      assert_equal 'downloaded', @report.status
-      assert_equal 'Downloaded', @report.to_label
+      report.status = 'downloaded'
+      assert_equal 'downloaded', report.status
+      assert_equal 'Downloaded', report.to_label
     end
 
     test 'should be installed' do
-      @report.status = 'installed'
-      assert_equal 'installed', @report.status
-      assert_equal 'Installed', @report.to_label
+      report.status = 'installed'
+      assert_equal 'installed', report.status
+      assert_equal 'Installed', report.to_label
     end
 
     test 'should be installed' do
-      @report.status = 'instance_hold'
-      assert_equal 'instance_hold', @report.status
-      assert_equal 'Instance Hold', @report.to_label
+      report.status = 'instance_hold'
+      assert_equal 'instance_hold', report.status
+      assert_equal 'Instance Hold', report.to_label
     end
 
     test 'should be error' do
-      @report.status = 'error'
-      assert_equal 'error', @report.status
-      assert_equal 'Error', @report.to_label
+      report.status = 'error'
+      assert_equal 'error', report.status
+      assert_equal 'Error', report.to_label
     end
   end
 
   context 'operatingsystem' do
+    let(:os) { FactoryGirl.create(:coreos, :major => '1068', :minor => '9.0') }
+    let(:report) { FactoryGirl.create(:omaha_report) }
+
     test 'should get operatingsystem' do
-      os = FactoryGirl.create(:coreos, :major => '1068', :minor => '9.0')
-      assert_equal os, @report.operatingsystem
+      assert_equal os, report.operatingsystem
     end
 
     test 'should parse major, minor' do
-      assert_equal '1068', @report.osmajor
-      assert_equal '9.0', @report.osminor
+      assert_equal '1068', report.osmajor
+      assert_equal '9.0', report.osminor
     end
   end
 
@@ -79,7 +82,7 @@ class OmahaReportTest < ActiveSupport::TestCase
         'reported_at' => Time.now.utc.to_s
       }
       assert_raise ArgumentError do
-       ForemanOmaha::OmahaReport.import(report)
+        ForemanOmaha::OmahaReport.import(report)
       end
     end
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_omaha
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/images/Omaha.png
+- app/assets/images/foreman_omaha/Omaha.png
 - app/controllers/api/v2/omaha_reports_controller.rb
 - app/controllers/omaha_reports_controller.rb
 - app/helpers/concerns/foreman_omaha/hosts_helper_extensions.rb
@@ -90,7 +90,7 @@ files:
 - test/functional/omaha_reports_controller_test.rb
 - test/test_plugin_helper.rb
 - test/unit/omaha_report_test.rb
-homepage: http://github.com/timogoebel/foreman_omaha
+homepage: http://github.com/theforeman/foreman_omaha
 licenses:
 - GPL-3
 metadata: {}
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: This plug-in adds support for the Omaha procotol to The Foreman.