MangUpdate 0.0.1 → 0.0.2

data/README.md

@@ -1,27 +1,27 @@
-MangUpdate
-==========
-
-Installation
-------------
-
-    gem install mangupdate
-
-Usage
------
-   
-### WARNING!!!
-**Always check you config with `mangupdate -nl` (dry run and list updates) before using `mangupdate`!**
-
- - Create `Mupfile` with `mangupdate init`.
- - Edit and configure `Mupfile` as you need.
- - Run `mangupdate -nl` to check that lists and jobs are configured.
- - Check `Mupfile.dump` file and change numbers there to your server's current revisions.
- - Use `mangupdate` to run the update.
- 
-Feel free to use `mangupdate -h update` to see all the options available.
-
-
-Mupfile examples
-----------------
-
+MangUpdate
+==========
+
+Installation
+------------
+
+    gem install mangupdate
+
+Usage
+-----
+   
+### WARNING!!!
+**Always check you config with `mangupdate -nl` (dry run and list updates) before using `mangupdate`!**
+
+ - Create `Mupfile` with `mangupdate init`.
+ - Edit and configure `Mupfile` as you need.
+ - Run `mangupdate -nl` to check that lists and jobs are configured.
+ - Check `Mupfile.dump` file and change numbers there to your server's current revisions.
+ - Use `mangupdate` to run the update.
+ 
+Feel free to use `mangupdate -h update` to see all the options available.
+
+
+Mupfile examples
+----------------
+
 Just use `mangupdate init` to get a basic `Mupfile`.

data/bin/mangupdate

@@ -1,4 +1,4 @@
-require "MangUpdate"
-require "MangUpdate/cli"
-
+require "MangUpdate"
+require "MangUpdate/cli"
+
 MangUpdate::CLI.start

data/lib/MangUpdate/cli.rb

@@ -1,66 +1,66 @@
-require 'thor'
-require 'MangUpdate/version'
-
-module MangUpdate
-
-  class CLI < Thor
-
-    default_task :update
-
-    desc 'update', 'Runs the update'
-    
-    method_option :debug,
-                  :type    => :boolean,
-                  :default => false,
-                  :aliases => '-d',
-                  :banner  => 'Print debug messages'  
-                  
-    method_option :mupfile,
-                  :type    => :string,
-                  :aliases => '-M',
-                  :banner  => 'Specify a Mupfile'
-    
-    method_option :dry_run,
-                  :type    => :boolean,
-                  :default => false,
-                  :aliases => '-n',
-                  :banner  => 'Do not upload SQL files'
-                  
-    method_option :list,
-                  :type    => :boolean,
-                  :default => false,
-                  :aliases => '-l',
-                  :banner  => 'Print SQL filenames'
-                  
-    method_option :nodump,
-                  :type    => :boolean,
-                  :default => false,
-                  :banner  => 'Do not dump update info'
-    
-    def update
-      ::MangUpdate.run(options)
-    end
-
-
-    desc 'version', 'Shows the MangUpdate version'
-    
-    map %w(-v --version) => :version
-    
-    def version
-      ::MangUpdate::UI.info "MangUpdate version #{ MangUpdate::VERSION }"
-    end
-
-    
-    desc 'init', 'Generates a Mupfile at the current working directory'
-    
-    method_option :mupfile,
-              :type    => :string,
-              :aliases => '-M',
-              :banner  => 'Specify a Mupfile path'
-    
-    def init
-      ::MangUpdate.initialize_template(options)
-    end
-
-  end
+require 'thor'
+require 'MangUpdate/version'
+
+module MangUpdate
+
+  class CLI < Thor
+
+    default_task :update
+
+    desc 'update', 'Runs the update'
+    
+    method_option :debug,
+                  :type    => :boolean,
+                  :default => false,
+                  :aliases => '-d',
+                  :banner  => 'Print debug messages'  
+                  
+    method_option :mupfile,
+                  :type    => :string,
+                  :aliases => '-M',
+                  :banner  => 'Specify a Mupfile'
+    
+    method_option :dry_run,
+                  :type    => :boolean,
+                  :default => false,
+                  :aliases => '-n',
+                  :banner  => 'Do not upload SQL files'
+                  
+    method_option :list,
+                  :type    => :boolean,
+                  :default => false,
+                  :aliases => '-l',
+                  :banner  => 'Print SQL filenames'
+                  
+    method_option :nodump,
+                  :type    => :boolean,
+                  :default => false,
+                  :banner  => 'Do not dump update info'
+    
+    def update
+      ::MangUpdate.run(options)
+    end
+
+
+    desc 'version', 'Shows the MangUpdate version'
+    
+    map %w(-v --version) => :version
+    
+    def version
+      ::MangUpdate::UI.info "MangUpdate version #{ MangUpdate::VERSION }"
+    end
+
+    
+    desc 'init', 'Generates a Mupfile at the current working directory'
+    
+    method_option :mupfile,
+              :type    => :string,
+              :aliases => '-M',
+              :banner  => 'Specify a Mupfile path'
+    
+    def init
+      ::MangUpdate.initialize_template(options)
+    end
+
+  end
 end

data/lib/MangUpdate/dumpfile.rb

@@ -1,44 +1,44 @@
-require 'yaml'
-
-module MangUpdate
-  class Dumpfile
-  
-    class << self
-      def load(path = "Mupfile.dump")
-        from_hash(YAML.load(File.read(path)))
-      rescue
-        nil
-      end
-      
-      def write(dump, path = "Mupfile.dump")
-        File.open(path, "wb") do |f|
-          f.write dump.to_hash.to_yaml
-        end
-      end
-      
-      def from_hash(hash)
-        dumpfile = self.new
-        dumpfile.revs = hash[:revs]
-        dumpfile
-      end
-    end
-    
-    attr_accessor :revs
-    def initialize(revs = {})
-      @revs = revs
-    end
-    
-    def update_revs(revs_new = {})
-      revs_new.each do |key, value|
-        @revs[key] = value if !@revs.key?(key) || @revs[key] < value
-      end
-    end
-    
-    def to_hash
-      {
-        :revs => revs
-      }
-    end
-    
-  end
+require 'yaml'
+
+module MangUpdate
+  class Dumpfile
+  
+    class << self
+      def load(path = "Mupfile.dump")
+        from_hash(YAML.load(File.read(path)))
+      rescue
+        nil
+      end
+      
+      def write(dump, path = "Mupfile.dump")
+        File.open(path, "wb") do |f|
+          f.write dump.to_hash.to_yaml
+        end
+      end
+      
+      def from_hash(hash)
+        dumpfile = self.new
+        dumpfile.revs = hash[:revs]
+        dumpfile
+      end
+    end
+    
+    attr_accessor :revs
+    def initialize(revs = {})
+      @revs = revs
+    end
+    
+    def update_revs(revs_new = {})
+      revs_new.each do |key, value|
+        @revs[key] = value if !@revs.key?(key) || @revs[key] < value
+      end
+    end
+    
+    def to_hash
+      {
+        :revs => revs
+      }
+    end
+    
+  end
 end

data/lib/MangUpdate/job.rb

@@ -1,54 +1,54 @@
-module MangUpdate
-  class Job
-    attr_reader :name, :updates, :latest_revs
-    
-    def initialize(name, applies)
-      @name = name
-      @applies = applies      
-      @updates = nil
-      @latest_revs = {}
-    end
-    
-    def collect_updates
-      @updates = []
-      @applies.each do |apply|
-        type = apply.shift
-        case type
-        when :list
-          options, filters = apply
-          
-          updates = []
-          MangUpdate.lists(options).each do |list|
-            next unless list.built?
-            
-            list.updates.each do |update|
-              selected = filters.all? do |filter|
-                filter.call(update, list)
-              end
-              
-              if selected
-                @latest_revs[list.name] = update.rev  
-                updates << update
-              end
-            end
-            
-          end
-          
-          @updates << updates
-        when :file
-          filename, database, rev = apply
-          model = Model::Common.new(filename, database, rev || 0)
-          @updates << [ model ]
-          
-        when :inline
-          sql, database, rev = apply
-          model = Model::InlineSql.new(nil, database, rev || 0, { :sql => sql })
-          @updates << [ model ]
-          
-        end
-        
-      end
-    end
-    
-  end
+module MangUpdate
+  class Job
+    attr_reader :name, :updates, :latest_revs
+    
+    def initialize(name, applies)
+      @name = name
+      @applies = applies      
+      @updates = nil
+      @latest_revs = {}
+    end
+    
+    def collect_updates
+      @updates = []
+      @applies.each do |apply|
+        type = apply.shift
+        case type
+        when :list
+          options, filters = apply
+          
+          updates = []
+          MangUpdate.lists(options).each do |list|
+            next unless list.built?
+            
+            list.updates.each do |update|
+              selected = filters.all? do |filter|
+                filter.call(update, list)
+              end
+              
+              if selected
+                @latest_revs[list.name] = update.rev  
+                updates << update
+              end
+            end
+            
+          end
+          
+          @updates << updates
+        when :file
+          filename, database, rev = apply
+          model = Model::Common.new(filename, database, rev || 0)
+          @updates << [ model ]
+          
+        when :inline
+          sql, database, rev = apply
+          model = Model::InlineSql.new(nil, database, rev || 0, { :sql => sql })
+          @updates << [ model ]
+          
+        end
+        
+      end
+    end
+    
+  end
 end

data/lib/MangUpdate/list.rb

@@ -1 +1,58 @@
-module MangUpdate
  class List
    
    attr_reader :name, :updates
    attr_accessor :current_rev
    
    def initialize(name, paths)
      @name = name
      @paths = []
      @updates = []
      @built = false
      @current_rev = 0
      add_paths(paths)
    end
    
    def add_paths(paths)
      paths.each do |path|
        _path, options = path
        @paths << Path.new(_path, options) 
      end
    end
    
    def build!
      @built = true
      @paths.each do |path|
        path.scan do |update|
          @updates << update
        end
      end
      sort_list!(@updates)
    rescue
      @built = false
      raise
    end
    
    def built?
      @built
    end    
    
    private
    
    # This sorts the array of updates by it's sort_data field
    def sort_list!(list)
      list.sort! do |a,b|
        a, b = a.sort_data, b.sort_data
        i = 0
        i += 1 while a[i] == b[i] && (a[i+1] || b[i+1])
        if a[i] && b[i]
          a[i] <=> b[i]
        else
          a[i] ? 1 : -1
        end
      end
      list
    end
  
  end
+module MangUpdate
+  class List
+    
+    attr_reader :name, :updates
+    attr_accessor :current_rev
+    
+    def initialize(name, paths)
+      @name = name
+      @paths = []
+      @updates = []
+      @built = false
+      @current_rev = 0
+      add_paths(paths)
+    end
+    
+    def add_paths(paths)
+      paths.each do |path|
+        _path, options = path
+        @paths << Path.new(_path, options) 
+      end
+    end
+    
+    def build!
+      @built = true
+      @paths.each do |path|
+        path.scan do |update|
+          @updates << update
+        end
+      end
+      sort_list!(@updates)
+    rescue
+      @built = false
+      raise
+    end
+    
+    def built?
+      @built
+    end    
+    
+    private
+    
+    # This sorts the array of updates by it's sort_data field
+    def sort_list!(list)
+      list.sort! do |a,b|
+        a, b = a.sort_data, b.sort_data
+        i = 0
+        i += 1 while a[i] == b[i] && (a[i+1] || b[i+1])
+        if a[i] && b[i]
+          a[i] <=> b[i]
+        else
+          a[i] ? 1 : -1
+        end
+      end
+      list
+    end
+  
+  end
+end

data/lib/MangUpdate/model.rb

@@ -1,38 +1,38 @@
-module MangUpdate
-  module Model
-    
-    autoload :Common,     'MangUpdate/models/common'
-    autoload :InlineSql,  'MangUpdate/models/inline_sql'
-  
-    class Base
-      
-      attr_reader :filename, :database, :rev, :info
-      attr_accessor :applied
-      
-      def self.build(filename, options = {})
-        raise "Do not know how to build #{name}"
-        
-        # Should be overwritten by subclasses with something like self.new ...
-      end
-      
-      def initialize(filename, database, rev, info = {})
-        @filename = filename
-        @database = database
-        @rev = rev
-        @info = info
-      end     
-      
-      def sort_data
-        [rev]
-      end
-      
-      def to_s
-        "Rev#{rev} [#{self.class.name}:#{filename}]"
-      end
-      
-      def upload
-        MangUpdate.upload_file_to_db(filename, database)
-      end
-    end
-  end
+module MangUpdate
+  module Model
+    
+    autoload :Common,     'MangUpdate/models/common'
+    autoload :InlineSql,  'MangUpdate/models/inline_sql'
+  
+    class Base
+      
+      attr_reader :filename, :database, :rev, :info
+      attr_accessor :applied
+      
+      def self.build(filename, options = {})
+        raise "Do not know how to build #{name}"
+        
+        # Should be overwritten by subclasses with something like self.new ...
+      end
+      
+      def initialize(filename, database, rev, info = {})
+        @filename = filename
+        @database = database
+        @rev = rev
+        @info = info
+      end     
+      
+      def sort_data
+        [rev]
+      end
+      
+      def to_s
+        "Rev#{rev} [#{self.class.name}:#{filename}]"
+      end
+      
+      def upload
+        MangUpdate.upload_file_to_db(filename, database)
+      end
+    end
+  end
 end

data/lib/MangUpdate/models/common.rb

@@ -1,14 +1,14 @@
-module MangUpdate
-  module Model
-
-    class Common < Base
-      
-      def self.build(filename, options = {})
-        data = File.basename(filename, '.sql').split('_')
-        self.new filename, data[1], data[0].gsub(/[^0-9]/, '').to_i
-      end
-      
-    end
-
-  end
+module MangUpdate
+  module Model
+
+    class Common < Base
+      
+      def self.build(filename, options = {})
+        data = File.basename(filename, '.sql').split('_')
+        self.new filename, data[1], data[0].gsub(/[^0-9]/, '').to_i
+      end
+      
+    end
+
+  end
 end

data/lib/MangUpdate/models/inline_sql.rb

@@ -1,23 +1,23 @@
-module MangUpdate
-  module Model
-
-    class InlineSql < Base
-      attr_reader :sql
-    
-      def self.build(filename, options = {})
-        raise "#{name} can not be used as a model"
-      end
-      
-      def initialize(filename, database, rev, info = {})
-        super("<Inline SQL>", database, rev, info)
-        @sql = @info[:sql]
-      end
-      
-      def upload
-        MangUpdate.upload_inline_sql(sql, database)
-      end
-      
-    end
-
-  end
+module MangUpdate
+  module Model
+
+    class InlineSql < Base
+      attr_reader :sql
+    
+      def self.build(filename, options = {})
+        raise "#{name} can not be used as a model"
+      end
+      
+      def initialize(filename, database, rev, info = {})
+        super("<Inline SQL>", database, rev, info)
+        @sql = @info[:sql]
+      end
+      
+      def upload
+        MangUpdate.upload_inline_sql(sql, database)
+      end
+      
+    end
+
+  end
 end

data/lib/MangUpdate/models/main_core.rb

@@ -1,19 +1,19 @@
-module MangUpdate
-  module Model
-
-    class MainCore < Base
-      APPLY_PRIORITY = 1
-      
-      def self.build(filename, options = {})
-        data = File.basename(filename, '.sql').split('_')
-        self.new filename, data[2], data[0].to_i, :num => data[1].to_i
-      end
-      
-      def sort_data
-        [rev, APPLY_PRIORITY, info[:num]]
-      end
-      
-    end
-
-  end
+module MangUpdate
+  module Model
+
+    class MainCore < Base
+      APPLY_PRIORITY = 1
+      
+      def self.build(filename, options = {})
+        data = File.basename(filename, '.sql').split('_')
+        self.new filename, data[2], data[0].to_i, :num => data[1].to_i
+      end
+      
+      def sort_data
+        [rev, APPLY_PRIORITY, info[:num]]
+      end
+      
+    end
+
+  end
 end

data/lib/MangUpdate/models/ytdb_core.rb

@@ -1,20 +1,20 @@
-module MangUpdate
-  module Model
-
-    class YtdbCore < Base
-      APPLY_PRIORITY = 2
-      
-      def self.build(filename, options = {})
-        data = File.basename(filename, '.sql').split('_')
-        return if data[1] == 'corepatch' # skip all corepatches...      
-        self.new filename, data[1], data[3].gsub(/[^0-9]/, '').to_i
-      end
-      
-      def sort_data
-        [rev, APPLY_PRIORITY]
-      end
-      
-    end
-
-  end
+module MangUpdate
+  module Model
+
+    class YtdbCore < Base
+      APPLY_PRIORITY = 2
+      
+      def self.build(filename, options = {})
+        data = File.basename(filename, '.sql').split('_')
+        return if data[1] == 'corepatch' # skip all corepatches...      
+        self.new filename, data[1], data[3].gsub(/[^0-9]/, '').to_i
+      end
+      
+      def sort_data
+        [rev, APPLY_PRIORITY]
+      end
+      
+    end
+
+  end
 end

data/lib/MangUpdate/path.rb

@@ -1 +1,44 @@
-require 'active_support/inflector'
  class Path
    
    def initialize(path, options = {})
      @path = path
      @options = options
      
      @model_class = get_model_class(options[:model] || :common)
      raise "Unable to load model!" unless @model_class
    end
    
    def scan
      Dir.glob(@path).each do |file|
        model = @model_class.build(file, @options)
        yield(model) if model
      end
    end
    
    private
    
    def get_model_class(name)
      name = name.to_s
      file_name   = name.underscore
      const_name  = name.camelize
      try_require = false
      begin
        require "MangUpdate/models/#{ file_name }" if try_require
        ::MangUpdate::Model.const_get(::MangUpdate::Model.constants.find { |c| c.to_s.downcase == const_name.downcase })
      rescue TypeError
        unless try_require
          try_require = true
          retry
        else
          UI.error "Could not find class MangUpdate::Model::#{ const_name }"
        end
      rescue LoadError => loadError
        UI.error "Could not load 'MangUpdate/models/#{ file_name }' or find class MangUpdate::Model::#{ const_name }"
        UI.error loadError.to_s
      end      
    end
    
  end
+require 'active_support/inflector'
+module MangUpdate
+  class Path
+    
+    def initialize(path, options = {})
+      @path = path
+      @options = options
+      
+      @model_class = get_model_class(options[:model] || :common)
+      raise "Unable to load model!" unless @model_class
+    end
+    
+    def scan
+      Dir.glob(@path).each do |file|
+        model = @model_class.build(file, @options)
+        yield(model) if model
+      end
+    end
+    
+    private
+    
+    def get_model_class(name)
+      name = name.to_s
+      file_name   = name.underscore
+      const_name  = name.camelize
+      try_require = false
+      begin
+        require "MangUpdate/models/#{ file_name }" if try_require
+        ::MangUpdate::Model.const_get(::MangUpdate::Model.constants.find { |c| c.to_s.downcase == const_name.downcase })
+      rescue TypeError
+        unless try_require
+          try_require = true
+          retry
+        else
+          UI.error "Could not find class MangUpdate::Model::#{ const_name }"
+        end
+      rescue LoadError => loadError
+        UI.error "Could not load 'MangUpdate/models/#{ file_name }' or find class MangUpdate::Model::#{ const_name }"
+        UI.error loadError.to_s
+      end      
+    end
+    
+  end
+end

data/lib/MangUpdate/templates/Mupfile.erb

@@ -1,32 +1,32 @@
-base_path       = "."
-mangos_path     = base_path + "/mangos"
-scriptdev2_path = base_path + "/scriptdev2"
-
-config :mysql_user, "mangos"
-config :mysql_pass, "mangos"
-
-list("Main Core") do
-  path "#{mangos_path}/sql/updates/*.sql", :model => :main_core
-end
-
-list("Main SD2") do
-  path "#{scriptdev2_path}/sql/updates/r*.sql"
-end
-
-job("Update all") do
-  filtered do
-  
-    # only apply updates that have revision number
-    # greater than currently installed revision
-    filter do |update, list|
-      update.rev > list.current_rev
-    end
-
-    apply
-    
-  end
-end
-
-#job("Custom SQL") do
-#  upload_file "#{base_path}/mangos_custom.sql", "mangos"
-#end
+base_path       = "."
+mangos_path     = base_path + "/mangos"
+scriptdev2_path = base_path + "/scriptdev2"
+
+config :mysql_user, "mangos"
+config :mysql_pass, "mangos"
+
+list("Main Core") do
+  path "#{mangos_path}/sql/updates/*.sql", :model => :main_core
+end
+
+list("Main SD2") do
+  path "#{scriptdev2_path}/sql/updates/r*.sql"
+end
+
+job("Update all") do
+  filtered do
+  
+    # only apply updates that have revision number
+    # greater than currently installed revision
+    filter do |update, list|
+      update.rev > list.current_rev
+    end
+
+    apply
+    
+  end
+end
+
+#job("Custom SQL") do
+#  upload_file "#{base_path}/mangos_custom.sql", "mangos"
+#end

data/lib/MangUpdate/templating.rb

@@ -1,23 +1,23 @@
-require 'erb'
-
-module MangUpdate
-  module Templating
-    class << self
-    
-      def init_template(options = {})
-        b = binding
-        template_filename = File.join(File.dirname(__FILE__), "templates", "Mupfile.erb")
-        
-        template = ERB.new(File.read(template_filename))
-        template.filename = template_filename
-        
-        result = template.result(b)
-        
-        File.open(options[:mupfile], 'wb') do |f|
-          f.puts(result)
-        end
-      end
-      
-    end
-  end
-end
+require 'erb'
+
+module MangUpdate
+  module Templating
+    class << self
+    
+      def init_template(options = {})
+        b = binding
+        template_filename = File.join(File.dirname(__FILE__), "templates", "Mupfile.erb")
+        
+        template = ERB.new(File.read(template_filename))
+        template.filename = template_filename
+        
+        result = template.result(b)
+        
+        File.open(options[:mupfile], 'wb') do |f|
+          f.puts(result)
+        end
+      end
+      
+    end
+  end
+end

data/lib/MangUpdate/version.rb

@@ -1,3 +1,3 @@
 module MangUpdate
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MangUpdate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &28246692 !ruby/object:Gem::Requirement
+  requirement: &22141480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28246692
+  version_requirements: *22141480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &28245336 !ruby/object:Gem::Requirement
+  requirement: &22141020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28245336
+  version_requirements: *22141020
 description: This is a small gem that will help you with updating your MaNGOS server.
   It uses Mupfile to keep all database update logic simple.
 email:
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: MangUpdate
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Use Mupfiles to update your MaNGOS server database.