maruto 0.0.9 → 0.0.10

data/.travis.yml

@@ -1,11 +1,8 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
   - rbx-19mode
 script: bundle exec rake test

data/README.md

@@ -3,7 +3,7 @@
 
 # Maruto
 
-Magento Ruby Tools
+Magento Ruby Tools, requires ruby >= 1.9.2
 
 ## Installation
 
@@ -28,6 +28,7 @@ Or install it yourself as:
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Run the tests (`bundle exec rake test`)
-4. Commit your changes (`git commit -am 'Add some feature'`)
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Pull Request
+4. Run the dev version of maruto (`ruby -Ilib bin/maruto ...`)
+5. Commit your changes (`git commit -am 'Add some feature'`)
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create new Pull Request

data/lib/maruto/magento_config.rb

@@ -127,13 +127,17 @@ module Maruto
 			name = xml_node.name
 			config = {
 				:active       => xml_node.at_xpath('active').content == 'true',
-				:code_pool    => xml_node.at_xpath('codePool').content,
 				:dependencies => xml_node.xpath('depends/*').map(&:name),
 				:defined      => file,
 			}
+			# deprecated will be deleted
+			if xml_node.at_xpath('codePool') then
+				config[:code_pool] = xml_node.at_xpath('codePool').content
+			else
+				#@warnings << "module:#{name} - ..."
+			end
 			if @modules.include? name then
-				# TODO test this
-				@warnings << "module:#{name} - duplicate module definition (#{@modules[name][:defined]} and file)"
+				#@warnings << "module:#{name} - duplicate module definition (#{@modules[name][:defined]} and file)"
 			end
 			@modules[name] = config
 		end

data/lib/maruto/module_definition.rb

@@ -5,23 +5,32 @@ require 'tsort'
 module Maruto::ModuleDefinition
 
 	def self.parse_module_definition(xml_node)
-		module_definition = {
-			:name      => xml_node.name.to_sym,
-			:active    => !(/^(false|off)$/ =~ xml_node.at_xpath('active').content),
-			:code_pool => xml_node.at_xpath('codePool').content.to_sym,
-		}
+		module_definition = { :name => xml_node.name.to_sym }
+
+		module_definition[:active]    = !(/^(false|off)$/ =~ xml_node.at_xpath('active').content) if xml_node.at_xpath('active')
+		module_definition[:code_pool] = xml_node.at_xpath('codePool').content.to_sym if xml_node.at_xpath('codePool')
 
 		deps = xml_node.xpath('depends/*').map { |e| e.name.to_sym }
 		module_definition[:dependencies] = deps if deps.size > 0
 
-		unless /^(true|false|off)$/ =~ xml_node.at_xpath('active').content then
+		unless xml_node.at_xpath('active') and /^(true|false|off)$/ =~ xml_node.at_xpath('active').content then
 			module_definition[:warnings] = []
-			module_definition[:warnings] << { :message => "value for active element should be in ['true','false','off'] (element: #{xml_node.at_xpath('active')})" }
+			# TODO write test
+			if xml_node.at_xpath('active')
+				module_definition[:warnings] << { :message => "value for active element should be in ['true','false','off'] (element: #{xml_node.at_xpath('active')})" }
+			else
+				module_definition[:warnings] << { :message => "missing element: active (#{xml_node.path})" }
+			end
 		end
 
-		unless /^(core|community|local)$/ =~ xml_node.at_xpath('codePool').content then
+		unless xml_node.at_xpath('codePool') and /^(core|community|local)$/ =~ xml_node.at_xpath('codePool').content then
 			module_definition[:warnings] ||= []
-			module_definition[:warnings] << { :message => "value for codePool element should be in ['core','community','local'] (element: #{xml_node.at_xpath('codePool')})" }
+			# TODO write test
+			if xml_node.at_xpath('codePool')
+				module_definition[:warnings] << { :message => "value for codePool element should be in ['core','community','local'] (element: #{xml_node.at_xpath('codePool')})" }
+			else
+				module_definition[:warnings] << { :message => "missing element: codePool (#{xml_node.path})" }
+			end
 		end
 
 		module_definition
@@ -68,14 +77,14 @@ module Maruto::ModuleDefinition
 	def self.analyse_module_definitions(module_definitions)
 		h = Hash.new
 		module_definitions.each do |m|
+			mod_name = m[:name]
+			if h.include? mod_name then
+				# disable first module
+				h[mod_name][:active] = false
+				m[:warnings] ||= []
+				m[:warnings] << { :file => m[:defined], :message => "duplicate module definition (in '#{h[mod_name][:defined]}' and '#{m[:defined]}')" }
+			end
 			if m[:active]
-				mod_name = m[:name]
-				if h.include? mod_name then
-					# disable first module
-					h[mod_name][:active] = false
-					m[:warnings] ||= []
-					m[:warnings] << { :file => m[:defined], :message => "duplicate module definition (in '#{h[mod_name][:defined]}' and '#{m[:defined]}')" }
-				end
 				parts = mod_name.to_s.split('_')
 				h[mod_name] = m
 				if parts.size != 2

data/lib/maruto/runner.rb

@@ -94,21 +94,18 @@ class Maruto::Runner < Thor
 
 	end
 
-	desc "modules FILTER", "list modules, optionally filtered by event name"
+	desc "modules", "list modules"
 	method_option :magento_root, :aliases => "-m", :default => "."
-	def modules(filter = nil)
+	def modules()
 
 		magento_root = check_magento_folder()
 
 		magento = Maruto::MagentoInstance.load(magento_root)
 
-
 		magento[:all_modules].each do |name, m|
-			if filter.nil? or name.to_s.include? filter
-				deps = ''
-				deps = ", dependencies:[#{m[:dependencies].collect{ |d| d.to_s }.join(', ')}]" if m[:dependencies]
-				puts "#{name}(active:#{m[:active]}, code_pool:#{m[:code_pool]}, defined:#{m[:defined]}#{deps})"
-			end
+			deps = ''
+			deps = ", dependencies:[#{m[:dependencies].collect{ |d| d.to_s }.join(', ')}]" if m[:dependencies]
+			puts "#{name}(active:#{m[:active]}, code_pool:#{m[:code_pool]}, defined:#{m[:defined]}#{deps})"
 		end
 
 	end

data/lib/maruto/version.rb

@@ -1,3 +1,3 @@
 module Maruto
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/maruto.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "~> 1.5"
+  spec.add_dependency "nokogiri", "~> 1.6"
   spec.add_dependency "thor", "~> 0.17"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maruto
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement