maruto 0.0.10 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0083f53e3076bf2dc44be857c447fc331b7bbc6e
+  data.tar.gz: 8e827f8f33add2acea9d74c588043462d627b437
+SHA512:
+  metadata.gz: 1aa5be1fa7983da6f278e47cc95ab14a3f674e7a5368759ddc80211953d9bf4024ec8c6e5619005180f480e38979128afacc98d4acefaa08c8b973eb6fc75a7f
+  data.tar.gz: 2b0cc72e2b1e6cc3a34bd1f08c8f6df12fbf77787194ab1b69a463bde419a8f1ba69f3112339170b361fa71b291d2a8ee41d4fb0538f8a0ead8c2a5ad58748d8

data/.ruby-version

@@ -1 +1 @@
-1.9.3
+2.3.1

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
+  - 2.0
+  - 2.2
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-19mode
 script: bundle exec rake test

data/README.md

@@ -3,7 +3,7 @@
 
 # Maruto
 
-Magento Ruby Tools, requires ruby >= 1.9.2
+Magento Ruby Tools, requires ruby >= 2
 
 ## Installation
 

data/lib/maruto/magento_config.rb

@@ -37,12 +37,11 @@ module Maruto
 						# puts mm_name
 						# puts mm_config
 
-						parts = mm_name.split('_')
-						abort "module:#{mm_name} - unrecognized module name format" unless parts.size == 2
-						config_path = "app/code/#{mm_config[:code_pool]}/#{parts[0]}/#{parts[1]}/etc/config.xml"
+						config_path = "app/code/#{mm_config[:code_pool]}/#{mm_name.gsub(/_/, '/')}/etc/config.xml"
 
-						if !File.exists?(config_path)
-							@warnings << "module:#{mm_name} is defined (#{mm_config[:defined]}) but does not exists (#{config_path})"
+						if !File.exist?(config_path)
+							# duplicate warning see new code in module_definition.rb
+							# @warnings << "module:#{mm_name} is defined (#{mm_config[:defined]}) but does not exists (#{config_path})"
 							next
 						end
 

data/lib/maruto/magento_version.rb

@@ -5,7 +5,7 @@ module Maruto::MagentoVersion
 
 	def self.read_magento_version()
 		mage = 'app/Mage.php'
-		return nil unless File.exists? mage
+		return nil unless File.exist? mage
 		File.open mage do |file|
 			# newer magento version have a getVersionInfo function
 			newer = file.find { |line| line =~ /getVersionInfo/ }

data/lib/maruto/module_definition.rb

@@ -85,19 +85,12 @@ module Maruto::ModuleDefinition
 				m[:warnings] << { :file => m[:defined], :message => "duplicate module definition (in '#{h[mod_name][:defined]}' and '#{m[:defined]}')" }
 			end
 			if m[:active]
-				parts = mod_name.to_s.split('_')
 				h[mod_name] = m
-				if parts.size != 2
+				m[:config_path] = "app/code/#{m[:code_pool]}/#{mod_name.to_s.gsub(/_/, '/')}/etc/config.xml"
+				if !File.exist?(m[:config_path])
 					m[:warnings] ||= []
-					m[:warnings] << { :file => m[:defined], :message => "invalid module name" }
+					m[:warnings]<< { :file => m[:defined], :message => "config.xml is missing (searching '#{m[:config_path]}' for #{m[:name]})" }
 					m[:active] = false
-				else
-					m[:config_path] = "app/code/#{m[:code_pool]}/#{parts[0]}/#{parts[1]}/etc/config.xml"
-					if !File.exists?(m[:config_path])
-						m[:warnings] ||= []
-						m[:warnings]<< { :file => m[:defined], :message => "config.xml is missing (searching '#{m[:config_path]}' for #{m[:name]})" }
-						m[:active] = false
-					end
 				end
 			else
 				if m[:code_pool] == :core and m[:name].to_s.start_with? 'Mage_' then

data/lib/maruto/runner.rb

@@ -78,6 +78,10 @@ class Maruto::Runner < Thor
 			end
 		end
 
+		if magento[:warnings].empty?
+			exit 0
+		end
+		exit 1
 	end
 
 	desc "models", "list models sorted and grouped by their group_name"
@@ -171,5 +175,3 @@ class Maruto::Runner < Thor
 		end
 	end
 end
-
-

data/lib/maruto/version.rb

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

data/maruto.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0.0'
+
   spec.add_dependency "nokogiri", "~> 1.6"
   spec.add_dependency "thor", "~> 0.17"
 

data/spec/module_definition_spec.rb

@@ -170,10 +170,12 @@ describe Maruto::ModuleDefinition do
 
 	describe "when analysing module definitions" do
 		before do
-			@module_a = { :name => :Mage_A, :code_pool => :core, :defined => 'a'}
-			@module_b = { :name => :Mage_B, :code_pool => :core, :defined => 'b'}
-			@module_c = { :name => :Mage_C, :code_pool => :core, :defined => 'c'}
-			@module_d = { :name => :Mage_D, :code_pool => :core, :defined => 'd'}
+			@module_a = { :name => :Mage_A,   :code_pool => :core, :defined => 'app/etc/modules/SomeFile.xml'}
+			@module_b = { :name => :Mage_B,   :code_pool => :core, :defined => 'app/etc/modules/SomeFile.xml'}
+			@module_c = { :name => :Mage_C,   :code_pool => :core, :defined => 'app/etc/modules/SomeFile.xml'}
+			@module_d = { :name => :Mage_D,   :code_pool => :core, :defined => 'app/etc/modules/SomeFile.xml'}
+			@module_e = { :name => :Short,    :code_pool => :core, :defined => 'app/etc/modules/SomeFile.xml'}
+			@module_f = { :name => :Long_A_B, :code_pool => :core, :defined => 'app/etc/modules/SomeFile.xml'}
 		end
 		it "will return an Array and a Hash" do
 			a,h = Maruto::ModuleDefinition.analyse_module_definitions([])
@@ -188,6 +190,15 @@ describe Maruto::ModuleDefinition do
 			a.size.must_equal 0
 			h.size.must_equal 0
 		end
+		it "will include active modules (in Array or Hash)" do
+			parsed_module_definitions = [
+				@module_a.merge({ :active => true }),
+				@module_e.merge({ :active => true }),
+				@module_f.merge({ :active => true }),
+			]
+			a,h = Maruto::ModuleDefinition.analyse_module_definitions(parsed_module_definitions)
+			h.keys.must_equal [:Mage_A, :Short, :Long_A_B]
+		end
 		it "will warn when a core/Mage_ module is inactive" do
 			parsed_module_definitions = [
 				@module_a.merge({ :active => false, :warnings => ['first warning'] }),
@@ -220,23 +231,19 @@ describe Maruto::ModuleDefinition do
 			h[:Mage_A][:warnings].size.must_equal 2
 			h[:Mage_A][:warnings][-1][:file].must_equal @module_a[:defined]
 		end
-		it "will deactivate modules with an invalid name and add a warning" do
-			parsed_module_definitions = [
-				{ :name => :a, :active => true, :defined => 'a', :warnings => ['first warning'] },
-			]
-			a,h = Maruto::ModuleDefinition.analyse_module_definitions(parsed_module_definitions)
-			parsed_module_definitions[0][:active].must_equal false
-			parsed_module_definitions[0][:warnings].size.must_equal 2
-			parsed_module_definitions[0][:warnings][-1][:message].must_include "invalid module name"
-			parsed_module_definitions[0][:warnings][-1][:file].must_equal 'a'
-		end
 		it "will add the path to the module's config.xml" do
 			parsed_module_definitions = [
 				@module_a.merge({ :active => true }),
+				@module_e.merge({ :active => true }),
+				@module_f.merge({ :active => true }),
 			]
 			a,h = Maruto::ModuleDefinition.analyse_module_definitions(parsed_module_definitions)
 			h[:Mage_A][:config_path].must_equal 'app/code/core/Mage/A/etc/config.xml'
 			h[:Mage_A].wont_include :warnings
+			h[:Short][:config_path].must_equal 'app/code/core/Short/etc/config.xml'
+			h[:Short].wont_include :warnings
+			h[:Long_A_B][:config_path].must_equal 'app/code/core/Long/A/B/etc/config.xml'
+			h[:Long_A_B].wont_include :warnings
 		end
 		it "will deactivate modules without a config.xml and add a warning" do
 			parsed_module_definitions = [
@@ -274,4 +281,3 @@ describe Maruto::ModuleDefinition do
 	end
 
 end
-

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: maruto
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Jean-Luc Geering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
 description: Magento Ruby Tools
@@ -99,9 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -114,10 +103,12 @@ files:
 - fixtures/magento_1.7.0.2/app/Mage.php
 - fixtures/magento_1.7.0.2/app/code/core/Mage/Catalog/etc/config.xml
 - fixtures/magento_1.7.0.2/app/code/core/Mage/Sales/etc/config.xml
+- fixtures/magento_root/app/code/core/Long/A/B/etc/config.xml
 - fixtures/magento_root/app/code/core/Mage/A/etc/config.xml
 - fixtures/magento_root/app/code/core/Mage/B/etc/config.xml
 - fixtures/magento_root/app/code/core/Mage/C/etc/config.xml
 - fixtures/magento_root/app/code/core/Mage/D/etc/config.xml
+- fixtures/magento_root/app/code/core/Short/etc/config.xml
 - fixtures/magento_root/app/etc/modules/Bad_Example.xml
 - fixtures/magento_root/app/etc/modules/Mage_All.xml
 - fixtures/magento_root/app/etc/modules/Mage_Api.xml
@@ -142,27 +133,26 @@ files:
 homepage: https://github.com/jlgeering/maruto
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: config parser and analyser, ...
 test_files:
 - spec/magento_version_spec.rb