runcible 0.1.3 → 0.1.4

data/lib/runcible/extensions/consumer.rb

@@ -62,6 +62,7 @@ module Runcible
         end
         content
       end
+
     end
   end
 end

data/lib/runcible/extensions/consumer_group.rb

@@ -25,6 +25,7 @@
 module Runcible
   module Extensions
     class ConsumerGroup < Runcible::Resources::ConsumerGroup
+
       def self.add_consumers_by_id(id, consumer_ids)
         self.associate(id, make_consumer_criteria(consumer_ids))
       end
@@ -33,14 +34,12 @@ module Runcible
         self.unassociate(id, make_consumer_criteria(consumer_ids))
       end
 
-
       def self.make_consumer_criteria(consumer_ids)
         {:criteria =>
               {:filters =>
                 {:id =>{"$in" =>consumer_ids}}
               }
         }
-
       end
 
       def self.install_content(id, type_id, units)

data/lib/runcible/extensions/repository.rb

@@ -90,9 +90,7 @@ module Runcible
       def self.rpm_remove(repo_id, package_ids)
         criteria = {:type_ids => ['rpm'], :filters => {}}
         criteria[:filters]['association'] = {'unit_id' => {'$in' => package_ids}}
-        payload = {}
-        payload[:criteria] = criteria
-        self.unassociate_units(repo_id, payload)
+        self.unassociate_units(repo_id, criteria)
       end
 
        #optional
@@ -107,8 +105,7 @@ module Runcible
       def self.errata_remove(repo_id, errata_ids)
         criteria = {:type_ids => ['erratum'], :filters => {}}
         criteria[:filters][:unit] = { :id=>{ '$in' => errata_ids } }
-        payload = {:criteria => criteria}
-        self.unassociate_units(repo_id, payload)
+        self.unassociate_units(repo_id, criteria)
       end
 
       #optoinal
@@ -123,23 +120,16 @@ module Runcible
       def self.distribution_remove(repo_id, distribution_id)
         criteria = {:type_ids => ['distribution'], :filters => {}}
         criteria[:filters][:unit] = { :id=>{ '$in' => [distribution_id] } }
-        payload = {:criteria => criteria}
-        self.unassociate_units(repo_id, payload)
+        self.unassociate_units(repo_id, criteria)
       end
 
       def self.rpm_ids(id)
-        criteria = {:type_ids=>['rpm'],
-                :sort => {
-                    :unit => [ ['name', 'ascending'], ['version', 'descending'] ]
-                }}
+        criteria = {:type_ids=>['rpm']}
         self.unit_search(id, criteria).collect{|i| i['unit_id']}
       end
 
       def self.rpms(id)
-        criteria = {:type_ids=>['rpm'],
-                :sort => {
-                    :unit => [ ['name', 'ascending'], ['version', 'descending'] ]
-                }}
+        criteria = {:type_ids=>['rpm']}
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
@@ -163,45 +153,25 @@ module Runcible
       end
 
       def self.errata_ids(id, filter = {})
-         criteria = {
-            :type_ids=>['erratum'],
-            :sort => {
-                :unit => [ ['title', 'ascending'] ]
-            }
-           }
+         criteria = {:type_ids=>['erratum']}
 
          self.unit_search(id, criteria).collect{|i| i['unit_id']}
       end
 
       def self.distributions(id)
-        criteria = {
-                  :type_ids=>['distribution'],
-                  :sort => {
-                      :unit => [ ['id', 'ascending'] ]
-                  }
-            }
+        criteria = {:type_ids=>['distribution']}
 
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
       def self.package_groups(id)
-        criteria = {
-                  :type_ids=>[Runcible::Extensions::PackageGroup::TYPE],
-                  :sort => {
-                      :unit => [ ['id', 'ascending'] ]
-                  }
-            }
+        criteria = {:type_ids=>[Runcible::Extensions::PackageGroup::TYPE]}
 
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
       def self.package_categories(id)
-        criteria = {
-                  :type_ids=>[Runcible::Extensions::PackageCategory::TYPE],
-                  :sort => {
-                      :unit => [ ['id', 'ascending'] ]
-                  }
-            }
+        criteria = {:type_ids=>[Runcible::Extensions::PackageCategory::TYPE]}
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 

data/lib/runcible/resources/consumer.rb

@@ -43,7 +43,6 @@ module Runcible
         call(:put, path(id), :payload => { :delta => optional })
       end
 
-
       def self.upload_profile(id, content_type, profile)
         required = required_params(binding.send(:local_variables), binding, ["id"])
         call(:post, path("#{id}/profiles/"), :payload => { :required => required })
@@ -65,7 +64,6 @@ module Runcible
         call(:get, path("#{id}/bindings/"))
       end
 
-
       def self.bind(id, repo_id, distributor_id)
         required = required_params(binding.send(:local_variables), binding, ["id"])
         call(:post, path("#{id}/bindings"), :payload => { :required => required })
@@ -75,10 +73,6 @@ module Runcible
         call(:delete, path("#{id}/bindings/#{repo_id}/#{distributor_id}"))
       end
 
-      def self.repos(id)
-        call(:get, path("#{id}/bindings/"))
-      end
-
       def self.install_units(id, units, options={})
         required = required_params(binding.send(:local_variables), binding, ["id"])
         call(:post, path("#{id}/actions/content/install/"), :payload => { :required => required })
@@ -93,6 +87,7 @@ module Runcible
         required = required_params(binding.send(:local_variables), binding, ["id"])
         call(:post, path("#{id}/actions/content/uninstall/"), :payload => { :required => required })
       end
+
     end
   end
-end
+end

data/lib/runcible/resources/repository.rb

@@ -81,10 +81,10 @@ module Runcible
              :payload => { :required => required, :optional=> optional })
       end
 
-      def self.unassociate_units(source_repo_id, optional={})
+      def self.unassociate_units(source_repo_id, criteria={})
         required = required_params(binding.send(:local_variables), binding, ["source_repo_id"])
         call(:post, "#{path(source_repo_id)}actions/unassociate/",
-             :payload => { :required => required, :optional=> optional })
+             :payload => { :required => { :criteria => criteria }})
       end
 
       def self.unit_search(id, criteria={})

data/lib/runcible/version.rb

@@ -1,3 +1,3 @@
 module Runcible
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runcible
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Eric D Helms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-02 00:00:00 Z
+date: 2012-11-12 00:00:00 Z
 dependencies: []
 
 description: Exposing Pulp's juiciest components to the Ruby world.