wagons 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTFiMDFkZWY5ZjY1MzE2MjRkYjlkZmJlNTZkMDY5MWYyNWEwNmNlYQ==
+    YTA2ZTc4NjkwNWJjZTU1YTZkNTE0MTY2MTg4MTMzYWMwMjU4N2ZhYQ==
   data.tar.gz: !binary |-
-    ZmQ3NzYzYTU5MzA4YmIyY2E1ZDcwMTVmOTk5Y2FiNTJlOTkxZWQzZA==
+    NTBhOTYzY2UxNDAxNzk0YjlkZjA1OTFkMDNlMjkwMGQ3NmY1YmI5ZA==
 SHA512:
   metadata.gz: !binary |-
-    NDk4NzUwMjRmNmQzNDA1ODQ4Mjk2ZGIyMDVlMmExZjc5MmY3YjNkNzY2ZmVi
-    ZWQ2ZWI2ZDVlOGI0ZjdkZTZkYWU4NTVjNTgwMjEyMWZmZTU5OWIyNDA1YjA2
-    MGFiN2FiZjQzMzA4M2ZiM2RhZmMxMmUwZDQ2Mzc3YmUzZGY1YzQ=
+    NzQzZWZhMGJjNmVkNzQ3OGRhMTRkOWZkMTNjZmVkZWZjNzU1ZjNkYzU0MjFl
+    NzliMGU5ZWRjNGQ3MDc2NTFhYzVmMjgwMDA1Y2QwNDM4MDdjZTg1OTMwODFh
+    NDhhOGMyNzU0ZGFmZWM5NGZiYjM0OGI2NTI5ODZlOWY5NWMyMzA=
   data.tar.gz: !binary |-
-    NTNlNTIwYjdlYWUzZTU3MGE3NDAwNmZkODQ1NTY0ZjU3ZDQ0MWJhMDVlMWEw
-    OWYxODE3ZDRkMzkwYThjYzA4NzU1NjUwYjJmZGZlYmM2YjVjODQ3NjcxNDU2
-    N2IwMGJhZGU5ODY3ZTQzZDM1NTQ0YjZkZTcwYWM0ZDgwYTQ0MDE=
+    M2I0MWExOWI1YzE5Njk0MTg1M2JmZDk3ZjU4MjBlMWUyNjg3NTE4YWI3MzI4
+    ZWUwN2Q2ZmQ0ZTFmZGZlYjM4MTdjNzY5ZGU3YmNlNjhhN2U5YTk0YjNmMWE0
+    MDQ3ZDQ3MDBkNmJiYmNiMzI0MmJjNjkwNDNkNDBjMDZjNjMwMmI=

data/Rakefile

@@ -21,7 +21,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -33,14 +32,13 @@ end
 
 task :test do
   begin
-    Bundler.with_clean_env { sh "cd test/dummy && rails g wagon test_wagon" }
-    Bundler.with_clean_env { sh "cd test/dummy && bundle exec rake wagon:bundle:update" }
+    Bundler.with_clean_env { sh 'cd test/dummy && rails g wagon test_wagon' }
+    Bundler.with_clean_env { sh 'cd test/dummy && bundle exec rake wagon:bundle:update' }
     Bundler.with_clean_env { sh "cd test/dummy && bundle exec rake db:migrate test  #{'-t' if Rake.application.options.trace}" }
     Bundler.with_clean_env { sh "cd test/dummy && bundle exec rake wagon:test  #{'-t' if Rake.application.options.trace}" }
   ensure
-    sh "rm -rf test/dummy/vendor/wagons/test_wagon"
+    sh 'rm -rf test/dummy/vendor/wagons/test_wagon'
   end
 end
 
-task :default => :test
-
+task default: :test

data/lib/generators/wagon/templates/%singular_name%.gemspec.tt

@@ -1,19 +1,20 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 # Maintain your wagon's version:
-require "<%= singular_name %>/version"
+require '<%= singular_name %>/version'
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "<%= singular_name %>"
+  # rubocop:disable SingleSpaceBeforeFirstArg
+  s.name        = '<%= singular_name %>'
   s.version     = <%= class_name %>::VERSION
-  s.authors     = ["Your name"]
-  s.email       = ["Your email"]
-  #s.homepage    = "TODO"
-  s.summary     = "<%= wagon_name.humanize.titleize %>"
-  s.description = "Wagon description"
-
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile"]
-  s.test_files = Dir["test/**/*"]
+  s.authors     = ['Your name']
+  s.email       = ['Your email']
+  # s.homepage    = 'TODO'
+  s.summary     = '<%= wagon_name.humanize.titleize %>'
+  s.description = 'Wagon description'
 
+  s.files = Dir['{app,config,db,lib}/**/*'] + ['Rakefile']
+  s.test_files = Dir['test/**/*']
+  # rubocop:enable SingleSpaceBeforeFirstArg
 end

data/lib/generators/wagon/templates/{script → bin}/rails.tt

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+# This command will automatically be run when you run "rails" with Rails
+# gems installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 
@@ -8,4 +9,4 @@ ENGINE_PATH = File.expand_path('lib/<%= singular_name %>/engine', ENGINE_ROOT)
 
 load File.expand_path('../../app_root.rb', __FILE__)
 
-load File.expand_path('script/rails', ENV["APP_ROOT"])
+load File.expand_path('script/rails', ENV['APP_ROOT'])

data/lib/generators/wagon/templates/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  
+
 end

data/lib/generators/wagon/templates/lib/%singular_name%/version.rb.tt

@@ -1,3 +1,3 @@
 module <%= class_name %>
-  VERSION = "0.0.1"
-end
+  VERSION = '0.0.1'
+end

data/lib/generators/wagon/templates/lib/%singular_name%.rb.tt

@@ -4,4 +4,3 @@ require '<%= singular_name %>/wagon'
 
 module <%= class_name %>
 end
-

data/lib/generators/wagon/wagon_generator.rb

@@ -1,5 +1,4 @@
 class WagonGenerator < Rails::Generators::NamedBase #:nodoc:
-
   attr_reader :wagon_name
 
   source_root File.expand_path('../templates', __FILE__)
@@ -28,11 +27,10 @@ class WagonGenerator < Rails::Generators::NamedBase #:nodoc:
   private
 
   def all_templates
-    source_paths.collect do |path|
-      Dir[File.join(path, "**", "{*,.[a-z]*}")].
-          select {|f| File.file?(f) }.
-          collect {|f| f.sub(path + File::SEPARATOR, '') }
+    source_paths.map do |path|
+      Dir[File.join(path, '**', '{*,.[a-z]*}')].
+          select { |f| File.file?(f) }.
+          map { |f| f.sub(path + File::SEPARATOR, '') }
     end.flatten.uniq.sort
   end
-
 end

data/lib/wagons/extensions/application.rb

@@ -1,6 +1,5 @@
 module Rails
   class Application < Engine
-    
     protected
 
     # Append wagons at the end of all railties, even after the application.
@@ -11,8 +10,7 @@ module Rails
         end
       end
     end
-    
+
     alias_method_chain :ordered_railties, :wagons
-    
   end
-end
+end

data/lib/wagons/extensions/require_optional.rb

@@ -5,5 +5,5 @@ class Object
   rescue LoadError
     # that's fine, it's an optional require
   end
-  alias optional_require require_optional
-end
+  alias_method :optional_require, :require_optional
+end

data/lib/wagons/extensions/test_case.rb

@@ -1,13 +1,11 @@
 module ActiveSupport #:nodoc:
   class TestCase
-  
     # Resets the fixtures to the new path
     def self.reset_fixture_path(path)
-        self.fixture_table_names = []
-        self.fixture_class_names = {}
-        self.fixture_path = path
-        self.fixtures :all  
+      self.fixture_table_names = []
+      self.fixture_class_names = {}
+      self.fixture_path = path
+      fixtures :all
     end
-
   end
-end
+end

data/lib/wagons/installer.rb

@@ -1,21 +1,19 @@
 module Wagons
-  
   # Helper class to install wagons into the current application.
   # Wagons are searched for in the system gem repository.
   #
   # If you want to use the #install method, add "gem 'open4'" to
   # your Gemfile.
   class Installer
-    
     attr_accessor :include_version_in_wagonfile
-    
+
     def initialize
       @include_version_in_wagonfile = true
     end
-    
+
     # Gem specifications of all installed wagons.
     def installed
-      @installed ||= Wagons.all.collect(&:gemspec)
+      @installed ||= Wagons.all.map(&:gemspec)
     end
 
     # Most recent gem specifications of all wagons available in GEM_HOME.
@@ -25,19 +23,18 @@ module Wagons
       # only keep most recent version in @available
       @available = []
       load_available_specs.each do |spec|
-        if prev = @available.find {|w| w.name == spec.name }
+        if prev = @available.find { |w| w.name == spec.name }
           if prev.version < spec.version
-          @available.delete(prev)
-          @available << spec
+            @available.delete(prev)
+            @available << spec
           end
         else
-        @available << spec
+          @available << spec
         end
       end
       @available
     end
 
-
     # Most recent gem specifications of available, but not installed (in any version) wagons.
     def not_installed
       exclude_specs(available, installed)
@@ -59,9 +56,9 @@ module Wagons
     # This method requires open4.
     def install(names)
       change_internal(names, :check_dependencies) do |specs|
-        content = File.read(wagonfile) rescue ""
+        content = File.read(wagonfile) rescue ''
         wagonfile_update(specs)
-        
+
         begin
           setup_wagons(specs)
         rescue => e
@@ -72,7 +69,7 @@ module Wagons
     end
 
     # Remove the wagons with the given names. I.e., reverts the migrations
-    # of the given wagon names if the wagon is not protected 
+    # of the given wagon names if the wagon is not protected
     # and removes the entries from the Wagonfile.
     # Returns nil if everything is fine or a string with error messages.
     def uninstall(names)
@@ -85,20 +82,20 @@ module Wagons
     # Get the gem specification of the installed wagon with the given name.
     # Return nil if not found.
     def installed_spec(name)
-      installed.find {|s| s.name == name }
+      installed.find { |s| s.name == name }
     end
 
     # Get the gem specification of an available wagon with the given name.
     # Return nil if not found.
     def available_spec(name)
-      available.find {|s| s.name == name}
+      available.find { |s| s.name == name }
     end
-    
+
     # Update the Wagonfile with the given gem specifications.
     def wagonfile_update(specs)
       wagonfile_edit(specs) do |spec, content|
         declaration = "gem '#{spec.name}'"
-        declaration += ", '#{spec.version.to_s}'" if include_version_in_wagonfile
+        declaration += ", '#{spec.version}'" if include_version_in_wagonfile
         unless content.sub!(gem_declaration_regexp(spec.name), declaration)
           content += "\n#{declaration}"
         end
@@ -112,7 +109,7 @@ module Wagons
         content.sub(gem_declaration_regexp(spec.name), '')
       end
     end
-    
+
     # Check if all wagon dependencies of the given gem specifications
     # are met by the installed wagons.
     # Returns nil if everything is fine or a string with error messages.
@@ -124,7 +121,7 @@ module Wagons
 
       check_all_dependencies(specs, future, missing)
     end
-    
+
     # Check if the app requirement of the given gem specifications
     # are met by the current app version.
     # Returns nil if everything is fine or a array with error messages.
@@ -140,7 +137,7 @@ module Wagons
 
       missing
     end
-    
+
     # Check if the wagon dependencies of the remaining wagons
     # would still be met after the given gem specifications are uninstalled.
     # Returns nil if everything is fine or a string with error messages.
@@ -163,47 +160,47 @@ module Wagons
     # List of available gem specifications with the given names.
     # Raises an error if a name cannot be found.
     def specs_from_names(names)
-      names.collect do |name| 
+      names.map do |name|
         spec = available_spec(name)
-        raise "#{name} was not found" if spec.nil?
+        fail "#{name} was not found" if spec.nil?
         spec
       end
     end
-    
+
     # Removes all gem specifications with the same name in to_be_excluded from full.
     # Versions are ignored.
     def exclude_specs(full, to_be_excluded)
-      full.clone.delete_if {|s| to_be_excluded.find {|d| s.name == d.name } }
+      full.clone.delete_if { |s| to_be_excluded.find { |d| s.name == d.name } }
     end
-    
+
     # Wagonfile
     def wagonfile
-      Rails.root.join("Wagonfile")
+      Rails.root.join('Wagonfile')
     end
-    
+
     # The wagon class of the given spec.
     def wagon_class(spec)
       @wagon_classes ||= {}
-      return @wagon_classes[spec] if @wagon_classes.has_key?(spec)
-      
+      return @wagon_classes[spec] if @wagon_classes.key?(spec)
+
       clazz = nil
       file = File.join(spec.gem_dir, 'lib', spec.name, 'wagon.rb')
-      if File.exists?(file)
+      if File.exist?(file)
         require file
         clazz = "#{spec.name.camelize}::Wagon".constantize
       else
-        raise "#{spec.name} wagon class not found in #{file}"
+        fail "#{spec.name} wagon class not found in #{file}"
       end
       @wagon_classes[spec] = clazz
     end
 
     private
-    
+
     def load_available_specs
       paths = [ENV['GEM_HOME']]
-      paths += (ENV['GEM_PATH'] || "").split(File::PATH_SEPARATOR)
-      paths.collect(&:presence).compact.collect do |path|
-        Dir[File.join(path, 'specifications', "#{Wagons.app_name}_*.gemspec")].collect do |gemspec|
+      paths += (ENV['GEM_PATH'] || '').split(File::PATH_SEPARATOR)
+      paths.map(&:presence).compact.map do |path|
+        Dir[File.join(path, 'specifications', "#{Wagons.app_name}_*.gemspec")].map do |gemspec|
           Gem::Specification.load(gemspec)
         end
       end.flatten
@@ -222,7 +219,7 @@ module Wagons
       to_check.each do |spec|
         spec.runtime_dependencies.each do |dep|
           if dep.name.start_with?("#{Wagons.app_name}_") &&
-          all.none? {|s| dep.matches_spec?(s) }
+          all.none? { |s| dep.matches_spec?(s) }
             missing << "#{spec.name} requires #{dep.name} #{dep.requirement}"
           end
         end
@@ -230,13 +227,13 @@ module Wagons
 
       missing.join("\n").presence
     end
-    
+
     def gem_declaration_regexp(name)
       /^.*gem\s+('|")#{name}('|").*$/
     end
-        
+
     def wagonfile_edit(specs)
-      content = File.read(wagonfile) rescue ""
+      content = File.read(wagonfile) rescue ''
 
       specs.each do |spec|
         content = yield spec, content
@@ -245,69 +242,68 @@ module Wagons
 
       wagonfile_write(content.strip)
     end
-    
+
     def wagonfile_write(content)
       File.open(wagonfile, 'w') do |f|
         f.puts content
       end
     end
-    
+
     def setup_wagons(specs)
       require 'open4'
-      
+
       env = Rails.env
       cmd = setup_command(specs)
       Rails.logger.info(cmd)
-      
+
       Bundler.with_clean_env do
         ENV['RAILS_ENV'] = env
         execute_setup(cmd)
       end
     end
-    
+
     def remove_wagons(specs)
       Wagons.all.reverse.each do |wagon|
-        if specs.find {|spec| wagon.gem_name == spec.name }
+        if specs.find { |spec| wagon.gem_name == spec.name }
           wagon.unload_seed
           wagon.revert
         end
       end
     end
-        
+
     def setup_command(specs)
-      wagons = specs.collect {|s| s.name.sub(/^#{Wagons.app_name}_/, '') }.join(',')
+      wagons = specs.map { |s| s.name.sub(/^#{Wagons.app_name}_/, '') }.join(',')
       "cd #{Rails.root} && bundle exec rake wagon:setup WAGON=#{wagons} -t"
     end
-    
+
     def execute_setup(cmd)
       msg = nil
       status = Open4.popen4(cmd) do |pid, input, output, errors|
         msg = errors.read
       end
-      
+
       if status.exitstatus.to_i != 0
-        raise msg.presence || "Unknown error while running wagon:setup"
+        fail msg.presence || 'Unknown error while running wagon:setup'
       end
     end
-    
+
     def change_internal(names, *checks)
       specs = specs_from_names(names)
-      
+
       if msg = perform_checks(specs, checks)
         msg
       else
         yield specs
         nil
       end
-    rescue Exception => e
+    rescue => e
       handle_exception(e, names)
     end
-    
+
     def handle_exception(e, names)
       msg = e.message
       Rails.logger.error msg + "\n\t" + e.backtrace.join("\n\t")
       msg
     end
-
   end
-end
+end

data/lib/wagons/railtie.rb

@@ -2,7 +2,7 @@ module Wagons
   # Integrate tasks into Rails.
   class Railtie < Rails::Railtie #:nodoc:
     rake_tasks do
-      load "tasks/wagons.rake"
+      load 'tasks/wagons.rake'
     end
   end
-end
+end

data/lib/wagons/version.rb

@@ -1,3 +1,3 @@
 module Wagons
-  VERSION = "0.2.2"
+  VERSION = '0.3.0'
 end

data/lib/wagons/view_helper.rb

@@ -1,55 +1,54 @@
 module Wagons
   module ViewHelper
-     
     # Renders all partials with names that match "_[ key ]_*.[ format ].[ handler ]"
     # in alphabetical order.
     # Accepts an additional option :folder to pass an additional folder to search
     # extension partials in.
     def render_extensions(key, options = {})
-      extensions = find_extension_partials(key, options.delete(:folder)).collect do |partial|
-        render options.merge(:partial => partial) 
+      extensions = find_extension_partials(key, options.delete(:folder)).map do |partial|
+        render options.merge(partial: partial)
       end
       safe_join(extensions)
     end
-    
+
     # The view folders relative to app/views in which extensions are searched for.
     # Uses the folder of the current template.
     def extension_folders
       [current_template_folder]
     end
-    
+
     # The folder of the current partial relative to app/views
     def current_template_folder
       @virtual_path[/(.+)\/.*/, 1]
     end
-    
+
     private
-    
+
     def find_extension_partials(key, folder = nil)
       folders = extension_folders.dup
       folders << folder if folder
-      
+
       files = find_extension_files(key, folders).sort_by { |f| File.basename(f) }
       files_to_partial_names(files)
     end
-    
+
     def find_extension_files(key, folders)
       folder_pattern = glob_pattern(folders)
       formats = glob_pattern(lookup_context.formats)
       handlers = glob_pattern(lookup_context.handlers)
-      
-      view_paths.collect do |path|
+
+      view_paths.map do |path|
         Dir.glob(File.join(path.to_s, folder_pattern, "_#{key}_*.#{formats}.#{handlers}"))
       end.flatten
     end
-    
+
     def files_to_partial_names(files)
-      files.collect do |f|
+      files.map do |f|
         m = f.match(/views.(.+?[\/\\])_(.+)\.\w+\.\w+$/)
         m[1] + m[2]
       end
     end
-      
+
     def glob_pattern(list)
       if list.size == 1
         list.first
@@ -57,8 +56,7 @@ module Wagons
         "{#{list.join(',')}}"
       end
     end
-    
   end
 end
 
-ActionView::Base.send(:include, Wagons::ViewHelper) if defined?(ActionView::Base)
+ActionView::Base.send(:include, Wagons::ViewHelper) if defined?(ActionView::Base)

data/lib/wagons/wagon.rb

@@ -1,7 +1,6 @@
 require 'active_support/concern'
 
 module Wagons
-
   # A wagon is an extension to your application train running on Rails.
   #
   # Wagons are built on Rails Engines. To change an engine to a wagon,
@@ -37,14 +36,14 @@ module Wagons
 
     # Direct dependencies on other wagons.
     def dependencies
-      gemspec.dependencies.collect(&:name).
-                           select {|dep| dep =~ /\A#{Wagons.app_name}_/ }.
-                           collect { |dep| Wagons.find(dep) || raise("No wagon #{dep} found") }
+      gemspec.dependencies.map(&:name).
+                           select { |dep| dep =~ /\A#{Wagons.app_name}_/ }.
+                           map { |dep| Wagons.find(dep) || fail("No wagon #{dep} found") }
     end
 
     # Recursive depdencies on other wagons.
     def all_dependencies
-      dependencies.collect {|dep| dep.all_dependencies + [dep] }.flatten.uniq
+      dependencies.map { |dep| dep.all_dependencies + [dep] }.flatten.uniq
     end
 
     # Gem Specification.
@@ -103,8 +102,8 @@ module Wagons
       end
 
       extend Rake::DSL if defined? Rake::DSL
-      self.class.rake_tasks.each { |block| self.instance_exec(app, &block) }
-      paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
+      self.class.rake_tasks.each { |block| instance_exec(app, &block) }
+      paths['lib/tasks'].existent.sort.each { |ext| load(ext) }
       self
     end
 
@@ -129,4 +128,3 @@ module Wagons
     end
   end
 end
-

data/lib/wagons.rb

@@ -10,7 +10,6 @@ require 'wagons/extensions/application'
 require 'wagons/extensions/require_optional'
 require 'wagons/extensions/test_case'
 
-
 # Utility class to find single wagons and provide additional information
 # about the main application.
 module Wagons
@@ -18,37 +17,36 @@ module Wagons
   def self.all
     enumerable = Rails.application.railties
     enumerable = enumerable.all if enumerable.respond_to?(:all)
-    enumerable.select {|r| r.is_a?(Wagon) }
+    enumerable.select { |r| r.is_a?(Wagon) }
   end
-  
+
   # Find a wagon by its name.
   def self.find(name)
     name = name.to_s
-    all.find {|wagon| wagon.wagon_name == name || wagon.gem_name == name }
+    all.find { |wagon| wagon.wagon_name == name || wagon.gem_name == name }
   end
-  
+
   # The name of the main Rails application.
   # By default, this is the underscored name of the application module.
   # This name is directly used for the gem names,
   def self.app_name
     @app_name ||= Rails.application.class.name.split('::').first.underscore
   end
-  
+
   # Set the application name. Should be lowercase with underscores.
   # Do this in an initializer.
   def self.app_name=(name)
     @app_name = name
   end
-  
+
   # The version of the main application.
   def self.app_version
-    @app_version ||= Gem::Version.new("0")
+    @app_version ||= Gem::Version.new('0')
   end
-  
+
   # Set the version of the main application.
   # Do this in an initializer.
   def self.app_version=(version)
     @app_version = version.is_a?(Gem::Version) ? version : Gem::Version.new(version)
   end
 end
-