pupu 0.1 → 0.2

data/examples/merb/public/pupu/autocompleter/metadata.yml

@@ -1,5 +1,5 @@
---- 
+---
 :revision: d48d57592b62ce7f77fcb7b71d0ddcc4c899933a
-:repozitory: git://github.com/botanicus/pupu-autocompleter.git
+:repository: git://github.com/botanicus/pupu-autocompleter.git
 :dependencies: []
 

data/examples/merb/public/pupu/blueprint/metadata.yml

@@ -1,5 +1,5 @@
 --- 
 :revision: 09c6862a75cc4462679d048a1e756fdf913de0c1
-:repozitory: git://github.com/botanicus/pupu-blueprint.git
+:repository: git://github.com/botanicus/pupu-blueprint.git
 :dependencies: []
 

data/examples/merb/public/pupu/flash/metadata.yml

@@ -1,5 +1,5 @@
 --- 
 :revision: bc43e37af109661e94aa7eeac846c8f6f36a4882
-:repozitory: git://github.com/botanicus/pupu-flash.git
+:repository: git://github.com/botanicus/pupu-flash.git
 :dependencies: []
 

data/examples/merb/public/pupu/mootools/metadata.yml

@@ -1,5 +1,5 @@
---- 
+---
 :revision: 375395a1490462c30a688729a8ae529a4e7199cf
-:repozitory: git://github.com/botanicus/pupu-mootools.git
+:repository: git://github.com/botanicus/pupu-mootools.git
 :dependencies: []
 

data/examples/rango/media/pupu/autocompleter/metadata.yml

@@ -1,5 +1,5 @@
---- 
+---
 :revision: d48d57592b62ce7f77fcb7b71d0ddcc4c899933a
-:repozitory: git://github.com/botanicus/pupu-autocompleter.git
+:repository: git://github.com/botanicus/pupu-autocompleter.git
 :dependencies: []
 

data/examples/rango/media/pupu/blueprint/metadata.yml

@@ -1,5 +1,5 @@
---- 
+---
 :revision: 09c6862a75cc4462679d048a1e756fdf913de0c1
-:repozitory: git://github.com/botanicus/pupu-blueprint.git
+:repository: git://github.com/botanicus/pupu-blueprint.git
 :dependencies: []
 

data/examples/rango/media/pupu/flash/metadata.yml

@@ -1,5 +1,5 @@
---- 
+---
 :revision: bc43e37af109661e94aa7eeac846c8f6f36a4882
-:repozitory: git://github.com/botanicus/pupu-flash.git
+:repository: git://github.com/botanicus/pupu-flash.git
 :dependencies: []
 

data/examples/rango/media/pupu/mootools/metadata.yml

@@ -1,5 +1,5 @@
---- 
+---
 :revision: 375395a1490462c30a688729a8ae529a4e7199cf
-:repozitory: git://github.com/botanicus/pupu-mootools.git
+:repository: git://github.com/botanicus/pupu-mootools.git
 :dependencies: []
 

data/lib/pupu/adapters/ace.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require "ace"
+require "pupu"
+require "pupu/helpers"
+
+Pupu.framework = :ace
+
+# def Pupu.environment
+#   Rails.environment
+# end
+
+# def Pupu.logger
+#   Rails.logger
+# end
+
+Pupu.root = Dir.pwd
+Pupu.media_root = File.join(Pupu.root, "content", "assets")
+Ace::Helpers.send(:include, Pupu::Helpers)

data/lib/pupu/adapters/padrino.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require "pupu"
+require "pupu/helpers"
+
+# class MyApp < Padrino::Application
+#   register Pupu::Helpers
+# end
+
+module Pupu::Helpers
+  def self.registered(app)
+    app.send(:include, self)
+  end
+end
+
+Pupu.framework = :padrino
+
+def Pupu.environment
+  Padrino.environment
+end
+
+def Pupu.logger
+  Padrino.logger
+end
+
+Pupu.root = Padrino.root
+Pupu.media_root = File.join(Padrino.root, "public")

data/lib/pupu/cli.rb

@@ -72,7 +72,7 @@ module Pupu
     end
 
     def detect
-      pupu_dir = Dir["media/pupu", "public/pupu"].first
+      pupu_dir = Dir["media/pupu", "public/pupu", "content/assets/pupu"].first
       path = pupu_dir ? File.expand_path(File.dirname(pupu_dir)) : nil
       path ||= ["media", "public"].find { |directory| File.directory?(directory) }
       return if path.nil?
@@ -107,7 +107,8 @@ module Pupu
     end
 
     def update
-      args = Pupu.all if self.args.empty? # update all if no pupu specified
+      args = self.args
+      args = Pupu.all if args.empty? # update all if no pupu specified
       args.each do |pupu|
         begin
           GitHub.update(pupu)

data/lib/pupu/dsl.rb

@@ -24,7 +24,7 @@ module Pupu
       @output = Array.new
       @files  = files
       @dependencies = Array.new
-      puts "DSL: #{page.inspect}"
+      # puts "DSL: #{page.inspect}"
       @path = pupu.file("config.rb")
     end
 

data/lib/pupu/github.rb

@@ -42,7 +42,7 @@ module Pupu
             path = pupu.root.to_s # otherwise after we remove the path, we get error at mkdir telling us that the path doesn't exist
             pupu.metadata # cache metadata
             FileUtils.rm_r(path)
-            self.install_files(pupu_name, pupu.metadata.repozitory)
+            self.install_files(pupu_name, pupu.metadata.repository)
           end
         else
           Pupu.all.each do |pupu_name|
@@ -63,10 +63,10 @@ module Pupu
 
       protected
       def save_metadata(pupu, url)
-        revision = %x(git log | head -1).chomp.sub(/^commit /, "")
+        revision = %x(git log --pretty=format:'%H' -1)
         dsl = DSL.new(pupu)
         dependencies = dsl.get_dependencies.map { |dependency| dependency.name }
-        params = {revision: revision, repozitory: url, dependencies: dependencies}
+        params = {revision: revision, repository: url, dependencies: dependencies}
         Dir.chdir(@pupu.root.to_s) do
           File.open("metadata.yml", "w") do |file|
             file.puts(params.to_yaml)

data/lib/pupu/parser.rb

@@ -19,7 +19,7 @@ module Pupu
     def initialize(plugin_name, plugin_params, page = Page.new)
       @plugin    = Pupu[plugin_name, plugin_params]
       @output    = Array.new
-      puts "Parser: #{page.inspect}"
+      # puts "Parser: #{page.inspect}"
       @page = page
       @dsl       = DSL.new(@plugin, page)
       @@loaded ||= Hash.new

data/lib/pupu/pupu.rb

@@ -113,7 +113,8 @@ module Pupu
     end
 
     def root
-      self.class.root.join(@path)
+      # self.class.root.join(@path)
+      File.join(self.class.root_path, @path)
     end
 
     def metadata
@@ -121,6 +122,7 @@ module Pupu
       path = self.file("metadata.yml").path
       hash = YAML::load_file(path)
       @metadata = OpenStruct.new(hash)
+      @metadata.repository ||= @metadata.repozitory   # temporary hack for old style metadata.yml
     rescue Errno::ENOENT # we might remove pupu directory, so metadata are missing, but we can get them from cache
       @metadata
     end

data/lib/pupu/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Pupu
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,18 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: pupu
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
+  prerelease: 
+  version: "0.2"
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2011-02-18 00:00:00 +00:00
+date: 2011-05-25 00:00:00 +02:00
 default_executable: pupu
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -36,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -333,7 +326,9 @@ files:
 - gems/cache/rspec-1.3.0.gem
 - gems/cache/term-ansicolor-1.0.4.gem
 - lib/pupu.rb
+- lib/pupu/adapters/ace.rb
 - lib/pupu/adapters/merb.rb
+- lib/pupu/adapters/padrino.rb
 - lib/pupu/adapters/rails.rb
 - lib/pupu/adapters/rango.rb
 - lib/pupu/cli.rb
@@ -415,23 +410,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ~>
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: pupu
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Framework-agnostic package system for media files