pupu 0.0.4.pre → 0.0.5

data/CHANGELOG

@@ -18,3 +18,11 @@
 
 = Version 0.0.4
   * Added Rails example app
+  * pupu reinstall & pupu install --force
+  * Added Pupu.framework
+  * Added Pupu.logger
+  * Added Pupu.environment & Pupu.environment?
+  * Added --ruby & --no-ruby options to the generator
+
+= Version 0.0.5
+  * Added if option to javascript/stylesheet, so you can use styleshett "ie", if: "lt IE 8"

data/bin/pupu

@@ -16,8 +16,9 @@ require "pupu/cli"
 def usage
 <<-HELP
 === Usage ===
-pupu install [pupu]
+pupu install [pupu] [-f|--force]
 pupu uninstall [pupu]
+pupu reinstall [pupu]
 pupu update [pupu|all]
 pupu list
 pupu check
@@ -34,6 +35,8 @@ begin
     Pupu::CLI.new(ARGV).install
   when "uninstall", "remove"
     Pupu::CLI.new(ARGV).uninstall
+  when "reinstall"
+    Pupu::CLI.new(ARGV, force: true).install
   when "update"
     Pupu::CLI.new(ARGV).update
   when "list" # list all pupus

data/lib/pupu/adapters/merb.rb

@@ -3,6 +3,16 @@
 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

@@ -3,6 +3,16 @@
 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

@@ -3,6 +3,16 @@
 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

data/lib/pupu/cli.rb

@@ -9,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" }
@@ -40,10 +40,9 @@ 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
@@ -88,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

data/lib/pupu/dsl.rb

@@ -51,15 +51,22 @@ 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
       @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
       @files.push(path)
       @output.push(tag)
     end

data/lib/pupu/github.rb

@@ -21,13 +21,14 @@ 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
 
@@ -73,17 +74,22 @@ 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"
+          info "Installing dependency #{dependency}"
+          self.install(dependency.name.to_s, options) # FIXME: "user/repo"
         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)

data/lib/pupu/pupu.rb

@@ -17,6 +17,18 @@ module Pupu
     @@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)

data/lib/pupu/version.rb

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

data/stubs/pupu/content/%name%.gemspec.rbt

@@ -0,0 +1,47 @@
+#!/usr/bin/env gem build
+# encoding: utf-8
+
+# Run ./<%= @name %>.gemspec or gem build <%= @name %>.gemspec
+# NOTE: we can't use require_relative because when we run gem build, it use eval for executing this file
+require File.join(File.dirname(__FILE__), "lib", "<%= @name %>", "version")
+require "base64"
+
+Gem::Specification.new do |s|
+  s.name = "<%= @name %>"
+  s.version = <%= @constant %>::VERSION
+  s.authors = ["<%= @full_name %>"]
+  s.homepage = "http://github.com/<%= @github_user %>/<%= @github_repository %>"
+  s.summary = "" # TODO: summary
+  s.description = "" # TODO: long description
+  s.cert_chain = nil
+  s.email = Base64.decode64() # TODO: your encrypted e-mail
+  s.has_rdoc = true
+
+  # files
+  s.files = `git ls-files`.split("\n")
+
+  s.executables = Dir["bin/*"].map(&File.method(:basename))
+  s.default_executable = "<%= @name %>"
+  s.require_paths = ["lib"]
+
+  # Ruby version
+  s.required_ruby_version = ::Gem::Requirement.new(">= 1.9")
+
+  # runtime dependencies
+  # s.add_dependency "my-gem"
+
+  # development dependencies
+  # use gem install <%= @name %> --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 = "<%= @name %>"
+end

data/stubs/pupu/content/%name%.pre.gemspec.rbt

@@ -0,0 +1,8 @@
+#!/usr/bin/env gem build
+# encoding: utf-8
+
+# You might think this is a terrible mess and guess what, you're
+# right mate! However say thanks to authors of RubyGems, not me.
+eval(File.read("<%= @name %>.gemspec")).tap do |specification|
+  specification.version = "#{specification.version}.pre"
+end

data/stubs/pupu/content/.gitignore

@@ -5,5 +5,8 @@
 .DS_Store
 .yardoc
 .cache
-pkg/
-nbproject/
+
+/*.gem
+script/*
+gems/*
+!gems/cache

data/stubs/pupu/content/deps.rip

@@ -0,0 +1,5 @@
+#!/usr/bin/env rip install
+
+# Syntax:
+# repository [tag or commit to install]
+git://github.com/botanicus/pupu.git

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

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+# This file will be loaded automatically when the pupu helper is used
+# If you don't want to load this file, use pupu :whatever, helpers: false
+
+$LOAD_PATH.unshift(File.expand_path("lib", __FILE__))
+
+begin
+  require "<%= @name %>/adapters/#{Pupu.framework}"
+rescue LoadError
+  # If you don't have adapter file, everything should work anyway since Pupu::Helpers
+  # mixin is included into helper module of your framework, so we can fail silently
+end
+
+module Pupu::Helpers
+  include <%= @constant %>::Helpers
+end

data/stubs/pupu/content/lib/%name%.rb.rbt

@@ -0,0 +1,4 @@
+# encoding: utf-8
+
+module <%= @constant %>
+end

data/stubs/pupu/content/spec/%name%_spec.rb.rbt

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+require_relative "spec_helper"
+
+describe <%= @constant %> do
+  it "should have VERSION constant" do
+    <%= @constant %>::VERSION.should be_kind_of(String)
+    <%= @constant %>::VERSION.should match(/^\d+\.\d+\.\d+$/)
+  end
+end

data/stubs/pupu/content/spec/spec.opts

@@ -0,0 +1,5 @@
+--colour
+--format
+progress
+--loadby
+mtime

data/stubs/pupu/content/spec/spec_helper.rb.rbt

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+# dependencies
+require "spec"
+
+# setup load paths
+$:.unshift(File.expand_path("../lib"), __FILE__)

data/stubs/pupu/postprocess.rb

@@ -8,4 +8,12 @@ require "simple-templater/hooks/postprocess/git_repository"
 hook do |generator, context|
   # simple-templater create rango --full-name="Jakub Stastny"
   generator.after Hooks::GitRepository
+
+  unless context[:ruby]
+    rm "init.rb"
+    rm "deps.rb"
+    rm "#{context[:name]}.gemspec"
+    rm "#{context[:name]}.pre.gemspec"
+    rm_r "lib"
+  end
 end

data/stubs/pupu/setup.rb

@@ -10,6 +10,7 @@ require "simple-templater/hooks/preprocess/full_name"
 # --javascripts=mootools-core,mootools-more | --no-javascripts
 # --stylesheets=one,two             | --no-stylesheets
 # --dependencies=mootools,blueprint | --no-dependencies
+# --ruby || --no-ruby
 hook do |generator, context|
   generator.before Hooks::FullName, Hooks::GithubUser
   generator.target = "pupu-#{context[:name]}" unless generator.target.match(/^pupu-/) # this is the convention
@@ -22,4 +23,7 @@ hook do |generator, context|
   unless context[:github_repository] && context[:github_repository].match(/^pupu-/)
     context[:github_repository] = "pupu-#{context[:github_repository]}"
   end
+  if context[:ruby]
+    context[:constant] = context[:name].camel_case
+  end
 end

data/tasks.rb

@@ -1,15 +1,14 @@
-#!./script/nake
+#!/usr/bin/env nake
 # encoding: utf-8
 
 begin
-  require_relative "gems/environment.rb"
+  require File.expand_path("../.bundle/environment", __FILE__)
 rescue LoadError
-  abort "You have to install bundler and run gem bundle first!"
+  require "bundler"
+  Bundler.setup
 end
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
-
-ENV["PATH"] = "script:#{ENV["PATH"]}"
+$LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
 
 require "pupu/version"
 require "nake/tasks/gem"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: pupu
 version: !ruby/object:Gem::Version 
-  version: 0.0.4.pre
+  version: 0.0.5
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-01-22 00:00:00 +00:00
+date: 2010-02-24 00:00:00 +00:00
 default_executable: pupu
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -364,16 +364,27 @@ files:
 - spec/pupu/pupu_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- stubs/pupu/content/%name%.gemspec.rbt
+- stubs/pupu/content/%name%.pre.gemspec.rbt
 - stubs/pupu/content/.gitignore
 - stubs/pupu/content/CHANGELOG
 - stubs/pupu/content/LICENSE.rbt
 - stubs/pupu/content/README.textile.rbt
 - stubs/pupu/content/TODO.txt
 - stubs/pupu/content/config.rb.rbt
+- stubs/pupu/content/deps.rip
 - stubs/pupu/content/images/.gitignore
+- stubs/pupu/content/init.rb.rbt
 - stubs/pupu/content/initializers/%name%.css
 - stubs/pupu/content/initializers/%name%.js
 - stubs/pupu/content/javascripts/%javascript%.js
+- stubs/pupu/content/lib/%name%.rb.rbt
+- stubs/pupu/content/lib/%name%/adapters/rails.rb
+- stubs/pupu/content/lib/%name%/adapters/rango.rb
+- stubs/pupu/content/spec/%name%/.gitignore
+- stubs/pupu/content/spec/%name%_spec.rb.rbt
+- stubs/pupu/content/spec/spec.opts
+- stubs/pupu/content/spec/spec_helper.rb.rbt
 - stubs/pupu/content/stylesheets/%stylesheet%.css
 - stubs/pupu/metadata.yml
 - stubs/pupu/postprocess.rb
@@ -383,7 +394,7 @@ has_rdoc: true
 homepage: http://github.com/botanicus/pupu
 licenses: []
 
-post_install_message: "[\e[32mVersion 0.0.4\e[0m] Added Rails example app\n"
+post_install_message: "[\e[32mVersion 0.0.5\e[0m] Added if option to javascript/stylesheet, so you can use styleshett \"ie\", if: \"lt IE 8\"\n"
 rdoc_options: []
 
 require_paths: 
@@ -396,9 +407,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: []