coral_core 0.2.6 → 0.2.7

data/.gitmodules

@@ -0,0 +1,9 @@
+[submodule "lib/dependency/git"]
+	path = lib/dependency/git
+	url = git://github.com/schacon/ruby-git.git
+[submodule "lib/dependency/json"]
+	path = lib/dependency/json
+	url = git://github.com/flori/json.git
+[submodule "lib/dependency/log4r"]
+	path = lib/dependency/log4r
+	url = git://github.com/colbygk/log4r.git

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/coral_core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "coral_core"
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".gitmodules",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",

data/lib/coral_core/interface.rb

@@ -1,5 +1,5 @@
 
-require "log4r"
+require 'log4r'
 
 module Coral
 class Interface

data/lib/coral_core/util/data.rb

@@ -50,9 +50,9 @@ class Data
   def self.to_json(data)
     output = ''
     begin
-      require 'json'
       output = data.to_json
-    rescue LoadError
+      
+    rescue Exception
     end
     return output
   end
@@ -64,7 +64,8 @@ class Data
     begin
       require 'yaml'
       output = YAML.dump(data)
-    rescue LoadError
+      
+    rescue Exception
     end
     return output
   end
@@ -116,6 +117,7 @@ class Data
           begin
             require 'deep_merge'
             value = force ? value.deep_merge!(item) : value.deep_merge(item)
+            
           rescue LoadError
             if item.is_a?(Hash) # Non recursive top level by default.
               value = value.merge(item)                

data/lib/coral_core.rb

@@ -1,24 +1,111 @@
 
-home = File.dirname(__FILE__)
+#*******************************************************************************
+# Coral Core Library
+#
+# This provides core data elements and utilities used in the Coral gems.
+#
+# Author::    Adrian Webb (mailto:adrian.webb@coraltech.net)
+# License::   GPLv3
 
-$:.unshift(home) unless
-  $:.include?(home) || $:.include?(File.expand_path(home))
+#-------------------------------------------------------------------------------
+# Global namespace
+
+module Kernel
+   
+  def dbg(data, label = '')
+    require 'pp'
+    
+    puts '>>----------------------'
+    unless label.empty?
+      puts label
+      puts '---'
+    end
+    pp data
+    puts '<<'
+  end
   
+  #---  
+    
+  def locate(command)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each do |ext|
+        exe = File.join(path, "#{command}#{ext}")
+        return exe if File.executable?(exe)
+      end
+    end
+    return nil
+  end
+end
+
 #-------------------------------------------------------------------------------
+# Properties and 
+
+home         = File.dirname(__FILE__)
+dependencies = File.join(home, 'dependency')
+
+git_location = locate('git')
+ 
+#-------------------------------------------------------------------------------
+
+$:.unshift(home) unless
+  $:.include?(home) || $:.include?(File.expand_path(home))
+
+#---
   
 require 'rubygems'
 require 'hiera_backend.rb'
 
 #---
 
-# Include pre core utilities (no internal dependencies)
-[ :git, :data ].each do |name| 
-  require File.join('coral_core', 'util', name.to_s + ".rb") 
+begin
+  require 'log4r'
+    
+rescue LoadError
+  log4r_lib = File.join(dependencies, 'log4r', 'lib')
+  
+  $:.push(log4r_lib)
+  require File.join(log4r_lib, 'log4r.rb')  
 end
 
-# Include Git overrides
-Dir.glob(File.join(home, 'coral_core', 'util', 'git', '*.rb')).each do |file|
-  require file
+#---
+
+begin
+  require 'json'
+    
+rescue LoadError
+  json_lib = File.join(dependencies, 'json', 'lib')
+  
+  $:.push(json_lib)
+  require File.join(json_lib, 'json.rb')  
+end
+
+#---
+
+if git_location
+  begin
+    require 'git'
+    
+  rescue LoadError
+    git_lib = File.join(dependencies, 'git', 'lib')
+  
+    $:.push(git_lib)
+    require File.join(git_lib, 'git.rb')  
+  end
+end
+
+#---
+
+# Include pre core utilities (no internal dependencies)
+require File.join('coral_core', 'util', 'data.rb') 
+
+if git_location
+  require File.join('coral_core', 'util', 'git.rb') 
+
+  # Include Git overrides
+  Dir.glob(File.join(home, 'coral_core', 'util', 'git', '*.rb')).each do |file|
+    require file
+  end
 end
 
 # Include core
@@ -35,15 +122,26 @@ end
 end
 
 # Include data model
-[ :event, :command, :repository, :memory ].each do |name| 
+[ :event, :command ].each do |name| 
   require File.join('coral_core', name.to_s + ".rb") 
 end
 
+if git_location
+  [ :repository, :memory ].each do |name| 
+    require File.join('coral_core', name.to_s + ".rb") 
+  end  
+end
+
 # Include specialized events
 Dir.glob(File.join(home, 'coral_core', 'event', '*.rb')).each do |file|
   require file
 end
 
+# Include bundled templates
+Dir.glob(File.join(home, 'coral_core', 'template', '*.rb')).each do |file|
+  require file
+end
+
 #*******************************************************************************
 # Coral Core Library
 #
@@ -59,6 +157,8 @@ module Coral
   
   @@ui = Coral::Core.ui
   
+  #---
+  
   def self.ui
     return @@ui
   end
@@ -110,23 +210,6 @@ module Coral
       ui.warning(Util::Data.to_yaml(error.backtrace))
       raise
     end
-  end 
-end
-
-#-------------------------------------------------------------------------------
-# Global namespace
-
-module Kernel
-  def dbg(data, label = '')
-    require 'pp'
-    
-    puts '>>----------------------'
-    unless label.empty?
-      puts label
-      puts '---'
-    end
-    pp data
-    puts '<<'
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coral_core
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Adrian Webb
@@ -182,6 +182,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gitmodules
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt