runcible 1.0.3 → 1.0.4

data/Gemfile

@@ -9,6 +9,7 @@ group :test do
   gem 'webmock'
   gem 'minitest', '< 5'
   gem 'parseconfig'
+  gem 'mocha'
 end
 
 group :debug do

data/README.md

@@ -4,7 +4,7 @@
 
 Exposing Pulp's juiciest parts. http://www.pulpproject.org/
 
-Latest Live Tested Version: **pulp-server-2.2.0-0.22.beta.fc18.noarch**
+Latest Live Tested Version: **pulp-server-2.2.0-0.22.beta.el6.noarch**
 
 Current stable Runcible: https://github.com/Katello/runcible/tree/0.3
 

data/lib/runcible/extensions/consumer.rb

@@ -30,23 +30,48 @@ module Runcible
       #
       # @param  [String]               id       the consumer ID
       # @param  [String]               repo_id  the repo ID to bind to
-      # @param  [Boolean]              notify_agent sends consumer a notification
+      # @param  [String]               type_id the distributor type_id to bind to
+      # @param  [Hash]                 options  options to pass to the bindings
+      # @option  options [Boolean]     :notify_agent sends consumer a notification
+      # @option  options [Hash]        :binding_config sends consumer a notification
       # @return [RestClient::Response]          set of tasks representing each bind operation
-      def bind_all(id, repo_id, notify_agent=true)
+      def bind_all(id, repo_id, type_id, options={})
         repository_extension.retrieve_with_details(repo_id)['distributors'].collect do |d|
-          bind(id, repo_id, d['id'], {:notify_agent=>notify_agent})
-        end.flatten
+          bind(id, repo_id, d['id'], options) if d['distributor_type_id'] == type_id
+        end.reject{|f| f.nil?}.flatten
       end
 
       # Unbind a consumer to all repositories with a given ID
       #
       # @param  [String]               id       the consumer ID
       # @param  [String]               repo_id  the repo ID to unbind from
+      # @param  [String]               type_id  the distributor type_id to unbind from
       # @return [RestClient::Response]          set of tasks representing each unbind operation
-      def unbind_all(id, repo_id)
+      def unbind_all(id, repo_id, type_id)
         repository_extension.retrieve_with_details(repo_id)['distributors'].collect do |d|
-          unbind(id, repo_id, d['id'])
-        end.flatten
+          unbind(id, repo_id, d['id']) if d['distributor_type_id'] == type_id
+        end.reject{|f| f.nil?}.flatten
+      end
+
+      # Activate a consumer as a pulp node
+      #
+      # @param  [String]               id       the consumer ID
+      # @param  [String]               update_strategy update_strategy for the node (defaults to additive)
+      # @return [RestClient::Response]          response from update call
+      def activate_node(id, update_strategy="additive")
+        delta = {:notes=>{'_child-node' => true,
+                          '_node-update-strategy' => update_strategy}}
+        self.update(id, delta)
+      end
+
+      # Deactivate a consumer as a pulp node
+      #
+      # @param  [String]               id       the consumer ID
+      # @return [RestClient::Response]          response from update call
+      def deactivate_node(id)
+        delta = {:notes=>{'child-node' => nil,
+                          'update_strategy' => nil}}
+        self.update(id, :delta=>delta)
       end
 
       # Install content to a consumer
@@ -95,6 +120,8 @@ module Runcible
             unit_key = :name
           when 'erratum'
             unit_key = :id
+          when 'repository'
+            unit_key = :repo_id
           else
             unit_key = :id
         end
@@ -104,6 +131,8 @@ module Runcible
           content_unit[:type_id] = type_id
           content_unit[:unit_key] = {}
           content.push(content_unit)
+        elsif units.nil?
+          content = [{:unit_key=> nil, :type_id=>type_id}]
         else
           units.each do |unit|
             content_unit = {}

data/lib/runcible/extensions/repository.rb

@@ -60,7 +60,7 @@ module Runcible
           optional[:importer_config] = importer
         end if importer
 
-        repo_type = if importer.methods.include?(repo_type)
+        repo_type = if importer.methods.include?(:repo_type)
                       importer.repo_type
                     elsif importer.is_a?(Hash) && importer.has_key?(:repo_type)
                       importer[:repo_type]

data/lib/runcible/models/distributor.rb

@@ -35,10 +35,6 @@ module Runcible
         params.each{|k,v| send("#{k.to_s}=",v)}
       end
 
-      def type_id
-        self.class.type_id
-      end
-
       # Distributor Type id
       #
       # @return [string]

data/lib/runcible/models/nodes_http_distributor.rb

@@ -0,0 +1,57 @@
+# Copyright (c) 2013 Red Hat Inc.
+#
+# 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.
+
+require 'active_support/json'
+require 'securerandom'
+
+module Runcible
+  module Models
+    class NodesHttpDistributor < Distributor
+
+      # Instantiates an nodes distributor
+      #
+      # @param  [Hash]         params  Distributor options
+      # @return [Runcible::Extensions::NodesHttpDistributor]
+      def initialize(params)
+        super(params)
+      end
+
+      # Distributor Type id
+      #
+      # @return [string]
+      def self.type_id
+        'nodes_http_distributor'
+      end
+
+      # generate the pulp config for the nodes distributor
+      #
+      # @return [Hash]
+      def config
+        to_ret = as_json
+        to_ret.delete('auto_publish')
+        to_ret.delete('id')
+        to_ret
+      end
+    end
+  end
+end

data/lib/runcible/models/puppet_distributor.rb

@@ -36,7 +36,7 @@ module Runcible
         super(params)
       end
 
-      def type_id
+      def self.type_id
         'puppet_distributor'
       end
 

data/lib/runcible/version.rb

@@ -1,3 +1,3 @@
 module Runcible
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runcible
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -131,41 +131,42 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/runcible.rb
-- lib/runcible/instance.rb
-- lib/runcible/version.rb
 - lib/runcible/models/puppet_distributor.rb
-- lib/runcible/models/puppet_importer.rb
-- lib/runcible/models/iso_distributor.rb
-- lib/runcible/models/importer.rb
 - lib/runcible/models/yum_clone_distributor.rb
 - lib/runcible/models/distributor.rb
 - lib/runcible/models/export_distributor.rb
-- lib/runcible/models/yum_distributor.rb
+- lib/runcible/models/puppet_importer.rb
 - lib/runcible/models/iso_importer.rb
+- lib/runcible/models/yum_distributor.rb
+- lib/runcible/models/nodes_http_distributor.rb
+- lib/runcible/models/iso_distributor.rb
 - lib/runcible/models/yum_importer.rb
-- lib/runcible/base.rb
+- lib/runcible/models/importer.rb
+- lib/runcible/extensions/package_category.rb
+- lib/runcible/extensions/errata.rb
+- lib/runcible/extensions/consumer_group.rb
+- lib/runcible/extensions/puppet_module.rb
+- lib/runcible/extensions/consumer.rb
 - lib/runcible/extensions/repository.rb
 - lib/runcible/extensions/rpm.rb
 - lib/runcible/extensions/unit.rb
-- lib/runcible/extensions/consumer_group.rb
-- lib/runcible/extensions/consumer.rb
-- lib/runcible/extensions/distribution.rb
 - lib/runcible/extensions/package_group.rb
-- lib/runcible/extensions/puppet_module.rb
-- lib/runcible/extensions/package_category.rb
-- lib/runcible/extensions/errata.rb
 - lib/runcible/extensions/yum_repo_metadata_file.rb
-- lib/runcible/resources/repository.rb
-- lib/runcible/resources/user.rb
-- lib/runcible/resources/unit.rb
-- lib/runcible/resources/consumer_group.rb
-- lib/runcible/resources/consumer.rb
+- lib/runcible/extensions/distribution.rb
 - lib/runcible/resources/role.rb
+- lib/runcible/resources/consumer_group.rb
 - lib/runcible/resources/content.rb
+- lib/runcible/resources/consumer.rb
 - lib/runcible/resources/repository_schedule.rb
-- lib/runcible/resources/repository_group.rb
-- lib/runcible/resources/event_notifier.rb
 - lib/runcible/resources/task.rb
+- lib/runcible/resources/event_notifier.rb
+- lib/runcible/resources/repository.rb
+- lib/runcible/resources/user.rb
+- lib/runcible/resources/unit.rb
+- lib/runcible/resources/repository_group.rb
+- lib/runcible/version.rb
+- lib/runcible/instance.rb
+- lib/runcible/base.rb
 - LICENSE
 - Rakefile
 - Gemfile