runcible 1.2.0 → 1.3.0

data/lib/runcible/extensions/docker_image.rb

@@ -21,7 +21,6 @@
 # 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 DockerImage < Runcible::Extensions::Unit

data/lib/runcible/extensions/errata.rb

@@ -21,15 +21,12 @@
 # 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 Errata < Runcible::Extensions::Unit
-
       def self.content_type
         'erratum'
       end
-
     end
   end
 end

data/lib/runcible/extensions/package_category.rb

@@ -21,15 +21,12 @@
 # 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 PackageCategory < Runcible::Extensions::Unit
-
       def self.content_type
         'package_category'
       end
-
     end
   end
 end

data/lib/runcible/extensions/package_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 PackageGroup < Runcible::Extensions::Unit
-
       def self.content_type
         'package_group'
       end

data/lib/runcible/extensions/puppet_module.rb

@@ -21,15 +21,12 @@
 # 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 PuppetModule < Runcible::Extensions::Unit
-
       def self.content_type
         'puppet_module'
       end
-
     end
   end
 end

data/lib/runcible/extensions/repository.rb

@@ -21,15 +21,14 @@
 # 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 Repository < Runcible::Resources::Repository
-
       # Utility function that allows an importer to be added at repository creation time
       #
       # @param  [String]                               id       the id of the repository being created
-      # @param  [Hash, Runcible::Extensions::Importer] importer either a hash representing an importer or an Importer object
+      # @param  [Hash, Runcible::Extensions::Importer] importer either a hash representing an importer or
+      #                                                         an Importer object
       # @return [RestClient::Response]                          the created repository
       def create_with_importer(id, importer)
         create_with_importer_and_distributors(id, importer)
@@ -38,7 +37,8 @@ module Runcible
       # Utility function that allows distributors to be added at repository creation time
       #
       # @param  [String]                id            the id of the repository being created
-      # @param  [Array]                 distributors  an array of hashes representing distributors or an array of Distributor objects
+      # @param  [Array]                 distributors  an array of hashes representing distributors or
+      #                                               an array of Distributor objects
       # @return [RestClient::Response]                the created repository
       def create_with_distributors(id, distributors)
         create_with_importer_and_distributors(id, nil, distributors)
@@ -47,11 +47,13 @@ module Runcible
       # Utility function that allows an importer and distributors to be added at repository creation time
       #
       # @param  [String]                                id            the id of the repository being created
-      # @param  [Hash, Runcible::Extensions::Importer]  importer      either a hash representing an importer or an Importer object
-      # @param  [Array]                                 distributors  an array of hashes representing distributors or an array of Distributor objects
+      # @param  [Hash, Runcible::Extensions::Importer]  importer      either a hash representing an importer or
+      #                                                               an Importer object
+      # @param  [Array]                                 distributors  an array of hashes representing distributors or
+      #                                                               an array of Distributor objects
       # @param  [Hash]                                  optional      container for all optional parameters
       # @return [RestClient::Response]                                the created repository
-      def create_with_importer_and_distributors(id, importer, distributors=[], optional={})
+      def create_with_importer_and_distributors(id, importer, distributors = [], optional = {})
         if importer.is_a?(Runcible::Models::Importer)
           optional[:importer_type_id] = importer.id
           optional[:importer_config] = importer.config
@@ -62,32 +64,32 @@ module Runcible
 
         repo_type = if importer.methods.include?(:repo_type)
                       importer.repo_type
-                    elsif importer.is_a?(Hash) && importer.has_key?(:repo_type)
+                    elsif importer.is_a?(Hash) && importer.key?(:repo_type)
                       importer[:repo_type]
                     else
                       nil
                     end
 
-        if optional.has_key?(:importer_type_id) && repo_type
+        if optional.key?(:importer_type_id) && repo_type
           # pulp needs _repo-type in order to determine the type of repo to create.
           optional[:notes] = { '_repo-type' => importer.repo_type }
         end
 
-        optional[:distributors] = distributors.collect do |d|
+        optional[:distributors] = distributors.map do |d|
           if d.is_a?(Runcible::Models::Distributor)
             {'distributor_type_id' => d.type_id,
-              "distributor_config" => d.config,
-              "auto_publish" => d.auto_publish,
-              "distributor_id" => d.id
+             'distributor_config' => d.config,
+             'auto_publish' => d.auto_publish,
+             'distributor_id' => d.id
             }
           else
             {'distributor_type_id' => d['type_id'],
-             "distributor_config" => d['config'],
-             "auto_publish" => d['auto_publish'],
-             "distributor_id" => d['id']
+             'distributor_config' => d['config'],
+             'auto_publish' => d['auto_publish'],
+             'distributor_id' => d['id']
             }
           end
-        end if !distributors.empty?
+        end unless distributors.empty?
         optional[:id] = id
         create(id, optional)
       end
@@ -97,7 +99,7 @@ module Runcible
       # @param  [String]                repo_id the repository ID
       # @return [RestClient::Response]          a task representing the sync status
       def sync_status(repo_id)
-        Runcible::Resources::Task.new(self.config).list(["pulp:repository:#{repo_id}", "pulp:action:sync"])
+        Runcible::Resources::Task.new(self.config).list(["pulp:repository:#{repo_id}", 'pulp:action:sync'])
       end
 
       # Retrieves the publish status for a repository
@@ -105,7 +107,7 @@ module Runcible
       # @param  [String]                repo_id the repository ID
       # @return [RestClient::Response]          a task representing the sync status
       def publish_status(repo_id)
-        Runcible::Resources::Task.new(self.config).list(["pulp:repository:#{repo_id}", "pulp:action:publish"])
+        Runcible::Resources::Task.new(self.config).list(["pulp:repository:#{repo_id}", 'pulp:action:publish'])
       end
 
       # Retrieves a set of repositories by their IDs
@@ -114,34 +116,39 @@ module Runcible
       # @return [RestClient::Response]                the set of repositories requested
       def search_by_repository_ids(repository_ids)
         criteria = {:filters =>
-                      { "id" => {"$in" => repository_ids}}
+                      { 'id' => {'$in' => repository_ids}}
                    }
         search(criteria)
       end
 
-
       # Retrieves the RPM IDs for a single repository
       #
       # @param [String]             id the ID of the repository
       # @return [Array<String>]     the array of repository RPM IDs
 
       def rpm_ids(id)
-        criteria = {:type_ids=>[Runcible::Extensions::Rpm.content_type],
-                            :fields=>{:unit=>[], :association=>['unit_id']}}
-        self.unit_search(id, criteria).collect{|i| i['unit_id']}
+        criteria = {:type_ids => [Runcible::Extensions::Rpm.content_type],
+                    :fields => {:unit => [], :association => ['unit_id']}}
+        self.unit_search(id, criteria).map { |i| i['unit_id'] }
       rescue RestClient::RequestTimeout
-        self.logger.warn("Call to rpm_ids timed out")
+        self.logger.warn('Call to rpm_ids timed out')
         # lazy evaluated iterator from zero to infinite
-        pages = Enumerator.new { |y| page = 0; loop { y << page; page += 1 } }
+        pages = Enumerator.new do |y|
+          page = 0
+          loop do
+            y << page
+            page += 1
+          end
+        end
 
-        # TODO this is hotfix, pagination support should be added to Runcible
-        pages.inject([]) do |rpm_ids, page|
+        # TODO: this is hotfix, pagination support should be added to Runcible
+        pages.reduce([]) do |rpm_ids, page|
           page_size = 500
           criteria  = { :type_ids => [Runcible::Extensions::Rpm.content_type],
                         :fields   => { :unit => [], :association => ['unit_id'] },
                         :limit    => page_size,
-                        :skip     => 0 + page*page_size }
-          result    = unit_search(id, criteria).collect { |i| i['unit_id'] }
+                        :skip     => 0 + page * page_size }
+          result    = unit_search(id, criteria).map { |i| i['unit_id'] }
           rpm_ids.concat(result)
           if result.empty? || result.size < 500
             break rpm_ids
@@ -156,8 +163,8 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository RPMs
       def rpms(id)
-        criteria = {:type_ids=>[Runcible::Extensions::Rpm.content_type]}
-        unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
+        criteria = {:type_ids => [Runcible::Extensions::Rpm.content_type]}
+        unit_search(id, criteria).map { |i| i['metadata'].with_indifferent_access }
       end
 
       # Retrieves the RPMs by NVRE for a single repository
@@ -168,23 +175,23 @@ module Runcible
       # @param  [String]                release the release of the RPMs
       # @param  [String]                epoch   the epoch of the RPMs
       # @return [RestClient::Response]          the set of repository RPMs
-      def rpms_by_nvre(id, name, version=nil, release=nil, epoch=nil)
+      def rpms_by_nvre(id, name, version = nil, release = nil, epoch = nil)
         and_condition = []
-        and_condition << {:name=>name} if name
-        and_condition << {:version=>version} if version
-        and_condition << {:release=>release} if release
-        and_condition << {:epoch=>epoch} if epoch
-
-        criteria = {:type_ids=>[Runcible::Extensions::Rpm.content_type],
-                :filters => {
-                    :unit => {
-                      "$and" => and_condition
-                    }
-                },
-                :sort => {
-                    :unit => [ ['name', 'ascending'], ['version', 'descending'] ]
-                }}
-        unit_search(id, criteria).collect{|p| p['metadata'].with_indifferent_access}
+        and_condition << {:name => name} if name
+        and_condition << {:version => version} if version
+        and_condition << {:release => release} if release
+        and_condition << {:epoch => epoch} if epoch
+
+        criteria = {:type_ids => [Runcible::Extensions::Rpm.content_type],
+                    :filters => {
+                      :unit => {
+                        '$and' => and_condition
+                      }
+                    },
+                    :sort => {
+                      :unit => [['name', 'ascending'], ['version', 'descending']]
+                    }}
+        unit_search(id, criteria).map { |p| p['metadata'].with_indifferent_access }
       end
 
       # Retrieves the errata IDs for a single repository
@@ -192,10 +199,10 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository errata IDs
       def errata_ids(id)
-         criteria = {:type_ids=>[Runcible::Extensions::Errata.content_type],
-                     :fields=>{:unit=>[], :association=>['unit_id']}}
+        criteria = {:type_ids => [Runcible::Extensions::Errata.content_type],
+                    :fields => {:unit => [], :association => ['unit_id']}}
 
-         unit_search(id, criteria).collect{|i| i['unit_id']}
+        unit_search(id, criteria).map { |i| i['unit_id'] }
       end
 
       # Retrieves the errata for a single repository
@@ -203,8 +210,8 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository errata
       def errata(id)
-         criteria = {:type_ids=>[Runcible::Extensions::Errata.content_type]}
-         unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
+        criteria = {:type_ids => [Runcible::Extensions::Errata.content_type]}
+        unit_search(id, criteria).map { |i| i['metadata'].with_indifferent_access }
       end
 
       # Retrieves the distributions for a single repository
@@ -212,9 +219,9 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository distributions
       def distributions(id)
-        criteria = {:type_ids=>[Runcible::Extensions::Distribution.content_type]}
+        criteria = {:type_ids => [Runcible::Extensions::Distribution.content_type]}
 
-        unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
+        unit_search(id, criteria).map { |i| i['metadata'].with_indifferent_access }
       end
 
       # Retrieves the package groups for a single repository
@@ -222,9 +229,9 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository package groups
       def package_groups(id)
-        criteria = {:type_ids=>[Runcible::Extensions::PackageGroup.content_type]}
+        criteria = {:type_ids => [Runcible::Extensions::PackageGroup.content_type]}
 
-        unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
+        unit_search(id, criteria).map { |i| i['metadata'].with_indifferent_access }
       end
 
       # Retrieves the package group categoriess for a single repository
@@ -232,8 +239,8 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository package group categories
       def package_categories(id)
-        criteria = {:type_ids=>[Runcible::Extensions::PackageCategory.content_type]}
-        unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
+        criteria = {:type_ids => [Runcible::Extensions::PackageCategory.content_type]}
+        unit_search(id, criteria).map { |i| i['metadata'].with_indifferent_access }
       end
 
       # Retrieves the puppet module IDs for a single repository
@@ -241,10 +248,10 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository puppet module IDs
       def puppet_module_ids(id)
-        criteria = {:type_ids=>[Runcible::Extensions::PuppetModule.content_type],
-                    :fields=>{:unit=>[], :association=>['unit_id']}}
+        criteria = {:type_ids => [Runcible::Extensions::PuppetModule.content_type],
+                    :fields => {:unit => [], :association => ['unit_id']}}
 
-        unit_search(id, criteria).collect{|i| i['unit_id']}
+        unit_search(id, criteria).map { |i| i['unit_id'] }
       end
 
       # Retrieves the puppet modules for a single repository
@@ -252,8 +259,8 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository puppet modules
       def puppet_modules(id)
-        criteria = {:type_ids=>[Runcible::Extensions::PuppetModule.content_type]}
-        unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
+        criteria = {:type_ids => [Runcible::Extensions::PuppetModule.content_type]}
+        unit_search(id, criteria).map { |i| i['metadata'].with_indifferent_access }
       end
 
       # Retrieves the docker image IDs for a single repository
@@ -261,10 +268,10 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]  the set of repository docker image IDs
       def docker_image_ids(id)
-        criteria = {:type_ids=>[Runcible::Extensions::DockerImage.content_type],
-                    :fields=>{:unit=>[], :association=>['unit_id']}}
+        criteria = {:type_ids => [Runcible::Extensions::DockerImage.content_type],
+                    :fields => {:unit => [], :association => ['unit_id']}}
 
-        unit_search(id, criteria).collect{|i| i['unit_id']}
+        unit_search(id, criteria).map { |i| i['unit_id'] }
       end
 
       # Retrieves the docker images for a single repository
@@ -272,8 +279,17 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]  the set of repository docker images
       def docker_images(id)
-        criteria = {:type_ids=>[Runcible::Extensions::DockerImage.content_type]}
-        unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
+        criteria = {:type_ids => [Runcible::Extensions::DockerImage.content_type]}
+        unit_search(id, criteria).map { |i| i['metadata'].with_indifferent_access }
+      end
+
+      # Updates the docker tags in a repo
+      # @param  [String]  id the ID of the repository
+      # @param [Hash]     tags for an image in the following format
+      #                   the [{:image_id => <image hash>, :tag =>"value"}]
+      # @return [RestClient::Response]
+      def update_docker_tags(id, tags)
+        update(id, :scratchpad => {:tags =>  tags})
       end
 
       # Creates or updates a sync schedule for a repository
@@ -287,7 +303,8 @@ module Runcible
         if schedules.empty?
           Runcible::Resources::RepositorySchedule.new(self.config).create(repo_id, type, schedule)
         else
-          Runcible::Resources::RepositorySchedule.new(self.config).update(repo_id, type, schedules[0]['_id'], {:schedule=>schedule})
+          Runcible::Resources::RepositorySchedule.new(self.config).update(repo_id, type,
+                                                      schedules[0]['_id'], :schedule => schedule)
         end
       end
 
@@ -320,7 +337,7 @@ module Runcible
       # @param  [String]                repo_id the ID of the repository
       # @return [RestClient::Response]          the repository with full details
       def retrieve_with_details(repo_id)
-        retrieve(repo_id, {:details => true})
+        retrieve(repo_id, :details => true)
       end
 
       # Regenerate the applicability for consumers bound to a given set of repositories
@@ -333,7 +350,6 @@ module Runcible
         }
         regenerate_applicability(criteria)
       end
-
     end
   end
 end

data/lib/runcible/extensions/rpm.rb

@@ -21,28 +21,26 @@
 # 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 Rpm < Runcible::Extensions::Unit
-
       def self.content_type
         'rpm'
       end
 
       # This function is not implemented for RPMs since they do not have content IDs
       def find
-        raise NotImplementedError
+        fail NotImplementedError
       end
 
       # This function is not implemented for RPMs since they do not have content IDs
       def find_all
-        raise NotImplementedError
+        fail NotImplementedError
       end
 
       # This function is not implemented for RPMs since they do not have content IDs
       def unassociate_ids_from_repo(repo_id, ids)
-        raise NotImplementedError
+        fail NotImplementedError
       end
     end
   end

data/lib/runcible/extensions/unit.rb

@@ -21,14 +21,12 @@
 # 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 Unit < Runcible::Resources::Unit
-
       # The content type (e.g. rpm, errata)
       def self.content_type
-        raise "Content type not defined"
+        fail 'Content type not defined'
       end
 
       def content_type
@@ -46,7 +44,7 @@ module Runcible
       #
       # @param  [Array]                id   the content ID of the content to retrieve
       # @return [RestClient::Response]      the requested content
-      def find(id, optional={})
+      def find(id, optional = {})
         optional[:include_repos] ||= true
         find_all([id], optional).first
       end
@@ -55,16 +53,16 @@ module Runcible
       #
       # @param  [Array]                ids  list of content IDs to retrieve
       # @return [RestClient::Response]      list of content
-      def find_all(ids, optional={})
+      def find_all(ids, optional = {})
         optional[:include_repos] ||= true
-        search(content_type, { :filters => {'id'=> {'$in'=> ids}} }, optional)
+        search(content_type, { :filters => {'id' => {'$in' => ids}} }, optional)
       end
 
       # Retrieves a single content by it's unit ID
       #
       # @param  [Array]                id   the unit ID of the content to retrieve
       # @return [RestClient::Response]      the requested content
-      def find_by_unit_id(id, optional={})
+      def find_by_unit_id(id, optional = {})
         optional[:include_repos] ||= true
         find_all_by_unit_ids([id], [], optional).first
       end
@@ -74,9 +72,9 @@ module Runcible
       # @param  [Array]                ids    list of content unit IDs to retrieve
       # @param  [Array]                fields optional list of to retrieve
       # @return [RestClient::Response]        list of content
-      def find_all_by_unit_ids(ids, fields=[], optional={})
+      def find_all_by_unit_ids(ids, fields = [], optional = {})
         optional[:include_repos] ||= true
-        criteria = { :filters => { :_id => { '$in'=> ids } } }
+        criteria = { :filters => { :_id => { '$in' => ids } } }
         criteria[:fields] = fields unless fields.empty?
         search(content_type, criteria, optional)
       end
@@ -108,7 +106,7 @@ module Runcible
       #
       # @param  [String]                repo_id the repository ID to remove units from
       # @param  [Array]                 ids list of the unique hash ids of the content unit
-      #                                     with respect to this repo. unit_id, _id are other names for this.
+      #                                     with respect to this repo. unit_id, id are other names for this.
       #                                     for example: "efdd2d63-b275-4728-a298-f68cf4c174e7"
       #
       # @return [RestClient::Response]          a task representing the unit unassociate operation
@@ -122,14 +120,14 @@ module Runcible
       # @param  [String]                destination_repo_id the destination repository ID
       # @param  [Hash]                  optional            container for all optional parameters
       # @return [RestClient::Response]                      a task representing the unit copy operation
-      def copy(source_repo_id, destination_repo_id, optional={})
+      def copy(source_repo_id, destination_repo_id, optional = {})
         criteria = {:type_ids => [content_type], :filters => {}}
         criteria[:filters]['association'] = {'unit_id' => {'$in' => optional[:ids]}} if optional[:ids]
         criteria[:filters] = optional[:filters] if optional[:filters]
         criteria[:fields] = {:unit => optional[:fields]} if optional[:fields]
 
         payload = {:criteria => criteria}
-        payload[:override_config] = optional[:override_config] if optional.has_key?(:override_config)
+        payload[:override_config] = optional[:override_config] if optional.key?(:override_config)
 
         if optional[:copy_children]
           payload[:override_config] ||= {}
@@ -138,7 +136,6 @@ module Runcible
 
         Runcible::Extensions::Repository.new(self.config).unit_copy(destination_repo_id, source_repo_id, payload)
       end
-
     end
   end
 end