runcible 1.2.0 → 1.3.0

data/Gemfile

@@ -10,8 +10,9 @@ group :test do
   gem 'minitest', '~> 4.7'
   gem 'parseconfig'
   gem 'mocha', "~> 0.14.0"
+  gem 'rubocop', "0.24.1"
 end
 
 group :debug do
-  gem 'debugger'
+  gem 'debugger' if RUBY_VERSION == "1.9.3"
 end

data/README.md

@@ -4,7 +4,7 @@
 
 Exposing Pulp's juiciest parts. http://www.pulpproject.org/
 
-Latest Live Tested Version: **pulp-server-2.5.0-0.1.alpha.el6.noarch**
+Latest Live Tested Version: **pulp-server-2.5.0-0.7.beta.el6.noarch**
 
 Current stable Runcible: https://github.com/Katello/runcible/tree/0.3
 

data/Rakefile

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 def clear_cassettes
   `rm -rf test/fixtures/vcr_cassettes/*.yml`
@@ -9,9 +9,8 @@ def clear_cassettes
   print "Cassettes cleared\n"
 end
 
-
 namespace :test do
-  "Runs the unit tests"
+  desc 'Runs the unit tests'
   Rake::TestTask.new :unit do |t|
     t.pattern = 'test/unit/test_*.rb'
   end
@@ -27,9 +26,9 @@ namespace :test do
       options[:logging]   = ENV['logging']
 
       if !['new_episodes', 'all', 'none', 'once'].include?(options[:mode])
-        puts "Invalid test mode"
+        puts 'Invalid test mode'
       else
-        require "./test/test_runner"
+        require './test/test_runner'
 
         test_runner = PulpMiniTestRunner.new
 
@@ -41,13 +40,13 @@ namespace :test do
 
         clear_cassettes if options[:mode] == 'all' && options[:test_name].nil? && ENV['record'] != 'false'
         test_runner.run_tests(task_name, options)
-        Rake::Task[:update_test_version].invoke if options[:mode] == "all" && ENV['record'] != 'false'
+        Rake::Task[:update_test_version].invoke if options[:mode] == 'all' && ENV['record'] != 'false'
       end
     end
   end
 end
 
-desc "Updats the version of Pulp tested against in README"
+desc 'Updats the version of Pulp tested against in README'
 task :update_test_version do
   text = File.open('README.md').read
 
@@ -60,15 +59,22 @@ task :update_test_version do
   end
 end
 
-desc "Clears out all cassette files"
+desc 'Clears out all cassette files'
 task :clear_cassettes do
   clear_cassettes
 end
 
-desc "Runs all tests"
+desc 'Runs all tests'
 task :test do
   Rake::Task['test:unit'].invoke
   Rake::Task['test:models'].invoke
   Rake::Task['test:resources'].invoke
   Rake::Task['test:extensions'].invoke
 end
+
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+rescue
+  puts "Rubocop not loaded"
+end

data/lib/runcible.rb

@@ -36,4 +36,4 @@ resources += Dir[File.dirname(__FILE__) + '/runcible/models/importer.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/models/distributor.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/models/*.rb']
 
-resources.uniq.each{ |f| require f }
+resources.uniq.each { |f| require f }

data/lib/runcible/base.rb

@@ -26,11 +26,9 @@ require 'oauth'
 require 'json'
 require 'thread'
 
-
 module Runcible
   class Base
-
-    def initialize(config={})
+    def initialize(config = {})
       @mutex = Mutex.new
       @config = config
     end
@@ -42,7 +40,7 @@ module Runcible
     def config
       @mutex.synchronize do
         @config = @lazy_config.call if defined?(@lazy_config)
-        raise Runcible::ConfigurationUndefinedError, Runcible::ConfigurationUndefinedError.message unless @config
+        fail Runcible::ConfigurationUndefinedError, Runcible::ConfigurationUndefinedError.message unless @config
         @config
       end
     end
@@ -51,16 +49,12 @@ module Runcible
       self.class.path(*args)
     end
 
-    def call(method, path, options={})
+    def call(method, path, options = {})
       clone_config = self.config.clone
       #on occation path will already have prefix (sync cancel)
-      path = clone_config[:api_path] + path if !path.start_with?(clone_config[:api_path])
+      path = clone_config[:api_path] + path unless path.start_with?(clone_config[:api_path])
 
       RestClient.log    = []
-      logger            = clone_config[:logging][:logger]
-      debug_logging     = clone_config[:logging][:debug]
-      exception_logging = clone_config[:logging][:exception]
-
       headers = clone_config[:headers].clone
 
       get_params = options[:params] if options[:params]
@@ -69,10 +63,11 @@ module Runcible
       client_options = {}
       client_options[:timeout] =  clone_config[:timeout] if clone_config[:timeout]
       client_options[:open_timeout] =  clone_config[:open_timeout] if clone_config[:open_timeout]
+      client_options[:verify_ssl] =  clone_config[:verify_ssl] unless clone_config[:verify_ssl].nil?
 
       if clone_config[:oauth]
         headers = add_oauth_header(method, path, headers) if clone_config[:oauth]
-        headers["pulp-user"] = clone_config[:user]
+        headers['pulp-user'] = clone_config[:user]
         client = RestClient::Resource.new(clone_config[:url], client_options)
       else
         client_options[:user] =  clone_config[:user]
@@ -93,7 +88,7 @@ module Runcible
     end
 
     def get_response(client, path, *args)
-      client[path].send(*args) do |response, request, result, &block|
+      client[path].send(*args) do |response, request, result, &_block|
         resp = response.return!(request, result)
         log_debug
         return resp
@@ -101,13 +96,14 @@ module Runcible
     end
 
     def combine_get_params(path, params)
-      query_string  = params.collect do |k, v|
+      query_string  = params.map do |k, v|
         if v.is_a? Array
-          v.collect{|y| "#{k.to_s}=#{y.to_s}" }.join('&')
+          v.map { |y| "#{k}=#{y}" }.join('&')
         else
-          "#{k.to_s}=#{v.to_s}"
+          "#{k}=#{v}"
         end
-      end.flatten().join('&')
+      end
+      query_string = query_string.flatten.join('&')
       path + "?#{query_string}"
     end
 
@@ -145,19 +141,20 @@ module Runcible
         if body.respond_to? :with_indifferent_access
           body = body.with_indifferent_access
         elsif body.is_a? Array
-          body = body.collect  do |i|
+          body = body.map  do |i|
             i.respond_to?(:with_indifferent_access) ? i.with_indifferent_access : i
           end
         end
         response = RestClient::Response.create(body, response.net_http_res, response.args)
       rescue JSON::ParserError
+        log_exception
       end
 
       return response
     end
 
-    def required_params(local_names, binding, keys_to_remove=[])
-      local_names = local_names.reduce({}) do |acc, v|
+    def required_params(local_names, binding, keys_to_remove = [])
+      local_names = local_names.each_with_object({}) do |v, acc|
         value = binding.eval(v.to_s) unless v == :_
         acc[v] = value unless value.nil?
         acc
@@ -166,8 +163,8 @@ module Runcible
       #The double delete is to support 1.8.7 and 1.9.3
       local_names.delete(:payload)
       local_names.delete(:optional)
-      local_names.delete("payload")
-      local_names.delete("optional")
+      local_names.delete('payload')
+      local_names.delete('optional')
       keys_to_remove.each do |key|
         local_names.delete(key)
         local_names.delete(key.to_sym)
@@ -183,9 +180,9 @@ module Runcible
     def add_oauth_header(method, path, headers)
       default_options = { :site               => config[:url],
                           :http_method        => method,
-                          :request_token_path => "",
-                          :authorize_path     => "",
-                          :access_token_path  => "" }
+                          :request_token_path => '',
+                          :authorize_path     => '',
+                          :access_token_path  => '' }
 
       default_options[:ca_file] = config[:ca_cert_file] unless config[:ca_cert_file].nil?
       consumer = OAuth::Consumer.new(config[:oauth][:oauth_key], config[:oauth][:oauth_secret], default_options)
@@ -204,7 +201,7 @@ module Runcible
 
     def log_debug
       if self.config[:logging][:debug]
-        log_message = generate_log_message                  
+        log_message = generate_log_message
         self.config[:logging][:logger].debug(log_message)
       end
     end
@@ -223,14 +220,12 @@ module Runcible
     def logger
       self.config[:logging][:logger]
     end
-
-  end 
+  end
 
   class ConfigurationUndefinedError < StandardError
-
     def self.message
       # override me to change the error message
-      "Configuration not set. Runcible::Base.config= must be called before Runcible::Base.config."
+      'Configuration not set. Runcible::Base.config= must be called before Runcible::Base.config.'
     end
   end
 end

data/lib/runcible/extensions/consumer.rb

@@ -21,11 +21,9 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
 module Runcible
   module Extensions
     class Consumer < Runcible::Resources::Consumer
-
       # Bind a consumer to all repositories with a given ID
       #
       # @param  [String]               id       the consumer ID
@@ -35,10 +33,11 @@ module Runcible
       # @option  options [Boolean]     :notify_agent sends consumer a notification
       # @option  options [Hash]        :binding_config sends consumer a notification
       # @return [RestClient::Response]          set of tasks representing each bind operation
-      def bind_all(id, repo_id, type_id, options={})
-        repository_extension.retrieve_with_details(repo_id)['distributors'].collect do |d|
+      def bind_all(id, repo_id, type_id, options = {})
+        details = repository_extension.retrieve_with_details(repo_id)['distributors'].map do |d|
           bind(id, repo_id, d['id'], options) if d['distributor_type_id'] == type_id
-        end.reject{|f| f.nil?}.flatten
+        end
+        details.compact.flatten
       end
 
       # Unbind a consumer to all repositories with a given ID
@@ -48,9 +47,10 @@ module Runcible
       # @param  [String]               type_id  the distributor type_id to unbind from
       # @return [RestClient::Response]          set of tasks representing each unbind operation
       def unbind_all(id, repo_id, type_id)
-        repository_extension.retrieve_with_details(repo_id)['distributors'].collect do |d|
+        details = repository_extension.retrieve_with_details(repo_id)['distributors'].map do |d|
           unbind(id, repo_id, d['id']) if d['distributor_type_id'] == type_id
-        end.reject{|f| f.nil?}.flatten
+        end
+        details.compact.flatten
       end
 
       # Activate a consumer as a pulp node
@@ -58,9 +58,9 @@ module Runcible
       # @param  [String]               id       the consumer ID
       # @param  [String]               update_strategy update_strategy for the node (defaults to additive)
       # @return [RestClient::Response]          response from update call
-      def activate_node(id, update_strategy="additive")
-        delta = {:notes=>{'_child-node' => true,
-                          '_node-update-strategy' => update_strategy}}
+      def activate_node(id, update_strategy = 'additive')
+        delta = {:notes => {'_child-node' => true,
+                            '_node-update-strategy' => update_strategy}}
         self.update(id, delta)
       end
 
@@ -69,9 +69,9 @@ module Runcible
       # @param  [String]               id       the consumer ID
       # @return [RestClient::Response]          response from update call
       def deactivate_node(id)
-        delta = {:notes=>{'child-node' => nil,
-                          'update_strategy' => nil}}
-        self.update(id, :delta=>delta)
+        delta = {:notes => {'child-node' => nil,
+                            'update_strategy' => nil}}
+        self.update(id, :delta => delta)
       end
 
       # Install content to a consumer
@@ -81,7 +81,7 @@ module Runcible
       # @param  [Array]                units    array of units to install
       # @param  [Hash]                 options to pass to content install
       # @return [RestClient::Response]          task representing the install operation
-      def install_content(id, type_id, units, options={})
+      def install_content(id, type_id, units, options = {})
         install_units(id, generate_content(type_id, units), options)
       end
 
@@ -92,7 +92,7 @@ module Runcible
       # @param  [Array]                units    array of units to update
       # @param  [Hash]                 options to pass to content update
       # @return [RestClient::Response]          task representing the update operation
-      def update_content(id, type_id, units, options={})
+      def update_content(id, type_id, units, options = {})
         update_units(id, generate_content(type_id, units, options), options)
       end
 
@@ -112,18 +112,18 @@ module Runcible
       # @param  [Array]   units   array of units
       # @param  [Hash]    options contains options which may impact the format of the content (e.g :all => true)
       # @return [Array]           array of formatted content units
-      def generate_content(type_id, units, options={})
+      def generate_content(type_id, units, options = {})
         content = []
 
         case type_id
-          when 'rpm', 'package_group'
-            unit_key = :name
-          when 'erratum'
-            unit_key = :id
-          when 'repository'
-            unit_key = :repo_id
-          else
-            unit_key = :id
+        when 'rpm', 'package_group'
+          unit_key = :name
+        when 'erratum'
+          unit_key = :id
+        when 'repository'
+          unit_key = :repo_id
+        else
+          unit_key = :id
         end
 
         if options[:all]
@@ -132,7 +132,7 @@ module Runcible
           content_unit[:unit_key] = {}
           content.push(content_unit)
         elsif units.nil?
-          content = [{:unit_key=> nil, :type_id=>type_id}]
+          content = [{:unit_key => nil, :type_id => type_id}]
         else
           units.each do |unit|
             content_unit = {}
@@ -184,7 +184,6 @@ module Runcible
       def repository_extension
         Runcible::Extensions::Repository.new(self.config)
       end
-
     end
   end
 end

data/lib/runcible/extensions/consumer_group.rb

@@ -21,11 +21,9 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
 module Runcible
   module Extensions
     class ConsumerGroup < Runcible::Resources::ConsumerGroup
-
       # Add consumers by ID to a consumer group
       #
       # @param  [String]                id            the consumer group ID
@@ -51,7 +49,7 @@ module Runcible
       def make_consumer_criteria(consumer_ids)
         {:criteria =>
               {:filters =>
-                {:id =>{"$in" =>consumer_ids}}
+                {:id => {'$in' => consumer_ids}}
               }
         }
       end
@@ -63,7 +61,7 @@ module Runcible
       # @param  [Array]                units    array of units to install
       # @param  [Hash]                 options  to pass to content install
       # @return [RestClient::Response]          task representing the install operation
-      def install_content(id, type_id, units, options={})
+      def install_content(id, type_id, units, options = {})
         install_units(id, generate_content(type_id, units), options)
       end
 
@@ -74,7 +72,7 @@ module Runcible
       # @param  [Array]                units    array of units to update
       # @param  [Hash]                 options  to pass to content update
       # @return [RestClient::Response]          task representing the update operation
-      def update_content(id, type_id, units, options={})
+      def update_content(id, type_id, units, options = {})
         update_units(id, generate_content(type_id, units, options), options)
       end
 
@@ -94,16 +92,16 @@ module Runcible
       # @param  [Array]   units   array of units
       # @param  [Hash]    options contains options which may impact the format of the content (e.g :all => true)
       # @return [Array]           array of formatted content units
-      def generate_content(type_id, units, options={})
+      def generate_content(type_id, units, options = {})
         content = []
 
         case type_id
-          when 'rpm', 'package_group'
-            unit_key = :name
-          when 'erratum'
-            unit_key = :id
-          else
-            unit_key = :id
+        when 'rpm', 'package_group'
+          unit_key = :name
+        when 'erratum'
+          unit_key = :id
+        else
+          unit_key = :id
         end
 
         if options[:all]
@@ -121,7 +119,6 @@ module Runcible
         end
         content
       end
-
     end
   end
 end

data/lib/runcible/extensions/distribution.rb

@@ -21,11 +21,9 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
 module Runcible
   module Extensions
     class Distribution < Runcible::Extensions::Unit
-
       def self.content_type
         'distribution'
       end