pupu 0.1.pre → 0.1

data/lib/pupu/cli.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "fileutils"
 require "yaml"
 require "ostruct"
@@ -7,7 +9,7 @@ require "pupu/pupu"
 require "pupu/github"
 
 # copyied from merb.thor, this part is actually my code as well :)
-module ColorfulMessages
+module Kernel
   # red
   def error(*messages)
     puts messages.map { |msg| "\033[1;31m#{msg}\033[0m" }
@@ -38,16 +40,15 @@ end
 
 module Pupu
   class CLI
-    include ColorfulMessages
-    attr_reader :args
-    def initialize(args)
-      @args = args
+    attr_reader :args, :options
+    def initialize(args, options = Hash.new)
+      @args, @options = args, options
       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
@@ -62,7 +63,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
@@ -76,7 +77,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
@@ -86,8 +87,9 @@ module Pupu
     def install
       self.args.each do |pupu|
         begin
-          GitHub.install(pupu)
-        rescue PluginIsAlreadyInstalled
+          GitHub.install(pupu, options)
+        rescue PluginIsAlreadyInstalled => e
+          puts e.backtrace.join("\n- ")
           info "Plugin #{pupu} is already installed, skipping"
         end
       end
@@ -146,7 +148,7 @@ module Pupu
       # search on github
       require "yaml"
       require "open-uri"
-      open("http://github.com/api/v1/yaml/search/pupu") do |stream|
+      open("https://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,5 +1,8 @@
+# encoding: utf-8
+
 require "ostruct"
 require "media-path"
+require "pupu/parser"
 
 class Hash
   def to_html_attrs
@@ -9,12 +12,19 @@ end
 
 module Pupu
   class DSL
-    attr_reader :output, :files, :path
-    def initialize(pupu)
-      @pupu = pupu
+    attr_reader :output, :path
+
+    def files
+      @page.files
+    end
+
+    def initialize(pupu, page = Page.new)
+      @pupu   = pupu
+      @page   = page
       @output = Array.new
-      @files  = Array.new
+      @files  = files
       @dependencies = Array.new
+      puts "DSL: #{page.inspect}"
       @path = pupu.file("config.rb")
     end
 
@@ -49,17 +59,28 @@ module Pupu
     def javascript(basename, params = Hash.new)
       path = @pupu.javascript(basename).url
       tag  = "<script src='#{path}' type='text/javascript'></script>"
-      @files.push(path)
-      @output.push(tag)
+      if params[:if]
+        tag = "<!--[if #{params[:if]}]>" + tag + "<![endif]-->"
+      end
+      unless files.include?(path)
+        files.push(path)
+        @output.push(tag)
+      end
     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} />"
-      @files.push(path)
-      @output.push(tag)
+      if condition
+        tag = "<!--[if #{condition}]>" + tag + "<![endif]-->"
+      end
+      unless files.include?(path)
+        files.push(path)
+        @output.push(tag)
+      end
     end
 
     def javascripts(*names)
@@ -74,7 +95,7 @@ module Pupu
       end
     end
 
-    # parameter :type, :optional => ["local", "request"] do |type|
+    # parameter :type, optional: ["local", "request"] do |type|
     #   javascript "autocompleter.#{type}"
     # end
 
@@ -82,11 +103,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,8 +1,13 @@
+# encoding: utf-8
+
 module Pupu
   class PupuRootNotFound < StandardError
   end
 
   class PluginNotFoundError < StandardError
+    def initialize(plugin)
+      super("Plugin not found: #{plugin.inspect}")
+    end
   end
 
   class PluginIsAlreadyInstalled < StandardError

data/lib/pupu/github.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "fileutils"
 require "yaml"
 require "ostruct"
@@ -7,7 +9,7 @@ require "pupu/exceptions"
 
 module ShellExtensions
   def run(command)
-    puts "[SHELL] #{command}"
+    puts "[SHELL] #{command} # in #{Dir.pwd}"
     %x(#{command})
     $?.exitstatus == 0
   end
@@ -19,20 +21,21 @@ module Pupu
     class << self
       include ShellExtensions
       # GitHub.install("autocompleter")
-      # GitHub.install("botanicus/autocompleter")
-      def install(repo)
+      # GitHub.install("botanicus/autocompleter", force: true)
+      def install(repo, options = Hash.new)
         user, repo = repo.split("/") if repo.match(%r{/})
         user = ENV["USER"] unless user
         url = "git://github.com/#{user}/pupu-#{repo}.git"
-        self.install_files(repo, url)
-        self.install_dependencies(@pupu)
+        info "Installing #{repo}"
+        self.install_files(repo, url, options)
+        self.install_dependencies(@pupu, options)
         # 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
@@ -63,7 +66,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)
@@ -71,17 +74,26 @@ module Pupu
         end
       end
 
-      def install_dependencies(pupu)
+      def install_dependencies(pupu, options = Hash.new)
         dsl = DSL.new(pupu)
         dsl.instance_eval(File.read(pupu.file("config.rb").path))
         dsl.get_dependencies.each do |dependency|
-          self.install(dependency.name.to_s) # FIXME: "user/repo"
+          begin
+            info "Installing dependency #{dependency}"
+            self.install(dependency.name.to_s, options) # FIXME: "user/repo"
+          rescue PluginIsAlreadyInstalled => exception
+            puts "~ #{exception.message}"
+          end
         end
       end
 
-      def install_files(repo, url)
+      def install_files(repo, url, options = Hash.new)
         chdir do |media_dir|
-          raise PluginIsAlreadyInstalled if File.directory?(repo) # TODO: custom exception class
+          if File.directory?(repo) && !options[:force]
+            raise PluginIsAlreadyInstalled, "Pupu #{repo} already exist"
+          elsif File.directory?(repo) && options[:force]
+            FileUtils.rm_r(repo)
+          end
           run("git clone #{url} #{repo}") || abort("Git failed")
           Dir.chdir(repo) do
             proceed_files(repo, url)
@@ -104,7 +116,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
@@ -112,8 +124,8 @@ module Pupu
 
       def chdir(pupu = nil, &block)
         FileUtils.mkdir_p(Pupu.root_path) unless File.directory?(Pupu.root_path)
-        Dir.chdir(Pupu.root.to_s) do
-          pupu ? block.call(pupu.root) : block.call(Pupu.root)
+        Dir.chdir(Pupu.root_path.to_s) do
+          pupu ? block.call(pupu.root) : block.call(Pupu.root_path)
         end
       end
     end

data/lib/pupu/helpers.rb

@@ -1,13 +1,19 @@
+# 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, Parser.new(name, params).parse!, "", ""].join("\n")
+      [comment, pupu_page.parse(name, params).parse!, "", ""].join("\n")
     end
   end
 end

data/lib/pupu/metadata.rb

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

data/lib/pupu/parser.rb

@@ -1,19 +1,34 @@
+# 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)
+    def initialize(plugin_name, plugin_params, page = Page.new)
       @plugin    = Pupu[plugin_name, plugin_params]
       @output    = Array.new
-      @dsl       = DSL.new(@plugin)
+      puts "Parser: #{page.inspect}"
+      @page = page
+      @dsl       = DSL.new(@plugin, page)
       @@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
@@ -30,7 +45,7 @@ module Pupu
 
     def add_dependencies
       @dsl.get_dependencies.each do |dependency|
-        parser = Parser.new(dependency.name, dependency.params)
+        parser = Parser.new(dependency.name, dependency.params, @page)
         @output.push(parser.parse!) unless parser.loaded?
       end
     end

data/lib/pupu/pupu.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "yaml"
 require "ostruct"
 require "fileutils"
@@ -7,36 +9,63 @@ require "pupu/metadata"
 
 module Pupu
   # this must be set in adapters
-  class << self
-    attr_accessor :root
+  def self.root
+    @@root ||= Dir.pwd
+  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
+  def self.root=(path)
+    @@root = path
+  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.framework
+    @@framework
+  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
+  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
+
+  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
+
+  # strategies: submodules, copy
+  def self.strategy
+    @@strategy ||= :copy
+  end
+
+  def self.strategy=(strategy)
+    @@strategy = strategy
   end
 
   class Pupu
     class << self
       # TODO: return Pupu object, not string
       def all
-        Dir["#{self.root}/*"].select do |item|
-          File.directory?(item)
-        end.map { |entry| File.basename(entry).to_s }
+        files = Dir["#{self.root_path}/*"]
+        dirs = files.select(&File.method(:directory?))
+        dirs.map(&File.method(:basename))
       end
 
       # same as root, but doesn't raise any exception
@@ -44,9 +73,6 @@ 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("/")
@@ -58,8 +84,8 @@ module Pupu
         #    # exception
         #  end
         raise "Pupu.media_root has to be initialized" if ::Pupu.media_root.nil?
-        raise Errno::ENOENT, "#{::Pupu.media_root}/pupu doesn't exist, you have to create it first!" unless File.directory?File.join(::Pupu.media_root, "pupu")
-        @root ||= MediaPath.new(File.join(::Pupu.media_root, "pupu"))
+        raise Errno::ENOENT, "#{self.root_path} doesn't exist, you have to create it first!" unless File.directory?(self.root_path)
+        @root ||= MediaPath.new(self.root_path)
       end
 
       # TODO: reflect changes on root method
@@ -74,7 +100,7 @@ module Pupu
         if self.all.include?(plugin)
           self.new(plugin, params)
         else
-          raise PluginNotFoundError
+          raise PluginNotFoundError.new(plugin)
         end
       end
     end