tiny_mce_helper 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 == master
 
+== 0.1.1 / 2008-10-19
+
+* Fix TinyMCE temp file getting closed/deleted too soon after being downloaded [Brandon Goodin]
+* Add more descriptive output during installation
+
 == 0.1.0 / 2008-08-30
 
 * Remove references to system wget/unzip calls for cross-platform compatibility

data/Rakefile

@@ -5,11 +5,11 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'tiny_mce_helper'
-  s.version           = '0.1.0'
+  s.version           = '0.1.1'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds helper methods for creating the TinyMCE initialization script.'
   
-  s.files             = FileList['{lib,tasks,test}/**/*'].to_a - FileList['test/app_root/log/*'].to_a + %w(CHANGELOG.rdoc init.rb install.rb Rakefile README.rdoc uninstall.rb)
+  s.files             = FileList['{lib,tasks,test}/**/*'] + %w(CHANGELOG.rdoc init.rb install.rb Rakefile README.rdoc uninstall.rb) - FileList['test/app_root/{log,log/*,script,script/*}']
   s.require_path      = 'lib'
   s.has_rdoc          = true
   s.test_files        = Dir['test/**/*_test.rb']

data/lib/tiny_mce_helper.rb

@@ -75,39 +75,44 @@ module PluginAWeek #:nodoc:
         require 'hpricot'
         require 'open-uri'
         
+        puts "Finding url of TinyMCE-#{version || 'latest'} download..." if verbose
         doc = Hpricot(open('http://sourceforge.net/project/showfiles.php?group_id=103281&package_id=111430'))
         if version
-          version.gsub!('.', '_')
-          file_element = (doc/'tr[@id*="rel0_"] a').detect {|file| file.innerHTML =~ /#{version}.zip$/}
+          url_version = version.gsub('.', '_')
+          file_element = (doc/'tr[@id*="rel0_"] a').detect {|file| file.innerHTML =~ /#{url_version}.zip$/}
           raise ArgumentError, "Could not find TinyMCE version #{version}" if !file_element
         else
-          file_element = (doc/'tr[@id^="pkg0_1rel0_"] a').detect {|file| file.innerHTML.to_s =~ /\d\.zip$/}
+          file_element = (doc/'tr[@id^="pkg0_1rel0_"] a').detect {|file| file.innerHTML.to_s =~ /tinymce_([\d_]+).zip$/}
           raise ArgumentError, 'Could not find latest TinyMCE version' if !file_element
+          
+          version = $1.gsub('_', '.')
         end
         
         filename = file_element.innerHTML
         file_url = file_element['href']
         
         # Download the file
-        puts 'Downloading TinyMCE source...' if verbose
-        file = open(file_url).path
-        
-        # Extract and install
-        puts 'Extracting...' if verbose
-        
-        require 'zip/zip'
-        require 'zip/zipfilesystem'
-        
-        Zip::ZipFile::open(file) do |zipfile|
-          zipfile.entries.each do |entry|
-            if match = /tinymce\/jscripts\/tiny_mce\/(.*)/.match(entry.name)
-              FileUtils.mkdir_p("#{target_path}/#{File.dirname(match[1])}")
-              entry.extract("#{target_path}/#{match[1]}") { true }
+        puts "Downloading TinyMCE-#{version} source from #{file_url}..." if verbose
+        open(file_url) do |file|
+          file_path = file.path
+          
+          # Extract and install
+          puts "Extracting source from #{file_path}..." if verbose
+          
+          require 'zip/zip'
+          require 'zip/zipfilesystem'
+          
+          Zip::ZipFile.open(file_path) do |zipfile|
+            zipfile.entries.each do |entry|
+              if match = /tinymce\/jscripts\/tiny_mce\/(.*)/.match(entry.name)
+                FileUtils.mkdir_p("#{target_path}/#{File.dirname(match[1])}")
+                entry.extract("#{target_path}/#{match[1]}") { true }
+              end
             end
           end
+          
+          puts 'Done!' if verbose
         end
-        
-        puts 'Done!' if verbose
       end
       
       # Uninstalls the TinyMCE installation and optional configuration file

data/test/test_helper.rb

@@ -1,3 +1,8 @@
+# Setup default folders
+require 'fileutils'
+FileUtils.rm_rf('test/app_root/config')
+FileUtils.cp_r('test/app_root/config_bak', 'test/app_root/config')
+
 # Load the plugin testing framework
 $:.unshift("#{File.dirname(__FILE__)}/../../plugin_test_helper/lib")
 require 'rubygems'

data/test/unit/tiny_mce_helper_test.rb

@@ -41,7 +41,6 @@ end
 class TinyMceInstallerTest < Test::Unit::TestCase
   def setup
     # Set up public path
-    @public_root = "#{Rails.root}/public"
     FileUtils.mkdir_p("#{Rails.root}/public/javascripts")
     
     # Set default STDIN value
@@ -128,17 +127,12 @@ class TinyMceInstallerTest < Test::Unit::TestCase
   end
   
   def teardown
-    FileUtils.rm_rf(@public_root)
+    FileUtils.rm_rf("#{Rails.root}/public")
   end
 end
 
 class TinyMceUpdaterTest < Test::Unit::TestCase
   def setup
-    # Set up config path
-    @config_root = "#{Rails.root}/config"
-    FileUtils.cp("#{Rails.root}/config_bak/tiny_mce_options.yml", @config_root)
-    @original_config_files = Dir["#{Rails.root}/config/**/*"].sort
-    
     # Track valid options
     @original_valid_options = PluginAWeek::TinyMCEHelper.valid_options.dup
   end
@@ -163,19 +157,14 @@ class TinyMceUpdaterTest < Test::Unit::TestCase
   
   def teardown
     PluginAWeek::TinyMCEHelper.valid_options = @original_valid_options
+    FileUtils.cp("#{Rails.root}/config_bak/tiny_mce_options.yml", "#{Rails.root}/config")
   end
 end
 
 class TinyMceUninstallerTest < Test::Unit::TestCase
   def setup
     # Set up public path
-    @public_root = "#{Rails.root}/public"
     FileUtils.mkdir_p("#{Rails.root}/public/javascripts")
-    
-    # Set up config path
-    @config_root = "#{Rails.root}/config"
-    FileUtils.cp("#{Rails.root}/config_bak/tiny_mce_options.yml", @config_root)
-    @original_config_files = Dir["#{Rails.root}/config/**/*"].sort
   end
   
   def test_uninstall_should_remove_options_configuration
@@ -191,7 +180,8 @@ class TinyMceUninstallerTest < Test::Unit::TestCase
   end
   
   def teardown
-    FileUtils.rm_rf(@public_root)
+    FileUtils.rm_rf("#{Rails.root}/public")
+    FileUtils.cp("#{Rails.root}/config_bak/tiny_mce_options.yml", "#{Rails.root}/config")
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_mce_helper
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-30 00:00:00 -04:00
+date: 2008-10-19 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,12 +27,8 @@ files:
 - test/app_root
 - test/app_root/config_bak
 - test/app_root/config_bak/tiny_mce_options.yml
-- test/app_root/script
-- test/app_root/script/rails_framework_root.rb
-- test/app_root/script/console
 - test/app_root/config
 - test/app_root/config/tiny_mce_options.yml
-- test/app_root/log
 - test/files
 - test/files/wiki.html
 - test/files/tinymce_3_0_6_2.zip

data/test/app_root/script/console

@@ -1,8 +0,0 @@
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-libs =  " -r irb/completion"
-libs << " -r test/app_root/script/rails_framework_root"
-libs << " -r test/test_helper"
-libs << " -r plugin_test_helper/console_with_fixtures"
-libs << " -r console_app"
-libs << " -r console_with_helpers"
-exec "#{irb} #{libs} --simple-prompt"

data/test/app_root/script/rails_framework_root.rb

@@ -1 +0,0 @@
-RAILS_FRAMEWORK_ROOT = '/home/aaron/Projects/Vendor/rails'