runcible 0.3.1 → 0.3.2

data/lib/runcible/base.rb

@@ -44,7 +44,8 @@ module Runcible
         :user       => '',
         :http_auth  => {:password => {} },
         :headers    => {:content_type => 'application/json',
-                        :accept       => 'application/json'}
+                        :accept       => 'application/json'},
+        :logging    => {}
       }.merge(conf)
     end
     
@@ -57,14 +58,16 @@ module Runcible
       #on occation path will already have prefix (sync cancel)
       path = clone_config[:api_path] + path if !path.start_with?(clone_config[:api_path])
 
-      RestClient.log = clone_config[:logger] if clone_config[:logger]
+      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]
       path = combine_get_params(path, get_params) if get_params
 
-
       if clone_config[:oauth]
         headers = add_oauth_header(method, path, headers) if clone_config[:oauth]
         headers["pulp-user"] = clone_config[:user]
@@ -77,7 +80,20 @@ module Runcible
       args << generate_payload(options) if [:post, :put].include?(method)
       args << headers 
 
-      process_response(client[path].send(*args))
+      response = get_response(client, path, *args)
+      process_response(response)
+
+    rescue => e
+      log_exception
+      raise e
+    end
+
+    def self.get_response(client, path, *args)
+      client[path].send(*args) do |response, request, result, &block|
+        resp = response.return!(request, result)
+        log_debug
+        return resp
+      end
     end
 
     def self.combine_get_params(path, params)
@@ -174,5 +190,23 @@ module Runcible
       return headers
     end
 
+    def self.log_debug
+      if self.config[:logging][:debug]
+        log_message = generate_log_message                  
+        self.config[:logging][:logger].debug(log_message)
+      end
+    end
+
+    def self.log_exception
+      if self.config[:logging][:exception]
+        log_message = generate_log_message
+        self.config[:logging][:logger].error(log_message)
+      end
+    end
+
+    def self.generate_log_message
+      RestClient.log.join('\n')
+    end
+
   end 
 end

data/lib/runcible/extensions/distribution.rb

@@ -29,7 +29,6 @@ module Runcible
       def self.content_type
         'distribution'
       end
-
     end
   end
 end

data/lib/runcible/extensions/package_group.rb

@@ -29,7 +29,6 @@ module Runcible
       def self.content_type
         'package_group'
       end
-
     end
   end
 end

data/lib/runcible/extensions/repository.rb

@@ -98,114 +98,13 @@ module Runcible
         search(criteria)
       end
 
-      # Copies RPMs from one repository to another
-      #
-      # optional
-      #   :package_ids
-      #   :name_blacklist
-      #
-      # @param  [String]                source_repo_id      the source repository ID
-      # @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 self.rpm_copy(source_repo_id, destination_repo_id, optional={})
-
-        criteria = {:type_ids => ['rpm'], :filters => {}}
-        criteria[:filters]['association'] = {'unit_id' => {'$in' => optional[:package_ids]}} if optional[:package_ids]
-        criteria[:filters]['unit'] = { 'name' => {'$not' => {'$in' => optional[:name_blacklist]}}} if optional[:name_blacklist]
-
-        payload = {:criteria=>criteria}
-        payload[:override_config] = optional[:override_config] if optional[:override_config]
-        unit_copy(destination_repo_id, source_repo_id, payload)
-      end
-
-      # Removes RPMs from a repository
-      #
-      # @param  [String]                repo_id the repository ID to remove RPMs from
-      # @param  [Array]                 rpm_ids array of RPM IDs to remove
-      # @return [RestClient::Response]          a task representing the unit unassociate operation
-      def self.rpm_remove(repo_id, rpm_ids)
-        criteria = {:type_ids => ['rpm'], :filters => {}}
-        criteria[:filters]['association'] = {'unit_id' => {'$in' => rpm_ids}}
-        self.unassociate_units(repo_id, criteria)
-      end
-
-      # Copies errata from one repository to another
-      #
-      # optional
-      #   :errata_ids
-      #
-      # @param  [String]                source_repo_id      the source repository ID
-      # @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 self.errata_copy(source_repo_id, destination_repo_id, optional={})
-        criteria = {:type_ids => ['erratum'], :filters => {}}
-        criteria[:filters]['association'] = {'unit_id' => {'$in' => optional[:errata_ids]}} if optional[:errata_ids]
-        payload = {:criteria => criteria}
-        unit_copy(destination_repo_id, source_repo_id, payload)
-      end
-
-      # Removes errata from a repository
-      #
-      # @param  [String]                repo_id     the repository ID to remove errata from
-      # @param  [Array]                 errata_ids  array of errata IDs to remove
-      # @return [RestClient::Response]              a task representing the unit unassociate operation
-      def self.errata_remove(repo_id, errata_ids)
-        criteria = {:type_ids => ['erratum'], :filters => {}}
-        criteria[:filters]['association'] = {'unit_id' => {'$in' => errata_ids}}
-        self.unassociate_units(repo_id, criteria)
-      end
-
-      # Copies distributions from one repository to another
-      #
-      # optoinal
-      #   :distribution_ids
-      #
-      # @param  [String]                source_repo_id      the source repository ID
-      # @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 self.distribution_copy(source_repo_id, destination_repo_id, optional={})
-        criteria = {:type_ids => ['distribution'], :filters => {}}
-        criteria[:filters][:unit] = { :id=>{ '$in' => optional[:distribution_ids] } } if optional[:distribution_ids]
-        payload = {:criteria => criteria}
-        unit_copy(destination_repo_id, source_repo_id, payload)
-      end
-
-      # Removes a distribution from a repository
-      #
-      # @param  [String]                repo_id         the repository ID to remove the distribution from
-      # @param  [String]                distribution_id the distribution ID to remove
-      # @return [RestClient::Response]                  a task representing the unit unassociate operation
-      def self.distribution_remove(repo_id, distribution_id)
-        criteria = {:type_ids => ['distribution'], :filters => {}}
-        criteria[:filters][:unit] = { :id=>{ '$in' => [distribution_id] } }
-        self.unassociate_units(repo_id, criteria)
-      end
-
-      # Copies package groups from one repository to another
-      #
-      # optoinal
-      #   :package_group_ids
-      #
-      # @param  [String]                source_repo_id      the source repository ID
-      # @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 self.package_group_copy(source_repo_id, destination_repo_id, optional={})
-        criteria = {:type_ids => [Runcible::Extensions::PackageGroup.content_type], :filters => {}}
-        criteria[:filters][:unit] = { :id=>{ '$in' => optional[:package_group_ids] } } if optional[:package_group_ids]
-        payload = {:criteria => criteria}
-        unit_copy(destination_repo_id, source_repo_id, payload)
-      end
 
       # Retrieves the RPM IDs for a single repository
       #
       # @param [String]                 id the ID of the repository
       # @return [RestClient::Response]     the set of repository RPM IDs
       def self.rpm_ids(id)
-        criteria = {:type_ids=>['rpm']}
+        criteria = {:type_ids=>[Runcible::Extensions::Rpm.content_type]}
         self.unit_search(id, criteria).collect{|i| i['unit_id']}
       end
 
@@ -214,7 +113,7 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository RPMs
       def self.rpms(id)
-        criteria = {:type_ids=>['rpm']}
+        criteria = {:type_ids=>[Runcible::Extensions::Rpm.content_type]}
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
@@ -233,7 +132,7 @@ module Runcible
         and_condition << {:release=>release} if release
         and_condition << {:epoch=>epoch} if epoch
 
-        criteria = {:type_ids=>['rpm'],
+        criteria = {:type_ids=>[Runcible::Extensions::Rpm.content_type],
                 :filters => {
                     :unit => {
                       "$and" => and_condition
@@ -250,7 +149,7 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository errata IDs
       def self.errata_ids(id)
-         criteria = {:type_ids=>['erratum']}
+         criteria = {:type_ids=>[Runcible::Extensions::Errata.content_type]}
 
          self.unit_search(id, criteria).collect{|i| i['unit_id']}
       end
@@ -260,7 +159,7 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository errata
       def self.errata(id)
-         criteria = {:type_ids=>['erratum']}
+         criteria = {:type_ids=>[Runcible::Extensions::Errata.content_type]}
          self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
@@ -269,7 +168,7 @@ module Runcible
       # @param  [String]                id the ID of the repository
       # @return [RestClient::Response]     the set of repository distributions
       def self.distributions(id)
-        criteria = {:type_ids=>['distribution']}
+        criteria = {:type_ids=>[Runcible::Extensions::Distribution.content_type]}
 
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end

data/lib/runcible/extensions/rpm.rb

@@ -40,6 +40,10 @@ module Runcible
         raise NotImplementedError
       end
 
+      # This function is not implemented for RPMs since they do not have content IDs
+      def self.unassociate_ids_from_repo(repo_id, ids)
+        raise NotImplementedError
+      end
     end
   end
 end

data/lib/runcible/extensions/unit.rb

@@ -74,6 +74,54 @@ module Runcible
         self.search(content_type, { :filters => {:_id=> {'$in'=> ids}} }, optional)
       end
 
+      # unassociates content units from a repository
+      #
+      # @param  [String]                repo_id the repository ID to remove units from
+      # @param  [Hash]                  filters the filters to find the units  this content type to remove
+      # @return [RestClient::Response]          a task representing the unit unassociate operation
+      def self.unassociate_from_repo(repo_id, filters)
+        criteria = {:type_ids => [content_type]}
+        criteria[:filters] = filters
+        Runcible::Extensions::Repository.unassociate_units(repo_id, criteria)
+      end
+
+      # unassociates content units from a repository
+      #
+      # @param  [String]                repo_id the repository ID to remove units from
+      # @param  [Array]                 ids  list of content unit ids of this
+      #                                      content type, aka metadata id or content id
+      #                                       ex: "RHEA-2010:0001" for errata..,
+      #                                       Note rpms do not have ids, so cant use this.
+      # @return [RestClient::Response]          a task representing the unit unassociate operation
+      def self.unassociate_ids_from_repo(repo_id, ids)
+        unassociate_from_repo(repo_id, :unit => {'id' => {'$in' => ids}})
+      end
+
+      # unassociates content units from a repository
+      #
+      # @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.
+      #                                     for example: "efdd2d63-b275-4728-a298-f68cf4c174e7"
+      #
+      # @return [RestClient::Response]          a task representing the unit unassociate operation
+      def self.unassociate_unit_ids_from_repo(repo_id, ids)
+        unassociate_from_repo(repo_id, :association => {'unit_id' => {'$in' => ids}})
+      end
+
+      #copy contents from source repo to the destination repo
+      #
+      # @param  [String]                source_repo_id      the source repository ID
+      # @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 self.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]
+        payload = {:criteria => criteria}
+        Runcible::Extensions::Repository.unit_copy(destination_repo_id, source_repo_id, payload)
+      end
+
     end
   end
 end

data/lib/runcible/resources/repository.rb

@@ -27,7 +27,6 @@ module Runcible
   module Resources
     # @see https://pulp-dev-guide.readthedocs.org/en/latest/rest-api/repo/index.html
     class Repository < Runcible::Base
-
       # Generates the API path for Repositories
       #
       # @param  [String]  id  the id of the repository

data/lib/runcible/version.rb

@@ -1,3 +1,3 @@
 module Runcible
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,26 +1,103 @@
 --- !ruby/object:Gem::Specification 
 name: runcible
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
-- Eric D Helms
+- Eric D Helms, Justin Sherrill
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-01-16 00:00:00 Z
-dependencies: []
-
+date: 2013-02-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 7
+        - 5
+        version: 1.7.5
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 0
+        - 10
+        version: 3.0.10
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id005
 description: Exposing Pulp's juiciest components to the Ruby world.
 email: 
-- ehelms@redhat.com
+- ehelms@redhat.com, jsherril@redhat.com
 executables: []
 
 extensions: []