magicloader 0.9.0 → 0.9.1

data/README.markdown

@@ -71,15 +71,22 @@ what the options do already, but if you can't, here's some help:
 
 * __target__: output file to annotate. See above.
 
-* __strip__: remove the given leading string from all of the output paths written
-  to the target file. Optionally, you can give an arbitrary regular 
+* __strip__: remove the given leading string from all of the output paths 
+  written to the target file. Optionally, you can give an arbitrary regular 
   expression, and whatever it matches will be removed from the string.
   This is good if you have a leading directory prefix you want to remove
   from the generated output files.
   
-* __name__: the name of the Rake task to define. It defaults to "magicload" if you
-  don't specify it yourself, so specifying it explicitly as "magicload" is a
-  bit redundant. Otherwise, you can set it to whatever you want.
+* __name__: the name of the Rake task to define. It defaults to "magicload" if
+  you don't specify it yourself, so specifying it explicitly as "magicload" is
+  a bit redundant. Otherwise, you can set it to whatever you want.
+  
+* __clean__: true or false boolean. The "clean" option is especially useful if
+  your target file is included in the Rake environment. If this happens, it 
+  will distrupt MagicLoader's typical operation. Setting :clean => true will
+  remove previous MagicLoader directives from the target file before
+  attempting to regenerate them, affording you a pristine environment in which
+  to compute your code dependencies.
 
 The wonderful require_all method
 --------------------------------

data/lib/magic_loader/tasks.rb

@@ -19,10 +19,18 @@ module MagicLoader
   
   # Generates the MagicLoader rake task
   class Task < Rake::TaskLib
+    # FIXME: Yeah all this functionality really shouldn't be part of the Rake
+    # task. It should be all nicely factored into a reusable class with all
+    # the core functionality exposed, then wrapped in a Rake task. But I'm
+    # lazy and just trying to get this thing out the door, and Rake tasks
+    # are my main use case. Got a problem? Refactor me!
+    
+    # Please see the README for how to use this task
     def initialize(*paths)
       options = paths.last.is_a?(Hash) ? paths.pop : {}
       task_name = options[:name] || 'magicload'
     
+      desc "Automagically calculate code dependencies"
       task task_name do
         load_order = MagicLoader.require_all(*paths)
         strip_paths!(load_order, options[:strip]) if options[:strip]
@@ -45,6 +53,17 @@ module MagicLoader
           puts magic_block
         end
       end
+      
+      if options[:clean]
+        namespace task_name do
+          desc "Remove the previous MagicLoader block"
+          task :clean do
+            strip_magic_block options[:target]
+          end
+        end
+        
+        Rake::Task[task_name].prerequisites << "#{task_name}:clean"
+      end
     end
   
     #######
@@ -71,6 +90,10 @@ module MagicLoader
     # Annotate a MagicLoader Magic Block onto the end of an existing file
     def annotate_file(path, magic_block)
       data = File.read path
+      
+      # Remove trailing whitespace from the file so it doesn't grow
+      data.sub!(/\w+$/m, '')
+      
       magic_matches = data.match(MAGIC_REGEXP)
       case magic_matches
       when MatchData
@@ -81,5 +104,12 @@ module MagicLoader
     
       File.open(path, 'w') { |f| f << data }
     end
+    
+    # Remove the MagicLoader block from a particular file
+    def strip_magic_block(file)
+      data = File.read path
+      data.sub(MAGIC_REGEXP, '')
+      File.open(path, 'w') { |f| f << data }
+    end
   end
 end

data/magicloader.gemspec

@@ -7,7 +7,7 @@ GEMSPEC = Gem::Specification.new do |s|
 Painless code dependency management. Think Bundler, but for managing file load
 ordering dependencies.
 EOD
-  s.version = "0.9.0"
+  s.version = "0.9.1"
   s.authors = "Tony Arcieri"
   s.email = "bascule@gmail.com"
   s.homepage = "http://github.com/tarcieri/MagicLoader"
@@ -19,6 +19,6 @@ EOD
 
   # RDoc settings
   s.has_rdoc = true
-  s.rdoc_options = %w(--title MagicLoader --main README.textile --line-numbers)
+  s.rdoc_options = %w(--title MagicLoader --main README.markdown --line-numbers)
   s.extra_rdoc_files = ["LICENSE", "README.markdown", "CHANGES"]
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: magicloader
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Tony Arcieri
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -06:00
+date: 2010-09-03 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -58,7 +58,7 @@ rdoc_options:
 - --title
 - MagicLoader
 - --main
-- README.textile
+- README.markdown
 - --line-numbers
 require_paths: 
 - lib