pupu 0.0.5.5 → 0.1.pre

data/examples/rango/media/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/lib/pupu.rb

@@ -1,8 +1,7 @@
-# encoding: utf-8
-
 require "media-path"
 require "pupu/exceptions"
 require "pupu/pupu"
 
 module Pupu
+  VERSION ||= "0.0.2"
 end

data/lib/pupu/adapters/merb.rb

@@ -1,18 +1,6 @@
-# encoding: utf-8
-
 require "pupu"
 require "pupu/helpers"
 
-Pupu.framework = :merb
-
-def Pupu.environment
-  Merb.environment
-end
-
-def Pupu.logger
-  Merb.logger
-end
-
 Merb::BootLoader.before_app_loads do
   Pupu.root = Merb.root
   Pupu.media_root = File.join(Merb.root, "public")

data/lib/pupu/adapters/rails.rb

@@ -1,18 +1,6 @@
-# encoding: utf-8
-
 require "pupu"
 require "pupu/helpers"
 
-Pupu.framework = :rails
-
-def Pupu.environment
-  Rails.environment
-end
-
-def Pupu.logger
-  Rails.logger
-end
-
 Pupu.root = Rails.root
 Pupu.media_root = File.join(Rails.root, "public")
 ActionView::Base.send(:include, Pupu::Helpers)

data/lib/pupu/adapters/rango.rb

@@ -1,32 +1,10 @@
-# encoding: utf-8
-
 require "pupu"
 require "pupu/helpers"
 
-Pupu.framework = :rango
-
-def Pupu.environment
-  Rango.environment
-end
-
-def Pupu.logger
-  Rango.logger
-end
-
 Rango.after_boot(:register_pupu) do
-  Pupu.root = Rango.root
-  #Pupu.media_prefix = Project.settings.media_prefix
-  #Pupu.media_root = Project.settings.media_root
+  Pupu.root = Project.root
+  Pupu.media_prefix = Project.settings.media_prefix
+  Pupu.media_root = Project.settings.media_root
   Rango::Helpers.send(:include, Pupu::Helpers)
   Rango.logger.info("Pupu plugin registered")
 end
-
-module Pupu
-  module Helpers
-    def pupu_page
-      # page = get_context_value(:page) # TOHLE KUNDA NEFUNGUJE V TEMPLEJTACH :(
-      # set_context_value(:page, page || Page.new)
-      context[:pupu_page] ||= Page.new
-    end
-  end
-end

data/lib/pupu/cli.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "fileutils"
 require "yaml"
 require "ostruct"
@@ -9,7 +7,7 @@ require "pupu/pupu"
 require "pupu/github"
 
 # copyied from merb.thor, this part is actually my code as well :)
-module Kernel
+module ColorfulMessages
   # red
   def error(*messages)
     puts messages.map { |msg| "\033[1;31m#{msg}\033[0m" }
@@ -40,15 +38,16 @@ end
 
 module Pupu
   class CLI
-    attr_reader :args, :options
-    def initialize(args, options = Hash.new)
-      @args, @options = args, options
+    include ColorfulMessages
+    attr_reader :args
+    def initialize(args)
+      @args = args
       self.detect
       self.load_config
       self.parse_argv
       self.check_setup
       note "Using media directory: #{::Pupu.media_root}"
-      note "Using strategy: #{::Pupu.strategy}"
+      note "Using strategy: #{Pupu.strategy}"
     end
 
     def parse_argv
@@ -63,7 +62,7 @@ module Pupu
         elsif argument.match(/--strategy=(.+)/)
           self.args.delete(argument)
           if %[copy submodules].include?($1)
-            ::Pupu.strategy = $1.to_sym
+            Pupu.strategy = $1.to_sym
           else
             abort "Available strategies: copy, submodules"
           end
@@ -77,7 +76,7 @@ module Pupu
       path ||= ["media", "public"].find { |directory| File.directory?(directory) }
       return if path.nil?
       ::Pupu.media_root = File.expand_path(path)
-      ::Pupu.strategy ||= :copy
+      Pupu.strategy ||= :copy
     end
 
     def check_setup
@@ -87,9 +86,8 @@ module Pupu
     def install
       self.args.each do |pupu|
         begin
-          GitHub.install(pupu, options)
-        rescue PluginIsAlreadyInstalled => e
-          puts e.backtrace.join("\n- ")
+          GitHub.install(pupu)
+        rescue PluginIsAlreadyInstalled
           info "Plugin #{pupu} is already installed, skipping"
         end
       end
@@ -148,7 +146,7 @@ module Pupu
       # search on github
       require "yaml"
       require "open-uri"
-      open("https://github.com/api/v1/yaml/search/pupu") do |stream|
+      open("http://github.com/api/v1/yaml/search/pupu") do |stream|
         repositories = YAML::load(stream.read)["repositories"]
         repositories.each do |repository|
           repository = OpenStruct.new(repository)

data/lib/pupu/dsl.rb

@@ -1,8 +1,5 @@
-# encoding: utf-8
-
 require "ostruct"
 require "media-path"
-require "pupu/parser"
 
 class Hash
   def to_html_attrs
@@ -12,19 +9,12 @@ end
 
 module Pupu
   class DSL
-    attr_reader :output, :path
-
-    def files
-      @page.files
-    end
-
-    def initialize(pupu, page = Page.new)
-      @pupu   = pupu
-      @page   = page
+    attr_reader :output, :files, :path
+    def initialize(pupu)
+      @pupu = pupu
       @output = Array.new
-      @files  = files
+      @files  = Array.new
       @dependencies = Array.new
-      puts "DSL: #{page.inspect}"
       @path = pupu.file("config.rb")
     end
 
@@ -59,28 +49,17 @@ module Pupu
     def javascript(basename, params = Hash.new)
       path = @pupu.javascript(basename).url
       tag  = "<script src='#{path}' type='text/javascript'></script>"
-      if params[:if]
-        tag = "<!--[if #{params[:if]}]>" + tag + "<![endif]-->"
-      end
-      unless files.include?(path)
-        files.push(path)
-        @output.push(tag)
-      end
+      @files.push(path)
+      @output.push(tag)
     end
 
     def stylesheet(basename, params = Hash.new)
       path = @pupu.stylesheet(basename).url
-      condition = params.delete(:if)
       default = {media: 'screen', rel: 'stylesheet', type: 'text/css'}
       params = default.merge(params)
       tag  = "<link href='#{path}' #{params.to_html_attrs} />"
-      if condition
-        tag = "<!--[if #{condition}]>" + tag + "<![endif]-->"
-      end
-      unless files.include?(path)
-        files.push(path)
-        @output.push(tag)
-      end
+      @files.push(path)
+      @output.push(tag)
     end
 
     def javascripts(*names)
@@ -95,7 +74,7 @@ module Pupu
       end
     end
 
-    # parameter :type, optional: ["local", "request"] do |type|
+    # parameter :type, :optional => ["local", "request"] do |type|
     #   javascript "autocompleter.#{type}"
     # end
 
@@ -103,11 +82,11 @@ module Pupu
     #  javascript "mootools-1.2-more" if boolean
     # end
     def parameter(name, params = Hash.new, &block)
-      # pupu :autocompleter, type: "request"
-      # @pupu.params: { type: "request" }
+      # pupu :autocompleter, :type => "request"
+      # @pupu.params: { :type => "request" }
 
-      # pupu :mootools, more: true
-      # @pupu.params: { more: true }
+      # pupu :mootools, :more => true
+      # @pupu.params: { :more => true }
       if @pupu.params.key?(name)
         block.call(@pupu.params[name])
       end

data/lib/pupu/exceptions.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Pupu
   class PupuRootNotFound < StandardError
   end

data/lib/pupu/github.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "fileutils"
 require "yaml"
 require "ostruct"
@@ -21,21 +19,20 @@ module Pupu
     class << self
       include ShellExtensions
       # GitHub.install("autocompleter")
-      # GitHub.install("botanicus/autocompleter", force: true)
-      def install(repo, options = Hash.new)
+      # GitHub.install("botanicus/autocompleter")
+      def install(repo)
         user, repo = repo.split("/") if repo.match(%r{/})
         user = ENV["USER"] unless user
         url = "git://github.com/#{user}/pupu-#{repo}.git"
-        info "Installing #{repo}"
-        self.install_files(repo, url, options)
-        self.install_dependencies(@pupu, options)
+        self.install_files(repo, url)
+        self.install_dependencies(@pupu)
         # TODO: git commit [files] -m "Added pupu #{repo} from #{url}"
       end
 
       def update(pupu_name)
         if pupu_name
           pupu = Pupu[pupu_name]
-          if ::Pupu.strategy.eql?(:submodules)
+          if Pupu.strategy.eql?(:submodules)
             puts %(git fetch)
             puts %(git reset origin/master --hard)
           else
@@ -66,7 +63,7 @@ module Pupu
         revision = %x(git log | head -1).chomp.sub(/^commit /, "")
         dsl = DSL.new(pupu)
         dependencies = dsl.get_dependencies.map { |dependency| dependency.name }
-        params = {revision: revision, repozitory: url, dependencies: dependencies}
+        params = {:revision => revision, :repozitory => url, :dependencies => dependencies}
         Dir.chdir(@pupu.root.to_s) do
           File.open("metadata.yml", "w") do |file|
             file.puts(params.to_yaml)
@@ -74,26 +71,17 @@ module Pupu
         end
       end
 
-      def install_dependencies(pupu, options = Hash.new)
+      def install_dependencies(pupu)
         dsl = DSL.new(pupu)
         dsl.instance_eval(File.read(pupu.file("config.rb").path))
         dsl.get_dependencies.each do |dependency|
-          begin
-            info "Installing dependency #{dependency}"
-            self.install(dependency.name.to_s, options) # FIXME: "user/repo"
-          rescue PluginIsAlreadyInstalled => exception
-            puts "~ #{exception.message}"
-          end
+          self.install(dependency.name.to_s) # FIXME: "user/repo"
         end
       end
 
-      def install_files(repo, url, options = Hash.new)
+      def install_files(repo, url)
         chdir do |media_dir|
-          if File.directory?(repo) && !options[:force]
-            raise PluginIsAlreadyInstalled, "Pupu #{repo} already exist"
-          elsif File.directory?(repo) && options[:force]
-            FileUtils.rm_r(repo)
-          end
+          raise PluginIsAlreadyInstalled if File.directory?(repo) # TODO: custom exception class
           run("git clone #{url} #{repo}") || abort("Git failed")
           Dir.chdir(repo) do
             proceed_files(repo, url)
@@ -116,7 +104,7 @@ module Pupu
         end
         @pupu = Pupu[repo]
         self.save_metadata(@pupu, url)
-        FileUtils.rm_r(".git") if ::Pupu.strategy.eql?(:copy)
+        FileUtils.rm_r(".git") if Pupu.strategy.eql?(:copy)
       rescue Exception => exception
         FileUtils.rm_r(repo) if File.directory?(repo)
         raise exception

data/lib/pupu/helpers.rb

@@ -1,19 +1,13 @@
-# encoding: utf-8
-
 require "pupu/parser"
 
 module Pupu
   module Helpers
-    def pupu_page
-      @page ||= Page.new
-    end
-
     # Use it in your layout
-    # Example: pupu :autocompleter, type: "local"
+    # Example: pupu :autocompleter, :type => "local"
     def pupu(name, params = Hash.new)
       comment = if params.empty? then "<!-- Pupu #{name} without params -->"
       else "<!-- Pupu #{name} with params #{params.inspect} -->" end
-      [comment, pupu_page.parse(name, params).parse!, "", ""].join("\n")
+      [comment, Parser.new(name, params).parse!, "", ""].join("\n")
     end
   end
 end

data/lib/pupu/metadata.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Pupu
   class Metadata
     class << self

data/lib/pupu/parser.rb

@@ -1,34 +1,19 @@
-# encoding: utf-8
-
 require "pupu/dsl"
 require "pupu/pupu"
 
 module Pupu
-  class Page
-    attr_reader :files
-    def initialize
-      @files = Array.new
-    end
-
-    def parse(name, options)
-      Parser.new(name, options, self)
-    end
-  end
-
   class Parser
-    def initialize(plugin_name, plugin_params, page = Page.new)
+    def initialize(plugin_name, plugin_params)
       @plugin    = Pupu[plugin_name, plugin_params]
       @output    = Array.new
-      puts "Parser: #{page.inspect}"
-      @page = page
-      @dsl       = DSL.new(@plugin, page)
+      @dsl       = DSL.new(@plugin)
       @@loaded ||= Hash.new
       @@loaded[@plugin.name] = Array.new
     end
 
     def loaded?
       # The reason why just array with plugin names isn't enough is that every time it can be called
-      # with different parameters. For example pupu :mootools and then pupu :mootools, more: true
+      # with different parameters. For example pupu :mootools and then pupu :mootools, :more => true
       @@loaded[@plugin.name] && @dsl.files.all? do |file|
         @@loaded[@plugin.name].include?(file)
       end
@@ -45,7 +30,7 @@ module Pupu
 
     def add_dependencies
       @dsl.get_dependencies.each do |dependency|
-        parser = Parser.new(dependency.name, dependency.params, @page)
+        parser = Parser.new(dependency.name, dependency.params)
         @output.push(parser.parse!) unless parser.loaded?
       end
     end

data/lib/pupu/pupu.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "yaml"
 require "ostruct"
 require "fileutils"
@@ -9,54 +7,27 @@ require "pupu/metadata"
 
 module Pupu
   # this must be set in adapters
-  def self.root
-    @@root ||= Dir.pwd
-  end
-
-  def self.root=(path)
-    @@root = path
-  end
-
-  def self.framework
-    @@framework
-  end
-
-  def self.framework=(framework)
-    @@framework = framework
-  end
-
-  def self.environment?(environment)
-    self.environment.eql?(environment)
-  end
-
-  # @example Pupu.media_prefix("media").url
-  #   => "/media/pupu/autocompleter/javascripts/autocompleter.js"
-  def self.media_prefix=(prefix)
-    MediaPath.rewrite { |path| File.join(prefix, path) }
-  end
-
-  def self.media_root
-    @@media_root ||= Dir.pwd
-  end
+  class << self
+    attr_accessor :root
 
-  def self.media_root=(path)
-    MediaPath.media_root = path
-    @@media_root = path
-  end
-
-  # @example Pupu.rewrite { |path| "http://media.domain.org/#{path}" }.url
-  #   # => "http://media.domain.org/pupu/autocompleter/javascripts/autocompleter.js"
-  def rewrite(&block)
-    MediaPath.rewrite(&block)
-  end
+    # @example Pupu.media_prefix("media").url
+    #   => "/media/pupu/autocompleter/javascripts/autocompleter.js"
+    def media_prefix=(prefix)
+      MediaPath.rewrite { |path| File.join(prefix, path) }
+    end
 
-  # strategies: submodules, copy
-  def self.strategy
-    @@strategy ||= :copy
-  end
+    # TODO: media_root or media_root?
+    def media_root=(path)
+      MediaPath.media_root = path
+      @media_root = path
+    end
+    attr_reader :media_root
 
-  def self.strategy=(strategy)
-    @@strategy = strategy
+    # @example Pupu.rewrite { |path| "http://media.domain.org/#{path}" }.url
+    #   # => "http://media.domain.org/pupu/autocompleter/javascripts/autocompleter.js"
+    def rewrite(&block)
+      MediaPath.rewrite(&block)
+    end
   end
 
   class Pupu
@@ -73,6 +44,9 @@ module Pupu
         File.join(::Pupu.media_root, "pupu")
       end
 
+      # strategies: submodules, copy
+      cattr_accessor :strategy
+
       def root
         # TODO: it should be configurable
         # root = ::Pupu.root.sub(%r[#{Regexp::quote(::Pupu.root)}], '').chomp("/")