cluster_management 0.6 → 0.7

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake_ext'
 
 project(
   name: "cluster_management",
-  version: "0.6",
+  version: "0.7",
   summary: "Simple Cluster Management Tools",
 
   author: "Alexey Petrushin",

data/lib/cluster_management.rb

@@ -6,6 +6,8 @@ require 'class_loader'
 # require 'micon'
 # require 'micon/rad'
 
+module ClusterManagement
+end
 
 # 
 # Classes

data/lib/cluster_management/cluster.rb

@@ -1,56 +1,54 @@
-module ClusterManagement
-  class Cluster
-    attr_accessor :config, :logger  
-    attr_reader :boxes
-    
-    def services &b
-      b ? @services.instance_eval(&b) : @services
+class ClusterManagement::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
     
-    class Services < BasicObject
-      def initialize
-        @h = ::Hash.new do |h, service_name|          
-          h[service_name] = ::ClusterManagement::Service.service_class(service_name).new
-        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 [] 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
+      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
-  
-    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
+
+  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

data/lib/cluster_management/config.rb

@@ -1,17 +1,10 @@
-module ClusterManagement
-  class Config < SafeHash
-    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      
-      if data
-        data.must_be.a ::Hash        
-        self.merge! data, override: true
-      end
+class ClusterManagement::Config < SafeHash
+  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      
+    if data
+      data.must_be.a ::Hash        
+      self.merge! data, override: true
     end
-    
-    # def self.load file  
-    #   @config = Config.new
-    #   @config.merge_file! file
-    # end
-  end  
+  end
 end

data/lib/cluster_management/integration/vfs.rb

@@ -1,4 +0,0 @@
-# module Vfs
-#   class File
-#   end
-# end

data/lib/cluster_management/integration/vos.rb

@@ -1,27 +1,25 @@
-module Vos
-  class Box
-    include Helpers::Ubuntu
+class Vos::Box
+  include Vos::Helpers::Ubuntu
+  
+  # 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
     
-    # 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
-      
-    def apply_once key, &block
-      unless has_mark? key
-        block.call self
-        mark! key
-      end
-    end      
-    
-  end
+  def apply_once key, &block
+    unless has_mark? key
+      block.call self
+      mark! key
+    end
+  end      
+  
 end
 
 # module Vos

data/lib/cluster_management/logger.rb

@@ -1,26 +1,15 @@
 require 'logger'
 
-module ClusterManagement
-  class CustomLogger < Logger
-    def info msg
-      super "#{msg}\n"
-    end
-    
-    def warn msg
-      super "#{msg}\n"
-    end
-    
-    def error msg
-      super "#{msg}\n"
-    end
+class ClusterManagement::CustomLogger < Logger
+  def info msg
+    super "#{msg}\n"
   end
   
-  # attr_writer :logger
-  # def self.logger
-  #   unless @logger
-  #     @logger = CustomLogger.new STDOUT
-  #     @logger.formatter = -> severity, datetime, progname, msg {msg}
-  #   end
-  #   @logger      
-  # end
+  def warn msg
+    super "#{msg}\n"
+  end
+  
+  def error msg
+    super "#{msg}\n"
+  end
 end

data/lib/cluster_management/service.rb

@@ -1,85 +1,83 @@
-module ClusterManagement
-  class Service
-    class << self
-      def version version = nil
-        if version
-          @version = version
-        else
-          @version ||= 1
-        end
-      end
-      
-      def tag tag = nil
-        if tag
-          @tag = tag
-        else
-          @tag || raise("service :#{service_name} not tagged!")
-        end
+class ClusterManagement::Service
+  class << self
+    def version version = nil
+      if version
+        @version = version
+      else
+        @version ||= 1
       end
-      
-      def marker extra_mark = nil
-        %(#{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
+    
+    def tag tag = nil
+      if tag
+        @tag = tag
+      else
+        @tag || raise("service :#{service_name} not tagged!")
       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 marker extra_mark = nil
+      %(#{service_name}:#{version}#{":#{extra_mark}" if extra_mark})
+    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
+    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
-      
-      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
+    
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster_management
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-11 00:00:00.000000000 +04:00
+date: 2011-06-24 00:00:00.000000000 +04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &3055160 !ruby/object:Gem::Requirement
+  requirement: &2738130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3055160
+  version_requirements: *2738130
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &3054950 !ruby/object:Gem::Requirement
+  requirement: &2737850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3054950
+  version_requirements: *2737850
 - !ruby/object:Gem::Dependency
   name: vos
-  requirement: &3054750 !ruby/object:Gem::Requirement
+  requirement: &2737650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3054750
+  version_requirements: *2737650
 - !ruby/object:Gem::Dependency
   name: class_loader
-  requirement: &3054550 !ruby/object:Gem::Requirement
+  requirement: &2737450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3054550
+  version_requirements: *2737450
 description: 
 email: 
 executables: []