pupu 0.0.5.5 → 0.1.pre

data/CHANGELOG

@@ -10,19 +10,3 @@
 = Version 0.0.2
   * Rails support
   * Better documentation
-
-= Version 0.0.3
-  * Bug fixes
-  * Refactoring
-  * Examples
-
-= Version 0.0.4
-  * Added Rails example app
-  * pupu reinstall & pupu install --force
-  * Added Pupu.framework
-  * Added Pupu.logger
-  * Added Pupu.environment & Pupu.environment?
-  * Added --ruby & --no-ruby options to the generator
-
-= Version 0.0.5
-  * Added if option to javascript/stylesheet, so you can use styleshett "ie", if: "lt IE 8"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 – 2010 Jakub Stastny aka Botanicus
+Copyright (c) 2008 Jakub Stastny aka Botanicus
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -1,6 +1,6 @@
 h1. About Pupu
 
-"Pupu":http://github.com/botanicus/pupu is a framework-agnostic plugin system for assets like JS/CSS frameworks and its plugins, icon sets etc. You can "search GitHub":http://github.com/search?type=Repositories&language=&q=pupu&repo=&langOverride=&x=9&y=24&start_value=1 for more examples. It provides CLI interface for searching, installing and updating pupus from GitHub and it also provides a helper for including static files from pupu into your HTML page. Both CLI and helper can handle dependencies.
+"Pupu":http://github.com/botanicus/pupu is a framework-agnostic plugin system for media stuff like JS/CSS frameworks and its plugins, icon sets etc. You can "search GitHub":http://github.com/search?type=Repositories&language=&q=pupu&repo=&langOverride=&x=9&y=24&start_value=1 for more examples. It provides CLI interface for searching, installing and updating pupus from GitHub and it also provides a helper for including static files from pupu into your HTML page. Both CLI and helper can handle dependencies.
 
 CLI example:
 
@@ -71,7 +71,7 @@ If pupu has optional arguments, you can specify them, it will modify its behavio
 
 <pre>
 # this will include not just basic autocompleter files, but script for local requests too
-pupu :autocompleter, type: "local"
+pupu :autocompleter, :type => "local"
 </pre>
 
 There is some helpers for getting path to pupu's files:
@@ -91,4 +91,4 @@ h1. Links
 - "Wiki":http://wiki.github.com/botanicus/pupu
 - "Source Code":http://github.com/botanicus/pupu
 - "API Documentation":http://rdoc.info/projects/botanicus/pupu
-- Examples: "Rango":http://github.com/botanicus/pupu/tree/master/examples/rango, "Merb":http://github.com/botanicus/pupu/tree/master/examples/merb and "Rails":http://github.com/botanicus/pupu/tree/master/examples/rails
+- Examples: "Rango":http://github.com/botanicus/pupu/tree/master/examples/rango, "Merb":http://github.com/botanicus/pupu/tree/master/examples/merb

data/Rakefile

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+require_relative "lib/pupu/version"
+
+# ENV setup for external commands
+ENV["RUBYLIB"] = Dir["vendor/*/lib"].join(":")
+$LOAD_PATH.clear.push(*Dir["vendor/*/lib"])
+
+# encoding
+Encoding.default_internal = "utf-8"
+Encoding.default_external = "utf-8"
+
+# http://support.runcoderun.com/faqs/builds/how-do-i-run-rake-with-trace-enabled
+Rake.application.options.trace = true
+
+# default task for RunCodeRun.com
+task :default => ["submodules:init", :spec]
+
+# load tasks
+Dir["tasks/*.rake"].each do |taskfile|
+  begin
+    load File.join(Dir.pwd, taskfile)
+  rescue Exception => exception
+    puts "Exception #{exception.class} occured during loading #{taskfile}:"
+    puts exception.message
+    puts exception.backtrace
+  end
+end

data/TODO.txt

@@ -1,14 +1,11 @@
-Examples:
-- recreate the rango app AFTER I release Rango 0.3 & bundle it
-- ensure all the examples has the same functionality include specs
-- ensure all the examples work
-
 === Version 0.1 ===
 - Pupu.framework_root: "."
 - Pupu.media_root: "media"
 - Pupu.root: "media/pupu"
 - @pupu.root: "media/pupu/mootools"
 
+- rango & merb apps: both with same functionality include specs
+
 - THERE SHOULD BE A CONVETION TO NAME PUPU WITH PUPU-FRAMEWORK-PLUGIN, FOR EXAMPLE PUPU-MOOTOOLS-FLASH because of search
 - install each dependency just once
 - how to handle metadata if we have it as submodules? (suggestions: media/pupu/metadata.yml for all) or on the fly from .git/config & config.rb etc
@@ -16,10 +13,8 @@ Examples:
 - media support (.swf): media helper
 - media vs. root vs. custom
 - how to handle metadata? Generate metadata.yml from config.rb (dependencies) or generate it through merb-gen and write it by hand?
-- what about ruby helpers such as flash :notice, :error for flash <divs>
+- what about ruby helpers such as flash :notice, :error for flash <divs
 - add array with loaded plugins, do not load plugin which is already loaded
-- hooks for minify etc
-- don't touch file system in production mode (don't use File.exist?) -> just load manifest
 
 === Version 0.2 ===
 

data/bin/pupu

@@ -1,49 +1,56 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby1.9
 # encoding: utf-8
 
-# follow symlink
 base   = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 libdir = File.expand_path(File.join(File.dirname(base), "..", "lib"))
 
+vendor = File.join(File.dirname(__FILE__), "..", "vendor")
+if File.directory?(vendor)
+  Dir["#{vendor}/*"].each do |path|
+    if File.directory?(path) && Dir["#{path}/*"].empty?
+      warn "Dependency #{File.basename(path)} in vendor seems to be empty. Run git submodule init && git submodule update to checkout it."
+    elsif File.directory?(path) && File.directory?(File.join(path, "lib"))
+      $:.unshift(File.join(path, "lib"))
+    end
+  end
+end
+
 # because of system installation, there is bin/../lib, but not bin/../lib/pupu
 if File.directory?(File.join(libdir, "pupu"))
   $:.unshift(libdir) unless $:.include?(libdir)
 end
 
-require "pupu/cli"
-
-# helpers
+# === Helpers === #
+# TODO: Generators.each { |generator| puts generator.help }
 def usage
 <<-HELP
 === Usage ===
-pupu install [pupu] [-f|--force]
-pupu uninstall [pupu]
-pupu reinstall [pupu]
-pupu update [pupu|all]
-pupu list
-pupu check
-pupu search [pattern]
-pupu create [name]
-     --media-root=media
+--media-root=media
+pupu create mootools  Generate pupu mootools
 HELP
 end
 
-# main loop
 begin
   case ARGV.shift
+  when nil
+    abort usage
   when "install"
+    require "pupu/cli"
     Pupu::CLI.new(ARGV).install
   when "uninstall", "remove"
+    require "pupu/cli"
     Pupu::CLI.new(ARGV).uninstall
-  when "reinstall"
-    Pupu::CLI.new(ARGV, force: true).install
   when "update"
+    require "pupu/cli"
     Pupu::CLI.new(ARGV).update
   when "list" # list all pupus
+    require "pupu/cli"
     Pupu::CLI.new(ARGV).list
   when "check" # check setup & if you are in the right directory
+    require "pupu/cli"
     Pupu::CLI.new(ARGV).check || abort("File config/pupu.rb doesn't exist or can't be loaded")
   when "search"
+    require "pupu/cli"
     Pupu::CLI.new(ARGV).search(ARGV.first)
   when "create"
     begin
@@ -62,7 +69,5 @@ begin
     rescue Exception => exception
       abort "Exception #{exception.inspect} occured during running generator #{generator.inspect}\n#{exception.backtrace.join("\n")}"
     end
-  else
-    abort usage
   end
 end

data/examples/merb/README.textile

@@ -1,5 +1,7 @@
 h1. Merb Example
 
-* @gem bundle@ (you have to have bundler 0.7.2 installed)
-* Run with @./bin/merb -a webrick@ (will start at @http://localhost:4000@)
-* Specs: @./bin/spec spec/application_spec.rb --colour@
+* Dependencies for running: @merb-core@
+* Run with @merb -a webrick@ (will start at @http://localhost:4000@)
+
+* Dependencies for testing: @rspec@, @webrat@
+* Specs: @spec spec/application_spec.rb --colour@

data/examples/merb/Rakefile

@@ -9,7 +9,7 @@ load "pupu/tasks/pupu.rake"
 # Load the basic runtime dependencies; this will include 
 # any plugins and therefore plugin rake tasks.
 init_env = ENV["MERB_ENV"] || "development"
-Merb.load_dependencies(environment: init_env)
+Merb.load_dependencies(:environment => init_env)
      
 # Get Merb plugins and dependencies
 Merb::Plugins.rakefiles.each { |r| require r } 
@@ -21,10 +21,10 @@ rake_files.each{|rake_file| load rake_file }
 
 desc "Start runner environment"
 task :merb_env do
-  Merb.start_environment(environment: init_env, adapter: "runner")
+  Merb.start_environment(:environment => init_env, :adapter => "runner")
 end
 
 require "spec/rake/spectask"
 require "merb-core/test/tasks/spectasks"
 desc "Default: run spec examples"
-task default: "spec"
+task :default => "spec"

data/examples/merb/config/framework.rb

@@ -1,7 +1,7 @@
 Merb::Config[:framework] = {
-  application: Merb.root / "application.rb",
-  config: [Merb.root / "config", nil],
-  public: [Merb.root / "public", nil],
-  view: Merb.root / "views"
+  :application => Merb.root / "application.rb",
+  :config => [Merb.root / "config", nil],
+  :public => [Merb.root / "public", nil],
+  :view   => Merb.root / "views"
 }
 

data/examples/merb/config/init.rb

@@ -1,12 +1,5 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
 
-# bundler
-begin
-  require_relative "../gems/environment.rb"
-rescue LoadError => exception
-  abort "LoadError during loading gems/environment: #{exception.message}\nRun gem bundle to fix it."
-end
-
 # setup $:
 pupu_libdir = File.expand_path("../../lib")
 raise Errno::ENOENT, "#{pupu_libdir} doesn't exist" unless File.directory?(pupu_libdir)

data/examples/merb/public/pupu/autocompleter/README.textile

@@ -19,8 +19,8 @@ h2. Layout
 plugin :autocompleter
 
 # for local requests through Autocompleter.Request class
-plugin :autocompleter, type: "local"
+plugin :autocompleter, :type => "local"
 
 # for ajax requests through Autocompleter.Request class
-plugin :autocompleter, type: "request"
+plugin :autocompleter, :type => "request"
 </pre>

data/examples/merb/public/pupu/autocompleter/config.rb

@@ -7,6 +7,6 @@ javascripts "observer", "autocompleter"
 # stylesheet
 stylesheet "autocompleter"
 
-parameter :type, optional: ["local", "request"] do |type|
+parameter :type, :optional => ["local", "request"] do |type|
   javascript "autocompleter.#{type}"
 end

data/examples/merb/public/pupu/blueprint/config.rb

@@ -1,18 +1,18 @@
-# css_include_tag "blueprint/screen", "blueprint/plugins/fancy-type/screen", media: "screen, projection"
-# css_include_tag "blueprint/print", media: "print"
+# css_include_tag "blueprint/screen", "blueprint/plugins/fancy-type/screen", :media => "screen, projection"
+# css_include_tag "blueprint/print", :media => "print"
 # / [if IE]
-#   = css_include_tag "blueprint/ie", media: "screen, projection"
+#   = css_include_tag "blueprint/ie", :media => "screen, projection"
 
 # TODO
-# if: "ie"
-stylesheet "screen", media: "screen, projection"
-stylesheet "print", media: "print"
+# :if => "ie"
+stylesheet "screen", :media => "screen, projection"
+stylesheet "print", :media => "print"
 stylesheet "ie"
 
 # parameters of plugin
 # it will be blank in most cases
 parameter :plugins do |plugins|
   plugins.each do |plugin|
-    stylesheet "plugins/#{plugin}/screen", media: "screen, projection"
+    stylesheet "plugins/#{plugin}/screen", :media => "screen, projection"
   end
 end

data/examples/merb/public/pupu/flash/config.rb

@@ -6,6 +6,6 @@ javascript "flash"
 
 # parameters of plugin
 # it will be blank in most cases
-#parameter :request, optional: ["local", "ajax"] do |type|
+#parameter :request, :optional => ["local", "ajax"] do |type|
 #  javascript "lib/autocompleter.#{type}"
 #end

data/examples/merb/public/pupu/lighter/config.rb

@@ -10,11 +10,11 @@ themes   = Dir["#{root}/stylesheets/Flame.*.css"].map { |theme| File.basename(th
 syntaxes = Dir["#{root}/javascripts/Fuel.*.js"].map { |theme| File.basename(theme).split(".")[1] }
 
 # pupu :lighter, theme: "mocha"
-parameter :theme, optional: themes do |theme|
+parameter :theme, :optional => themes do |theme|
  stylesheet "Flame.#{theme}"
 end
 
 # pupu :lighter, syntax: "ruby"
-parameter :syntax, optional: syntaxes do |syntax|
+parameter :syntax, :optional => syntaxes do |syntax|
  javascript "Fuel.#{syntax}"
 end

data/examples/merb/public/pupu/mootools/README.textile

@@ -15,5 +15,5 @@ h2. Layout
 plugin :mootools
 
 # for mootools-more
-plugin :mootools, more: true
+plugin :mootools, :more => true
 </pre>

data/examples/merb/public/pupu/mootools/config.rb

@@ -2,7 +2,7 @@
 javascript "mootools-1.2-core"
 
 # parameters of plugin
-# pupu :mootools, more: true
+# pupu :mootools, :more => true
 parameter :more do |boolean|
   javascript "mootools-1.2-more" if boolean
 end

data/examples/rango/README.textile

@@ -1,5 +1,7 @@
-h1. Merb Example
+h1. Rango Example
 
-* @gem bundle@ (you have to have bundler 0.7.2 installed)
-* Run with @./bin/merb -a webrick@ (will start at @http://localhost:4000@)
-* Specs: @./bin/spec spec/application_spec.rb --colour@
+* Dependencies for running: @rango@, @usher@, @haml@
+* Run with @./config.ru@ (will start at @http://localhost:4000@)
+
+* Dependencies for testing: @rspec@, @webrat@, @rack-test@
+* Specs: @spec spec/pupu_spec.rb --colour@

data/examples/rango/init.rb

@@ -4,13 +4,6 @@
 # === Usage === #
 # init.rb
 
-# bundler
-begin
-  require_relative "gems/environment.rb"
-rescue LoadError => exception
-  abort "LoadError during loading gems/environment: #{exception.message}\nRun gem bundle to fix it."
-end
-
 # setup $:
 pupu_libdir = File.expand_path("../../lib")
 raise Errno::ENOENT, "#{pupu_libdir} doesn't exist" unless File.directory?(pupu_libdir)

data/examples/rango/media/pupu/autocompleter/README.textile

@@ -19,8 +19,8 @@ h2. Layout
 plugin :autocompleter
 
 # for local requests through Autocompleter.Request class
-plugin :autocompleter, type: "local"
+plugin :autocompleter, :type => "local"
 
 # for ajax requests through Autocompleter.Request class
-plugin :autocompleter, type: "request"
+plugin :autocompleter, :type => "request"
 </pre>

data/examples/rango/media/pupu/autocompleter/config.rb

@@ -7,6 +7,6 @@ javascripts "observer", "autocompleter"
 # stylesheet
 stylesheet "autocompleter"
 
-parameter :type, optional: ["local", "request"] do |type|
+parameter :type, :optional => ["local", "request"] do |type|
   javascript "autocompleter.#{type}"
 end

data/examples/rango/media/pupu/blueprint/config.rb

@@ -1,18 +1,18 @@
-# css_include_tag "blueprint/screen", "blueprint/plugins/fancy-type/screen", media: "screen, projection"
-# css_include_tag "blueprint/print", media: "print"
+# css_include_tag "blueprint/screen", "blueprint/plugins/fancy-type/screen", :media => "screen, projection"
+# css_include_tag "blueprint/print", :media => "print"
 # / [if IE]
-#   = css_include_tag "blueprint/ie", media: "screen, projection"
+#   = css_include_tag "blueprint/ie", :media => "screen, projection"
 
 # TODO
-# if: "ie"
-stylesheet "screen", media: "screen, projection"
-stylesheet "print", media: "print"
+# :if => "ie"
+stylesheet "screen", :media => "screen, projection"
+stylesheet "print", :media => "print"
 stylesheet "ie"
 
 # parameters of plugin
 # it will be blank in most cases
 parameter :plugins do |plugins|
   plugins.each do |plugin|
-    stylesheet "plugins/#{plugin}/screen", media: "screen, projection"
+    stylesheet "plugins/#{plugin}/screen", :media => "screen, projection"
   end
 end

data/examples/rango/media/pupu/flash/config.rb

@@ -6,6 +6,6 @@ javascript "flash"
 
 # parameters of plugin
 # it will be blank in most cases
-#parameter :request, optional: ["local", "ajax"] do |type|
+#parameter :request, :optional => ["local", "ajax"] do |type|
 #  javascript "lib/autocompleter.#{type}"
 #end

data/examples/rango/media/pupu/lighter/config.rb

@@ -10,11 +10,11 @@ themes   = Dir["#{root}/stylesheets/Flame.*.css"].map { |theme| File.basename(th
 syntaxes = Dir["#{root}/javascripts/Fuel.*.js"].map { |theme| File.basename(theme).split(".")[1] }
 
 # pupu :lighter, theme: "mocha"
-parameter :theme, optional: themes do |theme|
+parameter :theme, :optional => themes do |theme|
  stylesheet "Flame.#{theme}"
 end
 
 # pupu :lighter, syntax: "ruby"
-parameter :syntax, optional: syntaxes do |syntax|
+parameter :syntax, :optional => syntaxes do |syntax|
  javascript "Fuel.#{syntax}"
 end

data/examples/rango/media/pupu/mootools/README.textile

@@ -15,5 +15,5 @@ h2. Layout
 plugin :mootools
 
 # for mootools-more
-plugin :mootools, more: true
+plugin :mootools, :more => true
 </pre>