rip 0.0.2 → 0.0.3

data/README.markdown

@@ -293,6 +293,18 @@ Contributors
 * [Blake Mizerany](http://github.com/bmizerany)
 * [Ryan Tomayko](http://github.com/rtomayko)
 * [Pat Nakajima](http://github.com/nakajima)
+* Eero Saynatkari
+* Coda Hale
+* Simon Rozet
+* Gabriel Horner
+* Pistos
+* Mark Turner
+* Hongli Lai
+* Tim Carey-Smith
+* August Lilleaas
+* Andre Arko
+* Rick Olson
+* Ben Burkert
 
 Special Thanks
 --------------

data/lib/rip.rb

@@ -38,6 +38,7 @@ end
 
 require 'rip/ui'
 require 'rip/version'
+require 'rip/help'
 require 'rip/env'
 require 'rip/memoize'
 require 'rip/installer'

data/lib/rip/commands.rb

@@ -1,6 +1,7 @@
 module Rip
   module Commands
     extend self
+    extend Help
 
     def invoke(args)
       command, options, args = parse_args(args)
@@ -41,30 +42,6 @@ module Rip
     end
 
   private
-    # tasty dsl for adding help text
-
-    def o(usage)
-      @usage ||= {}
-      @next_usage = usage
-    end
-
-    def x(help = '')
-      @help ||= {}
-      @next_help ||= []
-      @next_help.push help
-    end
-
-    def method_added(method)
-      @help[method.to_s] = @next_help if @next_help
-      @usage[method.to_s] = @next_usage if @next_usage
-      @next_help = nil
-      @next_usage = nil
-    end
-
-    def ui
-      Rip.ui
-    end
-
     def manager(env = nil)
       @manager ||= PackageManager.new(env)
     end

data/lib/rip/commands/build.rb

@@ -19,6 +19,7 @@ module Rip
           build_dir = File.dirname(build_file)
           Dir.chdir(build_dir) do
             system "ruby extconf.rb"
+            system "make clean"
             system "make install RUBYARCHDIR=#{manager.dir}/lib"
           end
         end

data/lib/rip/commands/core.rb

@@ -28,13 +28,21 @@ module Rip
     x 'Type rip env to see valid options.'
     def env(options = {}, command = nil, *args)
       if command && Rip::Env.commands.include?(command)
+        args.push(options)
         ui.puts 'ripenv: ' + Rip::Env.call(command, *args).to_s
       else
-        show_help :env, Rip::Env.commands
+        Rip::Env.show_help :env
         ui.puts '', "current ripenv: #{Rip::Env.active}"
       end
     end
 
+    o 'rip use RIPENV'
+    x 'Activate a ripenv.'
+    x 'Shortcut for `rip env use`'
+    def use(options = {}, ripenv = nil, *args)
+      puts 'ripenv: ' + Rip::Env.use(ripenv.to_s)
+    end
+
     x 'Outputs all installed libraries (and their versions) for the active env.'
     x 'Can be saved as a .rip and installed by other rip users with:'
     x '  rip install file.rip'
@@ -50,16 +58,6 @@ module Rip
     end
 
   private
-    def show_help(command, commands)
-      subcommand = command.to_s.empty? ? nil : "#{command} "
-      ui.puts "Usage: rip #{subcommand}COMMAND [options]", ""
-      ui.puts "Commands available:"
-
-      commands.each do |method|
-        ui.puts "  #{method}"
-      end
-    end
-
     def show_general_help
       commands = public_instance_methods.reject do |method|
         method =~ /-/ || %w( help version ).include?(method)

data/lib/rip/commands/install.rb

@@ -19,20 +19,20 @@ module Rip
       end
 
       package = Rip::Package.for(source, version)
+      installed_package = manager.package(package.name)
 
       if !package
         ui.abort "I don't know how to install #{source}"
       end
 
-      if options[:f]
-        Installer.new.uninstall(package) if package.installed?
+      if options[:f] && installed_package
+        Installer.new.uninstall(installed_package) if installed_package.installed?
         Installer.new.install(package)
       elsif package.installed?
         ui.puts "#{package} already installed"
       else
         installer = Installer.new
         installer.install(package)
-#         puts "#{installer.installed.size.to_i} packages installed"
       end
     end
   end

data/lib/rip/env.rb

@@ -1,12 +1,14 @@
 module Rip
   module Env
     extend self
+    extend Help
     PRIVATE_ENV =  /^(rip-|active)/i
 
     def commands
-      instance_methods - %w( call active_dir commands ui )
+      instance_methods - %w( call active_dir commands ui validate_ripenv )
     end
 
+    x 'Create the SOURCE environment.'
     def create(env)
       dir = File.join(Rip.dir, env)
 
@@ -29,28 +31,26 @@ module Rip
       end
     end
 
+    x 'Activate the SOURCE environment.'
     def use(env)
       if env.strip.empty?
         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"
+      if error = validate_ripenv(env)
+        return error
       end
 
       begin
         FileUtils.rm active_dir
       rescue Errno::ENOENT
       end
-      FileUtils.ln_s(target, active_dir)
+      FileUtils.ln_s(File.join(Rip.dir, env), active_dir)
 
       "using #{env}"
     end
 
+    x 'Remove the SOURCE environment.'
     def delete(env)
       if active == env
         return "can't delete active environment"
@@ -72,7 +72,14 @@ module Rip
       end
     end
 
-    def list(env = nil)
+    x 'Display all rip environments.'
+    def list(options = {})
+      # check if we got passed an env. kinda ghetto.
+      if options.is_a? String
+        target_env = options
+        options = {}
+      end
+
       envs = Dir.glob(File.join(Rip.dir, '*')).map do |env|
         env.split('/').last
       end
@@ -81,16 +88,37 @@ module Rip
 
       if envs.empty?
         "none. make one with `rip env create <env>`"
+      elsif target_env
+        if error = validate_ripenv(target_env)
+          return error
+        end
+
+        manager = PackageManager.new(target_env)
+        output  = [ target_env, "" ]
+        output += manager.packages
+        output.join("\n")
       else
-        envs.join(' ')
+        output  = [ "all installed ripenvs", "" ]
+        output += envs.map do |env|
+          if options[:p]
+            packages = PackageManager.new(env).packages
+            packages = packages.size > 3 ? packages[0, 3] + ['...'] : packages
+            "#{env} - #{packages.join(', ')}"
+          else
+            env
+          end
+        end
+        output.join("\n")
       end
     end
 
+    x 'Display the name of the active environment.'
     def active
       active = File.readlink(active_dir)
       active.split('/').last
     end
 
+    x 'Clone the active environment.'
     def copy(new)
       if new.strip.empty?
         return "must give a ripenv to copy to"
@@ -140,5 +168,15 @@ module Rip
     def ui
       Rip.ui
     end
+
+    def validate_ripenv(env)
+      if env.strip =~ PRIVATE_ENV
+        return "invalid environment name"
+      end
+
+      if !File.exists?(File.join(Rip.dir, env))
+        return "#{env} doesn't exist"
+      end
+    end
   end
 end

data/lib/rip/help.rb

@@ -0,0 +1,49 @@
+module Rip
+  # tasty dsl for adding help text
+  module Help
+
+    def show_help(command, commands = commands)
+      subcommand = command.to_s.empty? ? nil : "#{command} "
+      ui.puts "Usage: rip #{subcommand}COMMAND [options]", ""
+      ui.puts "Commands available:"
+
+      show_command_table begin
+        commands.zip begin
+          commands.map { |c| @help[c].first unless @help[c].nil? }
+        end
+      end
+    end
+
+  private
+    def ui
+      Rip.ui
+    end
+
+    def o(usage)
+      @usage ||= {}
+      @next_usage = usage
+    end
+
+    def x(help = '')
+      @help ||= {}
+      @next_help ||= []
+      @next_help.push help
+    end
+
+    def method_added(method)
+      @help[method.to_s] = @next_help if @next_help
+      @usage[method.to_s] = @next_usage if @next_usage
+      @next_help = nil
+      @next_usage = nil
+    end
+
+    def show_command_table(table)
+      offset = table.map {|a| a.first.size }.max + 2
+      offset += 1 unless offset % 2 == 0
+
+      table.each do |(command, help)|
+        ui.puts "  #{command}" << ' ' * (offset - command.size) << help.to_s
+      end
+    end
+  end
+end

data/lib/rip/packages/git_package.rb

@@ -37,7 +37,7 @@ module Rip
           git_fetch('origin')
         end
       else
-        git_clone(source, cache_name)
+        git_clone(source, cache_path)
       end
     end
 

data/lib/rip/setup.rb

@@ -100,6 +100,7 @@ module Rip
         src = File.join(RIPROOT, 'bin', 'rip')
         dst = File.join(BINDIR, 'rip')
         FileUtils.cp src, dst, :verbose => verbose, :preserve => true
+        FileUtils.chmod(0755, dst)
 
         ruby_bin = File.expand_path(File.join(BINDIR, RbConfig::CONFIG['ruby_install_name']))
         if File.exist? ruby_bin
@@ -258,7 +259,7 @@ end_error
       lines = File.readlines(file)[1..-1]
       File.open(file, 'w') do |f|
         f.puts first_line
-        f.puts lines.join("\n")
+        f.puts lines.join
         f.flush
       end
     end

data/lib/rip/version.rb

@@ -1,6 +1,6 @@
 module Rip
   module Version
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 
     def self.to_s
       VERSION

data/test/test_helper.rb

@@ -8,9 +8,16 @@ Rip.dir = File.expand_path(File.join(File.dirname(__FILE__), 'ripdir'))
 Rip.ui = nil
 
 require 'mock_git'
-require 'fakefs'
 require 'test/unit'
-require 'test/spec/mini'
+
+%w( fakefs test/spec/mini ).each do |dep|
+  begin
+    require dep
+  rescue LoadError => e
+    warn "*** run 'rip install test/dev.rip' before testing ***"
+    raise e
+  end
+end
 
 begin; require 'redgreen'; rescue LoadError; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rip
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: ""
 dependencies: []
 
@@ -39,6 +39,7 @@ files:
 - lib/rip/commands/setup.rb
 - lib/rip/commands/uninstall.rb
 - lib/rip/env.rb
+- lib/rip/help.rb
 - lib/rip/installer.rb
 - lib/rip/memoize.rb
 - lib/rip/package.rb