fiveruns_tuneup_merb 0.5.2 → 0.5.3

data/CHANGELOG

@@ -1,3 +1,3 @@
-v0.5.2. Fix for Safari Rendering.
-
-v0.5.1. Initial Release.
+* v0.5.3: Make asset installation automatic, fix sharing routing bug
+* v0.5.2: Fix for Safari Rendering.
+* v0.5.1: Initial Release.

data/README

@@ -22,13 +22,9 @@ See http://blog.fiveruns.com/2008/10/11/fiveruns-tuneup-for-merb for the announc
 
   dependency 'fiveruns_tuneup_merb'
 
-3. Run the following in your Merb.root:
+3. Add the following to your config/router.rb:
 
-  rake slices:fiveruns_tuneup_merb:install
-
-4. Add the following to your config/router.rb:
-
-  slice FiverunsTuneupMerb
+  add_slice FiverunsTuneupMerb
   
 (If you're already mounting other slices with `all_slices' this step isn't necessary.)
 

data/Rakefile

@@ -8,7 +8,10 @@ AUTHOR = "FiveRuns Development Team"
 EMAIL = "dev@fiveruns.com"
 HOMEPAGE = "http://tuneup.fiveruns.com/"
 SUMMARY = "Merb Slice that provides the FiveRuns TuneUp Panel (http://tuneup.fiveruns.com)"
-GEM_VERSION = "0.5.2"
+
+# IMPORTANT: Make sure you modify the version number in lib/fiveruns_tuneup_merb.rb
+#            as well!
+GEM_VERSION = "0.5.3"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = 'fiveruns_tuneup_merb'
@@ -22,7 +25,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('fiveruns_tuneup_core')
+  s.add_dependency('fiveruns_tuneup_core', '>= 0.5.3')
   s.add_dependency('merb-slices', '>= 0.9.5')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO CHANGELOG) + Dir.glob("{lib,spec,app,public,stubs}/**/*")

data/lib/fiveruns_tuneup_merb.rb

@@ -3,9 +3,8 @@ if defined?(Merb::Plugins)
   $:.unshift File.dirname(__FILE__)
   
   load_dependency 'merb-slices'
-  Merb::Plugins.add_rakefiles "fiveruns_tuneup_merb/merbtasks", "fiveruns_tuneup_merb/slicetasks"
-  
-  require 'fiveruns_tuneup_core'
+  load_dependency 'fiveruns_tuneup_core'
+    
   require File.dirname(__FILE__) / 'fiveruns_tuneup_merb' / 'instrumentation'
   require File.dirname(__FILE__) / 'fiveruns_tuneup_merb' / 'api_key'
 
@@ -33,7 +32,7 @@ if defined?(Merb::Plugins)
     
     # Slice metadata
     self.description = "Provides a FiveRuns TuneUp panel (http://tuneup.fiveruns.com)"
-    self.version = "0.5.2"
+    self.version = "0.5.3"
     self.author = "FiveRuns Development Team <dev@fiveruns.com>"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader
@@ -54,15 +53,16 @@ if defined?(Merb::Plugins)
     # Initialization hook - runs before AfterAppLoads BootLoader
     def self.init
       if Merb::Config[:adapter] != 'irb'
-        Merb.logger.info "Instrumenting with TuneUp"
+        Merb.logger.info "Instrumenting with FiveRuns TuneUp"
         ::Merb::Request.extend(FiverunsTuneupMerb::Instrumentation::Merb::Request)
         ::Merb::Controller.extend(FiverunsTuneupMerb::Instrumentation::Merb::Controller)
         if defined?(::DataMapper)
           ::DataMapper::Repository.extend(FiverunsTuneupMerb::Instrumentation::DataMapper::Repository)
         end
         log_share_status
+        copy_assets!
       else
-        Merb.logger.info "Not instrumenting with TuneUp (adapter is '#{Merb::Config[:adapter]}')"
+        Merb.logger.info "Not instrumenting with FiveRuns TuneUp (adapter is '#{Merb::Config[:adapter]}')"
       end
     end
     
@@ -90,6 +90,12 @@ if defined?(Merb::Plugins)
       end
     end
     
+    def self.copy_assets!
+      Merb.logger.info "Automatically copying assets for FiveRuns TuneUp"
+      copied, preserved = mirror_public!
+      preserved.each { |f| Merb.logger.warn "! preserved override as #{f}" }
+    end
+    
   end
   
   # Setup the slice layout for FiverunsTuneupMerb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns_tuneup_merb
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-14 00:00:00 -05:00
+date: 2008-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-slices
@@ -52,8 +52,6 @@ files:
 - lib/fiveruns_tuneup_merb
 - lib/fiveruns_tuneup_merb/api_key.rb
 - lib/fiveruns_tuneup_merb/instrumentation.rb
-- lib/fiveruns_tuneup_merb/merbtasks.rb
-- lib/fiveruns_tuneup_merb/slicetasks.rb
 - lib/fiveruns_tuneup_merb.rb
 - app/controllers
 - app/controllers/application.rb
@@ -112,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fiveruns_tuneup_merb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Merb Slice that provides the FiveRuns TuneUp Panel (http://tuneup.fiveruns.com)

data/lib/fiveruns_tuneup_merb/merbtasks.rb

@@ -1,106 +0,0 @@
-namespace :slices do
-  namespace :fiveruns_tuneup_merb do
-  
-    desc "Install FiverunsTuneupMerb"
-    task :install => [:preflight, :setup_directories, :copy_assets, :migrate]
-    
-    desc "Test for any dependencies"
-    task :preflight do # see slicetasks.rb
-    end
-  
-    desc "Setup directories"
-    task :setup_directories do
-      puts "Creating directories for host application"
-      FiverunsTuneupMerb.mirrored_components.each do |type|
-        if File.directory?(FiverunsTuneupMerb.dir_for(type))
-          if !File.directory?(dst_path = FiverunsTuneupMerb.app_dir_for(type))
-            relative_path = dst_path.relative_path_from(Merb.root)
-            puts "- creating directory :#{type} #{File.basename(Merb.root) / relative_path}"
-            mkdir_p(dst_path)
-          end
-        end
-      end
-    end
-    
-    desc "Copy stub files to host application"
-    task :stubs do
-      puts "Copying stubs for FiverunsTuneupMerb - resolves any collisions"
-      copied, preserved = FiverunsTuneupMerb.mirror_stubs!
-      puts "- no files to copy" if copied.empty? && preserved.empty?
-      copied.each { |f| puts "- copied #{f}" }
-      preserved.each { |f| puts "! preserved override as #{f}" }
-    end
-    
-    desc "Copy stub files and views to host application"
-    task :patch => [ "stubs", "freeze:views" ]
-  
-    desc "Copy public assets to host application"
-    task :copy_assets do
-      puts "Copying assets for FiverunsTuneupMerb - resolves any collisions"
-      copied, preserved = FiverunsTuneupMerb.mirror_public!
-      puts "- no files to copy" if copied.empty? && preserved.empty?
-      copied.each { |f| puts "- copied #{f}" }
-      preserved.each { |f| puts "! preserved override as #{f}" }
-    end
-    
-    desc "Migrate the database"
-    task :migrate do # see slicetasks.rb
-    end
-    
-    desc "Freeze FiverunsTuneupMerb into your app (only fiveruns_tuneup_merb/app)" 
-    task :freeze => [ "freeze:app" ]
-
-    namespace :freeze do
-      
-      desc "Freezes FiverunsTuneupMerb by installing the gem into application/gems using merb-freezer"
-      task :gem do
-        begin
-          Object.const_get(:Freezer).freeze(ENV["GEM"] || "fiveruns_tuneup_merb", ENV["UPDATE"], ENV["MODE"] || 'rubygems')
-        rescue NameError
-          puts "! dependency 'merb-freezer' missing"
-        end
-      end
-      
-      desc "Freezes FiverunsTuneupMerb by copying all files from fiveruns_tuneup_merb/app to your application"
-      task :app do
-        puts "Copying all fiveruns_tuneup_merb/app files to your application - resolves any collisions"
-        copied, preserved = FiverunsTuneupMerb.mirror_app!
-        puts "- no files to copy" if copied.empty? && preserved.empty?
-        copied.each { |f| puts "- copied #{f}" }
-        preserved.each { |f| puts "! preserved override as #{f}" }
-      end
-      
-      desc "Freeze all views into your application for easy modification" 
-      task :views do
-        puts "Copying all view templates to your application - resolves any collisions"
-        copied, preserved = FiverunsTuneupMerb.mirror_files_for :view
-        puts "- no files to copy" if copied.empty? && preserved.empty?
-        copied.each { |f| puts "- copied #{f}" }
-        preserved.each { |f| puts "! preserved override as #{f}" }
-      end
-      
-      desc "Freeze all models into your application for easy modification" 
-      task :models do
-        puts "Copying all models to your application - resolves any collisions"
-        copied, preserved = FiverunsTuneupMerb.mirror_files_for :model
-        puts "- no files to copy" if copied.empty? && preserved.empty?
-        copied.each { |f| puts "- copied #{f}" }
-        preserved.each { |f| puts "! preserved override as #{f}" }
-      end
-      
-      desc "Freezes FiverunsTuneupMerb as a gem and copies over fiveruns_tuneup_merb/app"
-      task :app_with_gem => [:gem, :app]
-      
-      desc "Freezes FiverunsTuneupMerb by unpacking all files into your application"
-      task :unpack do
-        puts "Unpacking FiverunsTuneupMerb files to your application - resolves any collisions"
-        copied, preserved = FiverunsTuneupMerb.unpack_slice!
-        puts "- no files to copy" if copied.empty? && preserved.empty?
-        copied.each { |f| puts "- copied #{f}" }
-        preserved.each { |f| puts "! preserved override as #{f}" }
-      end
-      
-    end
-    
-  end
-end

data/lib/fiveruns_tuneup_merb/slicetasks.rb

@@ -1,18 +0,0 @@
-namespace :slices do
-  namespace :fiveruns_tuneup_merb do 
-    
-    # add your own fiveruns_tuneup_merb tasks here
-    
-    # implement this to test for structural/code dependencies
-    # like certain directories or availability of other files
-    desc "Test for any dependencies"
-    task :preflight do
-    end
-    
-    # implement this to perform any database related setup steps
-    desc "Migrate the database"
-    task :migrate do
-    end
-    
-  end
-end