cluster_management 0.5.2 → 0.6

data/Rakefile

@@ -2,8 +2,8 @@ require 'rake_ext'
 
 project(
   name: "cluster_management",
-  version: "0.5.2",
-  summary: "Simple cluster management tools",
+  version: "0.6",
+  summary: "Simple Cluster Management Tools",
 
   author: "Alexey Petrushin",
   homepage: "http://github.com/alexeypetrushin/cluster_management"

data/lib/cluster_management.rb

@@ -2,11 +2,36 @@ require 'ruby_ext'
 require 'vos'
 require 'yaml'
 require 'tilt'
+require 'class_loader'
+# require 'micon'
+# require 'micon/rad'
 
+
+# 
+# Classes
+# 
 %w(
+  support/exception
   config
   logger
   service
   integration/vfs
   integration/vos
-).each{|f| require "cluster_management/#{f}"}
+  cluster
+).each{|f| require "cluster_management/#{f}"}
+
+
+# 
+# Cluster
+# 
+CLUSTER = ClusterManagement::Cluster.new
+def cluster; ::CLUSTER end
+
+
+# 
+# Config & Logger
+# 
+cluster.logger = ClusterManagement::CustomLogger.new STDOUT
+cluster.logger.formatter = -> severity, datetime, progname, msg {msg}
+
+cluster.config = ClusterManagement::Config.new

data/lib/cluster_management/cluster.rb

@@ -0,0 +1,56 @@
+module ClusterManagement
+  class Cluster
+    attr_accessor :config, :logger  
+    attr_reader :boxes
+    
+    def services &b
+      b ? @services.instance_eval(&b) : @services
+    end
+    
+    class Services < BasicObject
+      def initialize
+        @h = ::Hash.new do |h, service_name|          
+          h[service_name] = ::ClusterManagement::Service.service_class(service_name).new
+        end
+      end
+      
+      def [] service_name
+        service_name.must_be.a ::Symbol
+        @h[service_name.to_sym]
+      end        
+      
+      protected
+        def p msg
+          ::Object.send :p, msg
+        end
+        
+        def method_missing m, *a, &b          
+          super unless a.blank? and b.blank?
+          @h[m]
+        end
+    end
+  
+    def initialize 
+      @services = Services.new
+      
+      @boxes = Hash.new do |h, host|
+        box = config.ssh? ? Box.new(host.to_s, config.ssh.to_h) : Box.new(host.to_s)  
+        box.open
+        h[host] = box
+      end
+    end
+  
+    def configure runtime_dir            
+      config.merge_file! "#{runtime_dir}/config/config.yml"
+      config.set! :config_path, "#{runtime_dir}/config"
+      
+      r = {}
+      config.boxes!.to_h.each do |box, tags|
+        tags.each do |tag|
+          (r[tag.to_sym] ||= []) << box
+        end
+      end      
+      config.set! :tags, r
+    end  
+  end
+end

data/lib/cluster_management/config.rb

@@ -1,21 +1,17 @@
 module ClusterManagement
   class Config < SafeHash
-    def merge_config! file_path      
+    def merge_file! file_path
       raise("config file must have .yml extension (#{file_path})!") unless file_path.end_with? '.yml'
-      data = ::YAML.load_file file_path
+      data = ::YAML.load_file file_path      
       if data
-        data.must_be.a ::Hash
-        self.deep_merge! data            
+        data.must_be.a ::Hash        
+        self.merge! data, override: true
       end
     end
-  end
-
-  def self.load_config file    
-    @config = Config.new
-    @config.merge_config! file
-  end
-
-  def self.config    
-    @config || raise("config nod defined (use ClusterManagement.load_config to use config)!")
-  end
+    
+    # def self.load file  
+    #   @config = Config.new
+    #   @config.merge_file! file
+    # end
+  end  
 end

data/lib/cluster_management/gems.rb

@@ -3,4 +3,5 @@ gem 'tilt'
 if respond_to? :fake_gem
   fake_gem 'ruby_ext'
   fake_gem 'vos'
+  fake_gem 'class_loader'
 end

data/lib/cluster_management/integration/vfs.rb

@@ -1,8 +1,4 @@
-module Vfs
-  class File
-    def render *args
-      args.unshift Object.new if args.size == 1 and args.first.is_a?(Hash)
-      Tilt::ERBTemplate.new(path).render *args
-    end
-  end
-end
+# module Vfs
+#   class File
+#   end
+# end

data/lib/cluster_management/integration/vos.rb

@@ -1,38 +1,64 @@
 module Vos
-  class ServicesHelper < BasicObject
-    def initialize box, class_namespace
-      @box, @class_namespace = box, class_namespace
-    end
+  class Box
+    include Helpers::Ubuntu
     
-    class ServiceCallback < BasicObject
-      def initialize box, class_namespace, class_name
-        @box, @class_namespace, @class_name = box, class_namespace, class_name
-      end
+    # alias_method :mark_without_service!, :mark!
+    # def mark! key
+    #   key = key.respond_to(:marker) || key
+    #   mark_without_service! key
+    # end
+    #   
+    # alias_method :has_mark_without_service?, :has_mark?
+    # def has_mark? key
+    #   key = key.respond_to(:marker) || key
+    #   has_mark_without_service? key
+    # end
       
-      protected
-        def method_missing m, *a, &b
-          klass = "::#{@class_namespace.to_s.camelize}::#{@class_name.to_s.camelize}".constantize
-          klass.new(@box).send m, *a, &b
-        end
-    end
-    
-    protected
-      def method_missing class_name
-        ServiceCallback.new(@box, @class_namespace, class_name)
-      end
-  end
-  
-  class Box
-    def self.define_service_namespace class_namespace
-      define_method class_namespace do
-        ServicesHelper.new self, class_namespace
+    def apply_once key, &block
+      unless has_mark? key
+        block.call self
+        mark! key
       end
-    end
-    define_service_namespace :services
-    define_service_namespace :projects
+    end      
     
-    def already_required_services
-      @already_required_services ||= Set.new
-    end
   end
-end
+end
+
+# module Vos
+#   class ServicesHelper < BasicObject
+#     def initialize box, class_namespace
+#       @box, @class_namespace = box, class_namespace
+#     end
+#     
+#     class ServiceCallback < BasicObject
+#       def initialize box, class_namespace, class_name
+#         @box, @class_namespace, @class_name = box, class_namespace, class_name
+#       end
+#       
+#       protected
+#         def method_missing m, *a, &b
+#           klass = "::#{@class_namespace.to_s.camelize}::#{@class_name.to_s.camelize}".constantize
+#           klass.new(@box).send m, *a, &b
+#         end
+#     end
+#     
+#     protected
+#       def method_missing class_name
+#         ServiceCallback.new(@box, @class_namespace, class_name)
+#       end
+#   end
+#   
+#   # class Box
+#   #   def self.define_service_namespace class_namespace
+#   #     define_method class_namespace do
+#   #       ServicesHelper.new self, class_namespace
+#   #     end
+#   #   end
+#   #   define_service_namespace :services
+#   #   define_service_namespace :projects
+#   #   
+#   #   def already_required_services
+#   #     @already_required_services ||= Set.new
+#   #   end
+#   # end
+# end

data/lib/cluster_management/logger.rb

@@ -15,12 +15,12 @@ module ClusterManagement
     end
   end
   
-  attr_writer :logger
-  def self.logger
-    unless @logger
-      @logger = CustomLogger.new STDOUT
-      @logger.formatter = -> severity, datetime, progname, msg {msg}
-    end
-    @logger      
-  end
+  # attr_writer :logger
+  # def self.logger
+  #   unless @logger
+  #     @logger = CustomLogger.new STDOUT
+  #     @logger.formatter = -> severity, datetime, progname, msg {msg}
+  #   end
+  #   @logger      
+  # end
 end

data/lib/cluster_management/service.rb

@@ -1,55 +1,5 @@
 module ClusterManagement
   class Service
-    attr_reader :box
-    
-    # 
-    # Helpers
-    # 
-    def logger; ClusterManagement.logger end    
-    def config; ClusterManagement.config end
-    
-    
-    # 
-    # Business Logic
-    # 
-    def initialize box
-      @box = box
-    end
-  
-    def mark! extra_mark = nil
-      box.mark! self.class.marker(extra_mark)
-    end
-  
-    def has_mark? extra_mark = nil
-      box.has_mark? self.class.marker(extra_mark)
-    end
-  
-    def apply_once extra_mark = nil, &block
-      unless has_mark? extra_mark
-        block.call
-        mark! extra_mark
-      end
-    end
-  
-    def require *args
-      if args.size == 1 and args.first.is_a?(Hash)
-        services = args.first
-      elsif args.size == 2 and args.first.is_a?(Array)
-        services = {}
-        args.first.each{|klass| services[klass] = args.last}
-      else
-        raise 'invalid arguments'
-      end
-      
-      services.each do |klass, method|
-        key = "#{klass}.#{method}"
-        unless box.already_required_services.include? key
-          klass.new(box).send method if klass.method_defined? method
-          box.already_required_services << key
-        end
-      end
-    end
-  
     class << self
       def version version = nil
         if version
@@ -58,10 +8,78 @@ module ClusterManagement
           @version ||= 1
         end
       end
-
+      
+      def tag tag = nil
+        if tag
+          @tag = tag
+        else
+          @tag || raise("service :#{service_name} not tagged!")
+        end
+      end
+      
       def marker extra_mark = nil
-        %(#{name}:#{version}#{":#{extra_mark}" if extra_mark})
+        %(#{service_name}:#{version}#{":#{extra_mark}" if extra_mark})
+      end      
+      
+      def service_class name
+        # dont'use constantize, it works wrong, and returns ::File instead of ::Services::File for example.
+        eval("::Services::#{name.to_s.camelize}", TOPLEVEL_BINDING, __FILE__, __LINE__)
       end
+      cache_method_with_params :service_class
+      
+      def service_name; name.split('::').last.underscore end
+      cache_method_with_params :service_name
     end
+    
+    protected          
+      def config; cluster.config end
+      def logger; cluster.logger end    
+      def services &b; cluster.services &b end
+      
+      def service_name; self.class.service_name end
+    
+      def apply_once key, &block
+        boxes{|box| box.apply_once self.class.marker(key), &block}
+      end
+      
+      def boxes &b
+        if b
+          boxes.each &b
+        else
+          unless @boxes
+            hosts = config.tags!["#{self.class.tag}", nil] || []
+            @boxes = hosts.collect{|host| cluster.boxes[host]}
+          end
+          @boxes
+        end
+      end
+      
+      def single_box
+        boxes.size.must_be == 1
+        boxes.first
+      end
+      
+      # def require options
+      #   # if args.size == 1 and args.first.is_a?(Hash)
+      #   #   services = args.first
+      #   # elsif args.size == 2 and args.first.is_a?(Array)
+      #   #   services = {}
+      #   #   args.first.each{|klass| services[klass] = args.last}
+      #   # else
+      #   #   raise 'invalid arguments'
+      #   # end
+      #   
+      #   options.each do |service_name, method|
+      #     key = "#{service_name}.#{method}"
+      #     unless box.already_required_services.include? key
+      #       klass.new(box).send method if klass.method_defined? method
+      #       box.already_required_services << key
+      #     end
+      #   end
+      # end      
+      # 
+      # def already_required_services
+      #   
+      # end
   end
 end

data/lib/cluster_management/support/exception.rb

@@ -0,0 +1,36 @@
+warn 'stack trace filtering enabled'
+
+Exception.metaclass_eval do
+  attr_accessor :filters
+end
+Exception.filters = [
+  "/gems/haml",
+  "/gems/tilt",
+  "/gems/facets",
+  "/gems/rspec",
+  
+  "/timeout.rb",
+    
+  'lib/fake_gem',
+  'rubygems/custom_require',
+  
+  'lib/ruby_ext',
+  
+  'lib/cluster_management',
+  
+  'bin/rake',
+  'lib/rake',
+  
+  "/monitor",
+  "/synchronize",
+  "/class_loader",
+  "/micon"
+]
+# Exception.filters = []
+
+Exception.class_eval do
+  alias_method :set_backtrace_without_filter, :set_backtrace
+  def set_backtrace array
+    set_backtrace_without_filter array.sfilter(::Exception.filters)
+  end
+end

metadata

@@ -1,96 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cluster_management
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: '0.6'
   prerelease: 
-  version: 0.5.2
 platform: ruby
-authors: 
+authors:
 - Alexey Petrushin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-16 00:00:00 +03:00
+date: 2011-04-11 00:00:00.000000000 +04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: tilt
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &3055160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby_ext
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *3055160
+- !ruby/object:Gem::Dependency
+  name: ruby_ext
+  requirement: &3054950 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *3054950
+- !ruby/object:Gem::Dependency
   name: vos
+  requirement: &3054750 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *3054750
+- !ruby/object:Gem::Dependency
+  name: class_loader
+  requirement: &3054550 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *3054550
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - readme.md
+- lib/cluster_management/cluster.rb
 - lib/cluster_management/config.rb
 - lib/cluster_management/gems.rb
 - lib/cluster_management/integration/vfs.rb
 - lib/cluster_management/integration/vos.rb
 - lib/cluster_management/logger.rb
 - lib/cluster_management/service.rb
+- lib/cluster_management/support/exception.rb
 - lib/cluster_management.rb
 has_rdoc: true
 homepage: http://github.com/alexeypetrushin/cluster_management
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
-summary: Simple cluster management tools
+summary: Simple Cluster Management Tools
 test_files: []
-