coral_vagrant 0.2.1 → 0.2.2

data/Gemfile

@@ -1,6 +1,5 @@
 source "http://rubygems.org"
 
-gem "vagrant", "~> 1.0"
 gem "coral_plan", "~> 0.1"
 gem "coral_cloud", "~> 0.1"
 
@@ -10,4 +9,5 @@ group :development do
   gem "rspec", "~> 2.10"
   gem "rdoc", "~> 3.12"
   gem "yard", "~> 0.8"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.2.2'
 end

data/Gemfile.lock

@@ -1,17 +1,32 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: 7e400d00a3c5a0fdf2809c8b5001a035415a607b
+  tag: v1.2.2
+  specs:
+    vagrant (1.2.2)
+      childprocess (~> 0.3.7)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      json (>= 1.5.1, < 1.8.0)
+      log4r (~> 1.1.9)
+      net-scp (~> 1.1.0)
+      net-ssh (~> 2.6.6)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     coral_cloud (0.1.3)
       coral_core (~> 0.1)
-    coral_core (0.2.5)
+    coral_core (0.2.26)
+      deep_merge (~> 1.0)
       git (= 1.2.5)
       json (>= 1.4)
       log4r (~> 1.1)
     coral_plan (0.1.3)
       coral_core (~> 0.1)
+    deep_merge (1.0.0)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     ffi (1.8.1)
@@ -24,9 +39,9 @@ GEM
       rdoc
     json (1.7.7)
     log4r (1.1.10)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
+    net-scp (1.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -38,15 +53,6 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    vagrant (1.0.7)
-      archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.1)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0)
-      json (>= 1.5.1, < 1.8.0)
-      log4r (~> 1.1.9)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
     yard (0.8.6.1)
 
 PLATFORMS
@@ -59,5 +65,5 @@ DEPENDENCIES
   jeweler (~> 1.8)
   rdoc (~> 3.12)
   rspec (~> 2.10)
-  vagrant (~> 1.0)
+  vagrant!
   yard (~> 0.8)

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bin/coral

@@ -0,0 +1,2 @@
+#!/bin/bash
+vagrant coral $@

data/coral_vagrant.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "coral_vagrant"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2013-05-10"
+  s.date = "2013-05-24"
   s.description = "= coral_vagrant\n\nThis library contains various commands and exposes a data model to Vagrant\nthat allows for tightly integrated management of Virtual machines that are\nlinked to remote servers.  \n\nThis also allows for custom execution plans.\n\nNote:  This library is still very early in development!\n\n== Contributing to coral_vagrant\n \n* Check out the latest {major}.{minor} branch to make sure the feature hasn't \n  been implemented or the bug hasn't been fixed yet.\n* Check out the issue tracker to make sure someone already hasn't requested \n  it and/or contributed it.\n* Fork the project.\n* Start a feature/bugfix branch.\n* Commit and push until you are happy with your contribution.\n* Make sure to add tests for it. This is important so I don't break it in a \n  future version unintentionally.\n* Please try not to mess with the Rakefile, version, or history. If you want \n  to have your own version, or is otherwise necessary, that is fine, but \n  please isolate to its own commit so I can cherry-pick around it.\n\n== Copyright\n\nLicensed under GPLv3.  See LICENSE.txt for further details.\n\nCopyright (c) 2013  Adrian Webb <adrian.webb@coraltech.net>\nCoral Technology Group LLC"
   s.email = "adrian.webb@coraltech.net"
+  s.executables = ["coral"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -25,13 +26,21 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "Vagrantfile",
+    "bin/coral",
     "coral_vagrant.gemspec",
     "lib/coral_vagrant.rb",
+    "lib/coral_vagrant/commands/coral/add.rb",
+    "lib/coral_vagrant/commands/coral/config.rb",
+    "lib/coral_vagrant/commands/coral/create.rb",
+    "lib/coral_vagrant/commands/coral/image.rb",
+    "lib/coral_vagrant/commands/coral/init.rb",
+    "lib/coral_vagrant/commands/coral/push.rb",
+    "lib/coral_vagrant/commands/coral/rm.rb",
+    "lib/coral_vagrant/commands/coral/run.rb",
+    "lib/coral_vagrant/commands/coral/send.rb",
+    "lib/coral_vagrant/commands/coral/update.rb",
     "lib/coral_vagrant/commands/coral_base.rb",
-    "lib/coral_vagrant/commands/coral_init.rb",
-    "lib/coral_vagrant/commands/coral_push.rb",
-    "lib/coral_vagrant/commands/coral_run.rb",
-    "lib/coral_vagrant/commands/coral_update.rb",
+    "lib/plugin.rb",
     "spec/coral_test_kernel.rb",
     "spec/spec_helper.rb"
   ]
@@ -41,14 +50,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.1")
   s.rubyforge_project = "coral_vagrant"
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.11"
   s.summary = "Provides a data model and various Coral commands for Vagrant"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<vagrant>, ["~> 1.0"])
       s.add_runtime_dependency(%q<coral_plan>, ["~> 0.1"])
       s.add_runtime_dependency(%q<coral_cloud>, ["~> 0.1"])
       s.add_development_dependency(%q<bundler>, ["~> 1.2"])
@@ -56,8 +64,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.10"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
+      s.add_development_dependency(%q<vagrant>, [">= 0"])
     else
-      s.add_dependency(%q<vagrant>, ["~> 1.0"])
       s.add_dependency(%q<coral_plan>, ["~> 0.1"])
       s.add_dependency(%q<coral_cloud>, ["~> 0.1"])
       s.add_dependency(%q<bundler>, ["~> 1.2"])
@@ -65,9 +73,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.10"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<yard>, ["~> 0.8"])
+      s.add_dependency(%q<vagrant>, [">= 0"])
     end
   else
-    s.add_dependency(%q<vagrant>, ["~> 1.0"])
     s.add_dependency(%q<coral_plan>, ["~> 0.1"])
     s.add_dependency(%q<coral_cloud>, ["~> 0.1"])
     s.add_dependency(%q<bundler>, ["~> 1.2"])
@@ -75,6 +83,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.10"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<yard>, ["~> 0.8"])
+    s.add_dependency(%q<vagrant>, [">= 0"])
   end
 end
 

data/lib/coral_vagrant.rb

@@ -1,11 +1,10 @@
-
 home = File.dirname(__FILE__)
 
 $:.unshift(home) unless
-  $:.include?(home) || $:.include?(File.expand_path(home))
-  
+$:.include?(home) || $:.include?(File.expand_path(home))
+
 #-------------------------------------------------------------------------------
-  
+
 require 'rubygems'
 require 'optparse'
 require 'vagrant'
@@ -14,14 +13,18 @@ require 'coral_plan'
 
 #---
 
-# Include Vagrant commands
-[ :coral_base, 
-  :coral_init, 
-  :coral_update, 
-  :coral_push, 
-  :coral_run, 
-].each do |name| 
-  require File.join('coral_vagrant', 'commands', name.to_s + '.rb') 
+# Include top level Vagrant commands
+[ :coral_base ].each do |name|
+  require File.join('coral_vagrant', 'commands', name.to_s + '.rb')
+end
+
+require 'plugin.rb'
+
+#---
+
+# Include Coral Vagrant commands
+Dir.glob(File.join(home, 'coral_vagrant', 'commands', 'coral', '*.rb')).each do |file|
+  require file
 end
 
 #*******************************************************************************
@@ -32,43 +35,41 @@ end
 # Author::    Adrian Webb (mailto:adrian.webb@coraltech.net)
 # License::   GPLv3
 module Coral
-    
+
   #-----------------------------------------------------------------------------
   # Constructor / Destructor
-  
   def self.init_vagrant(directory, submodule = '', config_file = [ 'config', 'cloud.json' ])
     return Coral::Vagrant.init(directory, submodule, config_file)
   end
-      
+
   #-----------------------------------------------------------------------------
   # Accessors / Modifiers
-  
+
   def self.vagrant
     return Coral::Vagrant.get
-  end 
+  end
 
-#*******************************************************************************
+  #*******************************************************************************
 
-module Vagrant
-  
-  VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
-  
-  #-----------------------------------------------------------------------------
-  # Constructor / Destructor
+  module Vagrant
+
+    VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
 
-  def self.init(directory, submodule = '', config_file = [ 'config', 'cloud.json' ])
-    return Coral.create_cloud(:vagrant, {
-      :directory   => directory, 
-      :submodule   => submodule,
-      :config_file => config_file,
-    })
+    #-----------------------------------------------------------------------------
+    # Constructor / Destructor
+    def self.init(directory, submodule = '', config_file = [ 'config', 'cloud.json' ])
+      return Coral.create_cloud(:vagrant, {
+        :directory   => directory,
+        :submodule   => submodule,
+        :config_file => config_file,
+      })
+    end
+
+    #-----------------------------------------------------------------------------
+    # Accessors / Modifiers
+
+    def self.get
+      return Coral.cloud(:vagrant)
+    end
   end
-  
-  #-----------------------------------------------------------------------------
-  # Accessors / Modifiers
-  
-  def self.get
-    return Coral.cloud(:vagrant)  
-  end 
-end
 end

data/lib/coral_vagrant/commands/coral/add.rb

@@ -0,0 +1,41 @@
+module Coral
+  module Vagrant
+    module SubCommand
+      class CoralAdd < ::Vagrant.plugin('2', :command)
+
+        #-----------------------------------------------------------------------
+        # Execution
+        
+        def execute
+          options = {}
+          success = true
+
+          opts = OptionParser.new do |opts|
+            opts.banner = 'Usage: coral add -h --repo={repository} {name} [ {type} ]'
+            opts.separator ''
+
+            options[:repo] = ''
+            opts.on('-r', '--repo REPOSITORY', "Git repository URL of sub-project to add to project type") do |r|
+              options[:repo] = r
+            end
+          end
+
+          #---
+
+          args = parse_options(opts)
+          return unless args
+
+          raise ::Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if args.length < 1
+
+          project_name = args[0]
+          project_type = ( args.size < 2 ? 'module' : args[1] )
+
+          #---------
+          # Start
+
+          exit success ? 0 : 1
+        end
+      end
+    end
+  end
+end

data/lib/coral_vagrant/commands/coral/config.rb

@@ -0,0 +1,61 @@
+module Coral
+  module Vagrant
+    module SubCommand
+      class CoralConfig < ::Vagrant.plugin('2', :command)
+
+        #-----------------------------------------------------------------------
+        # Execution
+        
+        def execute
+          options = {}
+          success = true
+
+          opts = OptionParser.new do |opts|
+            opts.banner = 'Usage: coral config -ha --dir={config_dir} {config_name} [ {value} ]'
+            opts.separator ''
+            
+            opts.on('-a', '--add', 'Add configuration value to existing values instead of overriding') do |a|
+              options[:add] = a
+            end
+
+            options[:repo] = '.'
+            opts.on('-r', '--repo REPO_DIR', 'Local directory of repository relative to the Vagrantfile root (.)') do |r|
+              options[:repo] = r
+            end
+
+            options[:directory] = 'config'
+            opts.on('-d', '--dir DIRECTORY', 'Root directory of configuration files (config)') do |d|
+              options[:directory] = d
+            end
+            
+            options[:ext] = 'json'
+            opts.on('-e', '--ext FILE_EXTENSION', 'Configuration file extension (json)') do |e|
+              options[:ext] = e
+            end
+          end
+
+          #---
+
+          args = parse_options(opts)
+          return unless args
+          
+          raise ::Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if args.length < 1
+
+          config_elements = args[0].gsub(/\s+/, '').split(/\@/)
+          property        = config_elements.pop
+          config_file     = File.join(config_elements)
+          
+          raise ::Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp unless property && config_file
+          
+          config_file = "#{config_file}." + options[:ext]
+          value       = ( args.size < 2 ? nil : args[1] )
+
+          #---------
+          # Start
+          
+          exit success ? 0 : 1
+        end
+      end
+    end
+  end
+end

data/lib/coral_vagrant/commands/coral/create.rb

@@ -0,0 +1,41 @@
+module Coral
+  module Vagrant
+    module SubCommand
+      class CoralCreate < ::Vagrant.plugin('2', :command)
+
+        #-----------------------------------------------------------------------
+        # Execution
+        
+        def execute
+          options      = {}
+          success      = true
+          default_repo = 'git://github.com/coralnexus/cluster-core.git'
+
+          #---
+
+          opts = OptionParser.new do |opts|
+            opts.banner = 'Usage: coral create -h --repo={cluster_repository} [ {project_path} ]'
+            opts.separator ""
+
+            options[:repo] = default_repo
+            opts.on('-r', '--repo REPOSITORY', "Git repository URL of Coral cluster to start project from (#{default_repo})") do |r|
+              options[:repo] = r
+            end
+          end
+
+          #---
+
+          args = parse_options(opts)
+          return unless args
+
+          project_path = ( project_path.empty? ? '.' : args[0] )
+
+          #---------
+          # Start
+
+          exit success ? 0 : 1
+        end
+      end
+    end
+  end
+end

data/lib/coral_vagrant/commands/coral/image.rb

@@ -0,0 +1,47 @@
+module Coral
+  module Vagrant
+    module SubCommand
+      class CoralImage < ::Vagrant.plugin('2', :command)
+      
+        #-----------------------------------------------------------------------
+        # Execution
+  
+        def execute
+          options = {}
+          success = true
+        
+          opts = OptionParser.new do |opts|
+            opts.banner = 'Usage: coral image --servers={server_name},... {provider} ...'
+            opts.separator ''
+          
+            options[:tries] = 1       
+            opts.on('-t', '--tries TRIES', 'Number of times to try imaging the servers before stopping with an error (1)') do |t|
+              options[:tries] = t
+            end
+            
+            options[:servers] = ''
+            opts.on('-s', '--servers SERVER_NAME,...', 'Server names of servers to image on the specified providers') do |r|
+              options[:servers] = r
+            end
+          end
+        
+          options[:auth] = true
+
+          #---
+        
+          providers = parse_options(opts)
+          return unless providers
+          
+          raise ::Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if providers.length < 1      
+
+          #---------
+          # Start
+        
+          
+          
+          exit success ? 0 : 1
+        end
+      end
+    end
+  end
+end