runcible 0.4.12 → 1.0.0

data/lib/runcible/resources/consumer_group.rb

@@ -32,7 +32,7 @@ module Runcible
       #
       # @param  [String]  id  the ID of the consumer group
       # @return [String]      the consumer group path, may contain the id if passed      
-      def self.path(id=nil)
+      def path(id=nil)
         groups = "consumer_groups/"
         id.nil? ? groups : groups + "#{id}/"
       end
@@ -42,7 +42,7 @@ module Runcible
       # @param  [String]                id        the ID of the consumer
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]
-      def self.create(id, optional={})
+      def create(id, optional={})
         required = required_params(binding.send(:local_variables), binding)
         call(:post, path, :payload => { :required => required, :optional => optional })
       end
@@ -51,7 +51,7 @@ module Runcible
       #
       # @param  [String]                id  the ID of the consumer group
       # @return [RestClient::Response]
-      def self.retrieve(id)
+      def retrieve(id)
         call(:get, path(id))
       end
 
@@ -59,7 +59,7 @@ module Runcible
       #
       # @param  [String]                id  the ID of the consumer group
       # @return [RestClient::Response]
-      def self.delete(id)
+      def delete(id)
         call(:delete, path(id))
       end
 
@@ -68,7 +68,7 @@ module Runcible
       # @param  [String]                id        the ID of the consumer group
       # @param  [Hash]                  criteria  criteria based on Mongo syntax representing consumers to associate
       # @return [RestClient::Response]
-      def self.associate(id, criteria)
+      def associate(id, criteria)
         call(:post, path(id) + "actions/associate/", :payload => {:required => criteria})
       end
 
@@ -77,7 +77,7 @@ module Runcible
       # @param  [String]                id        the ID of the consumer group
       # @param  [Hash]                  criteria  criteria based on Mongo syntax representing consumers ta unassociate
       # @return [RestClient::Response]
-      def self.unassociate(id, criteria)
+      def unassociate(id, criteria)
         call(:post, path(id) + "actions/unassociate/", :payload => {:required => criteria})
       end
 
@@ -87,7 +87,7 @@ module Runcible
       # @param  [Array]                 units   array of units to install
       # @param  [Hash]                  options hash of install options
       # @return [RestClient::Response]
-      def self.install_units(id, units, options={})
+      def 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
@@ -98,7 +98,7 @@ module Runcible
       # @param  [Array]                 units   array of units to update
       # @param  [Hash]                  options hash of update options
       # @return [RestClient::Response]
-      def self.update_units(id, units, options={})
+      def 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
@@ -109,7 +109,7 @@ module Runcible
       # @param  [Array]                 units   array of units to uninstall
       # @param  [Hash]                  options hash of uninstall options
       # @return [RestClient::Response]
-      def self.uninstall_units(id, units, options={})
+      def 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/event_notifier.rb

@@ -52,7 +52,7 @@ module Runcible
       # @param  [Hash]                  notifier_config   configuration options for the notifier
       # @param  [Hash]                  event_types       event types to include in the notifier
       # @return [RestClient::Response]            
-      def self.create(notifier_type_id, notifier_config, event_types)
+      def create(notifier_type_id, notifier_config, event_types)
         required = required_params(binding.send(:local_variables), binding)
         call(:post, path, :payload => {:required => required})
       end
@@ -61,7 +61,7 @@ module Runcible
       #
       # @param  [String]                id  the ID of the event notifier
       # @return [RestClient::Response]            
-      def self.delete(id)
+      def delete(id)
         call(:delete, path(id))
       end
 
@@ -69,7 +69,7 @@ module Runcible
       #
       # @param  [String]                id  the ID of the event notifier
       # @return [RestClient::Response]            
-      def self.list
+      def list
         call(:get, path)
       end
 

data/lib/runcible/resources/repository.rb

@@ -30,7 +30,7 @@ module Runcible
       # Generates the API path for Repositories
       #
       # @param  [String]  id  the id of the repository
-      # @return [String]      the repository path, may contain the id if passed      
+      # @return [String]      the repository path, may contain the id if passed
       def self.path(id=nil)
         (id == nil) ? "repositories/" : "repositories/#{id}/" 
       end
@@ -40,7 +40,7 @@ module Runcible
       # @param  [String]                id        the id of the repository
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]            
-      def self.create(id, optional={})
+      def create(id, optional={})
         required = required_params(binding.send(:local_variables), binding)
         call(:post, path, :payload => { :required => required, :optional => optional })
       end
@@ -50,7 +50,7 @@ module Runcible
       # @param  [String]                id      the id of the repository
       # @param  [Hash]                  params  container for optional query parameters
       # @return [RestClient::Response]          
-      def self.retrieve(id, params={})
+      def retrieve(id, params={})
         call(:get, path(id), :params => params)
       end
 
@@ -59,7 +59,7 @@ module Runcible
       # @param  [String]                id        the id of the repository
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]            
-      def self.update(id, optional={})
+      def update(id, optional={})
         call(:put, path(id), :payload => { :delta => optional })
       end
 
@@ -67,7 +67,7 @@ module Runcible
       #
       # @param  [String]                id  the id of the repository
       # @return [RestClient::Response]            
-      def self.delete(id)
+      def delete(id)
         call(:delete, path(id))
       end
 
@@ -75,7 +75,7 @@ module Runcible
       #
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]            
-      def self.retrieve_all(optional={})
+      def retrieve_all(optional={})
         call(:get, path, :payload => { :optional => optional })
       end
 
@@ -84,7 +84,7 @@ module Runcible
       # @param  [Hash]                  criteria  criteria object containing Mongo syntax
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]            
-      def self.search(criteria, optional={})
+      def search(criteria, optional={})
         required = required_params(binding.send(:local_variables), binding)
         call(:post, path("search"), :payload => { :required => required, :optional => optional })
       end
@@ -95,7 +95,7 @@ module Runcible
       # @param  [String]                importer_type_id  the type ID of the importer being associated
       # @param  [Hash]                  importer_config   configuration options for the importer
       # @return [RestClient::Response]            
-      def self.associate_importer(id, importer_type_id, importer_config)
+      def associate_importer(id, importer_type_id, importer_config)
         required = required_params(binding.send(:local_variables), binding)
         call(:post, path("#{id}/importers"), :payload => { :required => required })
       end
@@ -107,7 +107,7 @@ module Runcible
       # @param  [Hash]                  distributor_config  configuration options for the distributor
       # @param  [Hash]                  optional            container for all optional parameters
       # @return [RestClient::Response]            
-      def self.associate_distributor(id, distributor_type_id, distributor_config, optional={})
+      def associate_distributor(id, distributor_type_id, distributor_config, optional={})
         required = required_params(binding.send(:local_variables), binding, ["id"])
         call(:post, path("#{id}/distributors"), :payload => { :required => required, :optional => optional })
       end
@@ -117,7 +117,7 @@ module Runcible
       # @param  [String]                id        the id of the repository
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]            
-      def self.sync(id, optional={})
+      def sync(id, optional={})
         call(:post, "#{path(id)}actions/sync/", :payload => { :optional => optional })
       end
 
@@ -125,7 +125,7 @@ module Runcible
       #
       # @param  [String]                id  the id of the repository
       # @return [RestClient::Response]            
-      def self.sync_history(id)
+      def sync_history(id)
         call(:get, "#{path(id)}/history/sync/")
       end
 
@@ -135,7 +135,7 @@ module Runcible
       # @param  [String]                source_repo_id      the id of the source repository
       # @param  [Hash]                  optional            container for all optional parameters
       # @return [RestClient::Response]            
-      def self.unit_copy(destination_repo_id, source_repo_id, optional={})
+      def unit_copy(destination_repo_id, source_repo_id, optional={})
         required = required_params(binding.send(:local_variables), binding, ["destination_repo_id"])
         call(:post, "#{path(destination_repo_id)}actions/associate/",
              :payload => { :required => required, :optional => optional })
@@ -146,7 +146,7 @@ module Runcible
       # @param  [String]                source_repo_id  the id of the source repository
       # @param  [Hash]                  criteria        criteria object containing Mongo syntax
       # @return [RestClient::Response]            
-      def self.unassociate_units(source_repo_id, criteria={})
+      def 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 })
@@ -157,7 +157,7 @@ module Runcible
       # @param  [String]                id        the id of the repository
       # @param  [Hash]                  criteria  criteria object containing Mongo syntax
       # @return [RestClient::Response]            
-      def self.unit_search(id, criteria={})
+      def unit_search(id, criteria={})
         call(:post, "#{path(id)}search/units/", :payload=>{:required=>{:criteria=>criteria}})
       end
 
@@ -166,8 +166,8 @@ module Runcible
       # @param  [String]                id              the id of the repository
       # @param  [String]                distributor_id  the id of the distributor
       # @param  [Hash]                  optional  optional params
-      # @return [RestClient::Response]            
-      def self.publish(id, distributor_id, optional={})
+      # @return [RestClient::Response]
+      def publish(id, distributor_id, optional={})
         call(:post, "#{path(id)}actions/publish/", :payload=>{:required=>{:id=>distributor_id}, :optional=>optional})
       end
 
@@ -176,7 +176,7 @@ module Runcible
       # @param  [String]                id              the id of the repository
       # @param  [String]                distributor_id  the id of the distributor
       # @return [RestClient::Response]            
-      def self.delete_distributor(id, distributor_id)
+      def delete_distributor(id, distributor_id)
         call(:delete, "#{path(id)}/distributors/#{distributor_id}/")
       end
 
@@ -186,7 +186,7 @@ module Runcible
       # @param  [String]                distributor_id  the id of the distributor
       # @param  [Hash]                  distributor_config attributes to change
       # @return [RestClient::Response]
-      def self.update_distributor(id, distributor_id, distributor_config)
+      def update_distributor(id, distributor_id, distributor_config)
         required = required_params(binding.send(:local_variables), binding, ["id", "distributor_id"])
         call(:put, path("#{id}/distributors/#{distributor_id}/"), :payload => { :required => required})
       end
@@ -196,7 +196,7 @@ module Runcible
       # @param  [String]                id              the id of the repository
       # @param  [String]                importer_id  the id of the importer
       # @return [RestClient::Response]
-      def self.delete_importer(id, importer_id)
+      def delete_importer(id, importer_id)
         call(:delete, "#{path(id)}/importers/#{importer_id}/")
       end
 
@@ -206,7 +206,7 @@ module Runcible
       # @param  [String]                importer_id  the id of the importer
       # @param  [Hash]                  importer_config  attributes to change
       # @return [RestClient::Response]
-      def self.update_importer(id, importer_id, importer_config)
+      def update_importer(id, importer_id, importer_config)
         required = required_params(binding.send(:local_variables), binding, ["id", "importer_id"])
         call(:put, path("#{id}/importers/#{importer_id}/"), :payload => { :required => required})
       end

data/lib/runcible/resources/repository_group.rb

@@ -42,7 +42,7 @@ module Runcible
       # @param  [String]                id        the ID of the group
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]
-      def self.create(id, optional={})
+      def create(id, optional={})
         required = required_params(binding.send(:local_variables), binding)
         call(:post, path, :payload => { :required => required, :optional => optional })
       end
@@ -51,14 +51,14 @@ module Runcible
       #
       # @param  [String]                id  the ID of the Repository group
       # @return [RestClient::Response]
-      def self.retrieve(id)
+      def retrieve(id)
         call(:get, path(id))
       end
 
       # Retrieves all Repository Group
       #
       # @return [RestClient::Response]
-      def self.retrieve_all
+      def retrieve_all
         call(:get, path)
       end
 
@@ -66,7 +66,7 @@ module Runcible
       #
       # @param  [String]                id  the ID of the Repository group
       # @return [RestClient::Response]
-      def self.delete(id)
+      def delete(id)
         call(:delete, path(id))
       end
 
@@ -75,7 +75,7 @@ module Runcible
       # @param  [String]                id        the ID of the Repository group
       # @param  [Hash]                  criteria  criteria based on Mongo syntax representing repos to associate
       # @return [RestClient::Response]
-      def self.associate(id, criteria)
+      def associate(id, criteria)
         call(:post, path(id) + "actions/associate/", :payload => {:required => criteria})
       end
 
@@ -84,7 +84,7 @@ module Runcible
       # @param  [String]                id        the ID of the Repository group
       # @param  [Hash]                  criteria  criteria based on Mongo syntax representing repos ta unassociate
       # @return [RestClient::Response]
-      def self.unassociate(id, criteria)
+      def unassociate(id, criteria)
         call(:post, path(id) + "actions/unassociate/", :payload => {:required => criteria})
       end
 

data/lib/runcible/resources/repository_schedule.rb

@@ -45,7 +45,7 @@ module Runcible
       # @param  [String]                repo_id       the ID of the repository
       # @param  [String]                importer_type the importer type
       # @return [RestClient::Response]
-      def self.list(repo_id, importer_type)
+      def list(repo_id, importer_type)
         call(:get, path(repo_id, importer_type))
       end
 
@@ -56,7 +56,7 @@ module Runcible
       # @param  [Hash]                  schedule      a hash representing a schedule
       # @param  [Hash]                  optional      container for all optional parameters
       # @return [RestClient::Response]
-      def self.create(repo_id, importer_type, schedule, optional={})
+      def create(repo_id, importer_type, schedule, optional={})
         call(:post, path(repo_id, importer_type),
              :payload => { :required => {:schedule=>schedule}, :optional => optional })
       end
@@ -68,7 +68,7 @@ module Runcible
       # @param  [String]                schedule_id   the ID of the schedule
       # @param  [Hash]                  optional      container for all optional parameters
       # @return [RestClient::Response]
-      def self.update(repo_id, importer_type, schedule_id, optional={})
+      def update(repo_id, importer_type, schedule_id, optional={})
         call(:put, path(repo_id, importer_type, schedule_id),
              :payload => {:optional => optional })
       end
@@ -79,7 +79,7 @@ module Runcible
       # @param  [String]                importer_type the importer type
       # @param  [String]                schedule_id   the ID of the schedule
       # @return [RestClient::Response]
-      def self.delete(repo_id, importer_type, schedule_id)
+      def delete(repo_id, importer_type, schedule_id)
         call(:delete, path(repo_id, importer_type, schedule_id))
       end
 

data/lib/runcible/resources/role.rb

@@ -40,7 +40,7 @@ module Runcible
       # @param  [String]                id    the ID of the role
       # @param  [String]                login the login of the user being added
       # @return [RestClient::Response]            
-      def self.add(id, login)
+      def add(id, login)
         required = required_params(binding.send(:local_variables), binding, ["id"])
         call(:post, "#{path(id)}users/", :payload => { :required => required })
       end
@@ -50,7 +50,7 @@ module Runcible
       # @param  [String]                id    the ID of the role
       # @param  [String]                login the login of the user being removed
       # @return [RestClient::Response]            
-      def self.remove(id, login)
+      def remove(id, login)
         call(:delete, "#{path(id)}users/#{login}/")
       end
 

data/lib/runcible/resources/task.rb

@@ -39,7 +39,7 @@ module Runcible
       #
       # @param  [String]              id  the id of the task
       # @return [RestClient::Response]            
-      def self.poll(id)
+      def poll(id)
         call(:get, path(id))
       end
 
@@ -47,7 +47,7 @@ module Runcible
       #
       # @param  [String]              id  the id of the task
       # @return [RestClient::Response]            
-      def self.cancel(id)
+      def cancel(id)
         #cancelling a task may require cancelling some higher level
         #  task, so query the tasks _href field to make sure
         call(:delete, poll(id)['_href'])
@@ -57,7 +57,7 @@ module Runcible
       #
       # @param  [Array]                 tags array of tags to scope the list on
       # @return [RestClient::Response]            
-      def self.list(tags=[])
+      def list(tags=[])
         call(:get, path, :params=>{:tag=>tags})
       end
 
@@ -66,8 +66,8 @@ module Runcible
       #
       # @param  [Array] ids array of ids to poll the status of
       # @return [Array]     array of RestClient::Response task poll objects           
-      def self.poll_all(ids)
-        return ids.collect{|id| self.poll(id)}
+      def poll_all(ids)
+        return ids.collect{|id| poll(id)}
       end
 
     end

data/lib/runcible/resources/unit.rb

@@ -31,7 +31,7 @@ module Runcible
       #
       # @param  [String]  type  the unit type
       # @return [String]        the unit search path
-      def self.path(type)
+      def path(type)
         "content/units/#{type}/search/"
       end
 
@@ -41,7 +41,7 @@ module Runcible
       # @param  [Hash]                  criteria  criteria object containing Mongo syntax
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]            
-      def self.search(type, criteria, optional={})
+      def search(type, criteria, optional={})
         call(:post, path(type), :payload=>{:required=>{:criteria=>criteria}, :optional=>optional})
       end
     end

data/lib/runcible/resources/user.rb

@@ -38,7 +38,7 @@ module Runcible
       # Retrieves all users
       #
       # @return [RestClient::Response]            
-      def self.retrieve_all
+      def retrieve_all
         call(:get, path)
       end
 
@@ -47,7 +47,7 @@ module Runcible
       # @param  [String]                login     the login requested for the user
       # @param  [Hash]                  optional  container for all optional parameters
       # @return [RestClient::Response]            
-      def self.create(login, optional={})
+      def create(login, optional={})
         required = required_params(binding.send(:local_variables), binding)
         call(:post, path, :payload => { :required => required, :optional => optional })
       end
@@ -56,7 +56,7 @@ module Runcible
       #
       # @param  [String]                login the login of the user being retrieved
       # @return [RestClient::Response]            
-      def self.retrieve(login)
+      def retrieve(login)
         call(:get, path(login))
       end
 
@@ -64,7 +64,7 @@ module Runcible
       #
       # @param  [String]                login the login of the user being deleted
       # @return [RestClient::Response]            
-      def self.delete(login)
+      def delete(login)
         call(:delete, path(login))
       end
 

data/lib/runcible/version.rb

@@ -1,3 +1,3 @@
 module Runcible
-  VERSION = "0.4.12"
+  VERSION = "1.0.0"
 end

data/lib/runcible.rb

@@ -26,10 +26,14 @@
 
 resources = Dir[File.dirname(__FILE__) + '/runcible/version.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/base.rb']
+resources += Dir[File.dirname(__FILE__) + '/runcible/instance.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/resources/*.rb']
-resources += Dir[File.dirname(__FILE__) + '/runcible/extensions/importer.rb']
-resources += Dir[File.dirname(__FILE__) + '/runcible/extensions/distributor.rb']
+
 resources += Dir[File.dirname(__FILE__) + '/runcible/extensions/unit.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/extensions/*.rb']
 
+resources += Dir[File.dirname(__FILE__) + '/runcible/models/importer.rb']
+resources += Dir[File.dirname(__FILE__) + '/runcible/models/distributor.rb']
+resources += Dir[File.dirname(__FILE__) + '/runcible/models/*.rb']
+
 resources.uniq.each{ |f| require f }