runcible 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81e84d07e192dd82fcf5eb669130f43b389dc667
-  data.tar.gz: 1c04abfe584586d01c6f7a6f0d45dd7700cd18b1
+  metadata.gz: 6fddef47151b53308fce3a4a103f5a082e657f47
+  data.tar.gz: 149ff0d3f758d5289c95e771f3056c567de70bc4
 SHA512:
-  metadata.gz: 02fa77aa02bb6569fc2e7b71f92ac82c6db708eb953cbb8a69fbbfc2b49a24a91dba7c5f5b2bacdfe79a7c7686d8839c2c78479fd2f442b8b1f97d405682fb4b
-  data.tar.gz: 0ce2e8c37fb40f68095cc0545d4b5472cc3d9bec62f0c0d5f3ab11f8ba76abfee362f6735b35ef139ae2d91c1df58a84059c2e9a63ec125d879de48af9172f94
+  metadata.gz: eb888ca430e0d85510c0c3116d673e762acf837eb23b4d79dffe0dccd6a74a362639303384dba25110670ad8cfb9adb60838e20f83c338318ff931219d70ad14
+  data.tar.gz: ca48cd2e29a30c0c2fbddb5ad85c9d4273a95f9227b14d01ca22752ac093af9ed444bdcaec6172b774390fc9575ab197b22da1d47018652f2717866419dce197

data/Gemfile

@@ -6,9 +6,10 @@ gemspec
 group :test do
   gem 'rake', '0.9.2.2'
   gem 'vcr'
-  gem 'webmock'
+  gem 'webmock', '< 2.0.0' # https://github.com/vcr/vcr/issues/570
   gem 'minitest', '~> 4.7'
   gem 'parseconfig'
   gem 'mocha', "~> 0.14.0"
-  gem 'rubocop', "0.24.1"
+  gem 'rubocop', "0.39.0"
+  gem 'coveralls'
 end

data/README.md

@@ -1,16 +1,17 @@
 # Runcible
 
 [![Build Status](https://secure.travis-ci.org/Katello/runcible.png)](http://travis-ci.org/Katello/runcible)
+[![Coverage Status](https://coveralls.io/repos/github/Katello/runcible/badge.svg?branch=master)](https://coveralls.io/github/Katello/runcible?branch=master)
 
 Exposing Pulp's juiciest parts. http://www.pulpproject.org/
 
-Latest Live Tested Version: **pulp-server-2.8.0-0.7.beta.el7.noarch**
+Latest Live Tested Version: **pulp-server-2.8.3-0.1.beta.el7.noarch**
 
 Current stable Runcible: https://github.com/Katello/runcible/tree/0.3
 
 For in-depth class and method documentation: http://katello.github.com/runcible/
 
-Please file new issues here: [Readmine](http://projects.theforeman.org/projects/runcible/issues/new)
+Please file new issues here: [Redmine](http://projects.theforeman.org/projects/runcible/issues/new)
 
 ## Installation
 

data/lib/runcible/base.rb

@@ -31,16 +31,16 @@ module Runcible
       #on occation path will already have prefix (sync cancel)
       path = clone_config[:api_path] + path unless path.start_with?(clone_config[:api_path])
 
-      RestClient.log    = []
+      RestClient.log = []
       headers = clone_config[:headers].clone
 
       get_params = options[:params] if options[:params]
       path = combine_get_params(path, get_params) if get_params
 
       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?
+      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)
@@ -52,7 +52,7 @@ module Runcible
         client_options[:ssl_client_cert] = clone_config[:cert_auth][:ssl_client_cert]
         client_options[:ssl_client_key] = clone_config[:cert_auth][:ssl_client_key]
       else
-        client_options[:user] =  clone_config[:user]
+        client_options[:user] = clone_config[:user]
         client_options[:password] = config[:http_auth][:password]
       end
 
@@ -83,7 +83,7 @@ module Runcible
     end
 
     def combine_get_params(path, params)
-      query_string  = params.map do |k, v|
+      query_string = params.map do |k, v|
         if v.is_a? Array
           v.map { |y| "#{k}=#{y}" }.join('&')
         else
@@ -105,11 +105,11 @@ module Runcible
     def format_payload_json(payload_hash)
       if payload_hash
         if payload_hash[:optional]
-          if payload_hash[:required]
-            payload = payload_hash[:required].merge(payload_hash[:optional])
-          else
-            payload = payload_hash[:optional]
-          end
+          payload = if payload_hash[:required]
+                      payload_hash[:required].merge(payload_hash[:optional])
+                    else
+                      payload_hash[:optional]
+                    end
         elsif payload_hash[:delta]
           payload = payload_hash
         else
@@ -128,7 +128,7 @@ module Runcible
         if body.respond_to? :with_indifferent_access
           body = body.with_indifferent_access
         elsif body.is_a? Array
-          body = body.map  do |i|
+          body = body.map do |i|
             i.respond_to?(:with_indifferent_access) ? i.with_indifferent_access : i
           end
         end

data/lib/runcible/extensions/consumer.rb

@@ -114,12 +114,12 @@ module Runcible
           units.each do |unit|
             content_unit = {}
             content_unit[:type_id] = type_id
-            if unit.is_a?(Hash)
-              #allow user to pass in entire unit
-              content_unit[:unit_key] = unit
-            else
-              content_unit[:unit_key] = { unit_key => unit }
-            end
+            content_unit[:unit_key] = if unit.is_a?(Hash)
+                                        #allow user to pass in entire unit
+                                        unit
+                                      else
+                                        { unit_key => unit }
+                                      end
 
             content.push(content_unit)
           end
@@ -132,7 +132,7 @@ module Runcible
       # @param [String, Array]         ids  array of consumer ids
       # @return [RestClient::Response]
       def regenerate_applicability_by_ids(ids)
-        criteria  = {
+        criteria = {
           'consumer_criteria' => { 'filters' => { 'id' => { '$in' => ids } } }
         }
         regenerate_applicability(criteria)
@@ -149,7 +149,7 @@ module Runcible
       def applicable_errata(ids)
         ids = [ids] if ids.is_a? String
 
-        criteria  = {
+        criteria = {
           'criteria' => { 'filters' => { 'id' => { '$in' => ids } } },
           'content_types' => [Runcible::Extensions::Errata.content_type]
         }

data/lib/runcible/extensions/file.rb

@@ -0,0 +1,9 @@
+module Runcible
+  module Extensions
+    class File < Runcible::Extensions::Unit
+      def self.content_type
+        'iso'
+      end
+    end
+  end
+end

data/lib/runcible/extensions/repository.rb

@@ -31,20 +31,18 @@ module Runcible
       # @param  [Hash]                                  optional      container for all optional parameters
       # @return [RestClient::Response]                                the created repository
       def create_with_importer_and_distributors(id, importer, distributors = [], optional = {})
-        if importer.is_a?(Runcible::Models::Importer)
+        if importer && importer.is_a?(Runcible::Models::Importer)
           optional[:importer_type_id] = importer.id
           optional[:importer_config] = importer.config
-        else
+        elsif importer
           optional[:importer_type_id] = importer.delete('id') || importer.delete(:id)
           optional[:importer_config] = importer
-        end if importer
+        end
 
         repo_type = if importer.methods.include?(:repo_type)
                       importer.repo_type
                     elsif importer.is_a?(Hash) && importer.key?(:repo_type)
                       importer[:repo_type]
-                    else
-                      nil
                     end
 
         if optional.key?(:importer_type_id) && repo_type
@@ -326,7 +324,27 @@ module Runcible
       #                   the [{:image_id => <image hash>, :tag =>"value"}]
       # @return [RestClient::Response]
       def update_docker_tags(id, tags)
-        update(id, :scratchpad => {:tags =>  tags})
+        update(id, :scratchpad => {:tags => tags})
+      end
+
+      # Retrieves the file IDs for a single repository
+      #
+      # @param  [String]                id the ID of the repository
+      # @return [RestClient::Response]  the set of repository file IDs
+      def file_ids(id)
+        criteria = {:type_ids => [Runcible::Extensions::File.content_type],
+                    :fields => {:unit => [], :association => ['unit_id']}}
+
+        unit_search(id, criteria).map { |i| i['unit_id'] }
+      end
+
+      # Retrieves the files for a single repository
+      #
+      # @param  [String]                id the ID of the repository
+      # @return [RestClient::Response]  the set of repository files
+      def files(id)
+        criteria = {:type_ids => [Runcible::Extensions::File.content_type]}
+        unit_search(id, criteria).map { |i| i['metadata'].with_indifferent_access }
       end
 
       # Creates or updates a sync schedule for a repository
@@ -387,7 +405,7 @@ module Runcible
       #                                         False is the default option.
       # @return [RestClient::Response]
       def regenerate_applicability_by_ids(ids, parallel = false)
-        criteria  = {
+        criteria = {
           'parallel' => parallel,
           'repo_criteria' => { 'filters' => { 'id' => { '$in' => ids } } }
         }

data/lib/runcible/instance.rb

@@ -1,16 +1,5 @@
 module Runcible
   class Instance
-    # rubocop:disable Style/ClassVars
-    def self.resource_classes
-      @@resource_classes ||= gather_classes('resources')
-      @@resource_classes
-    end
-
-    def self.extension_classes
-      @@extension_classes ||= gather_classes('extensions')
-      @@extension_classes
-    end
-
     attr_accessor :resources
     attr_accessor :extensions
 
@@ -50,6 +39,29 @@ module Runcible
 
     attr_reader :config
 
+    class << self
+      # rubocop:disable Style/ClassVars
+      def resource_classes
+        @@resource_classes ||= gather_classes('resources')
+        @@resource_classes
+      end
+
+      def extension_classes
+        @@extension_classes ||= gather_classes('extensions')
+        @@extension_classes
+      end
+
+      private
+
+      def gather_classes(type)
+        const = Runcible
+        const = const.const_get(type.camelize)
+        path = File.dirname(__FILE__) + "/#{type}/*.rb"
+        base_names = Dir.glob(path).map { |f| File.basename(f, '.rb') }
+        base_names.map { |name| const.const_get(name.camelize) }
+      end
+    end
+
     private
 
     def initialize_wrappers
@@ -72,14 +84,6 @@ module Runcible
       #  (e.g. consumer_group)
       class_object.name.split('::').last.underscore
     end
-
-    def self.gather_classes(type)
-      const = Runcible
-      const = const.const_get(type.camelize)
-      path = File.dirname(__FILE__) + "/#{type}/*.rb"
-      base_names = Dir.glob(path).map { |f| File.basename(f, '.rb')  }
-      base_names.map { |name| const.const_get(name.camelize) }
-    end
   end
 
   #Wrapper class to provide access to instances

data/lib/runcible/models/docker_distributor.rb

@@ -6,7 +6,7 @@ module Runcible
     class DockerDistributor < Distributor
       #optional attributes
       attr_accessor 'docker_publish_directory', 'protected',
-                    'redirect_url',  'repo_registry_id'
+                    'redirect_url', 'repo_registry_id'
 
       def initialize(params = {})
         super(params)

data/lib/runcible/models/docker_importer.rb

@@ -1,8 +1,8 @@
 module Runcible
   module Models
     class DockerImporter < Importer
-      ID = 'docker_importer'
-      REPO_TYPE = 'docker-repo'
+      ID = 'docker_importer'.freeze
+      REPO_TYPE = 'docker-repo'.freeze
 
       attr_accessor 'upstream_name', 'mask_id', 'enable_v1'
 

data/lib/runcible/models/iso_importer.rb

@@ -1,7 +1,7 @@
 module Runcible
   module Models
     class IsoImporter < Importer
-      ID = 'iso_importer'
+      ID = 'iso_importer'.freeze
 
       # Importer Type id
       #

data/lib/runcible/models/ostree_importer.rb

@@ -1,8 +1,8 @@
 module Runcible
   module Models
     class OstreeImporter < Importer
-      ID = 'ostree_web_importer'
-      REPO_TYPE = 'OSTREE'
+      ID = 'ostree_web_importer'.freeze
+      REPO_TYPE = 'OSTREE'.freeze
 
       attr_accessor 'branches'
 

data/lib/runcible/models/puppet_importer.rb

@@ -1,8 +1,8 @@
 module Runcible
   module Models
     class PuppetImporter < Importer
-      ID = 'puppet_importer'
-      REPO_TYPE = 'puppet-repo'
+      ID = 'puppet_importer'.freeze
+      REPO_TYPE = 'puppet-repo'.freeze
 
       attr_accessor 'queries'
 

data/lib/runcible/models/python_importer.rb

@@ -1,8 +1,8 @@
 module Runcible
   module Models
     class PythonImporter < Importer
-      ID = 'python_importer'
-      REPO_TYPE = 'python-repo'
+      ID = 'python_importer'.freeze
+      REPO_TYPE = 'python-repo'.freeze
 
       attr_accessor 'packages_names'
 

data/lib/runcible/models/yum_importer.rb

@@ -1,11 +1,11 @@
 module Runcible
   module Models
     class YumImporter < Importer
-      ID = 'yum_importer'
-      REPO_TYPE = 'rpm-repo'
-      DOWNLOAD_IMMEDIATE = 'immediate'
-      DOWNLOAD_ON_DEMAND = 'on_demand'
-      DOWNLOAD_BACKGROUND = 'background'
+      ID = 'yum_importer'.freeze
+      REPO_TYPE = 'rpm-repo'.freeze
+      DOWNLOAD_IMMEDIATE = 'immediate'.freeze
+      DOWNLOAD_ON_DEMAND = 'on_demand'.freeze
+      DOWNLOAD_BACKGROUND = 'background'.freeze
       DOWNLOAD_POLICIES = [DOWNLOAD_IMMEDIATE, DOWNLOAD_ON_DEMAND, DOWNLOAD_BACKGROUND].freeze
 
       attr_accessor 'download_policy'

data/lib/runcible/resources/consumer.rb

@@ -7,7 +7,7 @@ module Runcible
       # @param  [String]  id  the ID of the consumer
       # @return [String]      the consumer path, may contain the id if passed
       def self.path(id = nil)
-        (id.nil?) ? 'consumers/' : "consumers/#{id}/"
+        id.nil? ? 'consumers/' : "consumers/#{id}/"
       end
 
       # Creates a consumer

data/lib/runcible/resources/content.rb

@@ -9,7 +9,7 @@ module Runcible
       # @param  [String]  upload_id  the id of the upload_request
       # @return [String]             the content path, may contain the upload_id if passed
       def upload_path(upload_id = nil)
-        (upload_id.nil?) ? 'content/uploads/' : "content/uploads/#{upload_id}/"
+        upload_id.nil? ? 'content/uploads/' : "content/uploads/#{upload_id}/"
       end
 
       # Creates an Upload Request

data/lib/runcible/resources/event_notifier.rb

@@ -3,14 +3,14 @@ module Runcible
     # @see https://pulp-dev-guide.readthedocs.org/en/latest/events/index.html
     class EventNotifier < Runcible::Base
       class EventTypes
-        REPO_SYNC_COMPLETE    = 'repo.sync.finish'
-        REPO_SYNC_START       = 'repo.sync.start'
-        REPO_PUBLISH_COMPLETE = 'repo.publish.finish'
-        REPO_PUBLISH_START    = 'repo.publish.start'
+        REPO_SYNC_COMPLETE    = 'repo.sync.finish'.freeze
+        REPO_SYNC_START       = 'repo.sync.start'.freeze
+        REPO_PUBLISH_COMPLETE = 'repo.publish.finish'.freeze
+        REPO_PUBLISH_START    = 'repo.publish.start'.freeze
       end
 
       class NotifierTypes
-        REST_API = 'http'
+        REST_API = 'http'.freeze
       end
 
       # Generates the API path for Event Notifiers
@@ -18,7 +18,7 @@ module Runcible
       # @param  [String]  id  the ID of the event notifier
       # @return [String]      the event notifier path, may contain the ID if passed
       def self.path(id = nil)
-        (id.nil?) ? 'events/' : "events/#{id}/"
+        id.nil? ? 'events/' : "events/#{id}/"
       end
 
       # Creates an Event Notification

data/lib/runcible/resources/repository.rb

@@ -9,7 +9,7 @@ module Runcible
       # @param  [String]  id  the id of the repository
       # @return [String]      the repository path, may contain the id if passed
       def self.path(id = nil)
-        (id.nil?) ? 'repositories/' : "repositories/#{id}/"
+        id.nil? ? 'repositories/' : "repositories/#{id}/"
       end
 
       # Creates a repository

data/lib/runcible/resources/repository_schedule.rb

@@ -13,7 +13,7 @@ module Runcible
       def self.path(repo_id, importer_id, schedule_id = nil)
         repo_path = Runcible::Resources::Repository.path(repo_id)
         path = "#{repo_path}importers/#{importer_id}/schedules/sync/"
-        (schedule_id.nil?) ? path : "#{path}#{schedule_id}/"
+        schedule_id.nil? ? path : "#{path}#{schedule_id}/"
       end
 
       # List the schedules for a repository for a given importer type

data/lib/runcible/resources/role.rb

@@ -7,7 +7,7 @@ module Runcible
       # @param  [String]  id  the ID of the role
       # @return [String]      the role path, may contain the ID if passed
       def self.path(id = nil)
-        (id.nil?) ? 'roles/' : "roles/#{id}/"
+        id.nil? ? 'roles/' : "roles/#{id}/"
       end
 
       # Adds a user to a role

data/lib/runcible/resources/task.rb

@@ -7,7 +7,7 @@ module Runcible
       # @param  [String]  id  the id of the task
       # @return [String]      the task path, may contain the id if passed
       def self.path(id = nil)
-        (id.nil?) ? 'tasks/' : "tasks/#{id}/"
+        id.nil? ? 'tasks/' : "tasks/#{id}/"
       end
 
       # Polls for the status of a task

data/lib/runcible/resources/task_group.rb

@@ -7,7 +7,7 @@ module Runcible
       # @param  [String]  id  the id of the task
       # @return [String]      the task path, may contain the id if passed
       def self.path(id = nil)
-        (id.nil?) ? 'task_groups/' : "task_groups/#{id}/"
+        id.nil? ? 'task_groups/' : "task_groups/#{id}/"
       end
 
       def self.summary_path(id)

data/lib/runcible/resources/user.rb

@@ -7,7 +7,7 @@ module Runcible
       # @param  [String]  login the user's login
       # @return [String]        the user path, may contain the login if passed
       def self.path(login = nil)
-        (login.nil?) ? 'users/' : "users/#{login}/"
+        login.nil? ? 'users/' : "users/#{login}/"
       end
 
       # Retrieves all users

data/lib/runcible/version.rb

@@ -1,3 +1,3 @@
 module Runcible
-  VERSION = '1.7.2'
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runcible
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Eric D Helms, Justin Sherrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -135,6 +135,7 @@ files:
 - lib/runcible/extensions/docker_manifest.rb
 - lib/runcible/extensions/docker_tag.rb
 - lib/runcible/extensions/errata.rb
+- lib/runcible/extensions/file.rb
 - lib/runcible/extensions/ostree_branch.rb
 - lib/runcible/extensions/package_category.rb
 - lib/runcible/extensions/package_group.rb
@@ -196,8 +197,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ''
 test_files: []
+has_rdoc: