cm 0.1.4 → 0.1.6

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.4 ruby lib
+# stub: cm 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cm"
-  s.version = "0.1.4"
+  s.version = "0.1.6"
 
   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-11"
+  s.date = "2015-12-27"
   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"]
@@ -20,23 +20,25 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+    ".gitmodules",
     "Gemfile",
     "Gemfile.lock",
     "Rakefile",
     "VERSION",
     "bin/cm",
+    "bootstrap/lib/bash/LICENSE.txt",
     "cm.gemspec",
     "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",
     "lib/CM/plan/default.rb",
+    "lib/CM/resource/AWS.rb",
+    "lib/CM/resource/BOSH.rb",
+    "lib/CM/resource/MicroBOSH.rb",
+    "lib/CM/resource/concourse.rb",
+    "lib/CM/resource/keypair.rb",
+    "lib/CM/resource/variables.rb",
     "lib/CM/sequence/default.rb",
     "lib/cm.rb",
     "lib/core/errors.rb",
@@ -44,19 +46,21 @@ Gem::Specification.new do |s|
     "lib/core/mixin/action/config.rb",
     "lib/core/mixin/action/registration.rb",
     "lib/core/overrides.rb",
+    "lib/core/plugin/auth_docker_resource.rb",
     "lib/core/plugin/batch.rb",
     "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/docker_resource.rb",
     "lib/core/plugin/function.rb",
-    "lib/core/plugin/job.rb",
     "lib/core/plugin/parallel_base.rb",
     "lib/core/plugin/plan.rb",
     "lib/core/plugin/plan_action.rb",
+    "lib/core/plugin/resource.rb",
     "lib/core/plugin/sequence.rb",
     "lib/nucleon/action/plan/deploy.rb",
     "lib/nucleon/action/plan/destroy.rb",
+    "lib/nucleon/action/resource/run.rb",
     "locales/en.yml",
     "spec/spec_helper.rb"
   ]
@@ -64,7 +68,7 @@ Gem::Specification.new do |s|
   s.licenses = ["Apache License, Version 2.0"]
   s.rdoc_options = ["--title", "CM (Cloud Manager)", "--main", "README.rdoc", "--line-numbers"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.rubygems_version = "2.4.8"
+  s.rubygems_version = "2.4.5"
   s.summary = "Pluggable cloud management framework that provides a simple foundation for deploying and destroying enterprise ready cloud environments and components"
 
   if s.respond_to? :specification_version then
@@ -72,12 +76,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nucleon>, ["~> 0.2"])
+      s.add_runtime_dependency(%q<docker-api>, ["~> 1.24"])
       s.add_development_dependency(%q<bundler>, ["~> 1.10"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_development_dependency(%q<rspec>, ["~> 3.4"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.2"])
     else
       s.add_dependency(%q<nucleon>, ["~> 0.2"])
+      s.add_dependency(%q<docker-api>, ["~> 1.24"])
       s.add_dependency(%q<bundler>, ["~> 1.10"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_dependency(%q<rspec>, ["~> 3.4"])
@@ -85,6 +91,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<nucleon>, ["~> 0.2"])
+    s.add_dependency(%q<docker-api>, ["~> 1.24"])
     s.add_dependency(%q<bundler>, ["~> 1.10"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
     s.add_dependency(%q<rspec>, ["~> 3.4"])

data/lib/CM/batch/celluloid.rb

@@ -23,11 +23,11 @@ class Celluloid < Nucleon.plugin_class(:CM, :batch)
   #-----------------------------------------------------------------------------
   # Utilities
 
-  def execute_parallel
+  def execute_parallel(operation)
     values = []
-    jobs.each do |job|
-      values << Celluloid::Future.new(job) do
-        job.execute
+    resources.each do |resource|
+      values << ::Celluloid::Future.new(resource) do
+        resource.execute(operation)
       end
     end
     values = values.map { |future| future.value }

data/lib/CM/configuration/file.rb

@@ -14,10 +14,6 @@ class File < Nucleon.plugin_class(:CM, :disk_configuration)
   #-----------------------------------------------------------------------------
   # Checks
 
-  def initialized?(options = {})
-    path && ::File.exist?(path)
-  end
-
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
 

data/lib/CM/{job → resource}/AWS.rb

@@ -1,7 +1,7 @@
 
 module CM
-module Job
-class AWS < Nucleon.plugin_class(:CM, :job)
+module Resource
+class AWS < Nucleon.plugin_class(:CM, :docker_resource)
 
   #-----------------------------------------------------------------------------
   # Plugin interface
@@ -24,7 +24,15 @@ class AWS < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute
+  def operation_deploy
+    super do
+      success = true
+    end
+  end
+
+  #---
+
+  def operation_destroy
     super do
       success = true
     end

data/lib/CM/{job → resource}/BOSH.rb

@@ -1,7 +1,7 @@
 
 module CM
-module Job
-class BOSH < Nucleon.plugin_class(:CM, :job)
+module Resource
+class BOSH < Nucleon.plugin_class(:CM, :docker_resource)
 
   #-----------------------------------------------------------------------------
   # Plugin interface
@@ -24,7 +24,15 @@ class BOSH < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute
+  def operation_deploy
+    super do
+      success = true
+    end
+  end
+
+  #---
+
+  def operation_destroy
     super do
       success = true
     end

data/lib/CM/resource/MicroBOSH.rb

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

data/lib/CM/{job → resource}/concourse.rb

@@ -1,7 +1,7 @@
 
 module CM
-module Job
-class Concourse < Nucleon.plugin_class(:CM, :job)
+module Resource
+class Concourse < Nucleon.plugin_class(:CM, :docker_resource)
 
   #-----------------------------------------------------------------------------
   # Plugin interface
@@ -24,7 +24,15 @@ class Concourse < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute
+  def operation_deploy
+    super do
+      success = true
+    end
+  end
+
+  #---
+
+  def operation_destroy
     super do
       success = true
     end

data/lib/CM/{job → resource}/keypair.rb

@@ -1,7 +1,7 @@
 
 module CM
-module Job
-class Keypair < Nucleon.plugin_class(:CM, :job)
+module Resource
+class Keypair < Nucleon.plugin_class(:CM, :docker_resource)
 
   #-----------------------------------------------------------------------------
   # Plugin interface
@@ -24,7 +24,15 @@ class Keypair < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute
+  def operation_deploy
+    super do
+      success = true
+    end
+  end
+
+  #---
+
+  def operation_destroy
     super do
       success = true
     end

data/lib/CM/{job/MicroBOSH.rb → resource/variables.rb}

@@ -1,7 +1,7 @@
 
 module CM
-module Job
-class MicroBOSH < Nucleon.plugin_class(:CM, :job)
+module Resource
+class Variables < Nucleon.plugin_class(:CM, :resource)
 
   #-----------------------------------------------------------------------------
   # Plugin interface
@@ -14,17 +14,21 @@ class MicroBOSH < Nucleon.plugin_class(:CM, :job)
   #-----------------------------------------------------------------------------
   # Checks
 
-  def initialized?(options = {})
-    true
-  end
-
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
 
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute
+  def operation_deploy
+    super do
+      success = true
+    end
+  end
+
+  #---
+
+  def operation_destroy
     super do
       success = true
     end

data/lib/CM/sequence/default.rb

@@ -20,11 +20,11 @@ class Default < Nucleon.plugin_class(:CM, :sequence)
   #-----------------------------------------------------------------------------
   # Operations
 
-  def forward(options)
-    super do |config, success|
-      jobs.each do |job|
-        success = false unless job.execute
-        break if trap && step
+  def forward(operation)
+    super do |success|
+      resources.each do |resource|
+        success = false unless resource.execute(operation)
+        break if plan.trap && plan.step
       end
       success
     end
@@ -32,11 +32,11 @@ class Default < Nucleon.plugin_class(:CM, :sequence)
 
   #---
 
-  def reverse(options)
-    super do |config, success|
-      jobs.reverse.each do |job|
-        success = false unless job.execute
-        break if trap && step
+  def reverse(operation)
+    super do |success|
+      resources.reverse.each do |resource|
+        success = false unless resource.execute(operation)
+        break if plan.trap && plan.step
       end
       success
     end

data/lib/cm.rb

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

data/lib/core/facade.rb

@@ -55,12 +55,12 @@ module Facade
 
   #---
 
-  def job(options, provider = nil)
-    Nucleon.plugin(:CM, :job, provider, options)
+  def resource(options, provider = nil)
+    Nucleon.plugin(:CM, :resource, provider, options)
   end
 
-  def jobs(data, build_hash = false, keep_array = false)
-    Nucleon.plugins(:CM, :job, data, build_hash, keep_array)
+  def resources(data, build_hash = false, keep_array = false)
+    Nucleon.plugins(:CM, :resource, data, build_hash, keep_array)
   end
 
   #---

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

@@ -103,26 +103,26 @@ module Registration
 
   #---
 
-  def register_job_provider(name, default = nil, locale = nil, &code)
-    register_plugin_provider(:CM, :job, name.to_sym, default, locale, &code)
+  def register_resource_provider(name, default = nil, locale = nil, &code)
+    register_plugin_provider(:CM, :resource, name.to_sym, default, locale, &code)
   end
 
   #---
 
-  def register_job_providers(name, default = nil, locale = nil, &code)
-    register_plugin_providers(:CM, :job, name.to_sym, default, locale, &code)
+  def register_resource_providers(name, default = nil, locale = nil, &code)
+    register_plugin_providers(:CM, :resource, name.to_sym, default, locale, &code)
   end
 
   #---
 
-  def register_job(name, default = nil, locale = nil, &code)
-    register_plugin(:CM, :job, name.to_sym, default, locale, &code)
+  def register_resource(name, default = nil, locale = nil, &code)
+    register_plugin(:CM, :resource, name.to_sym, default, locale, &code)
   end
 
   #---
 
-  def register_jobs(name, default = nil, locale = nil, &code)
-    register_plugins(:CM, :job, name.to_sym, default, locale, &code)
+  def register_resources(name, default = nil, locale = nil, &code)
+    register_plugins(:CM, :resource, name.to_sym, default, locale, &code)
   end
 
   #---

data/lib/core/plugin/auth_docker_resource.rb

@@ -0,0 +1,52 @@
+
+nucleon_require(File.dirname(__FILE__), :docker_resource)
+
+#---
+
+module CM
+module Plugin
+class AuthDockerResource < Nucleon.plugin_class(:CM, :docker_resource)
+
+  #-----------------------------------------------------------------------------
+  # Plugin interface
+
+  def normalize(reload)
+    super
+
+    if settings[:docker_username] && settings[:docker_password] && settings[:docker_email]
+      begin
+        Docker.authenticate!({
+          'username' => settings[:docker_username],
+          'password' => settings[:docker_password],
+          'email' => settings[:docker_email]
+        })
+      rescue Docker::Error::AuthenticationError => error
+        error('authentication_failed', { :error => error.message })
+        raise error
+      end
+    else
+      raise render_message('cm.resource.docker.info.no_credentials', {
+        :username_option => 'docker_username',
+        :password_option => 'docker_password',
+        :email_option => 'docker_email'
+      })
+    end
+
+    yield if block_given?
+  end
+
+  #-----------------------------------------------------------------------------
+  # Checks
+
+  #-----------------------------------------------------------------------------
+  # Property accessors / modifiers
+
+  #-----------------------------------------------------------------------------
+  # Operations
+
+  #-----------------------------------------------------------------------------
+  # Utilities
+
+end
+end
+end