runcible 0.1.2 → 0.1.3

data/lib/runcible/base.rb

@@ -54,7 +54,8 @@ module Runcible
 
     def self.call(method, path, options={})
       clone_config = self.config.clone
-      path = clone_config[:api_path] + path
+      #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]
 
@@ -106,6 +107,7 @@ module Runcible
       else
         payload = {}
       end
+
       return payload.to_json
     end
 
@@ -133,10 +135,14 @@ module Runcible
         acc
       end
 
+      #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")
       keys_to_remove.each do |key|
         local_names.delete(key)
+        local_names.delete(key.to_sym)
       end
 
       return local_names

data/lib/runcible/extensions/consumer.rb

@@ -28,14 +28,14 @@ module Runcible
 
       def self.bind_all(id, repo_id)
         # bind the consumer to all repositories with the given repo_id
-        Runcible::Extensions::Repository.retrieve(repo_id)['distributors'].each do |d|
+        Runcible::Extensions::Repository.retrieve_with_details(repo_id)['distributors'].each do |d|
           self.bind(id, repo_id, d['id'])
         end
       end
 
       def self.unbind_all(id, repo_id)
         # unbind the consumer from all repositories with the given repo_id
-        Runcible::Extensions::Repository.retrieve(repo_id)['distributors'].each do |d|
+        Runcible::Extensions::Repository.retrieve_with_details(repo_id)['distributors'].each do |d|
           self.unbind(id, repo_id, d['id'])
         end
       end

data/lib/runcible/extensions/consumer_group.rb

@@ -0,0 +1,71 @@
+# Copyright (c) 2012
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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
+      def self.add_consumers_by_id(id, consumer_ids)
+        self.associate(id, make_consumer_criteria(consumer_ids))
+      end
+
+      def self.remove_consumers_by_id(id, consumer_ids)
+        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)
+        self.install_units(id, generate_content(type_id, units))
+      end
+
+      def self.update_content(id, type_id, units)
+        self.update_units(id, generate_content(type_id, units))
+      end
+
+      def self.uninstall_content(id, type_id, units)
+        self.uninstall_units(id, generate_content(type_id, units))
+      end
+
+      def self.generate_content(type_id, units)
+        content = []
+        units.each do |unit|
+          content_unit = {}
+          content_unit[:type_id] = type_id
+          content_unit[:unit_key] = { :name => unit }
+          content.push(content_unit)
+        end
+        content
+      end
+
+    end
+  end
+end

data/lib/runcible/extensions/errata.rb

@@ -36,11 +36,13 @@ module Runcible
        end
 
       def self.find_all(ids)
-        Runcible::Resources::Unit.search(TYPE, :filters=> {:id=> {'$in'=> ids}})
+        Runcible::Resources::Unit.search(TYPE, {:filters=>{:id=> {'$in'=> ids}}},
+                                         {:include_repos => true})
       end
 
       def self.find_all_by_unit_ids(ids)
-        Runcible::Resources::Unit.search(TYPE, :filters=> {:_id=> {'$in'=> ids}})
+        Runcible::Resources::Unit.search(TYPE, {:filters=> {:_id=> {'$in'=> ids}}},
+                                         {:include_repos=>true})
       end
 
     end

data/lib/runcible/extensions/repository.rb

@@ -223,11 +223,15 @@ module Runcible
 
       def self.publish_all(repo_id)
         to_ret = []
-        self.retrieve(repo_id)['distributors'].each do |d|
+        self.retrieve_with_details(repo_id)['distributors'].each do |d|
           to_ret << self.publish(repo_id, d['id'])
         end
         to_ret
       end
+
+      def self.retrieve_with_details(repo_id)
+        self.retrieve(repo_id, {:details => true})
+      end
     end
   end
 end

data/lib/runcible/extensions/rpm.rb

@@ -36,7 +36,7 @@ module Runcible
       end
 
       def self.find_all(ids)
-        Runcible::Resources::Unit.search(TYPE, :filters => {'_id'=> {'$in'=> ids}})
+        Runcible::Resources::Unit.search(TYPE, {:filters => {'_id'=> {'$in'=> ids}}}, {:include_repos=>true})
       end
     end
   end

data/lib/runcible/resources/consumer.rb

@@ -79,17 +79,17 @@ module Runcible
         call(:get, path("#{id}/bindings/"))
       end
 
-      def self.install_units(id, units, options="")
+      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 })
       end
 
-      def self.update_units(id, units, options="")
+      def self.update_units(id, units, options={})
         required = required_params(binding.send(:local_variables), binding, ["id"])
         call(:post, path("#{id}/actions/content/update/"), :payload => { :required => required })
       end
 
-      def self.uninstall_units(id, units, options="")
+      def self.uninstall_units(id, units, options={})
         required = required_params(binding.send(:local_variables), binding, ["id"])
         call(:post, path("#{id}/actions/content/uninstall/"), :payload => { :required => required })
       end

data/lib/runcible/resources/consumer_group.rb

@@ -44,6 +44,48 @@ module Runcible
       def self.retrieve(id)
         call(:get, path(id))
       end
+
+
+      def self.associate(id, criteria)
+        call(:post, path(id) + "actions/associate/", :payload => {:required => criteria})
+      end
+
+      def self.unassociate(id, criteria)
+        call(:post, path(id) + "actions/unassociate/", :payload => {:required => criteria})
+      end
+
+      #def self.retrieve_binding(id, repo_id, distributor_id)
+      #  call(:get, path("#{id}/bindings/#{repo_id}/#{distributor_id}"))
+      #end
+      #
+      #def self.retrieve_bindings(id)
+      #  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 })
+      #end
+      #
+      #def self.unbind(id, repo_id, distributor_id)
+      #  call(:delete, path("#{id}/bindings/#{repo_id}/#{distributor_id}"))
+      #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 })
+      end
+
+      def self.update_units(id, units, options={})
+        required = required_params(binding.send(:local_variables), binding, ["id"])
+        call(:post, path("#{id}/actions/content/update/"), :payload => { :required => required })
+      end
+
+      def self.uninstall_units(id, units, options={})
+        required = required_params(binding.send(:local_variables), binding, ["id"])
+        call(:post, path("#{id}/actions/content/uninstall/"), :payload => { :required => required })
+      end
+
     end
   end
 end

data/lib/runcible/resources/repository.rb

@@ -36,8 +36,8 @@ module Runcible
         call(:post, path, :payload => { :required => required, :optional => optional })
       end
 
-      def self.retrieve(id, details=true)
-        call(:get, path(id) + "?details=#{details}")
+      def self.retrieve(id, params={})
+        call(:get, path(id), :params => params)
       end
 
       def self.update(id, optional={})
@@ -72,7 +72,7 @@ module Runcible
       end
 
       def self.sync_history(id)
-          call(:get, "#{path(id)}/history/sync/")
+        call(:get, "#{path(id)}/history/sync/")
       end
 
       def self.unit_copy(destination_repo_id, source_repo_id, optional={:criteria=>{}})

data/lib/runcible/resources/unit.rb

@@ -6,8 +6,8 @@ module Runcible
         "content/units/#{type}/search/"
       end
 
-      def self.search(type, criteria)
-        call(:post, path(type), :payload=>{:required=>{:criteria=>criteria}})
+      def self.search(type, criteria, optional={})
+        call(:post, path(type), :payload=>{:required=>{:criteria=>criteria}, :optional=>optional})
       end
     end
 

data/lib/runcible/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runcible
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Eric D Helms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-25 00:00:00 Z
+date: 2012-11-02 00:00:00 Z
 dependencies: []
 
 description: Exposing Pulp's juiciest components to the Ruby world.
@@ -39,6 +39,7 @@ files:
 - lib/runcible/extensions/distribution.rb
 - lib/runcible/extensions/consumer.rb
 - lib/runcible/extensions/yum_distributor.rb
+- lib/runcible/extensions/consumer_group.rb
 - lib/runcible/extensions/repository.rb
 - lib/runcible/extensions/package_category.rb
 - lib/runcible/version.rb
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ""