cm 0.1.4 → 0.1.6

data/lib/core/plugin/plan_action.rb

@@ -27,25 +27,48 @@ class PlanAction < Nucleon.plugin_class(:nucleon, :cm_action)
         'cm.action.plan.base.options.plan',
         'cm.action.plan.base.errors.plan'
       ]
-      register_str :plan_path, Dir.pwd, [
-        'cm.action.plan.base.options.plan_path',
-        'cm.action.plan.base.errors.plan_path'
+      register_str :plan_path, Dir.pwd, 'cm.action.plan.base.options.plan_path'
+
+      register_configuration_provider :manifest_provider, :file, [
+        'cm.action.plan.base.options.manifest_provider',
+        'cm.action.plan.base.errors.manifest_provider'
+      ]
+      register_str :manifest, 'plan.yaml', 'cm.action.plan.base.options.manifest'
+
+      register_configuration_provider :config_provider, :directory, [
+        'cm.action.plan.base.options.config_provider',
+        'cm.action.plan.base.errors.config_provider'
       ]
-      register_str :manifest, 'plan.yml', [
-        'cm.action.plan.base.options.manifest',
-        'cm.action.plan.base.errors.manifest'
+      register_str :config_path, Dir.pwd, 'cm.action.plan.base.options.config_path'
+
+      register_configuration_provider :token_provider, :file, [
+        'cm.action.plan.base.options.token_provider',
+        'cm.action.plan.base.errors.token_provider'
       ]
-      register_directory :config_path, Dir.pwd, [
-        'cm.action.plan.base.options.config_path',
-        'cm.action.plan.base.errors.config_path'
+      register_directory :token_path, Dir.pwd, [
+        'cm.action.plan.base.options.token_path',
+        'cm.action.plan.base.errors.token_path'
       ]
+      register_str :token_file, 'tokens.json', 'cm.action.plan.base.options.token_file'
+
       register_directory :key_path, Dir.pwd, [
         'cm.action.plan.base.options.key_path',
         'cm.action.plan.base.errors.key_path'
       ]
       register_bool :trap, false, 'cm.action.plan.options.trap'
 
-      project_config
+      register_sequence_provider :sequence_provider, Nucleon.type_default(:CM, :sequence), [
+        'cm.action.plan.base.options.sequence_provider',
+        'cm.action.plan.base.errors.sequence_provider'
+      ]
+      register_batch_provider :batch_provider, Nucleon.type_default(:CM, :batch), [
+        'cm.action.plan.base.options.batch_provider',
+        'cm.action.plan.base.errors.batch_provider'
+      ]
+      register_resource_provider :default_resource_provider, Nucleon.type_default(:CM, :resource), [
+        'cm.action.plan.base.options.default_resource_provider',
+        'cm.action.plan.base.errors.default_resource_provider'
+      ]
 
       yield if block_given?
     end
@@ -72,14 +95,20 @@ class PlanAction < Nucleon.plugin_class(:nucleon, :cm_action)
 
   def initialize_plan
     @plan = CM.plan(plugin_name, extended_config(:plan, {
-      :path             => settings[:plan_path],
-      :config_directory => settings[:config_path],
-      :key_directory    => settings[:key_path],
-      :manifest_file    => settings[:manifest],
-      :project_provider => settings[:project_provider],
-      :url              => settings[:project_reference],
-      :revision         => settings[:project_revision],
-      :trap             => settings[:trap]
+      :action_settings           => Nucleon::Config.ensure(settings).export,
+      :path                      => settings[:plan_path],
+      :config_provider           => settings[:config_provider],
+      :config_path               => settings[:config_path],
+      :key_directory             => settings[:key_path],
+      :manifest_provider         => settings[:manifest_provider],
+      :manifest_file             => settings[:manifest],
+      :token_provider            => settings[:token_provider],
+      :token_directory           => settings[:token_path],
+      :token_file                => settings[:token_file],
+      :trap                      => settings[:trap],
+      :sequence_provider         => settings[:sequence_provider],
+      :batch_provider            => settings[:batch_provider],
+      :default_resource_provider => settings[:default_resource_provider]
     }), settings[:plan_provider])
   end
 end

data/lib/core/plugin/{job.rb → resource.rb}

@@ -1,11 +1,7 @@
 
-nucleon_require(File.dirname(__FILE__), :parallel_base)
-
-#---
-
 module CM
 module Plugin
-class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
+class Resource < Nucleon.plugin_class(:nucleon, :base)
 
   def self.register_ids
     [ :id ]
@@ -17,7 +13,7 @@ class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
   def normalize(reload)
     super
 
-    @sequence = delete(:sequence, nil) unless reload
+    @plan = delete(:plan, nil) unless reload
 
     yield if block_given?
   end
@@ -25,8 +21,6 @@ class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
   #---
 
   def init_tokens
-    @tokens = {}
-
     collect_tokens = lambda do |local_settings, token|
       local_settings.each do |name, value|
         setting_token = [ array(token), name ].flatten
@@ -35,7 +29,7 @@ class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
           collect_tokens.call(value, setting_token)
         else
           token_base = setting_token.shift
-          sequence.set_token(token_base, setting_token, value)
+          plan.set_token(token_base, setting_token, value)
         end
       end
     end
@@ -54,8 +48,8 @@ class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
 
-  def sequence
-    @sequence
+  def plan
+    @plan
   end
 
   #---
@@ -74,23 +68,48 @@ class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
     hash(settings[:parameters])
   end
 
+  #---
+
+  def data
+    hash(@data)
+  end
+
+  def data=data
+    @data = hash(data)
+  end
+
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute
+  def execute(operation)
     if initialized?
+      method = "operation_#{operation}"
       success = true
 
       execute_functions
       interpolate_parameters
 
-      success = yield if block_given?
+      if respond_to?(method)
+        success = send(method)
+      end
     else
       success = false
     end
     success
   end
 
+  #---
+
+  def operation_deploy
+    yield if block_given?
+  end
+
+  #---
+
+  def operation_destroy
+    yield if block_given?
+  end
+
   #-----------------------------------------------------------------------------
   # Utilities
 
@@ -135,7 +154,7 @@ class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
   def interpolate_parameters
     interpolate_value = lambda do |base_config, name, value|
       interpolations = false
-      sequence.tokens.each do |token_name, token_value|
+      plan.tokens.each do |token_name, token_value|
         if value.is_a?(String) && value.gsub!(/\{\{#{token_name}\}\}/, token_value.to_s)
           interpolations = true
         end

data/lib/core/plugin/sequence.rb

@@ -1,11 +1,7 @@
 
-nucleon_require(File.dirname(__FILE__), :parallel_base)
-
-#---
-
 module CM
 module Plugin
-class Sequence < Nucleon.plugin_class(:nucleon, :parallel_base)
+class Sequence < Nucleon.plugin_class(:nucleon, :base)
 
   #-----------------------------------------------------------------------------
   # Plugin interface
@@ -13,107 +9,66 @@ class Sequence < Nucleon.plugin_class(:nucleon, :parallel_base)
   def normalize(reload)
     super
 
-    init_tokens
-    init_jobs
+    @plan = delete(:plan, nil) unless reload
 
+    init_resources
     yield if block_given?
   end
 
   #---
 
-  def init_jobs
-    @jobs = []
-    get_array(:jobs).each do |job_config|
-      if job_config.has_key?(:aggregate) # Array
-        @jobs << create_batch(job_config[:aggregate])
+  def init_resources
+    @resources = []
+    get_array(:resources).each do |resource_config|
+      resource_config = Nucleon::Config.ensure(resource_config)
+
+      if resource_config.has_key?(:aggregate) # Array
+        @resources << plan.create_batch(resource_config[:aggregate])
       else # Atomic
-        @jobs << create_job(job_config)
+        @resources << plan.create_resource(resource_config)
       end
     end
-    @jobs
-  end
-
-  #---
-
-  def init_tokens
-    clear_tokens
-
-    collect_tokens = lambda do |local_settings, token|
-      local_settings.each do |name, value|
-        setting_token = [ array(token), name ].flatten
-
-        if value.is_a?(Hash)
-          collect_tokens.call(value, setting_token)
-        else
-          token_base = setting_token.shift
-          set_token(token_base, setting_token, value)
-        end
-      end
-    end
-
-    # Generate config tokens
-    collect_tokens.call(settings, 'config')
+    @resources
   end
 
   #-----------------------------------------------------------------------------
   # Checks
 
   def initialized?(options = {})
-    !@jobs.empty?
+    !@resources.empty?
   end
 
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
 
-  def settings
-    get_hash(:settings)
+  def plan
+    @plan
   end
 
   #---
 
-  def tokens
-    @tokens
-  end
-
-  def set_token(id, location, value)
-    @tokens["#{id}:#{array(location).join('.')}"] = value
-  end
-
-  def remove_token(id, location)
-    @tokens.delete("#{id}:#{array(location).join('.')}")
-  end
-
-  def clear_tokens
-    @tokens = {}
+  def settings
+    get_hash(:settings)
   end
 
   #---
 
-  def jobs
-    @jobs
-  end
-
-  def jobs=jobs
-    set(:jobs, Nucleon::Util::Data.array(jobs))
-    init_jobs
-    init_tokens
+  def resources
+    @resources
   end
 
-  #---
-
-  def trap
-    get(:trap, false)
+  def resources=resources
+    set(:resources, Nucleon::Util::Data.array(resources))
+    init_resources
   end
 
   #-----------------------------------------------------------------------------
   # Operations
 
-  def forward(options)
-    config = Nucleon::Config.ensure(options)
-
+  def forward(operation)
     if initialized?
       success = true
-      success = yield(config, success) if block_given?
+      success = yield(success) if block_given?
     else
       success = false
     end
@@ -122,12 +77,10 @@ class Sequence < Nucleon.plugin_class(:nucleon, :parallel_base)
 
   #---
 
-  def reverse(options)
-    config = Nucleon::Config.ensure(options)
-
+  def reverse(operation)
     if initialized?
       success = true
-      success = yield(config, success) if block_given?
+      success = yield(success) if block_given?
     else
       success = false
     end
@@ -137,42 +90,6 @@ class Sequence < Nucleon.plugin_class(:nucleon, :parallel_base)
   #-----------------------------------------------------------------------------
   # Utilities
 
-  def step
-    answer = ask('Continue? (yes|no): ', { :i18n => false })
-    answer.match(/^[Yy][Ee][Ss]$/) ? false : true
-  end
-
-  #---
-
-  def create_sequence(jobs)
-    CM.sequence({
-      :settings => settings,
-      :jobs => jobs,
-      :trap => trap,
-      :new => true,
-    }, get(:sequence_provider, :default))
-  end
-
-  #---
-
-  def create_batch(jobs)
-    CM.batch({
-      :sequence => myself,
-      :jobs => jobs,
-      :new => true
-    }, get(:batch_provider, :celluloid))
-  end
-
-  #---
-
-  def create_job(settings)
-    settings[:type] ||= get(:default_job_provider, :variables)
-    CM.job({
-      :sequence => myself,
-      :settings => settings,
-      :id => settings[:name]
-    }, settings[:type])
-  end
 end
 end
 end

data/lib/nucleon/action/resource/run.rb

@@ -0,0 +1,53 @@
+
+module Nucleon
+module Action
+module Resource
+class Run < Nucleon.plugin_class(:nucleon, :plan_action)
+
+  #-----------------------------------------------------------------------------
+  # Info
+
+  def self.describe
+    super(:resource, :run, 500)
+  end
+
+  #-----------------------------------------------------------------------------
+  # Checks
+
+  def strict?
+    false
+  end
+
+  #-----------------------------------------------------------------------------
+  # Settings
+
+  def configure
+    super do
+      codes :run_failed
+
+      register_str :provider, nil
+      register_str :operation, nil
+    end
+  end
+
+  #---
+
+  def arguments
+    [:provider, :operation]
+  end
+
+  #-----------------------------------------------------------------------------
+  # Action operations
+
+  def execute
+    super do
+      resource = plan.create_resource(settings[:resource_config])
+      success  = resource.execute(settings[:operation])
+
+      myself.status = code.run_failed unless success
+    end
+  end
+end
+end
+end
+end