pupu 0.2 → 0.2.1

data/.gitignore

@@ -3,6 +3,7 @@
 .DS_Store
 .cache
 .yardoc
+.rvmrc
 
 script/*
 gems/*

data/Gemfile

@@ -1,9 +1,8 @@
-# configuration
-bundle_path "gems"
-bin_path "script"
-disable_rubygems
+source 'http://rubygems.org'
 
 # gems
 gem "nake"
 gem "media-path"
-gem "rspec", only: "test"
+
+gem "rspec", "~> 2.6.0", group: :test
+gem "fakefs", "~> 0.3.2", group: :test

data/Gemfile.lock

@@ -0,0 +1,26 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    fakefs (0.3.2)
+    media-path (0.1.3)
+    nake (0.0.8)
+      term-ansicolor
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    term-ansicolor (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakefs (~> 0.3.2)
+  media-path
+  nake
+  rspec (~> 2.6.0)

data/examples/rails/config/initializers/session_store.rb

@@ -5,8 +5,8 @@
 # Make sure the secret is at least 30 characters and all random, 
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.session = {
-  :key         => '_rails_session',
-  :secret      => '6bd040269fe358f0a2bc3bccd9972b9096e31a59b68902d877b3599e026fe290912d57792b67b04e6dab3eda3f67471dc03d229466495c6fc583d3fb263dcea2'
+  key:         '_rails_session',
+  secret:      '6bd040269fe358f0a2bc3bccd9972b9096e31a59b68902d877b3599e026fe290912d57792b67b04e6dab3eda3f67471dc03d229466495c6fc583d3fb263dcea2'
 }
 
 # Use the database for sessions instead of the cookie-based default,

data/examples/rails/config/routes.rb

@@ -13,7 +13,7 @@ ActionController::Routing::Routes.draw do |map|
   #   map.resources :products
 
   # Sample resource route with options:
-  #   map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
+  #  map.resources :products, member: { short: :get, toggle: :post }, collection: { sold: :get }
 
   # Sample resource route with sub-resources:
   #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
@@ -21,7 +21,7 @@ ActionController::Routing::Routes.draw do |map|
   # Sample resource route with more complex sub-resources
   #   map.resources :products do |products|
   #     products.resources :comments
-  #     products.resources :sales, :collection => { :recent => :get }
+  #     products.resources :sales, collection: { recent: :get }
   #   end
 
   # Sample resource route within a namespace:

data/examples/rails/db/seeds.rb

@@ -3,5 +3,5 @@
 #
 # Examples:
 #   
-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Major.create(:name => 'Daley', :city => cities.first)
+#   cities = City.create([{name: 'Chicago'}, {name: 'Copenhagen'}])
+#   Major.create(name: 'Daley', city: cities.first)

data/lib/pupu/github.rb

@@ -102,19 +102,8 @@ module Pupu
       end
 
       def proceed_files(repo, url)
-        js_initializer = "initializers/#{repo}.js"
-        css_initializer = "initializers/#{repo}.css"
-        if File.exist?(js_initializer) &&  (not File.exist?("#{::Pupu.media_root}/javascripts/initializers/#{repo}.js"))
-          puts "Creating JS initializer"
-          FileUtils.mkdir_p("#{::Pupu.media_root}/javascripts/initializers")
-          FileUtils.mv js_initializer, "#{::Pupu.media_root}/javascripts/initializers/#{repo}.js"
-        end
-        if File.exist?(css_initializer) && (not File.exist?("#{::Pupu.media_root}/stylesheets/initializers/#{repo}.css"))
-          puts "Creating CSS initializer"
-          FileUtils.mkdir_p("#{::Pupu.media_root}/stylesheets/initializers")
-          FileUtils.mv css_initializer, "#{::Pupu.media_root}/stylesheets/initializers/#{repo}.css"
-        end
         @pupu = Pupu[repo]
+        @pupu.copy_initializers
         self.save_metadata(@pupu, url)
         FileUtils.rm_r(".git") if ::Pupu.strategy.eql?(:copy)
       rescue Exception => exception

data/lib/pupu/pupu.rb

@@ -14,6 +14,7 @@ module Pupu
   end
 
   def self.root=(path)
+    raise PupuRootNotFound unless File.directory?(path)
     @@root = path
   end
 
@@ -136,7 +137,7 @@ module Pupu
     end
 
     def image(basename)
-      file("javascripts/#{image}")
+      file("images/#{basename}")
     end
 
     def uninstall
@@ -152,9 +153,38 @@ module Pupu
       when :all
         [self.initializer(:javascript), self.initializer(:stylesheet)]
       when :javascript
-        file("#{@path}.js", "#{::Pupu.media_root}/javascripts/initializers") rescue nil # TODO: fix media
+        begin
+          file("#{@path}.js", "#{root}/initializers")
+        rescue AssetNotFound
+          file("#{@path}.js", "#{::Pupu.media_root}/javascripts/initializers")
+        rescue
+          nil
+        end
       when :stylesheet
-        file("#{@path}.css", "#{::Pupu.media_root}/stylesheets/initializers") rescue nil # TODO: fix media
+        begin
+          file("#{@path}.css", "#{root}/initializers")
+        rescue AssetNotFound
+          file("#{@path}.css", "#{::Pupu.media_root}/stylesheets/initializers")
+        rescue
+          nil
+        end
+      else
+        raise Exception, "#{type.to_s} is not know type of initializer"
+      end
+    end
+    
+    def copy_initializers
+      js_initializer = initializer(:javascript)
+      css_initializer = initializer(:stylesheet)
+      
+      if js_initializer && (not File.exist?("#{::Pupu.media_root}/javascripts/initializers/#{File.basename(js_initializer.to_s)}"))
+        FileUtils.mkdir_p("#{::Pupu.media_root}/javascripts/initializers")
+        FileUtils.mv js_initializer.to_s, "#{::Pupu.media_root}/javascripts/initializers/#{File.basename(js_initializer.to_s)}"
+      end
+      
+      if css_initializer && (not File.exist?("#{::Pupu.media_root}/stylesheets/initializers/#{File.basename(css_initializer.to_s)}"))
+        FileUtils.mkdir_p("#{::Pupu.media_root}/stylesheets/initializers")
+        FileUtils.mv css_initializer.to_s, "#{::Pupu.media_root}/stylesheets/initializers/#{File.basename(css_initializer.to_s)}"
       end
     end
 
@@ -165,6 +195,8 @@ module Pupu
     def file(path, root = self.root)
       root = MediaPath.new(root) if root.is_a?(String)
       root.join(path)
+    rescue Errno::ENOENT
+      raise AssetNotFound, "#{soft_file(path, root)}"
     end
   end
 end

data/lib/pupu/version.rb

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

data/pupu.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/botanicus/pupu"
   s.summary = "Framework-agnostic package system for media files"
   s.description = "Pupu is a plugin system for media like mootools plugins, icon sets etc. It knows dependencies and it has CLI interface, so it's really easy to bundle such pupus into your app."
-  s.cert_chain = nil
   s.email = Base64.decode64("c3Rhc3RueUAxMDFpZGVhcy5jeg==\n")
 
   # files
@@ -21,9 +20,6 @@ Gem::Specification.new do |s|
   s.default_executable = "pupu"
   s.require_paths = ["lib"]
 
-  # Ruby version
-  s.required_ruby_version = ::Gem::Requirement.new("~> 1.9.1")
-
   # runtime dependencies
   s.add_dependency "media-path"
 

data/spec/pupu/pupu_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "fakefs/spec_helpers"
 
 require_relative "../spec_helper"
 
@@ -28,6 +29,13 @@ describe Pupu::Pupu do
       lambda { Pupu.root = "#{PROJECT_ROOT}/root/prefix/pupu" }.should raise_error(Pupu::PupuRootNotFound)
     end
   end
+  
+  describe "#file" do
+    it "should return path" do
+      @pupu = Pupu::Pupu[:autocompleter]
+      @pupu.file("autocompleter.js", @pupu.root + "/initializers").to_s.should eql("#{@pupu.root}/initializers/autocompleter.js")
+    end
+  end
 
   describe "#initializers(type)" do
     before(:each) do
@@ -35,52 +43,62 @@ describe Pupu::Pupu do
     end
 
     it "should return pathname to pupu" do
-      @pupu.initializer.should eql("#{PROJECT_ROOT}/root/pupu/autocompleter/initializer.js") # TODO: pole s 2 pathname
+      @pupu.initializer.map{|path| path.to_s}.should eql(["#{Pupu.media_root}/pupu/autocompleter/initializers/autocompleter.js","#{Pupu.media_root}/pupu/autocompleter/initializers/autocompleter.css"])
     end
 
     it "should return pathname to pupu" do
-      @pupu.initializer(:script).should eql("#{PROJECT_ROOT}/root/pupu/autocompleter/initializer.js")
+      @pupu.initializer(:javascript).to_s.should eql("#{Pupu.media_root}/pupu/autocompleter/initializers/autocompleter.js")
     end
 
     it "should return pathname to pupu" do
-      @pupu.initializer(:stylesheet).should eql("#{PROJECT_ROOT}/root/pupu/autocompleter/initializer.css")
+      @pupu.initializer(:stylesheet).to_s.should eql("#{Pupu.media_root}/pupu/autocompleter/initializers/autocompleter.css")
     end
 
-    it "should return pathname to pupu" do
+    it "should raise error for non-existing initializer type" do
       lambda { @pupu.initializer(:nonexisting) }.should raise_error()
     end
 
-    it "should return nil if image do not exists" do
-      lambda { @pupu.image("missing.gif") }.should raise_error(AssetNotFound) # TODO
+    it "should raise AssetNotFound if image do not exists" do
+      lambda { @pupu.image("missing.gif") }.should raise_error(Pupu::AssetNotFound)
     end
   end
 
   # initializer.js will be copied into root/javascripts/initializers/[pupu-name].js
   describe "#copy_initializers" do
+    include FakeFS::SpecHelpers
+    
     before(:each) do
+      FakeFS::FileSystem.clone("#{PROJECT_ROOT}")
       @pupu = Pupu::Pupu[:autocompleter]
     end
 
-    it "should return pathname to pupu" do
-      @pupu.initializer.should eql("#{PROJECT_ROOT}/root/pupu/autocompleter/initializer.js")
+    it "should copy initializers to ROOT/initializers" do
+      File.should_not exist("#{Pupu.media_root}/javascripts/initializers/autocompleter.js")
+      File.should_not exist("#{Pupu.media_root}/stylesheets/initializers/autocompleter.css")
+      @pupu.copy_initializers
+      File.should exist("#{Pupu.media_root}/javascripts/initializers/autocompleter.js")
+      File.should exist("#{Pupu.media_root}/stylesheets/initializers/autocompleter.css")      
     end
 
-    it "should return nil if image do not exists" do
-      lambda { @pupu.image("missing.gif") }.should raise_error(AssetNotFound) # TODO
+    it "should cause #initializer to return path to copied file" do
+      @pupu.initializer(:javascript).to_s.should eql("#{Pupu.media_root}/pupu/autocompleter/initializers/autocompleter.js")
+      @pupu.copy_initializers
+      @pupu.initializer(:javascript).to_s.should eql("#{Pupu.media_root}/javascripts/initializers/autocompleter.js")
     end
   end
 
   describe "#uninstall" do
-    before(:each) do
-      #@pupu = Pupu::Pupu[:autocompleter]
-    end
+    include FakeFS::SpecHelpers
 
-    it "should return path to image" do
-      @pupu.uninstall # TODO
+    before(:each) do
+      FakeFS::FileSystem.clone("#{PROJECT_ROOT}")
+      @pupu = Pupu::Pupu[:autocompleter]
     end
 
-    it "should return nil if image do not exists" do
-      lambda { @pupu.image("missing.gif") }.should raise_error(AssetNotFound) # TODO
+    it "should remove plugins directory" do
+      File.should exist(@pupu.root.to_s)
+      @pupu.uninstall
+      File.should_not exist(@pupu.root.to_s)
     end
   end
 
@@ -90,11 +108,11 @@ describe Pupu::Pupu do
     end
 
     it "should return path to image" do
-      @pupu.image("spinner.gif").should eql("/pupu/autocompleter/images/spinner.gif")
+      @pupu.image("spinner.gif").to_s.should eql("#{Pupu.media_root}/pupu/autocompleter/images/spinner.gif")
     end
 
     it "should return nil if image do not exists" do
-      lambda { @pupu.image("missing.gif") }.should raise_error(AssetNotFound)
+      lambda { @pupu.image("missing.gif") }.should raise_error(Pupu::AssetNotFound)
     end
   end
 
@@ -104,11 +122,11 @@ describe Pupu::Pupu do
     end
 
     it "should return path to javascript" do
-      @pupu.javascript("autocompleter").should eql("/pupu/autocompleter/lib/autocompleter.js")
+      @pupu.javascript("autocompleter").to_s.should eql("#{Pupu.media_root}/pupu/autocompleter/javascripts/autocompleter.js")
     end
 
     it "should return nil if javascript do not exists" do
-      lambda { @pupu.javascript("missing") }.should raise_error(AssetNotFound)
+      lambda { @pupu.javascript("missing") }.should raise_error(Pupu::AssetNotFound)
     end
   end
 
@@ -118,11 +136,11 @@ describe Pupu::Pupu do
     end
 
     it "should return path to image" do
-      @pupu.stylesheet("autocompleter").should eql("/pupu/autocompleter/autocompleter.css")
+      @pupu.stylesheet("autocompleter").to_s.should eql("#{Pupu.media_root}/pupu/autocompleter/stylesheets/autocompleter.css")
     end
 
     it "should return nil if stylesheet do not exists" do
-      lambda { @pupu.stylesheet("missing") }.should raise_error(AssetNotFound)
+      lambda { @pupu.stylesheet("missing") }.should raise_error(Pupu::AssetNotFound)
     end
   end
 end

metadata

@@ -1,51 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pupu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: "0.2"
 platform: ruby
-authors: 
-- "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
+authors:
+- Jakub Šťastný aka Botanicus
 autorequire: 
 bindir: bin
-cert_chain: 
-date: 2011-05-25 00:00:00 +02:00
-default_executable: pupu
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain: []
+date: 2013-04-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: media-path
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: simple-templater
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple-templater
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Pupu is a plugin system for media like mootools plugins, icon sets etc. It knows dependencies and it has CLI interface, so it's really easy to bundle such pupus into your app.
-email: stastny@101ideas.cz
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Pupu is a plugin system for media like mootools plugins, icon sets etc.
+  It knows dependencies and it has CLI interface, so it's really easy to bundle such
+  pupus into your app.
+email: !binary |-
+  c3Rhc3RueUAxMDFpZGVhcy5jeg==
+executables:
 - pupu
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.textile
 - TODO.txt
@@ -354,6 +365,7 @@ files:
 - spec/data/public/pupu/autocompleter/TODO
 - spec/data/public/pupu/autocompleter/config.rb
 - spec/data/public/pupu/autocompleter/images/spinner.gif
+- spec/data/public/pupu/autocompleter/initializers/autocompleter.css
 - spec/data/public/pupu/autocompleter/initializers/autocompleter.js
 - spec/data/public/pupu/autocompleter/javascripts/autocompleter.js
 - spec/data/public/pupu/autocompleter/javascripts/autocompleter.local.js
@@ -396,33 +408,28 @@ files:
 - stubs/pupu/postprocess.rb
 - stubs/pupu/setup.rb
 - tasks.rb
-has_rdoc: true
 homepage: http://github.com/botanicus/pupu
 licenses: []
-
-post_install_message: "[\e[32mVersion 0.1\e[0m] Ace adapter.\n"
+post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ~>
-    - !ruby/object:Gem::Version 
-      version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: pupu
-rubygems_version: 1.5.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Framework-agnostic package system for media files
 test_files: []
-