rip 0.0.3 → 0.0.4

data/README.markdown

@@ -281,7 +281,7 @@ Currently it's UNIX-only. This is because Rip needs to manipulate the RUBYLIB
 and PATH environment variables so that Ruby knows where to find installed Rip
 packages.
 
-As a result, the setup script expects you to be running bash or zshell.
+As a result, the setup script expects you to be running bash, zshell, or fish.
 
 Contributors
 ------------
@@ -305,6 +305,7 @@ Contributors
 * Andre Arko
 * Rick Olson
 * Ben Burkert
+* James Adam
 
 Special Thanks
 --------------

data/bin/rip

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
 require 'rip'
 require 'rip/commands'
 

data/lib/rip.rb

@@ -12,7 +12,7 @@ module Rip
     else
       dir = File.expand_path(env)
     end
-    
+
     FileUtils.mkdir_p dir unless File.exists? dir
     @dir = dir
   end
@@ -28,7 +28,7 @@ module Rip
   def self.ui=(io)
     @ui = Rip::UI.new(io)
   end
-  
+
   def self.user_home
     @home ||= ENV['HOME']
   end
@@ -47,6 +47,7 @@ require 'rip/package'
 require 'rip/package_manager'
 require 'rip/setup'
 require 'rip/sh/git'
+require 'rip/sh/gem'
 
 
 # load rip packages - order is important

data/lib/rip/commands/build.rb

@@ -5,6 +5,8 @@
 
 module Rip
   module Commands
+    o 'rip build PACKAGE'
+    x "Attempts to build a package using extconf.rb"
     def build(options={}, *packages)
       packages.each do |package_name|
         package = manager.package(package_name)
@@ -20,7 +22,7 @@ module Rip
           Dir.chdir(build_dir) do
             system "ruby extconf.rb"
             system "make clean"
-            system "make install RUBYARCHDIR=#{manager.dir}/lib"
+            system "make install sitearchdir=#{manager.dir}/lib"
           end
         end
 

data/lib/rip/commands/core.rb

@@ -37,8 +37,7 @@ module Rip
     end
 
     o 'rip use RIPENV'
-    x 'Activate a ripenv.'
-    x 'Shortcut for `rip env use`'
+    x 'Activates a ripenv. Shortcut for `rip env use`.'
     def use(options = {}, ripenv = nil, *args)
       puts 'ripenv: ' + Rip::Env.use(ripenv.to_s)
     end
@@ -63,7 +62,7 @@ module Rip
         method =~ /-/ || %w( help version ).include?(method)
       end
 
-      show_help nil, commands
+      show_help nil, commands.sort
 
       ui.puts
       ui.puts "For more information on a a command use:"

data/lib/rip/commands/install.rb

@@ -19,12 +19,13 @@ 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
 
+      installed_package = manager.package(package.name)
+
       if options[:f] && installed_package
         Installer.new.uninstall(installed_package) if installed_package.installed?
         Installer.new.install(package)

data/lib/rip/commands/show.rb

@@ -0,0 +1,28 @@
+module Rip
+  module Commands
+    o 'rip show PACKAGE'
+    x 'Displays information about an installed package'
+    def show(options = {}, name = nil, *args)
+      if name.to_s.empty?
+        ui.abort "Please give me the name of a package."
+      end
+
+      installed_package = manager.package(name)
+      if installed_package.nil?
+        ui.abort "The package '#{name}' doesn't seem to be installed"
+      end
+
+      ui.puts installed_package
+      ui.puts "Depends on: #{display_package_list(manager.dependencies_for(name))}"
+      ui.puts "Required by: #{display_package_list(manager.packages_that_depend_on(name))}"
+
+      ui.puts "Files:\n\t#{manager.files(name).join("\n\t")}" if options[:f]
+    end
+
+  private
+    def display_package_list(packages)
+      return "Nothing" unless packages && packages.any?
+      packages.join(", ")
+    end
+  end
+end

data/lib/rip/installer.rb

@@ -25,8 +25,6 @@ module Rip
         begin
           installed = @installed[package.name] || package.installed?
 
-          manager.add_package(package, parent) unless package.meta_package?
-
           return if installed
           @installed[package.name] = package
 
@@ -36,6 +34,10 @@ module Rip
 
           package.fetch
           package.unpack
+
+          parent_package = (parent && parent.meta_package?) ? parent.actual_package : parent
+          manager.add_package(package, parent)
+
           install_dependencies(package)
           build_extensions(package)
           copy_files(package)

data/lib/rip/package_manager.rb

@@ -91,6 +91,10 @@ module Rip
     def packages_that_depend_on(name)
       (@dependents[name] || []).map { |name| package(name) }
     end
+    
+    def dependencies_for(name)
+      (@dependencies[name] || []).map { |name| package(name) }
+    end
 
     def files(name)
       Array(@files[name])
@@ -112,6 +116,10 @@ module Rip
         raise VersionConflict.new(name, version, parent, @versions[name], @dependents[name].to_a)
       end
 
+      if parent && parent.meta_package? && parent.actual_package != package
+        parent = parent.actual_package
+      end
+
       if parent && !parent.meta_package?
         @dependents[name] ||= Set.new
         @dependents[name].add(parent.name)

data/lib/rip/packages/gem_package.rb

@@ -20,9 +20,7 @@ module Rip
     end
 
     def exists?
-      if `which #{gembin}`.strip.empty?
-        ui.abort "you don't have #{gembin} installed"
-      end
+      ui.abort "can't find your gem command" unless Sh::Gem.check?
 
       File.exists?(source)
     end
@@ -32,7 +30,11 @@ module Rip
     end
 
     def unpack!
-      system "'#{gembin}' unpack '#{cache_file}' --target='#{packages_path}' > /dev/null"
+      Sh::Gem.rgem("unpack '#{cache_file}' --target='#{packages_path}' > /dev/null")
+    end
+
+    def dependencies!
+      Sh::Gem.dependencies(name)
     end
 
     memoize :metadata
@@ -40,9 +42,5 @@ module Rip
       parts = source.split('/').last.chomp('.gem').split('-')
       { :name => parts[0...-1].join('-'), :version => parts[-1] }
     end
-
-    def gembin
-      ENV['GEMBIN'] || 'gem'
-    end
   end
 end

data/lib/rip/packages/remote_gem_package.rb

@@ -6,7 +6,7 @@ module Rip
       RemoteGemPackage.new(source).exists?
     end
 
-    @@remotes = %w( gems.github.com gems.rubyforge.org )
+    @@remotes = %w( gems.github.com gemcutter.org gems.rubyforge.org )
     @@exists_cache = {}
 
     def exists?
@@ -17,27 +17,24 @@ module Rip
 
       Dir.chdir cache_path do
         @@remotes.each do |remote|
-          ui.puts "Searching %s for %s..." % [ remote, source ]
+          # hack: every github gem has a dash in its name
+          next if remote =~ /github/ && !source.include?('-')
+
+          ui.vputs "Searching %s for %s..." % [ remote, source ]
 
           source_flag = "--source=http://#{remote}/"
-          if rgem("fetch #{source} #{source_flag}") =~ /Downloaded (.+)/
+          if Sh::Gem.rgem("fetch #{source} #{source_flag}") =~ /Downloaded (.+)/
+            ui.vputs "Found #{source} at #{remote}"
             @@exists_cache[source] = $1
             return true
           end
         end
       end
 
+      FileUtils.rm_rf cache_path
       false
     end
 
-    def rgem(command)
-      Timeout.timeout(5) do
-        `#{gembin} #{command}`
-      end
-    rescue Timeout::Error
-      ''
-    end
-
     def meta_package?
       true
     end
@@ -47,11 +44,15 @@ module Rip
 
     def unpack!
       installer = Installer.new
-      installer.install actual_package
+      installer.install actual_package, self
       installer.manager.sources[actual_package.name] = source
       installer.manager.save
     end
 
+    def dependencies!
+      actual_package.dependencies
+    end
+
     def version
       actual_package ? actual_package.version : super
     end
@@ -60,9 +61,5 @@ module Rip
     def actual_package
       Package.for(Dir[cache_path + '/*'].first)
     end
-
-    def gembin
-      ENV['GEMBIN'] || 'gem'
-    end
   end
 end

data/lib/rip/sh/gem.rb

@@ -0,0 +1,39 @@
+module Rip
+  module Sh
+    module Gem
+      extend self
+
+      def check?
+        `which #{gembin}`.strip.any?
+      end
+
+      def rgem(command)
+        Timeout.timeout(30) do
+          `#{gembin} #{command} 2> /dev/null`
+        end
+      rescue Timeout::Error
+        ''
+      end
+
+      def dependencies(name)
+        if rgem("dependency #{name} --remote") =~ /(Gem #{name}-.*?)(Gem|\z)/m
+          $1.split("\n").grep(/runtime\s*\)/).map do |line|
+            line =~ /([\w-]+)\s*\([~><=]+\s*((?:\d+\.?)+\d+|\d)/
+            source, version = $1, $2
+            if source
+              Package.for(source, version)
+            else
+              nil
+            end
+          end.compact
+        else
+          []
+        end
+      end
+
+      def gembin
+        ENV['GEMBIN'] || 'gem'
+      end
+    end
+  end
+end

data/lib/rip/ui.rb

@@ -1,7 +1,8 @@
 module Rip
   class UI
-    def initialize(io=nil)
+    def initialize(io = nil, verbose = false)
       @io = io
+      @verbose = verbose
     end
 
     def puts(*args)
@@ -20,5 +21,9 @@ module Rip
     def abort(msg)
       @io && Kernel.abort("rip: #{msg}")
     end
+
+    def vputs(*args)
+      puts(*args) if @verbose
+    end
   end
 end

data/lib/rip/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rip
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: ""
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - lib/rip/commands/install.rb
 - lib/rip/commands/ruby.rb
 - lib/rip/commands/setup.rb
+- lib/rip/commands/show.rb
 - lib/rip/commands/uninstall.rb
 - lib/rip/env.rb
 - lib/rip/help.rb
@@ -53,6 +54,7 @@ files:
 - lib/rip/packages/remote_gem_package.rb
 - lib/rip/packages/ripfile_package.rb
 - lib/rip/setup.rb
+- lib/rip/sh/gem.rb
 - lib/rip/sh/git.rb
 - lib/rip/ui.rb
 - lib/rip/version.rb