smart_proxy_salt 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 716d33f19133ef06e16cf558c8a43f44d3bbd4db
-  data.tar.gz: 27104bd5181a5dd086c0ac5f76932e5a6ca59a99
+  metadata.gz: 77c8f6c3ad50715f41fb5606a65ddd3cb6f06bd1
+  data.tar.gz: 61153e01b2c2043c19b22f33a651932c6c8fb8b9
 SHA512:
-  metadata.gz: 4137417072ef95e3cf394ab307c04c221e02a973b169ceeecdcaeef8980a3e610bf19825b361275ad8426023554333cc05075da5de91df36782f0a9e5c4e6d39
-  data.tar.gz: 47a173fe70cb02e92a169a1b3fe7cff2160a3987586db6d9e4fe9a5a8fc20d525733de325a7f29aa9fba7d95b1308315ba0cf388b6a1769cb9192108da18dfe7
+  metadata.gz: de0c1674f1e3742a185e3f1f4bb9574e8c2c498cc3fa1278914c1e0617517cfe19a63774f4c53d3b567650bbc959816ee312a7a7e6dee3cd42785d071de1c13f
+  data.tar.gz: f85fb6810cbb2c47846f167875880825b788f9cf7cd430358c1d58becdaae63b4b2b9f8884428104a5626288d15e761d415019a2bb24b2f0acedbffca49a5fb6

data/bin/foreman-node

@@ -5,7 +5,7 @@
 
 require 'yaml'
 
-$settings_file = "/etc/salt/foreman.yaml"
+$settings_file = '/etc/salt/foreman.yaml'
 SETTINGS = YAML.load_file($settings_file)
 
 require 'net/http'
@@ -22,7 +22,7 @@ rescue LoadError
     require 'rubygems' rescue nil
     require 'json'
   rescue LoadError => e
-    puts "You need the `json` gem to use the Foreman ENC script"
+    puts 'You need the `json` gem to use the Foreman ENC script'
     # code 1 is already used below
     exit 2
   end
@@ -32,7 +32,7 @@ def foreman_url
   "#{SETTINGS[:proto]}://#{SETTINGS[:host]}:#{SETTINGS[:port]}"
 end
 
-def valid_hostname? hostname
+def valid_hostname?(hostname)
   hostname =~ /\A(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\z/
 end
 
@@ -53,7 +53,7 @@ def get_grains(minion)
   end
 end
 
-def plain_grains minion
+def plain_grains(minion)
   # We have to get the grains from the cache, because the client
   # is probably running 'state.highstate' right now.
   #
@@ -84,7 +84,7 @@ if __name__ == '__main__':
     print json.dumps(ret)
 EOF
 
-  result = IO.popen("python", mode='r+') do |python|
+  result = IO.popen('python', mode='r+') do |python|
     python.write script
     python.close_write
     result = python.read
@@ -169,15 +169,15 @@ def enc(minion)
 
   res = http.start { |http| http.request(req) }
 
-  raise "Error retrieving node #{minion}: #{res.class}\nCheck Foreman's /var/log/foreman/production.log for more information." unless res.code == "200"
+  raise "Error retrieving node #{minion}: #{res.class}\nCheck Foreman's /var/log/foreman/production.log for more information." unless res.code == '200'
   res.body
 end
 
-minion = ARGV[0] || raise("Must provide minion as an argument")
+minion = ARGV[0] || raise('Must provide minion as an argument')
 
-raise "Invalid hostname" unless valid_hostname? minion
+raise 'Invalid hostname' unless valid_hostname? minion
 begin
-  result = ""
+  result = ''
 
   if SETTINGS[:upload_grains]
     timeout(SETTINGS[:timeout]) do

data/lib/smart_proxy_salt/salt_api.rb

@@ -6,8 +6,9 @@ module Proxy::Salt
   class Api < ::Sinatra::Base
     include ::Proxy::Log
     helpers ::Proxy::Helpers
+    authorize_with_ssl_client
 
-    post "/autosign/:host" do
+    post '/autosign/:host' do
       content_type :json
       begin
         Proxy::Salt.autosign_create(params[:host]).to_json
@@ -16,7 +17,7 @@ module Proxy::Salt
       end
     end
 
-    delete "/autosign/:host" do
+    delete '/autosign/:host' do
       content_type :json
       begin
         Proxy::Salt.autosign_remove(params[:host]).to_json
@@ -27,7 +28,7 @@ module Proxy::Salt
       end
     end
 
-    get "/autosign" do
+    get '/autosign' do
       content_type :json
       begin
         Proxy::Salt::autosign_list.to_json
@@ -36,17 +37,17 @@ module Proxy::Salt
       end
     end
 
-    post "/highstate/:host" do
+    post '/highstate/:host' do
       content_type :json
       begin
-        log_halt 500, "Failed salt run for #{params[:host]}: Check Log files" unless result=Proxy::Salt.highstate(params[:host])
+        log_halt 500, "Failed salt run for #{params[:host]}: Check Log files" unless (result = Proxy::Salt.highstate(params[:host]))
         result
       rescue => e
         log_halt 406, "Failed salt run for #{params[:host]}: #{e}"
       end
     end
 
-    delete "/key/:host" do
+    delete '/key/:host' do
       content_type :json
       begin
         Proxy::Salt.key_delete(params[:host])
@@ -55,7 +56,7 @@ module Proxy::Salt
       end
     end
 
-    post "/key/:host" do
+    post '/key/:host' do
       content_type :json
       begin
         Proxy::Salt::key_accept(params[:host])
@@ -64,7 +65,7 @@ module Proxy::Salt
       end
     end
 
-    delete "/key/reject/:host" do
+    delete '/key/reject/:host' do
       content_type :json
       begin
         Proxy::Salt::key_reject(params[:host])
@@ -73,7 +74,7 @@ module Proxy::Salt
       end
     end
 
-    get "/key" do
+    get '/key' do
       content_type :json
       begin
         Proxy::Salt::key_list.to_json

data/lib/smart_proxy_salt/salt_http_config.ru

@@ -1,4 +1,4 @@
 require 'smart_proxy_salt/salt_api'
-map "/salt" do
+map '/salt' do
   run Proxy::Salt::Api
 end

data/lib/smart_proxy_salt/salt_main.rb

@@ -33,14 +33,14 @@ module Proxy::Salt
       Proxy::Salt::Plugin.settings.autosign_file
     end
 
-    def autosign_create host
+    def autosign_create(host)
       FileUtils.touch(autosign_file) unless File.exist?(autosign_file)
 
       autosign = open(autosign_file, File::RDWR)
 
       found = false
       autosign.each_line { |line| found = true if line.chomp == host }
-      autosign.puts host if found == false
+      autosign.puts host unless found
       autosign.close
 
       result = {:message => "Added #{host} to autosign"}
@@ -48,7 +48,7 @@ module Proxy::Salt
       result
     end
 
-    def autosign_remove host
+    def autosign_remove(host)
       raise "No such file #{autosign_file}" unless File.exists?(autosign_file)
 
       found = false
@@ -83,26 +83,26 @@ module Proxy::Salt
       }
     end
 
-    def highstate host
+    def highstate(host)
       find_salt_binaries
-      cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt, "--async", escape_for_shell(host), "state.highstate"]
-      logger.info "Will run state.highstate for #{host}. Full command: #{cmd.join(" ")}"
+      cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt, '--async', escape_for_shell(host), 'state.highstate']
+      logger.info "Will run state.highstate for #{host}. Full command: #{cmd.join(' ')}"
       shell_command(cmd)
     end
 
-    def key_delete host
+    def key_delete(host)
       find_salt_binaries
       cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt_key, '--yes', '-d', escape_for_shell(host)]
       shell_command(cmd)
     end
 
-    def key_reject host
+    def key_reject(host)
       find_salt_binaries
       cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt_key, '--yes', '-r', escape_for_shell(host)]
       shell_command(cmd)
     end
 
-    def key_accept host
+    def key_accept(host)
       find_salt_binaries
       cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt_key, '--yes', '-a', escape_for_shell(host)]
       shell_command(cmd)
@@ -116,7 +116,7 @@ module Proxy::Salt
       response = `#{command}`
       unless $? == 0
         logger.warn "Failed to run salt-key: #{response}"
-        raise "Execution of salt-key failed, check log files"
+        raise 'Execution of salt-key failed, check log files'
       end
 
       keys_hash = {}

data/lib/smart_proxy_salt/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Salt
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Moll
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies: []
 description: SaltStack Plug-In for Foreman's Smart Proxy
 email: foreman-dev@googlegroups.com
@@ -20,20 +20,20 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- LICENSE
+- README.md
 - bin/foreman-node
+- bundler.d/salt.rb
 - cron/smart_proxy_salt
 - etc/foreman.yaml.example
-- lib/smart_proxy_salt/salt_main.rb
-- lib/smart_proxy_salt/salt_http_config.ru
+- lib/smart_proxy_salt.rb
 - lib/smart_proxy_salt/salt.rb
 - lib/smart_proxy_salt/salt_api.rb
+- lib/smart_proxy_salt/salt_http_config.ru
+- lib/smart_proxy_salt/salt_main.rb
 - lib/smart_proxy_salt/version.rb
-- lib/smart_proxy_salt.rb
 - sbin/upload-salt-reports
 - settings.d/salt.yml.example
-- bundler.d/salt.rb
-- README.md
-- LICENSE
 homepage: https://github.com/theforeman/smart_proxy_salt
 licenses:
 - GPLv3
@@ -44,17 +44,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: SaltStack Plug-In for Foreman's Smart Proxy