juicer 1.0.10 → 1.0.11

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in rb-notifu.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: .
+  specs:
+    juicer (1.0.9)
+      cmdparse
+      nokogiri
+      rubyzip
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    cmdparse (2.0.3)
+    fakefs (0.3.2)
+    git (1.2.5)
+    jeweler (1.6.0)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    mocha (0.9.12)
+    nokogiri (1.4.4.1-x86-mingw32)
+    rake (0.9.0)
+    rubyzip (0.9.4)
+    shoulda (2.11.3)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  fakefs (>= 0.2.1)
+  jeweler (>= 0.2.1)
+  juicer!
+  mocha (>= 0.9.8)
+  shoulda (>= 2.10.2)

data/History.txt

@@ -1,3 +1,6 @@
+== 1.0.11 / 2011-05-27
+* Fix downloading of YUI jar, which moved again. Thanks to sterebooster.
+
 == 1.0.10 / 2011-05-11
 * Fix downloading of Rhino jar. Add mechanism for scraping out the
   latest version.

data/Readme.rdoc

@@ -10,6 +10,7 @@ Christian Johansen (http://www.cjohansen.no) and contributors:
 * Aaron Suggs (http://ktheory.com)
 * Olle Jonsson (http://ollehost.dk/blog/)
 * Jakub Pawlowicz (http://blog.jakubpawlowicz.com)
+* stereobooster (https://github.com/stereobooster)
 
 == DESCRIPTION:
 

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/lib/juicer.rb

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

data/lib/juicer/install/base.rb

@@ -124,7 +124,7 @@ module Juicer
       # force argument is true (default false)
       #
       def download(url, force = false)
-        filename = File.join(@install_dir, "download", path.sub("lib/", ""), File.basename(url))
+        filename = File.join(@install_dir, "download", path.sub("lib/", ""), File.basename(url).split("?").first)
         return filename if File.exists?(filename) && !force
         FileUtils.mkdir_p(File.dirname(filename))
         File.delete(filename) if File.exists?(filename) && force

data/lib/juicer/install/yui_compressor_installer.rb

@@ -13,6 +13,7 @@ module Juicer
       def initialize(install_dir = Juicer.home)
         super(install_dir)
         @latest = nil
+        @href = nil
         @website = "http://yuilibrary.com/downloads/"
       end
 
@@ -28,7 +29,7 @@ module Juicer
       def install(version = nil)
         version = super(version)
         base = "yuicompressor-#{version}"
-        filename = download(File.join(@website, "yuicompressor", "#{base}.zip"))
+        filename = download(@href)
         target = File.join(@install_dir, path)
 
         Zip::ZipFile.open(filename) do |file|
@@ -60,7 +61,9 @@ module Juicer
       def latest
         return @latest if @latest
         webpage = Nokogiri::HTML(open(@website))
-        @latest = (webpage / "h3#yuicompressor + ul li a:last").text.match(/(\d\.\d\.\d)/)[1]
+        a = (webpage / "h3#yuicompressor + ul li a:last")[0]
+        @href = a["href"]
+        @latest = a.text.match(/(\d\.\d\.\d)/)[1]
       end
     end
   end

data/test/test_helper.rb

@@ -48,8 +48,8 @@ module Kernel
   alias juicer_original_open open # :nodoc:
 
   def open(name, *rest, &block)
-    if name =~ /http.+yuicompressor-(\d\.\d\.\d)\.zip$/
-      name = File.join($data_dir, "..", "bin", "yuicompressor-#{$1}.zip")
+    if name =~ /download\.php\?/
+      name = File.join($data_dir, "..", "bin", "yuicompressor-2.4.2.zip")
     elsif name =~ /http:\/\/yuilibrary\.com\/download/
       name = File.join($data_dir, "../fixtures/yui-download.html")
     elsif name =~ /http.+yuicompressor/

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: juicer
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,13 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 +02:00
+date: 2011-05-27 00:00:00 +02:00
 default_executable: juicer
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: juicer
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: shoulda
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +46,12 @@ dependencies:
         - 10
         - 2
         version: 2.10.2
+  requirement: *id002
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: mocha
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +62,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
+  requirement: *id003
   type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: fakefs
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +78,60 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
+  requirement: *id004
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  requirement: *id005
+  type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: shoulda
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 10
+        - 2
+        version: 2.10.2
+  requirement: *id006
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: mocha
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  requirement: *id007
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: fakefs
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +142,28 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
+  requirement: *id008
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: jeweler
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  requirement: *id009
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: redgreen
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: redgreen
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,12 +174,12 @@ dependencies:
         - 2
         - 2
         version: 1.2.2
+  requirement: *id010
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: cmdparse
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: cmdparse
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,12 +188,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id011
   type: :runtime
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,12 +202,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id012
   type: :runtime
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: rubyzip
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -138,8 +216,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id013
   type: :runtime
-  version_requirements: *id008
 description: Resolve dependencies, merge and minify CSS and JavaScript files with Juicer - the command line tool for frontend engineers
 email: christian@cjohansen.no
 executables: 
@@ -149,6 +227,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
 - Rakefile