corl 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 3840ed0b53491146d0b010ac91c9e262b9ccd25f
-  data.tar.gz: 417a4965b14c57eb2a681240675e010ac46ea29c
-SHA512:
-  metadata.gz: 9586034c27a82e8d560a7fcd1b3b36f80683303adecf0f63dd78b4a8dfbf9ecac9cd5c9a565cb34320e356f6f1c95bf58588f51d0eccfba15526ea4f6b19ed2f
-  data.tar.gz: d64b068925770fd9f5fd02da6fe7ac5149cdc88e68d181626c92a4011615c70f52d6c4216787a40b1fc6c757451bff412056421f5d8ca017af49b2c805a1650f
+--- 
+SHA1: 
+  metadata.gz: fc0f4119fb65c2e0bcc38762618961f514b467d2
+  data.tar.gz: 806867a324bedab231f6aabea3afa2b0c6dde980
+SHA512: 
+  metadata.gz: 33a0ac51b370915ef9aa8fef62966b26c754db84ba6fe3d641a4187191ff592934fbf43f9e7586813735d39123a685aad552b7ab00f96b44ea61ffdb9912a078
+  data.tar.gz: 99025a53c6d3b7d75fc722c97b5fc0ed3b0b500e43cb026b5566a42330b79b7ffbb136a4dc5b7378fd381511ad1f3afb4c89e4a9ac453f04e7ba0f46596e8a42

data/.gitignore

@@ -0,0 +1,51 @@
+# rcov generated
+coverage
+coverage.data
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Gem builds
+*.gem
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+
+# For Eclipse IDE:
+.project
+.buildpath
+.cache
+

data/Gemfile

@@ -2,23 +2,18 @@ source "http://rubygems.org"
 
 gem "nucleon", "~> 0.2", ">= 0.2.2", :github => 'coralnexus/nucleon', :branch => '0.2'
 
-gem "fog", "~> 1.20"
+gem "fog", "~> 1.25"
+gem "fog-rackspace", "~> 1.0"
 gem "unf", "~> 0.1"
 
-gem "facter", "~> 2.1"
+gem "facter", "~> 2.3"
 gem "hiera", "~> 1.3"
 
-gem "puppet", "~> 3.6"
+gem "puppet", "~> 3.7"
 
 group :development do
-  gem "bundler", "~> 1.2"
+  gem "bundler", "~> 1.7"
   gem "jeweler", "~> 2.0"
-  gem "rspec", "~> 2.10"
+  gem "rspec", "~> 3.1"
   gem "rdoc", "~> 3.12"
-  gem "yard", "~> 0.8"
-  gem "vagrant", "~> 1.5", :github => 'mitchellh/vagrant', :branch => 'master'
-end
-
-group :plugins do
-  gem "corl", :path => "."
 end

data/Gemfile.lock

@@ -1,117 +1,121 @@
 GIT
   remote: git://github.com/coralnexus/nucleon.git
-  revision: 2c89c3aa92950bec4f6d364ff7a5b528190677b8
+  revision: d6848f16f76b9cdd6fb6737bdac6b13f40d9e36e
   branch: 0.2
   specs:
-    nucleon (0.2.2)
-      celluloid (~> 0.15)
+    nucleon (0.2.3)
+      celluloid (~> 0.16)
       childprocess (~> 0.5)
       deep_merge (~> 1.0)
       erubis (~> 2.7)
       highline (~> 1.6)
       i18n (~> 0.6)
       log4r (~> 1.1)
-      multi_json (~> 1.7)
-      netrc (~> 0.7)
-      octokit (~> 2.7)
-      rugged (~> 0.19)
+      multi_json (~> 1.10)
+      netrc (~> 0.9)
+      octokit (~> 3.6)
+      rugged (~> 0.21)
       sshkey (~> 1.6)
 
-GIT
-  remote: git://github.com/mitchellh/vagrant.git
-  revision: a47b85c8c4c80352287da8b87f8f46743cb0e74a
-  branch: master
-  specs:
-    vagrant (1.6.0.dev)
-      bundler (~> 1.5.2)
-      childprocess (~> 0.5.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0)
-      listen (~> 2.7.1)
-      log4r (~> 1.1.9, < 1.1.11)
-      net-scp (~> 1.1.0)
-      net-ssh (>= 2.6.6, < 2.8.0)
-      rb-kqueue (~> 0.2.0)
-      wdm (~> 0.1.0)
-      winrm (~> 1.1.3)
-
-PATH
-  remote: .
-  specs:
-    corl (0.5.2)
-      facter (~> 2.1)
-      fog (~> 1.20)
-      hiera (~> 1.3)
-      nucleon (~> 0.2, >= 0.2.2)
-      puppet (~> 3.6)
-      unf (~> 0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
     addressable (2.3.6)
-    akami (1.2.2)
-      gyoku (>= 0.4.0)
-      nokogiri
     builder (3.2.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    childprocess (0.5.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     deep_merge (1.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    excon (0.33.0)
-    facter (2.1.0)
+    excon (0.42.0)
+    facter (2.3.0)
       CFPropertyList (~> 2.2.6)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
-    fog (1.22.0)
-      fog-brightbox
-      fog-core (~> 1.21, >= 1.21.1)
+    ffi (1.9.6)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.25.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.25)
       fog-json
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-sakuracloud (>= 0.0.4)
+      fog-softlayer
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.0.2)
-      fog-core
+      opennebula
+    fog-brightbox (0.7.0)
+      fog-core (~> 1.22)
       fog-json
-    fog-core (1.22.0)
+      inflecto (~> 0.0.2)
+    fog-core (1.25.0)
       builder
-      excon (~> 0.33)
+      excon (~> 0.38)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    formatador (0.2.4)
-    git (1.2.6)
-    github_api (0.11.3)
+    fog-profitbricks (0.0.1)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-rackspace (1.0.4)
+      addressable
+      fog-core
+      fog-json
+    fog-radosgw (0.0.3)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-sakuracloud (0.1.1)
+      fog-core
+      fog-json
+    fog-softlayer (0.3.25)
+      fog-core
+      fog-json
+    fog-terremark (0.0.3)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.0.1)
+      fission
+      fog-core
+    fog-voxel (0.0.2)
+      fog-core
+      fog-xml
+    fog-xml (0.1.1)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
+    git (1.2.8)
+    github_api (0.12.2)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    gssapi (1.0.3)
-      ffi (>= 1.0.1)
-    gyoku (1.1.1)
-      builder (>= 2.1.2)
-    hashie (2.1.1)
-    hiera (1.3.2)
+    hashie (3.3.2)
+    hiera (1.3.4)
       json_pure
     highline (1.6.21)
-    httpclient (2.3.4.1)
-    httpi (0.9.7)
-      rack
-    i18n (0.6.9)
+    hitimes (1.2.2)
+    i18n (0.6.11)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -123,109 +127,80 @@ GEM
       rdoc
     json (1.8.1)
     json_pure (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    listen (2.7.1)
-      celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    little-plugger (1.1.3)
+    jwt (1.2.0)
     log4r (1.1.10)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
-    mime-types (2.2)
-    mini_portile (0.5.3)
-    multi_json (1.9.2)
+    mime-types (2.4.3)
+    mini_portile (0.6.1)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    net-scp (1.1.2)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    netrc (0.7.7)
-    nio4r (1.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nori (1.1.5)
-    oauth2 (0.9.3)
+    net-ssh (2.9.1)
+    netrc (0.9.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    octokit (2.7.2)
-      sawyer (~> 0.5.2)
-    puppet (3.6.2)
+    octokit (3.6.0)
+      sawyer (~> 0.6.0, >= 0.5.3)
+    opennebula (4.10.1)
+      json
+      nokogiri
+      rbvmomi
+    puppet (3.7.3)
       facter (> 1.6, < 3)
       hiera (~> 1.0)
       json_pure
-      rgen (~> 0.6.5)
     rack (1.5.2)
-    rake (10.3.1)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
-      ffi (>= 0.5.0)
+    rake (10.4.1)
+    rbvmomi (1.8.2)
+      builder
+      nokogiri (>= 1.4.1)
+      trollop
     rdoc (3.12.2)
       json (~> 1.4)
-    rgen (0.6.6)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rubyntlm (0.1.1)
-    rugged (0.21.0)
-    savon (0.9.5)
-      akami (~> 1.0)
-      builder (>= 2.1.2)
-      gyoku (>= 0.4.0)
-      httpi (~> 0.9)
-      nokogiri (>= 1.4.0)
-      nori (~> 1.0)
-      wasabi (~> 1.0)
-    sawyer (0.5.4)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rugged (0.21.2)
+    sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     sshkey (1.6.1)
-    thread_safe (0.3.3)
-    timers (1.1.0)
+    thread_safe (0.3.4)
+    timers (4.0.1)
+      hitimes
+    trollop (2.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.6)
-    uuidtools (2.1.4)
-    wasabi (1.0.0)
-      nokogiri (>= 1.4.0)
-    wdm (0.1.0)
-    winrm (1.1.3)
-      gssapi (~> 1.0.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (~> 1.6, >= 1.6.1)
-      nokogiri (~> 1.5)
-      rubyntlm (~> 0.1.1)
-      savon (= 0.9.5)
-      uuidtools (~> 2.1.2)
-    yard (0.8.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.2)
-  corl!
-  facter (~> 2.1)
-  fog (~> 1.20)
+  bundler (~> 1.7)
+  facter (~> 2.3)
+  fog (~> 1.25)
+  fog-rackspace (~> 1.0)
   hiera (~> 1.3)
   jeweler (~> 2.0)
   nucleon (~> 0.2, >= 0.2.2)!
-  puppet (~> 3.6)
+  puppet (~> 3.7)
   rdoc (~> 3.12)
-  rspec (~> 2.10)
+  rspec (~> 3.1)
   unf (~> 0.1)
-  vagrant (~> 1.5)!
-  yard (~> 0.8)

data/Rakefile

@@ -6,9 +6,6 @@ require 'bundler'
 require 'jeweler'
 require 'rspec/core/rake_task'
 require 'rdoc/task'
-require 'yard'
-
-require './lib/corl.rb'
 
 #-------------------------------------------------------------------------------
 # Dependencies
@@ -33,15 +30,27 @@ Jeweler::Tasks.new do |gem|
   gem.email                 = "adrian.webb@coralnexus.com"
   gem.authors               = ["Adrian Webb"]
   gem.summary               = %Q{Coral Orchestration and Research Library}
-  gem.description           = %Q{Framework that provides a simple foundation for growing organically in the cloud} 
+  gem.description           = %Q{Framework that provides a simple foundation for growing organically in the cloud}
   gem.required_ruby_version = '>= 1.9.1'
   gem.has_rdoc              = true
   gem.rdoc_options << '--title' << 'Coral Orchestration and Research Library' <<
                       '--main' << 'README.rdoc' <<
                       '--line-numbers'
-                      
-  gem.files.include Dir.glob('bootstrap/**/*') 
-  
+
+  gem.files = [
+    Dir.glob('bootstrap/**/*'),
+    Dir.glob('bin/*'),
+    Dir.glob('lib/**/*.rb'),
+    Dir.glob('spec/**/*.rb'),
+    Dir.glob('locales/**/*.yml'),
+    Dir.glob('**/*.rdoc'),
+    Dir.glob('**/*.txt'),
+    Dir.glob('Gemfile*'),
+    Dir.glob('*.gemspec'),
+    Dir.glob('.git*'),
+    'VERSION',
+    'Rakefile'
+  ]
   # Dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -51,16 +60,15 @@ Jeweler::RubygemsDotOrgTasks.new
 
 RSpec::Core::RakeTask.new(:spec, :tag) do |spec, task_args|
   options = []
-  options << "--tag #{task_args[:tag]}" if task_args.is_a?(Array) && ! task_args[:tag].to_s.empty?  
+  options << "--tag #{task_args[:tag]}" if task_args.is_a?(Array) && ! task_args[:tag].to_s.empty?
   spec.rspec_opts = options.join(' ')
 end
-
 task :default => :spec
 
 #-------------------------------------------------------------------------------
 # Documentation
 
-version   = CORL.VERSION
+version   = File.read(File.join(File.dirname(__FILE__), 'VERSION'))
 doc_title = "corl #{version}"
 
 class RDoc::Options
@@ -71,21 +79,14 @@ end
 
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = File.join('rdoc', 'site', version)
-  
+
   rdoc.title    = doc_title
-  rdoc.main     = 'README.rdoc' 
-  
+  rdoc.main     = 'README.rdoc'
+
   rdoc.options << '--line-numbers'
   rdoc.options << '--all'
   rdoc.options << '-w' << '2'
-  
+
   rdoc.rdoc_files.include('*.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-#---
-
-YARD::Rake::YardocTask.new do |ydoc|
-  ydoc.files   = [ '*.rdoc', 'lib/**/*.rb' ]
-  ydoc.options = [ "--output-dir yardoc", "--title '#{doc_title}'" ]
-end

data/TODO.rdoc

@@ -0,0 +1,12 @@
+== CORL tasks to complete before 1.0 release
+
+* Default action arguments and options for networks
+* Error handling improvements
+* Full code documentation
+* Full coverage unit tests
+* Test on Windows, Mac, Linux (Debian, Ubuntu, CentOS, Redhat, Suse)
+* Performance improvements
+* Google node and machine providers
+* Localization improvements
+* Logging consolidation (eliminate redundant log entries)
+* Fix bugs :-(

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/bin/corl

@@ -1,29 +1,23 @@
 #!/usr/bin/env ruby
 
-Signal.trap("INT") { exit 1 }
+begin
+  require 'corl'
 
-#---
+  # Set version info
 
-require 'corl'
-
-# Set version info
-
-module Nucleon; module Util; module CLI
-class Parser
-  def version
-    version = CORL.VERSION
-    "CORL: #{version}  (Apache License, Version 2.0)  --  https://github.com/coralnexus/corl/tree/v#{version}"  
+  module Nucleon; module Util; module CLI
+  class Parser
+    def version
+      version = CORL.VERSION
+      "CORL: #{version}  (Apache License, Version 2.0)  --  https://github.com/coralnexus/corl/tree/v#{version}"  
+    end
   end
-end
-end; end; end
+  end; end; end
 
-# Execute
+  # Execute
 
-internal_exec = ( CORL.admin? || ARGV.include?('--version') || ARGV.include?('-h') || ARGV.include?('--help') )
+  exit(CORL.executable(ARGV, :corl))
 
-if ! internal_exec && nucleon_locate(:vagrant)
-  system(*[ 'vagrant', 'corl', ARGV ].flatten)
-  exit($?.exitstatus)
-else
-  exit(CORL.executable(ARGV, :corl))  
-end
+rescue Interrupt
+  exit(CORL.interrupt_handler)
+end