cm 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d05228dd289bffb3d2c8be98aad43c5b5fa57fa
-  data.tar.gz: 40b139ff6302463f604cafb6a2ae76a378c9d001
+  metadata.gz: 43114deae0d0a5a16b27cf22708d0181fa55f98f
+  data.tar.gz: 2b0a9a2184272ff5af48fa7fb762a8ba9ec07276
 SHA512:
-  metadata.gz: 094fe4e3533a99cb4893bad66e79fb4cb9804b4009fa90ec06920f843267b82f6879b07401b2bb97cff569700e94970b796d7bed82a9a58016c8534f138b442d
-  data.tar.gz: 2f90ff99791b7b60a51deb6c2b9dbae728771a7773438e07b1882a0be61af959b52c688a8a8d5355ec206ad08ab0b5f5c2fc8febd6fa8e2066e341bc31442e16
+  metadata.gz: 9011215f6338f7a2e73fba8f441fb505e8428f7d25d65ef2dcd598defff2e176951fd28bc9a8631ed6150aad1d87484e8191ea1fff66c53dc9f0b71aba938d6d
+  data.tar.gz: dc9b882a12f4a03bb3fdf36cf744ac3bcb842facac3410fa63e33bd3f88a42e143b77cef801872c001605467c3b85573fd4bed4b0cb2863a7860c06c631e4240

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/cm.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cm 0.1.3 ruby lib
+# stub: cm 0.1.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cm"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2015-12-09"
+  s.date = "2015-12-11"
   s.description = "\nPluggable cloud management framework that provides a simple foundation for\ndeploying and destroying enterprise ready cloud environments and components\nthat integrate; cloud provider components and services, cloud orchestration\nand configuration management tools, and continuous integration and delivery\npipelines.\n"
   s.email = "adrian.webb@gsa.gov"
   s.executables = ["cm"]
@@ -29,8 +29,10 @@ Gem::Specification.new do |s|
     "lib/CM/batch/celluloid.rb",
     "lib/CM/configuration/directory.rb",
     "lib/CM/configuration/file.rb",
+    "lib/CM/function/generate_password.rb",
     "lib/CM/job/AWS.rb",
     "lib/CM/job/BOSH.rb",
+    "lib/CM/job/MicroBOSH.rb",
     "lib/CM/job/concourse.rb",
     "lib/CM/job/keypair.rb",
     "lib/CM/job/variables.rb",
@@ -46,6 +48,8 @@ Gem::Specification.new do |s|
     "lib/core/plugin/cm_action.rb",
     "lib/core/plugin/configuration.rb",
     "lib/core/plugin/disk_configuration.rb",
+    "lib/core/plugin/docker_job.rb",
+    "lib/core/plugin/function.rb",
     "lib/core/plugin/job.rb",
     "lib/core/plugin/parallel_base.rb",
     "lib/core/plugin/plan.rb",

data/lib/CM/batch/celluloid.rb

@@ -27,7 +27,7 @@ class Celluloid < Nucleon.plugin_class(:CM, :batch)
     values = []
     jobs.each do |job|
       values << Celluloid::Future.new(job) do
-        job.execute(sequence.settings)
+        job.execute
       end
     end
     values = values.map { |future| future.value }

data/lib/CM/function/generate_password.rb

@@ -0,0 +1,30 @@
+
+module CM
+module Function
+class GeneratePassword < Nucleon.plugin_class(:CM, :function)
+
+  #-----------------------------------------------------------------------------
+  # Plugin interface
+
+  #-----------------------------------------------------------------------------
+  # Checks
+
+  #-----------------------------------------------------------------------------
+  # Property accessors / modifiers
+
+  #-----------------------------------------------------------------------------
+  # Operations
+
+  def execute(args)
+    super do
+      length = (args.length == 1 ? args[0] : 40)
+      `openssl rand -base64 "$((#{length} * 2))" | perl -pe 's/[^a-zA-Z0-9]//g' - | cut -c1-#{length}`
+    end
+  end
+
+  #-----------------------------------------------------------------------------
+  # Utilities
+
+end
+end
+end

data/lib/CM/job/AWS.rb

@@ -24,6 +24,12 @@ class AWS < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Operations
 
+  def execute
+    super do
+      success = true
+    end
+  end
+
   #-----------------------------------------------------------------------------
   # Utilities
 

data/lib/CM/job/BOSH.rb

@@ -24,6 +24,12 @@ class BOSH < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Operations
 
+  def execute
+    super do
+      success = true
+    end
+  end
+
   #-----------------------------------------------------------------------------
   # Utilities
 

data/lib/CM/job/MicroBOSH.rb

@@ -0,0 +1,38 @@
+
+module CM
+module Job
+class MicroBOSH < Nucleon.plugin_class(:CM, :job)
+
+  #-----------------------------------------------------------------------------
+  # Plugin interface
+
+  def normalize(reload)
+    super
+    yield if block_given?
+  end
+
+  #-----------------------------------------------------------------------------
+  # Checks
+
+  def initialized?(options = {})
+    true
+  end
+
+  #-----------------------------------------------------------------------------
+  # Property accessors / modifiers
+
+  #-----------------------------------------------------------------------------
+  # Operations
+
+  def execute
+    super do
+      success = true
+    end
+  end
+
+  #-----------------------------------------------------------------------------
+  # Utilities
+
+end
+end
+end

data/lib/CM/job/concourse.rb

@@ -24,6 +24,12 @@ class Concourse < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Operations
 
+  def execute
+    super do
+      success = true
+    end
+  end
+
   #-----------------------------------------------------------------------------
   # Utilities
 

data/lib/CM/job/keypair.rb

@@ -24,6 +24,12 @@ class Keypair < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Operations
 
+  def execute
+    super do
+      success = true
+    end
+  end
+
   #-----------------------------------------------------------------------------
   # Utilities
 

data/lib/CM/job/variables.rb

@@ -14,16 +14,18 @@ class Variables < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Checks
 
-  def initialized?(options = {})
-    true
-  end
-
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
 
   #-----------------------------------------------------------------------------
   # Operations
 
+  def execute
+    super do
+      success = true
+    end
+  end
+
   #-----------------------------------------------------------------------------
   # Utilities
 

data/lib/CM/sequence/default.rb

@@ -23,7 +23,8 @@ class Default < Nucleon.plugin_class(:CM, :sequence)
   def forward(options)
     super do |config, success|
       jobs.each do |job|
-        success = false unless job.execute(settings)
+        success = false unless job.execute
+        break if trap && step
       end
       success
     end
@@ -34,7 +35,8 @@ class Default < Nucleon.plugin_class(:CM, :sequence)
   def reverse(options)
     super do |config, success|
       jobs.reverse.each do |job|
-        success = false unless job.execute(settings)
+        success = false unless job.execute
+        break if trap && step
       end
       success
     end

data/lib/cm.rb

@@ -107,7 +107,8 @@ module CM
         :configuration => :file,     # Component and manifest storage
         :sequence      => :default,  # Event sequence
         :batch         => :celluloid,# Batch processor
-        :job           => :variables # Individual job
+        :job           => :variables,# Individual job
+        :function      => nil        # Configuration processing function
       }
     end
   end

data/lib/core/facade.rb

@@ -62,5 +62,15 @@ module Facade
   def jobs(data, build_hash = false, keep_array = false)
     Nucleon.plugins(:CM, :job, data, build_hash, keep_array)
   end
+
+  #---
+
+  def function(options, provider = nil)
+    Nucleon.plugin(:CM, :function, provider, options)
+  end
+
+  def functions(data, build_hash = false, keep_array = false)
+    Nucleon.plugins(:CM, :function, data, build_hash, keep_array)
+  end
 end
 end

data/lib/core/mixin/action/registration.rb

@@ -104,7 +104,7 @@ module Registration
   #---
 
   def register_job_provider(name, default = nil, locale = nil, &code)
-    register_plugin_provider(:CM, :jobch, name.to_sym, default, locale, &code)
+    register_plugin_provider(:CM, :job, name.to_sym, default, locale, &code)
   end
 
   #---
@@ -124,6 +124,30 @@ module Registration
   def register_jobs(name, default = nil, locale = nil, &code)
     register_plugins(:CM, :job, name.to_sym, default, locale, &code)
   end
+
+  #---
+
+  def register_function_provider(name, default = nil, locale = nil, &code)
+    register_plugin_provider(:CM, :function, name.to_sym, default, locale, &code)
+  end
+
+  #---
+
+  def register_function_providers(name, default = nil, locale = nil, &code)
+    register_plugin_providers(:CM, :function, name.to_sym, default, locale, &code)
+  end
+
+  #---
+
+  def register_function(name, default = nil, locale = nil, &code)
+    register_plugin(:CM, :function, name.to_sym, default, locale, &code)
+  end
+
+  #---
+
+  def register_functions(name, default = nil, locale = nil, &code)
+    register_plugins(:CM, :function, name.to_sym, default, locale, &code)
+  end
 end
 end
 end

data/lib/core/plugin/batch.rb

@@ -61,9 +61,9 @@ class Batch < Nucleon.plugin_class(:nucleon, :parallel_base)
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute(settings, parallel = true)
+  def execute
     if initialized?
-      if Nucleon.parallel? && parallel
+      if Nucleon.parallel?
         success = execute_parallel
       else
         success = execute_sequence
@@ -86,7 +86,8 @@ class Batch < Nucleon.plugin_class(:nucleon, :parallel_base)
   def execute_sequence
     success = true
     jobs.each do |job|
-      success = false unless job.execute(sequence.settings)
+      success = false unless job.execute
+      break if sequence.trap && sequence.step
     end
     success
   end

data/lib/core/plugin/docker_job.rb

@@ -0,0 +1,52 @@
+
+nucleon_require(File.dirname(__FILE__), :job)
+
+#---
+
+module CM
+module Plugin
+class DockerJob < Nucleon.plugin_class(:CM, :job)
+
+  #-----------------------------------------------------------------------------
+  # Plugin interface
+
+  def normalize(reload)
+    super
+    yield if block_given?
+  end
+
+  #-----------------------------------------------------------------------------
+  # Checks
+
+  def initialized?(options = {})
+    true
+  end
+
+  #-----------------------------------------------------------------------------
+  # Property accessors / modifiers
+
+  def image
+    settings[:image]
+  end
+
+  def image=image
+    settings[:image] = image
+  end
+
+  #-----------------------------------------------------------------------------
+  # Operations
+
+  def execute
+    super do
+      success = true
+      success = yield if block_given?
+      success
+    end
+  end
+
+  #-----------------------------------------------------------------------------
+  # Utilities
+
+end
+end
+end

data/lib/core/plugin/function.rb

@@ -0,0 +1,42 @@
+
+module CM
+module Plugin
+class Function < Nucleon.plugin_class(:nucleon, :base)
+
+  #-----------------------------------------------------------------------------
+  # Plugin interface
+
+  def normalize(reload)
+    super
+    yield if block_given?
+  end
+
+  #-----------------------------------------------------------------------------
+  # Checks
+
+  def initialized?(options = {})
+    true
+  end
+
+  #-----------------------------------------------------------------------------
+  # Property accessors / modifiers
+
+  #-----------------------------------------------------------------------------
+  # Operations
+
+  def execute(args)
+    if initialized?
+      output = ''
+      output = yield if block_given?
+    else
+      output = ''
+    end
+    output.strip
+  end
+
+  #-----------------------------------------------------------------------------
+  # Utilities
+
+end
+end
+end

data/lib/core/plugin/job.rb

@@ -7,14 +7,43 @@ module CM
 module Plugin
 class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
 
+  def self.register_ids
+    [ :id ]
+  end
+
   #-----------------------------------------------------------------------------
   # Plugin interface
 
   def normalize(reload)
     super
+
+    @sequence = delete(:sequence, nil) unless reload
+
     yield if block_given?
   end
 
+  #---
+
+  def init_tokens
+    @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
+          sequence.set_token(token_base, setting_token, value)
+        end
+      end
+    end
+
+    # Generate parameter tokens
+    collect_tokens.call(settings[:parameters], id)
+  end
+
   #-----------------------------------------------------------------------------
   # Checks
 
@@ -25,12 +54,36 @@ class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
 
+  def sequence
+    @sequence
+  end
+
+  #---
+
+  def settings
+    get_hash(:settings)
+  end
+
+  #---
+
+  def id
+    get(:id, '')
+  end
+
+  def parameters
+    hash(settings[:parameters])
+  end
+
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute(settings)
+  def execute
     if initialized?
       success = true
+
+      execute_functions
+      interpolate_parameters
+
       success = yield if block_given?
     else
       success = false
@@ -41,6 +94,86 @@ class Job < Nucleon.plugin_class(:nucleon, :parallel_base)
   #-----------------------------------------------------------------------------
   # Utilities
 
+  def execute_functions
+    execute_value = lambda do |value|
+      if value.is_a?(String) && match = value.match(/\<\<([^\>]+)\>\>/)
+        match.captures.each do |function_id|
+          function_components = function_id.split(':')
+          function_provider = function_components.shift
+          function_args = function_components
+
+          function = CM.function({}, function_provider)
+          rendered_output = function.execute(function_args)
+
+          value.gsub!(/\<\<#{function_id}\>\>/, rendered_output)
+        end
+      end
+      value
+    end
+
+    execute = lambda do |settings|
+      settings.each do |name, value|
+        if value.is_a?(Hash)
+          execute.call(value)
+        elsif value.is_a?(Array)
+          final = []
+          value.each do |item|
+            final << execute_value.call(item)
+          end
+          settings[name] = final
+        else
+          settings[name] = execute_value.call(value)
+        end
+      end
+    end
+
+    execute.call(settings[:parameters])
+  end
+
+  #---
+
+  def interpolate_parameters
+    interpolate_value = lambda do |base_config, name, value|
+      interpolations = false
+      sequence.tokens.each do |token_name, token_value|
+        if value.is_a?(String) && value.gsub!(/\{\{#{token_name}\}\}/, token_value.to_s)
+          interpolations = true
+        end
+      end
+      base_config[name] = value
+      interpolations
+    end
+
+    interpolate = lambda do |settings|
+      interpolations = false
+
+      if settings.is_a?(Hash)
+        settings.each do |name, value|
+          if value.is_a?(Hash) || value.is_a?(Array)
+            interpolations = true if interpolate.call(value)
+          else
+            interpolations = true if interpolate_value.call(settings, name, value)
+          end
+        end
+      elsif settings.is_a?(Array)
+        settings.each_with_index do |value, index|
+          if value.is_a?(Hash) || value.is_a?(Array)
+            interpolations = true if interpolate.call(value)
+          else
+            interpolations = true if interpolate_value.call(settings, index, value)
+          end
+        end
+      end
+      interpolations
+    end
+
+    tries = 0
+    loop do
+      tries += 1
+      init_tokens
+      break if tries >= 10 || !interpolate.call(settings[:parameters])
+    end
+  end
 end
 end
 end

data/lib/core/plugin/plan.rb

@@ -7,6 +7,10 @@ module CM
 module Plugin
 class Plan < Nucleon.plugin_class(:CM, :disk_configuration)
 
+  def self.register_ids
+    [ :directory, :revision ]
+  end
+
   #-----------------------------------------------------------------------------
   # Plugin interface
 
@@ -25,7 +29,7 @@ class Plan < Nucleon.plugin_class(:CM, :disk_configuration)
       :nucleon_file   => false
     }))
 
-    if project
+    if project && !reload
       @loaded_config = CM.configuration(extended_config(:config_data, {
         :provider => _get(:config_provider, :directory),
         :path => config_directory
@@ -136,7 +140,8 @@ class Plan < Nucleon.plugin_class(:CM, :disk_configuration)
       # Initialize job sequence
       @sequence = CM.sequence({
         :jobs => manifest_jobs,
-        :settings => manifest_config
+        :settings => manifest_config,
+        :trap => _get(:trap, false)
       }, _get(:sequence_provider, :default))
 
       yield if block_given?

data/lib/core/plugin/plan_action.rb

@@ -43,6 +43,7 @@ class PlanAction < Nucleon.plugin_class(:nucleon, :cm_action)
         '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
 
@@ -77,7 +78,8 @@ class PlanAction < Nucleon.plugin_class(:nucleon, :cm_action)
       :manifest_file    => settings[:manifest],
       :project_provider => settings[:project_provider],
       :url              => settings[:project_reference],
-      :revision         => settings[:project_revision]
+      :revision         => settings[:project_revision],
+      :trap             => settings[:trap]
     }), settings[:plan_provider])
   end
 end

data/lib/core/plugin/sequence.rb

@@ -13,10 +13,48 @@ class Sequence < Nucleon.plugin_class(:nucleon, :parallel_base)
   def normalize(reload)
     super
 
+    init_tokens
     init_jobs
+
     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])
+      else # Atomic
+        @jobs << create_job(job_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')
+  end
+
   #-----------------------------------------------------------------------------
   # Checks
 
@@ -33,18 +71,24 @@ class Sequence < Nucleon.plugin_class(:nucleon, :parallel_base)
 
   #---
 
-  def init_jobs
-    @jobs = []
-    get_array(:jobs).each do |job_config|
-      if job_config.has_key?(:aggregate) # Array
-        @jobs << create_batch(job_config[:aggregate])
-      else # Atomic
-        @jobs << create_job(job_config)
-      end
-    end
-    @jobs
+  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 = {}
+  end
+
+  #---
+
   def jobs
     @jobs
   end
@@ -52,6 +96,13 @@ class Sequence < Nucleon.plugin_class(:nucleon, :parallel_base)
   def jobs=jobs
     set(:jobs, Nucleon::Util::Data.array(jobs))
     init_jobs
+    init_tokens
+  end
+
+  #---
+
+  def trap
+    get(:trap, false)
   end
 
   #-----------------------------------------------------------------------------
@@ -86,21 +137,41 @@ 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 }, get(:sequence_provider, :default))
+    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 }, get(:batch_provider, :celluloid))
+    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({ :settings => settings }, settings[:type])
+    CM.job({
+      :sequence => myself,
+      :settings => settings,
+      :id => settings[:name]
+    }, settings[:type])
   end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -105,8 +105,10 @@ files:
 - lib/CM/batch/celluloid.rb
 - lib/CM/configuration/directory.rb
 - lib/CM/configuration/file.rb
+- lib/CM/function/generate_password.rb
 - lib/CM/job/AWS.rb
 - lib/CM/job/BOSH.rb
+- lib/CM/job/MicroBOSH.rb
 - lib/CM/job/concourse.rb
 - lib/CM/job/keypair.rb
 - lib/CM/job/variables.rb
@@ -122,6 +124,8 @@ files:
 - lib/core/plugin/cm_action.rb
 - lib/core/plugin/configuration.rb
 - lib/core/plugin/disk_configuration.rb
+- lib/core/plugin/docker_job.rb
+- lib/core/plugin/function.rb
 - lib/core/plugin/job.rb
 - lib/core/plugin/parallel_base.rb
 - lib/core/plugin/plan.rb