require_reloader 0.1.6 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7f99ac277b896b3dc347c2be0195edb4d9d9dfa7
+  data.tar.gz: 0c43c9c7187d3b857fc9a37c49f69d8f9e73ab58
+SHA512:
+  metadata.gz: d7643d31465ca0f496aa6cd0c9544092462207e448c632a76f0301377c71c8a9c2bd94269de3e973778bd2e33f636912edbc2cdb5442c20dc1faf7f812ab0ae5
+  data.tar.gz: d90c175222c87e55d9102727cee57dd7d112e68fc020f77276521871caf45365c2c652a5c7a31f6fe280ae36142e1588de9d0226a29e43faebff67af666e389c

data/README.md

@@ -17,7 +17,7 @@ Given a `Gemfile`
 
     # Gemfile
     gem 'my_gem',  :path => '~/work/my_gem'
-    gem 'my_gem2', :path => '~/fun/my_gem2'
+    gem 'my_gem2', :path => '~/fun/my_gem2', :module_name => 'MYGEM2'
 
 To reload all **local gems** (the ones with `:path` attribute,
 or using [local git repo](http://gembundler.com/v1.2/git.html#local)):
@@ -39,6 +39,10 @@ You can also **reload a `.rb` file in `lib`** or any directory:
 
 The `:path` option is *optional*. In **Rails 3.2**, `:path` value is added into `watchable_dirs`. Rails 3.1 and 3.0 ignore this value.
 
+The `:module_name` option is *optional*. By default, it is assumed that the top-level module is a CamelCase version of the gem name.
+If this is not the case, you can pass this option, a String. This value will also be picked up if included in the metadata of the gemspec,
+as in `spec.metadata = {'module_name' => 'MYMOD'}`.
+
 RequireReloader adds `lib` into `watchable_dirs`. So, specify `:path`
 only if it is not specified in `Gemfile` and the file is located in other directory.
 
@@ -71,9 +75,11 @@ This gem is forked from Colin Young's [gem_reloader](https://github.com/colinyou
 
 ### Contributors
 - @sven-winkler: trigger callback after gem reloaded (issue #2)
+- @aceofspades: support gem metadata :module_name in Gemfile (issue #4)
 
 ## Changelog
-- v0.1.6: RequireReloader::watch accepts :callback, runs it after gem reloaded ([pull request](https://github.com/teohm/require_reloader/pull/2) from @sven-winkler). 
+- v0.2.0: Support module_name option/spec-metadata
+- v0.1.6: RequireReloader::watch accepts :callback, runs it after gem reloaded ([pull request](https://github.com/teohm/require_reloader/pull/2) from @sven-winkler).
 - v0.1.5: properly guess top-level module name based on gem name
 pattern, only watch git repo if it's local.
 - v0.1.4: remove 'vendor/gems' from watchable_dirs & autoload_paths, as local gem path is already specified in Gemfile.

data/lib/require_reloader.rb

@@ -14,9 +14,9 @@ module RequireReloader
     def watch_local_gems!
       local_gems.each do |gem|
         # never reload itself for now, causing error raised in integration test
-        next if gem[:name] == 'require_reloader'
+        next if gem.name == 'require_reloader'
 
-        watch gem[:name], :path => gem[:path]
+        watch gem.name, :path => gem.source.path.to_s, :module_name => gem.metadata['module_name']
       end
     end
 
@@ -47,7 +47,11 @@ module RequireReloader
         # based on Tim Cardenas's solution:
         # http://timcardenas.com/automatically-reload-gems-in-rails-327-on-eve
         ActionDispatch::Callbacks.to_prepare do
-          helper.remove_module_if_defined(gem)
+          if opts[:module_name]
+            helper.remove_module_if_defined(opts[:module_name])
+          else
+            helper.remove_gem_module_if_defined(gem)
+          end
           $".delete_if {|s| s.include?(gem)}
           require gem
           opts[:callback].call(gem) if opts[:callback]
@@ -59,16 +63,15 @@ module RequireReloader
 
     def expanded_gem_path(gem, preferred_path)
       return File.expand_path(preferred_path) if preferred_path
-      local_gem = local_gems.find {|g| g[:name] == gem}
-      local_gem ? File.expand_path(local_gem[:path]) : false
+      local_gem = local_gems.find {|g| g.name == gem}
+      local_gem ? File.expand_path(local_gem.source.path.to_s) : false
     end
 
     # returns only local gems, local git repo
     def local_gems
       Bundler.definition.specs.
         select{|s| s.source.is_a?(Bundler::Source::Path) }.
-        delete_if{|s| s.source.is_a?(Bundler::Source::Git) && !s.source.send(:local?) }.
-        map{|s| {:name => s.name, :path => s.source.path.to_s} }
+        delete_if{|s| s.source.is_a?(Bundler::Source::Git) && !s.source.send(:local?) }
     end
   end
 end

data/lib/require_reloader/helper.rb

@@ -50,9 +50,13 @@ module RequireReloader
   class Helper
     include ActionPackInfectorMethods
 
-    def remove_module_if_defined(gem_name)
-      full_name = full_qualified_name(gem_name)
-      remove_module(full_name) if module_defined?(full_name)
+    def remove_gem_module_if_defined(gem_name)
+      mod_name = full_qualified_name(gem_name)
+      remove_module_if_defined(mod_name)
+    end
+
+    def remove_module_if_defined(mod_name)
+      remove_module(mod_name) if module_defined?(mod_name)
     end
 
     def module_defined?(full_name)

data/lib/require_reloader/version.rb

@@ -1,3 +1,3 @@
 module RequireReloader
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: require_reloader
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Colin Young
@@ -10,22 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   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'
 description: Auto-reload require files or local gems without restarting server during
@@ -49,26 +46,26 @@ files:
 - require_reloader.gemspec
 homepage: https://github.com/teohm/require_reloader
 licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Auto-reload require files or local gems without restarting Rails server.
 test_files: []
+has_rdoc: