corl 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23fcbd9522d74de8d9fabe3088878f6cb9dc3a6c
-  data.tar.gz: 6c43e4e675d03eef1cc30d177ec08202cd3901fd
+  metadata.gz: 1181f057133b1e194133f258705368c735857e7d
+  data.tar.gz: 331b4db63e4a5c9c7511a28ce1a543f35f59c121
 SHA512:
-  metadata.gz: 042608cad0db86ae1b155d543439fd0d1dd9d7a973430bee5a53fe059627a277968b49d9030c56b0613e7c4d6aa944c9cfdb0efd5a85602044de8a6113470c95
-  data.tar.gz: 4842c6e679aae45c3fa6cb589d9f5d4d172220971c752bea454865928df71be8557115248b9805887110785299c91161bde4228b3cec2c99257b3691da6264e2
+  metadata.gz: 9f3b203645b9c5c05e8f744ecc6a1261a37f45d158b818827f3bc13cd58ced70f85e8c054a6d07f40f5c55eccc9137446373a12b17daef82580814b2b9bb7bc6
+  data.tar.gz: adabf9741d0e51b0481cf6891075eddf92b798486ffecb0a610dae53af38c62fc8f5f030a992f14d52a4394e54f96f72ffc157e8571acc0d7d6d00c8d5073e12

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/corl.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: corl 0.5.9 ruby lib
+# stub: corl 0.5.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.9"
+  s.version = "0.5.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -56,13 +56,11 @@ Gem::Specification.new do |s|
     "lib/CORL/builder/project.rb",
     "lib/CORL/configuration/file.rb",
     "lib/CORL/machine/AWS.rb",
-    "lib/CORL/machine/docker.rb",
     "lib/CORL/machine/physical.rb",
     "lib/CORL/machine/rackspace.rb",
     "lib/CORL/machine/vagrant.rb",
     "lib/CORL/network/CORL.rb",
     "lib/CORL/node/AWS.rb",
-    "lib/CORL/node/docker.rb",
     "lib/CORL/node/local.rb",
     "lib/CORL/node/rackspace.rb",
     "lib/CORL/node/vagrant.rb",
@@ -79,7 +77,6 @@ Gem::Specification.new do |s|
     "lib/core/mod/fog_aws_server.rb",
     "lib/core/mod/fog_rackspace_server.rb",
     "lib/core/mod/hiera_backend.rb",
-    "lib/core/mod/vagrant.rb",
     "lib/core/plugin/agent.rb",
     "lib/core/plugin/builder.rb",
     "lib/core/plugin/cloud_action.rb",
@@ -95,7 +92,6 @@ Gem::Specification.new do |s|
     "lib/core/util/puppet/resource_group.rb",
     "lib/core/vagrant/action.rb",
     "lib/core/vagrant/actions/delete_cache.rb",
-    "lib/core/vagrant/actions/include_overrides.rb",
     "lib/core/vagrant/actions/init_keys.rb",
     "lib/core/vagrant/actions/link_network.rb",
     "lib/core/vagrant/commands/launcher.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Adrian Webb
@@ -216,13 +216,11 @@ files:
 - lib/CORL/builder/project.rb
 - lib/CORL/configuration/file.rb
 - lib/CORL/machine/AWS.rb
-- lib/CORL/machine/docker.rb
 - lib/CORL/machine/physical.rb
 - lib/CORL/machine/rackspace.rb
 - lib/CORL/machine/vagrant.rb
 - lib/CORL/network/CORL.rb
 - lib/CORL/node/AWS.rb
-- lib/CORL/node/docker.rb
 - lib/CORL/node/local.rb
 - lib/CORL/node/rackspace.rb
 - lib/CORL/node/vagrant.rb
@@ -239,7 +237,6 @@ files:
 - lib/core/mod/fog_aws_server.rb
 - lib/core/mod/fog_rackspace_server.rb
 - lib/core/mod/hiera_backend.rb
-- lib/core/mod/vagrant.rb
 - lib/core/plugin/agent.rb
 - lib/core/plugin/builder.rb
 - lib/core/plugin/cloud_action.rb
@@ -255,7 +252,6 @@ files:
 - lib/core/util/puppet/resource_group.rb
 - lib/core/vagrant/action.rb
 - lib/core/vagrant/actions/delete_cache.rb
-- lib/core/vagrant/actions/include_overrides.rb
 - lib/core/vagrant/actions/init_keys.rb
 - lib/core/vagrant/actions/link_network.rb
 - lib/core/vagrant/commands/launcher.rb

data/lib/CORL/machine/docker.rb

@@ -1,327 +0,0 @@
-
-module CORL
-module Machine
-class Docker < Nucleon.plugin_class(:CORL, :machine)
-
-  #include Mixin::Machine::SSH
-
-  #---
-
-  #@@lock = Mutex.new
-
-  #-----------------------------------------------------------------------------
-  # Machine plugin interface
-
-  def normalize(reload)
-    super
-    #myself.plugin_name = node.plugin_name if node
-  end
-
-  #-----------------------------------------------------------------------------
-  # Checks
-
-  def created?
-    server && state != :not_created
-  end
-
-  #---
-
-  def running?
-    server && state == :running
-  end
-
-  #-----------------------------------------------------------------------------
-  # Property accessors / modifiers
-
-  def set_command
-    #@command = nil
-
-    #begin
-    #  # Ensure we are running within Vagrant from the corl base command
-    #  require 'docker'
-    #
-    #  logger.info("Setting up Vagrant for machine")
-    #  @command = CORL::Vagrant.command
-    #
-    #rescue LoadError
-    #end
-  end
-  protected :set_command
-
-  #---
-
-  def command
-    #set_command unless @command
-    #@command
-  end
-
-  #---
-
-  def env
-    #return command.env if command
-    #nil
-  end
-
-  #---
-
-  def server=id
-    #@server = nil
-    #
-    #if id.is_a?(String)
-    #  @server = new_machine(id)
-    #elsif ! id.nil?
-    #  @server = id
-    #end
-  end
-
-  def server
-    #command
-    #load unless @server
-    #@server
-  end
-
-  #---
-
-  def state
-    #return server.state.id if server
-    #:not_loaded
-  end
-
-  #---
-
-  def machine_types
-    #[ :virtualbox, :vmware_fusion, :hyperv ]
-  end
-
-  #-----------------------------------------------------------------------------
-  # Management
-
-  def load
-    super do
-    #  myself.server = plugin_name if command && plugin_name
-    #  ! plugin_name && @server.nil? ? false : true
-    end
-  end
-
-  #---
-
-  def create(options = {})
-    super do |config|
-    #  start_machine(config)
-    end
-  end
-
-  #---
-
-  def download(remote_path, local_path, options = {}, &code)
-    super do |config, success|
-      #ssh_download(remote_path, local_path, config, &code)
-    end
-  end
-
-  #---
-
-  def upload(local_path, remote_path, options = {}, &code)
-    super do |config, success|
-      #ssh_upload(local_path, remote_path, config, &code)
-    end
-  end
-
-  #---
-
-  def exec(commands, options = {}, &code)
-    super do |config|
-      #ssh_exec(commands, config, &code)
-    end
-  end
-
-  #---
-
-  def terminal(user, options = {})
-    super do |config|
-      #ssh_terminal(user, config)
-    end
-  end
-
-  #---
-
-  def reload(options = {})
-    super do |config|
-      #success = run(:reload, config)
-      #success = init_ssh_session(true, config.get(:tries, 12), config.get(:sleep_time, 5)) if success
-    end
-  end
-
-  #---
-
-  def create_image(options = {})
-    super do |config|
-      #stop = config.delete(:stop, false)
-      #
-      ## TODO: Decide how to handle versions??
-      ## Timestamps stink since these things are huge (>600MB)
-      #box_name = sprintf("%s", node.id).gsub(/\s+/, '-')
-      #box_path = File.join(node.network.directory, 'boxes', "#{box_name}.box")
-      #box_url  = "file://#{box_path}"
-      #FileUtils.mkdir_p(File.dirname(box_path))
-      #FileUtils.rm_f(box_path)
-      #
-      #begin
-      #  close_ssh_session
-      #  success = run(:package, config.defaults({ 'package.output' => box_path }), false)
-      #
-      #  node.set_cache_setting(:box, box_name)
-      #  node.set_cache_setting(:box_url, box_url)
-      #
-      #  if success
-      #    env.action_runner.run(::Vagrant::Action.action_box_add, {
-      #      :box_name  => box_name,
-      #      :box_url   => box_url,
-      #      :box_clean => false,
-      #      :box_force => true,
-      #      :ui        => ::Vagrant::UI::Prefixed.new(env.ui, "box")
-      #    })
-      #    load
-      #  end
-      #
-      #rescue => error
-      #  error(error.message, { :i18n => false })
-      #  success = false
-      #end
-      #
-      #success = run(:up, config) if success && ! stop
-      #success
-    end
-  end
-
-  #---
-
-  def stop(options = {})
-    super do |config|
-      #create_image(config.import({ :stop => true }))
-    end
-  end
-
-  #---
-
-  def start(options = {})
-    super do |config|
-      #start_machine(config)
-    end
-  end
-
-  #---
-
-  def destroy(options = {})
-    super do |config|
-      ## We should handle prompting internally to keep it consistent
-      #success = run(:destroy, config.defaults({ :force_confirm_destroy => true }))
-      #
-      #if success
-      #  box_name = sprintf("%s", node.id).gsub(/\s+/, '-')
-      #  found    = false
-      #
-      #  # TODO: Figure out box versions.
-      #
-      #  env.boxes.all.each do |info|
-      #    registered_box_name     = info[0]
-      #    registered_box_version  = info[1]
-      #    registered_box_provider = info[2]
-      #
-      #    if box_name == registered_box_name
-      #      found = true
-      #      break
-      #    end
-      #  end
-      #
-      #  if found
-      #    env.action_runner.run(::Vagrant::Action.action_box_remove, {
-      #      :box_name     => box_name,
-      #      :box_provider => node.machine_type
-      #    })
-      #
-      #    box_name = sprintf("%s", node.id).gsub(/\s+/, '-')
-      #    box_path = File.join(node.network.directory, 'boxes', "#{box_name}.box")
-      #    Util::Disk.delete(box_path)
-      #  end
-      #end
-      #close_ssh_session if success
-      #success
-    end
-  end
-
-  #-----------------------------------------------------------------------------
-  # Utilities
-
-  def refresh_config
-    if env
-      #@@lock.synchronize do
-      #  begin
-      #    CORL::Vagrant::Config.network = node.network
-      #    env.vagrantfile.reload
-      #  ensure
-      #    CORL::Vagrant::Config.network = nil
-      #  end
-      #end
-    end
-  end
-  protected :refresh_config
-
-  #---
-
-  def new_machine(id)
-    #server = nil
-    #if command && ! id.empty?
-    #  refresh_config
-    #  if env.vagrantfile.machine_names.include?(id.to_sym)
-    #    server = command.vm_machine(id.to_sym, node.machine_type, true)
-    #  end
-    #end
-    #server
-  end
-  protected :new_machine
-
-  #---
-
-  def start_machine(options)
-    #success = false
-    #
-    #if server
-    #  load
-    #  success = run(:up, options)
-    #
-    #  # Make sure provisioner changes (key changes) are accounted for
-    #  # TODO: Is there a better way?
-    #  load if success
-    #end
-    #success
-  end
-  protected :start_machine
-
-  #---
-
-  def run(action, options = {}, symbolize_keys = true)
-    #config = Config.ensure(options)
-    #
-    #if server
-    #  logger.debug("Running Vagrant action #{action} on machine #{node.id}")
-    #
-    #  success = true
-    #  begin
-    #    params = config.export
-    #    params = string_map(params) unless symbolize_keys
-    #
-    #    server.send(:action, action.to_sym, params)
-    #
-    #  rescue => error
-    #    error(error.message, { :i18n => false })
-    #    error(Util::Data.to_yaml(error.backtrace), { :i18n => false })
-    #    success = false
-    #  end
-    #end
-    #success
-  end
-  protected :run
-end
-end
-end

data/lib/CORL/node/docker.rb

@@ -1,269 +0,0 @@
-
-module CORL
-module Node
-class Docker < Nucleon.plugin_class(:CORL, :node)
-
-  #-----------------------------------------------------------------------------
-  # Node plugin interface
-
-  def normalize(reload)
-    super
-
-    #unless reload
-    #  machine_provider = :vagrant
-    #  machine_provider = yield if block_given?
-    #
-    #  myself.machine = create_machine(:machine, machine_provider, machine_config)
-    #end
-    #
-    #network.ignore([ '.vagrant', 'boxes' ])
-    #init_shares
-  end
-
-  #-----------------------------------------------------------------------------
-  # Checks
-
-  #-----------------------------------------------------------------------------
-  # Property accessors / modifiers
-
-  def state(reset = false)
-    #machine.state
-  end
-
-  #---
-
-  def vm=vm
-    #myself[:vm] = vm
-  end
-
-  def vm
-    #hash(myself[:vm])
-  end
-
-  #---
-
-  def ssh=ssh
-    #myself[:ssh] = ssh
-  end
-
-  def ssh
-    #hash(myself[:ssh])
-  end
-
-  #---
-
-  def shares=shares
-    #myself[:shares] = shares
-    #init_shares
-  end
-
-  def shares
-    #hash(myself[:shares])
-  end
-
-  #---
-
-  def build_time=time
-    #set_cache_setting(:build, time)
-  end
-
-  def build_time
-    #cache_setting(:build, nil)
-  end
-
-  #---
-
-  def bootstrap_script=bootstrap
-    #set_cache_setting(:bootstrap, bootstrap)
-  end
-
-  def bootstrap_script
-    #cache_setting(:bootstrap, nil)
-  end
-
-  #-----------------------------------------------------------------------------
-  # Settings groups
-
-  def machine_config
-    super do |config|
-      #config[:vm]     = vm
-      #config[:shares] = shares
-
-      yield(config) if block_given?
-    end
-  end
-
-  #---
-
-  def exec_options(name, options = {})
-    extended_config(name, options).export
-  end
-
-  #-----------------------------------------------------------------------------
-  # Node operations
-
-  def build(options = {})
-    super(Config.ensure(options).import({ :save => false }))
-  end
-
-  #---
-
-  def create(options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:create))
-        #config[:provision_enabled] = false
-      end
-    end
-  end
-
-  #---
-
-  def download(remote_path, local_path, options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:download))
-      end
-    end
-  end
-
-  #---
-
-  def upload(local_path, remote_path, options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:upload))
-      end
-    end
-  end
-
-  #---
-
-  def exec(options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:exec))
-      end
-    end
-  end
-
-  #---
-
-  def save(options = {})
-    super do
-      id(true)
-      delete_setting(:machine_type)
-    end
-  end
-
-  #---
-
-  def start(options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:start))
-        #config[:provision_enabled] = false
-      end
-    end
-  end
-
-  #---
-
-  def reload(options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:reload))
-        #config[:provision_enabled] = false
-      end
-    end
-  end
-
-  #---
-
-  def create_image(options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:image))
-      end
-    end
-  end
-
-  #---
-
-  def stop(options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:stop))
-      elsif op == :finalize
-        true
-      end
-    end
-  end
-
-  #---
-
-  def destroy(options = {})
-    super do |op, config|
-      if op == :config
-        config.import(exec_options(:destroy))
-      end
-    end
-  end
-
-  #-----------------------------------------------------------------------------
-  # Utilities
-
-  def init_shares
-    #shares.each do |name, info|
-    #  local_dir = info[:local]
-    #  network.ignore(local_dir) unless info[:type].to_s =~ /^rsync-?.*/
-    #end
-  end
-
-  #---
-
-  def filter_output(type, data)
-    data = super
-
-    #if type == :error
-    #  if data.include?('stdin: is not a tty') || data.include?('unable to re-open stdin')
-    #    data = ''
-    #  end
-    #end
-    data
-  end
-
-  #-----------------------------------------------------------------------------
-  # Machine type utilities
-
-  def machine_type_id(machine_type)
-    #machine_type
-  end
-
-  #---
-
-  def render_machine_type(machine_type)
-    #machine_type.to_s
-  end
-
-  #-----------------------------------------------------------------------------
-  # Image utilities
-
-  def image_id(image)
-    #image.id
-  end
-
-  #---
-
-  def render_image(image)
-    #''
-  end
-
-  #---
-
-  def image_search_text(image)
-    #image.to_s
-  end
-end
-end
-end

data/lib/core/mod/vagrant.rb

@@ -1,30 +0,0 @@
-
-module VagrantPlugins
-module CommunicatorSSH
-class Communicator
-  # Override Vagrant key insertion (we handle generated keys internally)
-  def ready?
-    @logger.debug("Checking whether SSH is ready...")
-
-    # Attempt to connect. This will raise an exception if it fails.
-    begin
-      connect
-      @logger.info("SSH is ready!")
-    rescue Vagrant::Errors::VagrantError => e
-      # We catch a `VagrantError` which would signal that something went
-      # wrong expectedly in the `connect`, which means we didn't connect.
-      @logger.info("SSH not up: #{e.inspect}")
-      return false
-    end
-
-    # Verify the shell is valid
-    if execute("", error_check: false) != 0
-      raise Vagrant::Errors::SSHInvalidShell
-    end
-
-    # If we reached this point then we successfully connected
-    true
-  end
-end
-end
-end

data/lib/core/vagrant/actions/include_overrides.rb

@@ -1,17 +0,0 @@
-
-module VagrantPlugins
-module CORL
-module Action
-class IncludeOverrides < BaseAction
-
-  def call(env)
-    super do
-      # Ignore Vagrant key generation (we handle our own keys)
-      #load File.join(File.dirname(__FILE__), '..', '..', 'mod', 'vagrant.rb')
-      @app.call env
-    end
-  end
-end
-end
-end
-end