rip 0.0.1 → 0.0.2

data/README.markdown

@@ -1,8 +1,8 @@
 Rip: Ruby's Intelligent Packaging
 =================================
 
-Rip is an attempt to create an intelligent packaging system
-for Ruby.
+Rip is an attempt to create a next generation packaging 
+system for Ruby.
 
 For more thorough documentation please see the Rip site:
 
@@ -36,14 +36,14 @@ None. Really? Let's try to require Grit.
     
 Whoops. Not found. Let's install the latest using rip.
 
-    $ rip install git://github.com/mojombo/grit.git v1.1.1
+    $ rip install git://github.com/defunkt/grit.git v1.1.1b
     Successfully installed grit v1.1.1
     $ rip list
     ripenv: base
 
-    diff-lcs (5621f02)
+    diff-lcs (491fbc0)
+    mime-types (v1.16)
     grit (v1.1.1)
-    mime-types (0fd8958)
 
 Great, now we have Grit and all its dependencies.    
 
@@ -190,12 +190,11 @@ dependents, use `-d` (for dependents).
 Extensions
 ----------
 
-Installing a package that is not Rip aware but needs an extension
-built? Use `rip build`.
+Rip will attempt to build extensions during installation through the 
+`rip build` command.
 
-Rip will attempt to run `rake rip:install` in your library if a 
-Rakefile is found. If you need to compile your C extension or do
-any other work, this is the place.
+You can also run `rip build PACKAGE` to try and build a package
+manually.
 
 Rip Directory Structure
 -----------------------
@@ -222,14 +221,14 @@ Here is a typical directory structure for Rip:
         - lib/
         - thunderhorse.ripenv
 
-The above contains three ripenvs: `base`, `cheat`, and `thunderhose`. Each 
+The above contains three ripenvs: `base`, `cheat`, and `thunderhorse`. Each 
 ripenv contains directories for executable binaries and Ruby source files.
 They also include a generated `.ripenv` file containing metadata about
 the ripenev and its packages.
 
 This individual may use `base` for general tomfoolery (it's the
 default), `cheat` for developing their Cheat application, and
-`thunderhorse` for working on their new Thunderhose project.
+`thunderhorse` for working on their new Thunderhorse project.
 
 `active` is a symlink to the current, active ripenv. We also see a 
 `rip-packages` directory. This is where Rip stores the raw repositories.
@@ -287,13 +286,13 @@ As a result, the setup script expects you to be running bash or zshell.
 Contributors
 ------------
 
-* Chris Wanstrath (that's me!)
-* Jeff Hodges
-* Tom Preston-Werner
-* John Barnette
-* Blake Mizerany
-* Ryan Tomayko
-* Pat Nakajima
+* [Chris Wanstrath](http://github.com/defunkt) (that's me!)
+* [Jeff Hodges](http://github.com/jmhodges/)
+* [Tom Preston-Werner](http://github.com/mojombo/)
+* [John Barnette](http://github.com/jbarnette)
+* [Blake Mizerany](http://github.com/bmizerany)
+* [Ryan Tomayko](http://github.com/rtomayko)
+* [Pat Nakajima](http://github.com/nakajima)
 
 Special Thanks
 --------------

data/lib/rip.rb

@@ -1,16 +1,18 @@
 require 'fileutils'
 
 module Rip
+  # Returns the Rip data directory. That is, the directory which contains
+  # all the Rip environment directories.
   def self.dir
     return @dir if @dir
 
-    dir = ENV['RIPDIR'].to_s
-
-    if dir.empty?
-      abort "RIPDIR env variable not found. did you run setup.rb?"
+    env = ENV['RIPDIR'].to_s
+    if env.empty?
+      dir = File.join(user_home, ".rip")
+    else
+      dir = File.expand_path(env)
     end
-
-    dir = File.expand_path(dir)
+    
     FileUtils.mkdir_p dir unless File.exists? dir
     @dir = dir
   end
@@ -26,6 +28,10 @@ module Rip
   def self.ui=(io)
     @ui = Rip::UI.new(io)
   end
+  
+  def self.user_home
+    @home ||= ENV['HOME']
+  end
 end
 
 # load rip files

data/lib/rip/commands.rb

@@ -5,7 +5,11 @@ module Rip
     def invoke(args)
       command, options, args = parse_args(args)
 
-      if command.nil? || command == ''
+      if command.nil? && (options[:v] || options[:version])
+        command = :version
+      end
+
+      if command.nil? || command == '' || options[:h] || options[:help]
         command = :help
       end
 
@@ -23,8 +27,17 @@ module Rip
       end
     end
 
+    def load_plugin(file)
+      begin
+        require file
+      rescue Exception => e
+        ui.puts "rip: plugin not loaded (#{file})"
+        ui.puts "-> #{e.message}", ''
+      end
+    end
+
     def public_instance_methods
-      super - %w( invoke public_instance_methods )
+      super - %w( invoke load_plugin public_instance_methods )
     end
 
   private
@@ -35,7 +48,7 @@ module Rip
       @next_usage = usage
     end
 
-    def x(help)
+    def x(help = '')
       @help ||= {}
       @next_help ||= []
       @next_help.push help
@@ -62,6 +75,8 @@ module Rip
       end
 
       if matches.size == 0
+        ui.puts "Could not find the command: #{command.inspect}"
+        ui.puts
         :help
       elsif matches.size == 1
         matches.first
@@ -71,16 +86,16 @@ module Rip
     end
 
     def parse_args(args)
-      command = args.shift
       options = args.select { |piece| piece =~ /^-/ }
       args   -= options
+      command = args.shift
       options = options.inject({}) do |hash, flag|
         key, value = flag.split('=')
         hash[key.sub(/^--?/,'').intern] = value.nil? ? true : value
         hash
       end
 
-      [command, options, args]
+      [ command, options, args ]
     end
   end
 end
@@ -93,14 +108,14 @@ end
 # load ~/.rip/rip-commands/*.rb
 if File.exists? dir = File.join(Rip.dir, 'rip-commands')
   Dir[dir + '/*.rb'].each do |file|
-    require file
+    Rip::Commands.load_plugin(file)
   end
 end
 
 # load lib/rip/commands/*.rb from the active ripenv
 if File.exists? dir = File.join(Rip::Env.active_dir, 'lib', 'rip', 'commands')
   Dir[dir + '/*.rb'].each do |file|
-    require file
+    Rip::Commands.load_plugin(file)
   end
 end
 
@@ -108,6 +123,6 @@ end
 # load lib/rip/commands/*.rb from rip itself
 if File.exists? dir = File.join(File.dirname(__FILE__), 'commands')
   Dir[dir + '/*.rb'].each do |file|
-    require file
+    Rip::Commands.load_plugin(file)
   end
 end

data/lib/rip/commands/build.rb

@@ -7,15 +7,24 @@ module Rip
   module Commands
     def build(options={}, *packages)
       packages.each do |package_name|
-        ui.puts "rip: building package: #{package_name}"
         package = manager.package(package_name)
+        alerted = false
 
         Dir["#{package.cache_path}/**/extconf.rb"].each do |build_file|
+          if !alerted
+            ui.puts "rip: building #{package_name}"
+            alerted = true
+          end
+
           build_dir = File.dirname(build_file)
-          Dir.chdir(build_dir) {
+          Dir.chdir(build_dir) do
             system "ruby extconf.rb"
             system "make install RUBYARCHDIR=#{manager.dir}/lib"
-          }
+          end
+        end
+
+        if !alerted && !options[:quiet]
+          ui.puts "rip: don't know how to build #{package_name}"
         end
       end
     end

data/lib/rip/commands/core.rb

@@ -27,7 +27,7 @@ module Rip
     x 'Commands for managing your ripenvs.'
     x 'Type rip env to see valid options.'
     def env(options = {}, command = nil, *args)
-      if command && Rip::Env.respond_to?(command)
+      if command && Rip::Env.commands.include?(command)
         ui.puts 'ripenv: ' + Rip::Env.call(command, *args).to_s
       else
         show_help :env, Rip::Env.commands
@@ -48,8 +48,6 @@ module Rip
     def version(options = {}, *args)
       ui.puts "Rip #{Rip::Version}"
     end
-    alias_method        "-v", :version
-    alias_method "--version", :version
 
   private
     def show_help(command, commands)

data/lib/rip/commands/install.rb

@@ -4,8 +4,10 @@ module Rip
     def check(*args)
       Setup.check_installation
       ui.puts "All systems go."
+    rescue Setup::StaleEnvironmentError, Setup::InstallationError => e
+      ui.puts e.message
     rescue => e
-      ui.abort "Installation failed: #{e.message}"
+      ui.puts "Installation failed: #{e.message}"
     end
 
     o 'rip install SOURCE [options]'

data/lib/rip/commands/ruby.rb

@@ -0,0 +1,15 @@
+module Rip
+  module Commands
+    o 'ruby ENV ARGS'
+    x 'Runs a Ruby instance in a particular environment.'
+    def ruby(options={}, *args)
+      selected_env = File.join(Rip.dir, ARGV.shift, "lib")
+      path = (ENV["RUBYLIB"] || "").split(":")
+      active_env = File.join(Rip.dir, "active", "lib")
+      path -= [active_env]
+      path += [selected_env]
+      ENV["RUBYLIB"] = path.join(":")
+      exec(ENV['RUBYBIN'] || "ruby", *ARGV)
+    end
+  end
+end

data/lib/rip/commands/setup.rb

@@ -0,0 +1,21 @@
+module Rip
+  module Commands
+
+    # Generate necessary envs etc. in ~/.{bash,zsh,...}rc.
+    #
+    o "rip setup [script to modify]"
+    x "Inserts required environment variables into your startup script."
+    x
+    x "Pass it the startup script you want to modify, otherwise it will"
+    x "guess one."
+    def setup(options = {}, script = nil)
+      require "rip/setup"
+
+      if Setup.setup_startup_script(script)
+        ui.puts "rip: Your #{Setup.startup_script} script has been modified."
+        ui.puts "rip: Please restart your shell or type `source #{Rip::Setup.startup_script}` for the changes to become effective."
+      end
+    end
+
+  end
+end

data/lib/rip/commands/uninstall.rb

@@ -1,7 +1,7 @@
 module Rip
   module Commands
     o 'rip uninstall PACKAGE [options]'
-    x 'Uninstalls a single Rip package.'
+    x 'Uninstalls a single Rip package (or rip itself).'
     x '-y removes the package no matter what.'
     x '-d removes the package and its dependents.'
     def uninstall(options = {}, name = nil, *args)
@@ -9,6 +9,13 @@ module Rip
         ui.abort "Please tell me what to uninstall."
       end
 
+      if name == 'rip' && !options[:y]
+        ui.abort "Are you sure you want to uninstall rip? Pass -y if so."
+      elsif name == 'rip' && options[:y]
+        require 'rip/setup'
+        return Rip::Setup.uninstall(true)
+      end
+
       force = options[:y] || options[:d]
       package = manager.package(name)
 

data/lib/rip/env.rb

@@ -1,6 +1,7 @@
 module Rip
   module Env
     extend self
+    PRIVATE_ENV =  /^(rip-|active)/i
 
     def commands
       instance_methods - %w( call active_dir commands ui )
@@ -13,6 +14,10 @@ module Rip
         return "must give a ripenv to create"
       end
 
+      if env.strip =~ PRIVATE_ENV
+        return "invalid environment name"
+      end
+
       if File.exists? dir
         "#{env} exists"
       else
@@ -29,6 +34,10 @@ module Rip
         return "must give a ripenv to use"
       end
 
+      if env.strip =~ PRIVATE_ENV
+        return "invalid environment name"
+      end
+
       if !File.exists?(target = File.join(Rip.dir, env))
         return "#{env} doesn't exist"
       end
@@ -51,6 +60,10 @@ module Rip
         return "must give a ripenv to delete"
       end
 
+      if env.strip =~ PRIVATE_ENV
+        return "invalid environment name"
+      end
+
       if File.exists?(target = File.join(Rip.dir, env))
         FileUtils.rm_rf target
         "deleted #{env}"
@@ -64,7 +77,7 @@ module Rip
         env.split('/').last
       end
 
-      envs.reject! { |env| env =~ /^(rip-|active)/ }
+      envs.reject! { |env| env =~ PRIVATE_ENV }
 
       if envs.empty?
         "none. make one with `rip env create <env>`"
@@ -95,6 +108,7 @@ module Rip
 
       if File.exists? ripfile = File.join(dest, "#{env}.ripenv")
         FileUtils.cp ripfile, File.join(dest, "#{new}.ripenv")
+        FileUtils.rm ripfile
       end
 
       use new
@@ -112,8 +126,10 @@ module Rip
         send(meth, *args)
       elsif arity == 0
         send(meth)
+      elsif args.empty?
+        send(meth, '')
       else
-        send(meth, args[0, arity])
+        send(meth, *args[0, arity])
       end
     end
 

data/lib/rip/installer.rb

@@ -15,7 +15,7 @@ module Rip
 
     def install(package, parent = nil)
       if !package.exists?
-        error = package.name
+        error = package.to_s
         error += " requested by #{parent} but" if parent
         error += " not found at #{package.source}"
         ui.abort error
@@ -30,17 +30,18 @@ module Rip
           return if installed
           @installed[package.name] = package
 
-          if !package.version
+          if !package.meta_package? && !package.version
             ui.abort "can't install #{package} - it has no version"
           end
 
           package.fetch
           package.unpack
           install_dependencies(package)
-          run_install_hook(package)
+          build_extensions(package)
           copy_files(package)
           cleanup(package)
           ui.puts "Successfully installed #{package}" unless package.meta_package?
+          true
 
         rescue VersionConflict => e
           ui.puts e.message
@@ -56,17 +57,13 @@ module Rip
 
     def install_dependencies(package)
       package.dependencies.each do |dependency|
-        install(dependency, package)
+        success = install(dependency, package)
+        package.run_hook(:dependency_installed, dependency, success)
       end
     end
 
-    def run_install_hook(package)
-      return unless File.exists? File.join(package.cache_path, 'Rakefile')
-
-      Dir.chdir package.cache_path do
-        ui.puts "running install hook for #{package.name}"
-        system "rake -s rip:install >& /dev/null"
-      end
+    def build_extensions(package)
+      Rip::Commands.build({:quiet => true}, package)
     end
 
     def copy_files(package)
@@ -82,7 +79,7 @@ module Rip
       end
 
       if File.exists? package_bin
-        FileUtils.cp_r package_bin + '/.', dest_bin
+        FileUtils.cp_r package_bin + '/.', dest_bin, :preserve => true
       end
     end
 
@@ -123,6 +120,10 @@ module Rip
       end
     end
 
+    def rakebin
+      ENV['RAKEBIN'] || 'rake'
+    end
+
     def ui
       Rip.ui
     end