pupu 0.0.3.pre → 0.0.3

data/CHANGELOG

@@ -10,3 +10,8 @@
 = Version 0.0.2
   * Rails support
   * Better documentation
+
+= Version 0.0.3
+  * Bug fixes
+  * Refactoring
+  * Examples

data/README.textile

@@ -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:

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/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/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>

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/cli.rb

@@ -47,7 +47,7 @@ module Pupu
       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 +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
@@ -76,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

data/lib/pupu/dsl.rb

@@ -74,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
 
@@ -82,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/github.rb

@@ -32,7 +32,7 @@ module Pupu
       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 +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)
@@ -104,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

@@ -3,7 +3,7 @@ require "pupu/parser"
 module Pupu
   module Helpers
     # 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

data/lib/pupu/parser.rb

@@ -13,7 +13,7 @@ module Pupu
 
     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

data/lib/pupu/pupu.rb

@@ -7,27 +7,42 @@ 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
+  # @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
 
-    # @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.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
@@ -44,9 +59,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("/")

data/pupu.gemspec

@@ -1,4 +1,4 @@
-#!/usr/bin/env gem1.9 build
+#!/usr/bin/env gem build
 # encoding: utf-8
 
 require "base64"
@@ -30,6 +30,14 @@ Gem::Specification.new do |s|
   # use gem install pupu --development if you want to install them
   s.add_development_dependency "simple-templater"
 
+  begin
+    require "changelog"
+  rescue LoadError
+    warn "You have to have changelog gem installed for post install message"
+  else
+    s.post_install_message = CHANGELOG.new.version_changes
+  end
+
   # RubyForge
   s.rubyforge_project = "pupu"
 end

data/spec/data/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/spec/data/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/spec/pupu/github_spec.rb

@@ -13,7 +13,7 @@ describe Pupu::GitHub do
     end
 
     it "should return nil if plugin do not exists" do
-      plugin(:autocompleter, :request => "local")
+      plugin(:autocompleter, request: "local")
     end
   end
 end

data/spec/pupu/helpers_spec.rb

@@ -13,6 +13,6 @@ describe "Helpers#pupu" do
   end
 
   it "should return text with assets" do
-    pupu(:autocompleter, :type => "local").should eql(Parser.new(:autocompleter, :type => "local").parse!)
+    pupu(:autocompleter, type: "local").should eql(Parser.new(:autocompleter, type: "local").parse!)
   end
 end

data/spec/pupu/parser_spec.rb

@@ -13,7 +13,7 @@ describe Pupu::Parser do
     end
 
     it "should return nil if plugin do not exists" do
-      plugin(:autocompleter, :request => "local")
+      plugin(:autocompleter, request: "local")
     end
   end
 end

data/stubs/pupu/content/config.rb.rbt

@@ -17,6 +17,6 @@ stylesheet "<%= stylesheet %>"
 
 # 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pupu
 version: !ruby/object:Gem::Version 
-  version: 0.0.3.pre
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
@@ -337,7 +337,9 @@ has_rdoc: true
 homepage: http://github.com/botanicus/pupu
 licenses: []
 
-post_install_message: 
+post_install_message: "[\e[32mVersion 0.0.3\e[0m] Bug fixes\n\
+  [\e[32mVersion 0.0.3\e[0m] Refactoring\n\
+  [\e[32mVersion 0.0.3\e[0m] Examples\n"
 rdoc_options: []
 
 require_paths: 
@@ -350,9 +352,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []