juicer 1.0.12 → 1.0.13

data/History.txt

@@ -1,3 +1,6 @@
+== 1.0.13 / 2011-08-30
+* Update YUI Compressor installer (new download page)
+
 == 1.0.12 / 2011-06-03
 * Fix gemspec - 1.0.11 depends on Juicer itself
 
@@ -59,7 +62,7 @@
 * Constant refefined warnings fixed in installer module (Aaron Suggs)
 * Ruby 1.9 compatibility
 * Google Closure Compiler support for `juicer merge` (Pavel Valodzka)
-* Fix bug in `juicer list` for files with no dependencies (Daniel Stockman) 
+* Fix bug in `juicer list` for files with no dependencies (Daniel Stockman)
 * Image embedder to embed images using data uris (Morgan Roderick)
 * YUI Compressor --arguments now works (Daniel Stockman)
 * Download Rhino over HTTP rather than FTP to avoid certain corporate

data/Manifest.txt

@@ -27,32 +27,3 @@ lib/juicer/merger/javascript_dependency_resolver.rb
 lib/juicer/merger/javascript_merger.rb
 lib/juicer/merger/stylesheet_merger.rb
 lib/juicer/minifyer/yui_compressor.rb
-tasks/test/setup.rake
-test/bin/jslint.js
-test/bin/rhino1_7R1.zip
-test/bin/rhino1_7R2-RC1.zip
-test/bin/yuicompressor
-test/bin/yuicompressor-2.3.5.zip
-test/bin/yuicompressor-2.4.2.zip
-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_rhino_installer.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/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

data/VERSION

@@ -1 +1 @@
-1.0.12
+1.0.13

data/lib/juicer.rb

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

data/lib/juicer/install/yui_compressor_installer.rb

@@ -14,7 +14,7 @@ module Juicer
         super(install_dir)
         @latest = nil
         @href = nil
-        @website = "http://yuilibrary.com/downloads/"
+        @website = 'http://yuilibrary.com/download/yuicompressor/'
       end
 
       #
@@ -61,9 +61,9 @@ module Juicer
       def latest
         return @latest if @latest
         webpage = Nokogiri::HTML(open(@website))
-        a = (webpage / "h3#yuicompressor + ul li a:last")[0]
-        @href = a["href"]
-        @latest = a.text.match(/(\d\.\d\.\d)/)[1]
+        a = webpage.css('#downloads #dl_list ul li:first a').first
+        @href = a['href']
+        @latest = a.text.match(/\d\.\d\.\d/)[0]
       end
     end
   end

data/test/test_helper.rb

@@ -48,7 +48,7 @@ module Kernel
   alias juicer_original_open open # :nodoc:
 
   def open(name, *rest, &block)
-    if name =~ /download\.php\?/
+    if name =~ /yui\.zenfs\.com/
       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")
@@ -103,7 +103,7 @@ module Juicer
         mkfile(@dir, 'd1.css', "h2 {\n    font-size: 10px;\n}\n")
         mkfile(@dir, 'ok.js', "function hey() {\n    return \"Hey\";\n}\n")
         mkfile(@dir, 'not-ok.js', "var a = 34\nb = 78;\n")
-        
+
         images = mkdir File.join(@dir, "images")
         mkfile(images, '1.png', "")
 
@@ -165,7 +165,7 @@ h2 {
    background: url(http://assets2/css/2.gif) no-repeat;
 }
         CSS
-        
+
         mkfile(css_dir, 'test3.css', css)
 
         mkfile(@dir, 'Changelog.txt', "2008.02.09 | stb-base 1.29\n\nFEATURE: Core  | Bla bla bla bla bla\nFEATURE: UI: | Bla bla bla bla bla\n\n\n2008.02.09 | stb-base 1.29\n\nFEATURE: Core  | Bla bla bla bla bla\nFEATURE: UI: | Bla bla bla bla bla\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: juicer
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 0
-  - 12
-  version: 1.0.12
+  - 13
+  version: 1.0.13
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 +02:00
+date: 2011-08-30 00:00:00 +02:00
 default_executable: juicer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,90 +82,10 @@ dependencies:
         version: 0.2.1
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 10
-        - 2
-        version: 2.10.2
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fakefs
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: redgreen
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
-  type: :development
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: cmdparse
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,25 +95,27 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 1
+        - 5
         - 0
-        version: "0"
+        version: 1.5.0
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -203,7 +125,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id007
 description: Resolve dependencies, merge and minify CSS and JavaScript files with Juicer - the command line tool for frontend engineers
 email: christian@cjohansen.no
 executables: 
@@ -213,11 +135,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- Gemfile
-- Gemfile.lock
 - History.txt
 - Manifest.txt
-- Rakefile
 - Readme.rdoc
 - VERSION
 - bin/juicer
@@ -256,42 +175,6 @@ files:
 - lib/juicer/minifyer/closure_compiler.rb
 - lib/juicer/minifyer/java_base.rb
 - lib/juicer/minifyer/yui_compressor.rb
-- test/bin/jslint-1.0.js
-- test/bin/jslint.js
-- test/bin/rhino1_7R1.zip
-- test/bin/rhino1_7R2-RC1.jar
-- test/bin/rhino1_7R2-RC1.zip
-- test/bin/rhino1_7R3.jar
-- test/bin/rhino1_7R3.zip
-- test/bin/yuicompressor
-- test/bin/yuicompressor-2.3.5.zip
-- test/bin/yuicompressor-2.4.2.jar
-- test/bin/yuicompressor-2.4.2.zip
-- test/data/Changelog.txt
-- test/data/a.css
-- test/data/a.js
-- test/data/a1.css
-- test/data/b.css
-- test/data/b.js
-- test/data/b1.css
-- test/data/b2.css
-- test/data/c1.css
-- test/data/css/2.gif
-- test/data/css/test.css
-- test/data/css/test2.css
-- test/data/css/test3.css
-- test/data/d1.css
-- test/data/images/1.png
-- test/data/my_app.js
-- test/data/not-ok.js
-- test/data/ok.js
-- test/data/path_test.css
-- test/data/path_test2.css
-- test/data/pkg/module/moda.js
-- test/data/pkg/module/modb.js
-- test/data/pkg/pkg.js
-- test/fixtures/rhino-download.html
-- test/fixtures/yui-download.html
 - test/test_helper.rb
 - test/unit/juicer/asset/path_resolver_test.rb
 - test/unit/juicer/asset/path_test.rb

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify gem dependencies in juicer.gemspec
-gemspec

data/Gemfile.lock

@@ -1,33 +0,0 @@
-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/Rakefile

@@ -1,96 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "juicer"
-    gem.summary = "Command line tool for CSS and JavaScript developers"
-    gem.description = "Resolve dependencies, merge and minify CSS and JavaScript files with Juicer - the command line tool for frontend engineers"
-    gem.email = "christian@cjohansen.no"
-    gem.homepage = "http://github.com/cjohansen/juicer"
-    gem.authors = ["Christian Johansen"]
-    gem.rubyforge_project = "juicer"
-    gem.add_development_dependency "shoulda", ">= 2.10.2"
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    gem.add_development_dependency "fakefs", ">= 0.2.1"
-    gem.add_development_dependency "jeweler", ">= 0.2.1"
-    gem.add_development_dependency "redgreen", ">= 1.2.2" if RUBY_VERSION < "1.9"
-    gem.add_dependency "cmdparse"
-    gem.add_dependency "nokogiri"
-    gem.add_dependency "rubyzip"
-    gem.executables = ["juicer"]
-    gem.post_install_message = <<-MSG
-Juicer does not ship with third party libraries. You probably want to install
-Yui Compressor and JsLint now:
-
-juicer install yui_compressor
-juicer install jslint
-
-Happy juicing!
-    MSG
-    gem.files = FileList["[A-Z]*", "{bin,generators,lib,test}/**/*"]
-  end
-
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
-rescue LoadError => err
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-  puts err.message
-end
-
-Rake::TestTask.new("test:units") do |test|
-  test.libs << 'test'
-  test.pattern = 'test/unit/**/*_test.rb'
-  test.verbose = true
-end
-
-Rake::TestTask.new("test:integration") do |test|
-  test.libs << 'test'
-  test.pattern = 'test/integration/**/*_test.rb'
-  test.verbose = true
-end
-
-task :test => ["check_dependencies:development", "test:units", "test:integration"]
-
-task :default => "test:units"
-
-# lib/tasks/cruise.rake
-desc 'Continuous build target'
-task :cruise do
-  out = ENV['CC_BUILD_ARTIFACTS']
-  mkdir_p out unless File.directory? out if out
- 
-  Rake::Task["rcov"].invoke
-  mv 'coverage/', "#{out}/" if out
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "jstdutil #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end