juicer 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.6 / 2009-07-20
+* New installation paths for YUI Compressor
+  Patch by http://github.com/craveytrain
+
 == 0.2.5 / 2009-05-22
 * Fixed a bug with the stylesheet merger where url( <url> ); (ie URL surrounded
   by spaces) resolved wrong.

data/lib/juicer.rb

@@ -3,7 +3,7 @@ require "logger"
 module Juicer
 
   # :stopdoc:
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   LOGGER = Logger.new(STDOUT)

data/lib/juicer/css_cache_buster.rb

@@ -49,7 +49,7 @@ module Juicer
             @contents.gsub!(url, File.join(File.dirname(url), basename))
           end
         rescue Errno::ENOENT
-          puts "Unable to locate file #{path || url}, skipping"
+          puts "Unable to locate file #{path || url}, skipping cache buster"
         end
       end
 

data/lib/juicer/install/yui_compressor_installer.rb

@@ -12,7 +12,7 @@ module Juicer
       def initialize(install_dir = Juicer.home)
         super(install_dir)
         @latest = nil
-        @website = "http://www.julienlecomte.net/yuicompressor/"
+        @website = "http://yuilibrary.com/downloads/"
       end
 
       #
@@ -27,7 +27,7 @@ module Juicer
       def install(version = nil)
         version = super(version)
         base = "yuicompressor-#{version}"
-        filename = download(File.join(@website, "#{base}.zip"))
+        filename = download(File.join(@website, "yuicompressor", "#{base}.zip"))
         target = File.join(@install_dir, path)
 
         Zip::ZipFile.open(filename) do |file|
@@ -59,7 +59,7 @@ module Juicer
       def latest
         return @latest if @latest
         webpage = Hpricot(open(@website))
-        @latest = (webpage / "#downloadbutton a")[0].get_attribute("href").match(/(\d\.\d\.\d)/)[1]
+        @latest = (webpage / "//h2[@id='yuicompressor']/../../../..//a")[0].get_attribute("href").match(/(\d\.\d\.\d)/)[1]
       end
     end
   end

data/tasks/rdoc.rake

@@ -19,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/tasks/setup.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'ostruct'
 require 'find'
 
-class OpenStruct; undef :gem; end
+class OpenStruct; undef :gem if defined? :gem; end 
 
 # TODO: make my own openstruct type object that includes descriptions
 # TODO: use the descriptions to output help on the available bones options
@@ -124,9 +124,7 @@ import(*rakefiles)
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
 
 def quiet( &block )
   io = [STDOUT.dup, STDERR.dup]
@@ -139,23 +137,17 @@ ensure
   $stdout, $stderr = STDOUT, STDERR
 end
 
-DIFF = if WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
+DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
+       else 'diff' end unless defined? DIFF
 
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       end
+SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
+       else '' end unless defined? SUDO
 
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
+RCOV = "#{RUBY} -S rcov"
+RDOC = "#{RUBY} -S rdoc"
+GEM  = "#{RUBY} -S gem"
 
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones facets/ansicode zentest).each do |lib|
   begin
     require lib
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}

data/tasks/zentest.rake

@@ -0,0 +1,36 @@
+if HAVE_ZENTEST
+
+# --------------------------------------------------------------------------
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'autotest'
+
+namespace :test do
+  task :autotest do
+    Autotest.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'test:autotest'
+
+end  # if test
+
+# --------------------------------------------------------------------------
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'autotest/rspec'
+
+namespace :spec do
+  task :autotest do
+    load '.autotest' if test(?f, '.autotest')
+    Autotest::Rspec.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'spec:autotest'
+
+end  # if rspec
+
+end  # if HAVE_ZENTEST
+
+# EOF

data/test/integration/juicer/minifyer/yui_compressor_test.rb

@@ -0,0 +1,133 @@
+require "test_helper"
+
+# TODO: Only keep tests that are actually needed to verify
+# yui_compressor working with the java lib
+class TestYuiCompressor < Test::Unit::TestCase
+  def setup
+    @path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
+    @yui_compressor = Juicer::Minifyer::YuiCompressor.new({ :bin_path => @path })
+    Juicer::Test::FileSetup.new.create
+    @file = path('out.min.css')
+  end
+
+  def teardown
+    File.delete(@file) if @file && File.exists?(@file)
+    File.delete(path("a-1.css")) if File.exists?(path("a-1.css"))
+  end
+
+  def test_save_overwrite
+    FileUtils.cp(path('a.css'), path('a-1.css'))
+    @yui_compressor.save(path('a-1.css'))
+    assert_equal "@import 'b.css';", IO.read(path('a-1.css'))
+  end
+
+  def test_save_with_symbol_type
+    @yui_compressor.save(path('a.css'), path('a-1.css'), :css)
+    assert_equal "@import 'b.css';", IO.read(path('a-1.css'))
+    File.delete(path('a-1.css'))
+  end
+
+  def test_save_with_string_type
+    @yui_compressor.save(path('a.css'), path('a-1.css'), "css")
+    assert_equal "@import 'b.css';", IO.read(path('a-1.css'))
+    File.delete(path('a-1.css'))
+  end
+
+  def test_save_other_file
+    @yui_compressor.save(path('a.css'), path('a-1.css'))
+    assert_equal "@import 'b.css';", IO.read(path('a-1.css'))
+    assert_not_equal IO.read(path('a-1.css')), IO.read(path('a.css'))
+    File.delete(path('a-1.css'))
+  end
+
+  def test_save_should_create_non_existant_path
+    @yui_compressor.save(path('a.css'), path('bleh/blah/a-1.css'))
+    assert File.exists? path('bleh/blah/a-1.css')
+    FileUtils.rm_rf(path('bleh'))
+  end
+
+#  def test_command
+#    Juicer::Minifyer::YuiCompressor.publicize_methods do
+#      cmd = /java -jar #{@path.sub('2.3.5', '\d\.\d\.\d')}\/yuicompressor-\d\.\d\.\d\.jar --type css/
+#      assert_match cmd, @yui_compressor.command('css')
+
+#      @yui_compressor.no_munge = true
+#      cmd = /#{cmd} --no-munge/
+#      assert_match cmd, @yui_compressor.command('css')
+#    end
+#  end
+
+  context "locating jar" do
+    setup do
+      # Avoid developer env settings
+      @yuic_home = ENV['YUIC_HOME']
+      ENV.delete('YUIC_HOME')
+    end
+
+    teardown do
+      ENV['YUIC_HOME'] = @yuic_home
+      File.delete('yuicompressor-2.3.4.jar') if File.exists?('yuicompressor-2.3.4.jar')
+      File.delete('yuicompressor-2.3.5.jar') if File.exists?('yuicompressor-2.3.5.jar')
+      File.delete('yuicompressor.jar') if File.exists?('yuicompressor.jar')
+      FileUtils.rm_rf("another") if File.exists?("another")
+    end
+    
+    should "not find jar when no jars on path" do
+      Juicer::Minifyer::YuiCompressor.publicize_methods do
+        yui_compressor = Juicer::Minifyer::YuiCompressor.new
+
+        assert_nil yui_compressor.locate_jar
+      end
+    end
+
+    should "find only jar in path" do
+      Juicer::Minifyer::YuiCompressor.publicize_methods do
+        File.open('yuicompressor-2.3.4.jar', 'w') { |f| f.puts '' }
+        yui_compressor = Juicer::Minifyer::YuiCompressor.new
+        assert_equal File.expand_path('yuicompressor-2.3.4.jar'), yui_compressor.locate_jar
+      end
+    end
+
+    should "find most recent of two jars on path" do
+      Juicer::Minifyer::YuiCompressor.publicize_methods do
+        # Create files
+        File.open('yuicompressor-2.3.4.jar', 'w') { |f| f.puts '' }
+        File.open('yuicompressor-2.3.5.jar', 'w') { |f| f.puts '' }
+
+        yui_compressor = Juicer::Minifyer::YuiCompressor.new
+        
+        # Test
+        assert_equal File.expand_path('yuicompressor-2.3.5.jar'), yui_compressor.locate_jar
+      end
+    end
+
+    should "find most recent of three jar files on path" do
+      Juicer::Minifyer::YuiCompressor.publicize_methods do
+        # Create files
+        File.open('yuicompressor-2.3.4.jar', 'w') { |f| f.puts '' }
+        File.open('yuicompressor-2.3.5.jar', 'w') { |f| f.puts '' }
+        File.open('yuicompressor.jar', 'w') { |f| f.puts '' }
+
+        yui_compressor = Juicer::Minifyer::YuiCompressor.new
+        
+        # Test
+        assert_equal File.expand_path('yuicompressor.jar'), yui_compressor.locate_jar
+      end
+    end
+
+    should "find jar in custom directory" do
+      Juicer::Minifyer::YuiCompressor.publicize_methods do
+        # Prepare
+        Dir.mkdir('another')
+        File.open('another/yuicompressor-2.3.4.jar', 'w') { |f| f.puts "" }
+
+        yui_compressor = Juicer::Minifyer::YuiCompressor.new
+        
+        # Test
+        assert_nil yui_compressor.locate_jar
+        yui_compressor = Juicer::Minifyer::YuiCompressor.new({ :bin_path => 'another' })
+        assert_equal File.expand_path('another/yuicompressor-2.3.4.jar'), yui_compressor.locate_jar
+      end
+    end
+  end
+end

data/test/unit/juicer/ext/#string_test.rb#

@@ -0,0 +1,66 @@
+require "test_helper"
+
+
+class TestStringExtensions < Test::Unit::TestCase
+  context "camel case method" do
+    should "convert underscored string" do
+      assert_equal "CamelCase", "camel_case".camel_case
+    end
+
+    should "convert spaced string" do
+      assert_equal "Camel case", "camel case".camel_case
+    end
+
+    should "convert upper-case underscored string" do
+      assert_equal "CamelCase", "CAMEL_CASE".camel_case
+    end
+
+    should "convert 'camel cased' underscored string" do
+      assert_equal "CamelCase", "Camel_Case".camel_case
+    end
+  end
+
+  context "to_class method" do
+    should "return String class" do
+      assert_equal String, "String".to_class
+    end
+
+    should "raise error when loading String class from array class" do
+      assert_raise RuntimeError do
+        "String".to_class(Array)
+      end
+    end
+
+    should "return String class from Object" do
+      assert_equal String, "String".to_class(Object)
+    end
+
+    should "return nested class" do
+      assert_equal Juicer::DependencyResolver, "Juicer::DependencyResolver".to_class
+    end
+
+    should "return class from module" do
+      assert_equal Juicer::DependencyResolver, "DependencyResolver".to_class(Juicer)
+    end
+
+    should "return class from nested module" do
+      assert_equal Juicer::Install::YuiCompressorInstaller, "YuiCompressorInstaller".to_class(Juicer::Install)
+    end
+  end
+
+  context "classify method" do
+    should "return class from underscored string" do
+      assert_equal Juicer::DependencyResolver, "dependency_resolver".classify(Juicer)
+    end
+
+    should "return top level class from underscored string" do
+      assert_equal FileUtils, "file_utils".classify
+    end
+  end
+
+  context "underscore method" do
+    should "return underscored string from camel cased string" do
+      assert_equal "stylesheet_merger", "StylesheetMerger".underscore
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: juicer
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 +02:00
+date: 2009-10-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,9 +50,21 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.1
     version: 
-description: Juicer is a command line tool that helps you ship frontend code for production.  High level overview; Juicer can  * figure out which files depend on each other and merge them together, reducing the number of http requests per page view, thus improving performance * use YUI Compressor to compress code, thus improving performance * verify that your JavaScript is safe to minify/compress by running JsLint on it * cycle asset hosts in CSS files * add "cache busters" to URLs in CSS files * recalculate relative URLs in CSS files, as well as convert them to absolute (or convert absolute URLs to relative URLs)
+description: |-
+  Juicer is a command line tool that helps you ship frontend code for production.
+  
+  High level overview; Juicer can
+  
+  * figure out which files depend on each other and merge them together, reducing
+    the number of http requests per page view, thus improving performance
+  * use YUI Compressor to compress code, thus improving performance
+  * verify that your JavaScript is safe to minify/compress by running JsLint on it
+  * cycle asset hosts in CSS files
+  * add "cache busters" to URLs in CSS files
+  * recalculate relative URLs in CSS files, as well as convert them to absolute
+    (or convert absolute URLs to relative URLs)
 email: christian@cjohansen.no
 executables: 
 - juicer
@@ -106,6 +118,8 @@ files:
 - tasks/svn.rake
 - tasks/test.rake
 - tasks/test/setup.rake
+- tasks/zentest.rake
+- test/integration/juicer/minifyer/yui_compressor_test.rb
 - test/juicer/command/test_install.rb
 - test/juicer/command/test_list.rb
 - test/juicer/command/test_merge.rb
@@ -128,8 +142,11 @@ files:
 - test/juicer/test_jslint.rb
 - test/test_helper.rb
 - test/test_juicer.rb
+- test/unit/juicer/ext/#string_test.rb#
 has_rdoc: true
 homepage: http://www.cjohansen.no/en/projects/juicer
+licenses: []
+
 post_install_message: |
   Juicer does not ship with third party libraries. You probably want to install
   Yui Compressor and JsLint now:
@@ -159,30 +176,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: juicer
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Juicer is a command line tool that helps you ship frontend code for production
 test_files: 
-- test/test_helper.rb
-- test/juicer/test_cache_buster.rb
-- test/juicer/test_chainable.rb
-- test/juicer/test_jslint.rb
+- test/juicer/command/test_install.rb
+- test/juicer/command/test_list.rb
+- test/juicer/command/test_merge.rb
+- test/juicer/command/test_util.rb
+- test/juicer/command/test_verify.rb
 - test/juicer/install/test_installer_base.rb
 - test/juicer/install/test_jslint_installer.rb
-- test/juicer/install/test_yui_compressor_installer.rb
 - test/juicer/install/test_rhino_installer.rb
-- test/juicer/test_css_cache_buster.rb
-- test/juicer/merger/test_javascript_dependency_resolver.rb
-- test/juicer/merger/test_css_dependency_resolver.rb
+- test/juicer/install/test_yui_compressor_installer.rb
 - test/juicer/merger/test_base.rb
+- test/juicer/merger/test_css_dependency_resolver.rb
+- test/juicer/merger/test_javascript_dependency_resolver.rb
 - test/juicer/merger/test_javascript_merger.rb
 - test/juicer/merger/test_stylesheet_merger.rb
-- test/juicer/command/test_verify.rb
-- test/juicer/command/test_util.rb
-- test/juicer/command/test_install.rb
-- test/juicer/command/test_merge.rb
-- test/juicer/command/test_list.rb
-- test/juicer/test_core.rb
 - test/juicer/minifyer/test_yui_compressor.rb
+- test/juicer/test_cache_buster.rb
+- test/juicer/test_chainable.rb
+- test/juicer/test_core.rb
+- test/juicer/test_css_cache_buster.rb
+- test/juicer/test_jslint.rb
+- test/test_helper.rb
 - test/test_juicer.rb