smart_proxy_chef 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65d721182fbd48d1c3ca2dad32fd6a32d1de3d19
-  data.tar.gz: 67cebe73ee91e8b2338293084fe56d254fafc44a
+  metadata.gz: f52bafb874c675e729ede6b64f05a61d30522d50
+  data.tar.gz: 3ea968011835b0bb98e1406ab814c560a5ca3067
 SHA512:
-  metadata.gz: ff52af84bcdc9b646dad703df3a1ecedcf779c21ec06c08374f32c5687dc167cc2d07249094f5e286c3fe63d2e35d88ecacd6c5b6cc8ea4be8f0e502f93fce33
-  data.tar.gz: c4e0ae11fb9a6365aa1b9076447c5c45f7e18b8468fb532cdaa4bb8be389404d14f886be929224877b07b92d596e4503ac0f6451e1d048072293a3c38b3ab6ab
+  metadata.gz: 2e3f9c348e46e3e5d02f48a05a7a6747c03a8adbcb65b54faa7179e882329e08964c74e5d5f97be2e7ce27b48445ab64ab84b6d7dbd7fbd3c3e0cca3ab1ebc76
+  data.tar.gz: 021689d60f75eb6102ffd0ee48d170d091d35882ede4062f8c366f1e5181a9e309e0e959478f10933d0487ddd6dc496e53ec90ae3831fd271e9bf212104f58d2

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in smart-proxy-chef.gemspec
 gemspec
+
+group :development do
+  gem 'smart_proxy', :git => "https://github.com/theforeman/smart-proxy"
+end

data/lib/smart_proxy_chef_plugin/chef_api.rb

@@ -1,36 +1,7 @@
-require 'proxy/request'
-require 'smart_proxy_chef_plugin/authentication'
 require 'smart_proxy_chef_plugin/resources/node'
 require 'smart_proxy_chef_plugin/resources/client'
 
 module ChefPlugin
-  class ForemanApi < ::Sinatra::Base
-    helpers ::Proxy::Helpers
-    authorize_with_trusted_hosts
-
-    error Proxy::Error::BadRequest do
-      log_halt(400, "Bad request : " + env['sinatra.error'].message )
-    end
-
-    error Proxy::Error::Unauthorized do
-      log_halt(401, "Unauthorized : " + env['sinatra.error'].message )
-    end
-
-    post "/hosts/facts" do
-      logger.debug 'facts upload request received'
-      ChefPlugin::Authentication.new.authenticated(request) do |content|
-        Proxy::HttpRequest::Facts.new.post_facts(content)
-      end
-    end
-
-    post "/reports" do
-      logger.debug 'report upload request received'
-      ChefPlugin::Authentication.new.authenticated(request) do |content|
-        Proxy::HttpRequest::Reports.new.post_report(content)
-      end
-    end
-  end
-
   class ChefApi < ::Sinatra::Base
     get "/nodes/:fqdn" do
       logger.debug "Showing node #{params[:fqdn]}"
@@ -54,7 +25,7 @@ module ChefPlugin
       end
     end
 
-    delete "/chef/nodes/:fqdn" do
+    delete "/nodes/:fqdn" do
       logger.debug "Starting deletion of node #{params[:fqdn]}"
 
       result = Resources::Node.new.delete(params[:fqdn])
@@ -64,7 +35,7 @@ module ChefPlugin
       { :result => result }.to_json
     end
 
-    delete "/chef/clients/:fqdn" do
+    delete "/clients/:fqdn" do
       logger.debug "Starting deletion of client #{params[:fqdn]}"
 
       result = Resources::Client.new.delete(params[:fqdn])

data/lib/smart_proxy_chef_plugin/foreman_api.rb

@@ -0,0 +1,31 @@
+require 'proxy/request'
+require 'smart_proxy_chef_plugin/authentication'
+
+module ChefPlugin
+  class ForemanApi < ::Sinatra::Base
+    helpers ::Proxy::Helpers
+    authorize_with_trusted_hosts
+
+    error Proxy::Error::BadRequest do
+      log_halt(400, "Bad request : " + env['sinatra.error'].message )
+    end
+
+    error Proxy::Error::Unauthorized do
+      log_halt(401, "Unauthorized : " + env['sinatra.error'].message )
+    end
+
+    post "/hosts/facts" do
+      logger.debug 'facts upload request received'
+      ChefPlugin::Authentication.new.authenticated(request) do |content|
+        Proxy::HttpRequest::Facts.new.post_facts(content)
+      end
+    end
+
+    post "/reports" do
+      logger.debug 'report upload request received'
+      ChefPlugin::Authentication.new.authenticated(request) do |content|
+        Proxy::HttpRequest::Reports.new.post_report(content)
+      end
+    end
+  end
+end

data/lib/smart_proxy_chef_plugin/http_config.ru

@@ -1,3 +1,4 @@
+require 'smart_proxy_chef_plugin/foreman_api'
 require 'smart_proxy_chef_plugin/chef_api'
 
 map "/api" do

data/lib/smart_proxy_chef_plugin/version.rb

@@ -1,3 +1,3 @@
 module ChefPlugin
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_chef
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marek Hulan
@@ -38,6 +38,76 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+- !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
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +147,7 @@ files:
 - bundler.d/chef.rb
 - lib/smart_proxy_chef_plugin/http_config.ru
 - lib/smart_proxy_chef_plugin/chef_api.rb
+- lib/smart_proxy_chef_plugin/foreman_api.rb
 - lib/smart_proxy_chef_plugin/authentication.rb
 - lib/smart_proxy_chef_plugin/resources/client.rb
 - lib/smart_proxy_chef_plugin/resources/base.rb