rip 0.0.1 → 0.0.2

data/lib/rip/package.rb

@@ -55,7 +55,7 @@ module Rip
     end
 
     def to_s
-      "#{name} (#{version})"
+      version ? "#{name} (#{version})" : name.to_s
     end
 
     memoize :cache_name
@@ -119,6 +119,10 @@ module Rip
       end
     end
 
+    def run_hook(hook, *args, &block)
+      send(hook, *args, &block) if respond_to? hook
+    end
+
     def ui
       Rip.ui
     end

data/lib/rip/package_api.rb

@@ -34,6 +34,14 @@
 #     end
 #   end
 #
+# Hooks are provided to give your package access to the installation
+# process. If your package implements a method with the same name as
+# a hook, it'll be called and passed relevant information.
+#
+# The following hooks currently exist:
+#
+#   dependency_installed(dependency<Package>, success<Boolean>)
+#
 
 module Rip
   module PackageAPI

data/lib/rip/package_manager.rb

@@ -2,6 +2,9 @@ require 'zlib'
 require 'set'
 
 module Rip
+  class CorruptedRipenv < RuntimeError
+  end
+
   class VersionConflict < RuntimeError
     def initialize(name, bad_version, requester, real_version, owners)
       @name = name
@@ -14,17 +17,23 @@ module Rip
     def message
       message = []
       message << "version conflict!"
-      message << "#{@name} requested at #{@bad_version} by #{@requester}"
+
+      requested  = "#{@name} requested at #{@bad_version}"
+      requested += " by #{@requester}" if @requester
+      message << requested
 
       if @owners.size == 1
         owners = @owners[0]
       elsif @owners.size == 2
         owners = "#{@owners[0]} and #{@owners[1]}"
-      else
+      elsif @owners.size > 2
         owners = [ @owners[0...-1], "and #{@owners[-1]}" ].join(', ')
       end
 
-      message << "#{@name} previously requested at #{@real_version} by #{owners}"
+      previously_requested  = "#{@name} previously requested at #{@real_version}"
+      previously_requested += " by #{owners}" if owners
+      message << previously_requested
+
       message.join("\n")
     end
     alias_method :to_s, :message
@@ -69,9 +78,14 @@ module Rip
       @versions.keys
     end
 
+    # If given a package name, finds and returns the package.
+    # If given a package, returns it.
     def package(name)
-      return unless @versions[name]
-      Package.for(@sources[name], @versions[name], @files[name])
+      if name.respond_to? :cache_path
+        name
+      elsif @versions[name]
+        Package.for(@sources[name], @versions[name], @files[name])
+      end
     end
 
     def packages_that_depend_on(name)
@@ -162,6 +176,8 @@ module Rip
 
     def unzip(data)
       Zlib::Inflate.inflate(data)
+    rescue Zlib::BufError
+      raise CorruptedRipenv.new("#{path} possibly corrupted")
     end
 
     def marshal_payload

data/lib/rip/packages/file_package.rb

@@ -17,17 +17,21 @@ module Rip
 
     memoize :name
     def name
-      source.split('/').last
+      File.basename(source)
     end
 
     def version
-      Date.today.to_s
+      if name.match(/-((?:\d+\.?)+\d+)\.rb$/)
+        $1
+      else
+        Date.today.to_s
+      end
     end
 
     def fetch!
       FileUtils.rm_rf cache_path
       FileUtils.mkdir_p cache_path
-      FileUtils.cp source, cache_path
+      FileUtils.cp source, File.join(cache_path, name)
     end
 
     def files!

data/lib/rip/packages/gem_package.rb

@@ -20,8 +20,8 @@ module Rip
     end
 
     def exists?
-      if `which gem`.strip.empty?
-        ui.abort "you don't have rubygems installed"
+      if `which #{gembin}`.strip.empty?
+        ui.abort "you don't have #{gembin} installed"
       end
 
       File.exists?(source)
@@ -32,7 +32,7 @@ module Rip
     end
 
     def unpack!
-      system "gem unpack #{cache_file} --target=#{packages_path} > /dev/null"
+      system "'#{gembin}' unpack '#{cache_file}' --target='#{packages_path}' > /dev/null"
     end
 
     memoize :metadata
@@ -40,5 +40,9 @@ 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/git_package.rb

@@ -14,7 +14,7 @@ module Rip
 
       fetch!
       Dir.chdir cache_path do
-        @version = git_revparse('origin/master')[0,7]
+        @version = git_rev_parse('origin/master')[0,7]
       end
     end
 
@@ -55,8 +55,13 @@ module Rip
     end
 
     def remote_exists?
-      out = git_ls_remote(source, @version)
-      out.include? @version || 'HEAD'
+      return false if git_ls_remote(source).size == 0
+      return true if !@version
+
+      fetch
+      Dir.chdir(cache_path) do
+        git_cat_file(@version).size > 0
+      end
     end
   end
 end

data/lib/rip/packages/http_package.rb

@@ -38,7 +38,6 @@ module Rip
       actual_package ? actual_package.version : super
     end
 
-    memoize :actual_package
     def actual_package
       Package.for(File.join(cache_path, name))
     end

data/lib/rip/packages/remote_gem_package.rb

@@ -32,7 +32,7 @@ module Rip
 
     def rgem(command)
       Timeout.timeout(5) do
-        `gem #{command}`
+        `#{gembin} #{command}`
       end
     rescue Timeout::Error
       ''
@@ -60,5 +60,9 @@ module Rip
     def actual_package
       Package.for(Dir[cache_path + '/*'].first)
     end
+
+    def gembin
+      ENV['GEMBIN'] || 'gem'
+    end
   end
 end

data/lib/rip/packages/ripfile_package.rb

@@ -15,6 +15,10 @@ module Rip
       source.split('/').last
     end
 
+    def version
+      nil
+    end
+
     def meta_package?
       true
     end
@@ -23,20 +27,34 @@ module Rip
       false
     end
 
-    def fetch!
+    def dependency_installed(dependency, success = true)
+      if !success
+        ui.puts "rip: already installed #{dependency}"
+      end
     end
 
-    def unpack!
+    def fetch!
       FileUtils.rm_rf cache_path
       FileUtils.mkdir_p cache_path
-      FileUtils.cp source, cache_path
+      FileUtils.cp source, File.join(cache_path, name)
+    end
+
+    def unpack!
+      fetch
     end
 
     def dependencies!
       if File.exists? deps = File.join(cache_path, name)
         File.readlines(deps).map do |line|
-          source, version, *extra = line.split(' ')
-          Package.for(source, version)
+          package_source, version, *extra = line.split(' ')
+          if package = Package.for(package_source, version)
+            package
+          else
+            # Allows .rip file and dir packages to be listed as
+            # relative paths.
+            path = File.join(File.dirname(@source), package_source)
+            Package.for(path, version)
+          end
         end
       else
         []

data/lib/rip/setup.rb

@@ -11,20 +11,38 @@ module Rip
     #
 
     WEBSITE = "http://hellorip.com/"
-    STARTUP_SCRIPTS = %w( .bash_profile .bash_login .bashrc .zshrc .profile )
+    STARTUP_SCRIPTS = %w( .bash_profile .bash_login .bashrc .zshenv .profile .zshrc )
+    FISH_STARTUP_SCRIPT = ".config/fish/config.fish"
 
     __DIR__ = File.expand_path(File.dirname(__FILE__))
 
     HOME = File.expand_path('~')
-    USER = HOME.split('/')[-1]
+
+    USER = HOME.split('/')[-1]    # TODO: *cough*
+
+    # Work around Apple's Ruby.
+    #
+    BINDIR = if defined? RUBY_FRAMEWORK_VERSION
+               File.join("/", "usr", "bin")
+             else
+               RbConfig::CONFIG["bindir"]
+             end
+
     LIBDIR = RbConfig::CONFIG['sitelibdir']
+
     RIPDIR = File.expand_path(ENV['RIPDIR'] || File.join(HOME, '.rip'))
     RIPROOT = File.expand_path(File.join(__DIR__, '..', '..'))
     RIPINSTALLDIR = File.join(LIBDIR, 'rip')
 
-    # caution: RbConfig::CONFIG['bindir'] does NOT work for me
-    # on OS X
-    BINDIR = File.join('/', 'usr', 'local', 'bin')
+
+    # Indicates that Rip isn't properly installed.
+    class InstallationError < StandardError; end
+
+    # Indicates that Rip is properly installed, but the current shell
+    # hasn't picked up the installed Rip environment variables yet. The
+    # shell must be restarted for the changes to become effective, or
+    # the shell startup files must be re-sourced.
+    class StaleEnvironmentError < StandardError; end
 
 
     #
@@ -39,24 +57,35 @@ module Rip
       finish_setup
     end
 
+    def upgrade
+      remove_libs
+      install_libs
+      ui.puts "rip upgraded"
+    end
+
     def uninstall(verbose = false)
-      FileUtils.rm_rf RIPINSTALLDIR, :verbose => verbose
-      FileUtils.rm_rf File.join(LIBDIR, 'rip.rb'), :verbose => verbose
-      FileUtils.rm_rf RIPDIR, :verbose => verbose
       FileUtils.rm File.join(BINDIR, 'rip'), :verbose => verbose
+      remove_libs verbose
+      FileUtils.rm_rf RIPDIR, :verbose => verbose
 
       # just in case...
-      `gem uninstall rip 2&> /dev/null`
+      gembin = ENV['GEMBIN'] || 'gem'
+      `#{gembin} uninstall rip 2&> /dev/null`
 
       ui.abort "rip uninstalled" if verbose
     rescue Errno::EACCES
-      ui.abort "rip: uninstall failed. please try again with `sudo`" if verbose
+      ui.abort "uninstall failed. please try again with `sudo`" if verbose
     rescue Errno::ENOENT
       nil
     rescue => e
       raise e if verbose
     end
 
+    def remove_libs(verbose = false)
+      FileUtils.rm_rf RIPINSTALLDIR, :verbose => verbose
+      FileUtils.rm_rf File.join(LIBDIR, 'rip.rb'), :verbose => verbose
+    end
+
     def install_libs(verbose = false)
       transaction "installing library files" do
         riprb = File.join(RIPROOT, 'lib', 'rip.rb')
@@ -70,7 +99,13 @@ module Rip
       transaction "installing rip binary" do
         src = File.join(RIPROOT, 'bin', 'rip')
         dst = File.join(BINDIR, 'rip')
-        FileUtils.cp src, dst, :verbose => verbose
+        FileUtils.cp src, dst, :verbose => verbose, :preserve => true
+
+        ruby_bin = File.expand_path(File.join(BINDIR, RbConfig::CONFIG['ruby_install_name']))
+        if File.exist? ruby_bin
+          ui.puts "rip: using Ruby bin: #{ruby_bin}"
+          rewrite_bang_line(dst, "#!#{ruby_bin}")
+        end
       end
     end
 
@@ -83,22 +118,37 @@ module Rip
       end
     end
 
-    def setup_startup_script
-      script = startup_script
+    # Modifies the shell startup script(s) and inserts the Rip
+    # configuration statements.
+    #
+    # Returns whether a startup script has been modified. If one of
+    # the startup scripts already contain the Rip configuration
+    # statements, then nothing will be modified and false will be
+    # returned.
+    #
+    # TODO: Requires the startup script, but probably acceptable for most? --rue
+    #
+    def setup_startup_script(script = nil)
+      if script
+        script = File.expand_path(script)
+      else
+        script = startup_script
+      end
 
-      if script.empty?
-        ui.puts "rip: please create one of these startup scripts in $HOME:"
-        ui.puts startup_scripts.map { |s| '  ' + s }
-        exit
+      if script.empty? || !File.exists?(script)
+        ui.puts "rip: please create one of these startup scripts in $HOME and re-run:"
+        ui.abort STARTUP_SCRIPTS.map { |s| '  ' + s }
       end
 
-      if File.read(script).include? 'RIPDIR='
+      if File.read(script).include? 'RIPDIR'
         ui.puts "rip: env variables already present in startup script"
+        false
       else
         ui.puts "rip: adding env variables to #{script}"
         File.open(script, 'a+') do |f|
           f.puts startup_script_template
         end
+        true
       end
     end
 
@@ -106,15 +156,16 @@ module Rip
       ui.puts finish_setup_banner(startup_script)
     end
 
-    def finish_setup_banner(script = "~/.bashrc")
+    def finish_setup_banner(script = "~/.bash_profile")
       <<-EOI.gsub(/^ +/, "")
       ****************************************************
       So far so good...
 
-      Run `rip check` to be sure Rip installed successfully
+      Rip needs certain env variables to run. We've tried
+      to install them automatically but may have failed.
 
-      NOTE: You may need to source your #{script}
-            or start a new shell session.
+      Run `rip check` to check the status of your
+      installation.
 
       Get started: `rip -h` or #{WEBSITE}
 
@@ -139,17 +190,30 @@ module Rip
     end
 
     def startup_script_template
-      STARTUP_SCRIPT_TEMPLATE % RIPDIR
+      (fish? ? FISH_CONFIG_TEMPLATE : STARTUP_SCRIPT_TEMPLATE) % RIPDIR
     end
 
     def startup_script
-      script = STARTUP_SCRIPTS.detect do |script|
+      script = fish_startup_script || STARTUP_SCRIPTS.detect do |script|
         File.exists? file = File.join(HOME, script)
       end
 
       script ? File.join(HOME, script) : ''
     end
 
+    def startup_script_contains_rip_configuration?
+      filename = startup_script
+      !filename.empty? && File.read(filename).include?(startup_script_template)
+    end
+
+    def fish_startup_script
+      FISH_STARTUP_SCRIPT if fish?
+    end
+
+    def fish?
+      File.exists?(File.join(HOME, FISH_STARTUP_SCRIPT))
+    end
+
     def installed?
       check_installation
       true
@@ -158,35 +222,47 @@ module Rip
     end
 
     def check_installation
-      script = startup_script
-
-      if !File.read(script).include? 'RIPDIR='
-        raise "no env variables in startup script"
-      end
-
       if ENV['RIPDIR'].to_s.empty?
-        if startup_script.empty?
-          raise "no $RIPDIR."
+        if startup_script_contains_rip_configuration?
+          raise StaleEnvironmentError, <<-end_error
+No $RIPDIR. Rip has been integrated into your shell startup scripts but your
+shell hasn't yet picked up the changes.
+
+To complete the installation process please restart your shell or run:
+  source #{startup_script}
+end_error
         else
-          raise "no $RIPDIR. you may need to run `source #{startup_script}`"
+          raise InstallationError, <<-end_error
+No $RIPDIR. Rip hasn't been integrated into your shell startup scripts yet.
+Please run `rip setup` to do so.
+end_error
         end
       end
 
       if !File.exists? File.join(BINDIR, 'rip')
-        raise "no rip in #{BINDIR}"
+        raise InstallationError, "no rip in #{BINDIR}"
       end
 
       if !File.exists? File.join(LIBDIR, 'rip')
-        raise "no rip in #{LIBDIR}"
+        raise InstallationError, "no rip in #{LIBDIR}"
       end
 
       if !File.exists? File.join(LIBDIR, 'rip')
-        raise "no rip.rb in #{LIBDIR}"
+        raise InstallationError, "no rip.rb in #{LIBDIR}"
       end
 
       true
     end
 
+    def rewrite_bang_line(file, first_line)
+      lines = File.readlines(file)[1..-1]
+      File.open(file, 'w') do |f|
+        f.puts first_line
+        f.puts lines.join("\n")
+        f.flush
+      end
+    end
+
     def ui
       Rip.ui
     end
@@ -200,6 +276,14 @@ RUBYLIB="$RUBYLIB:$RIPDIR/active/lib"
 PATH="$PATH:$RIPDIR/active/bin"
 export RIPDIR RUBYLIB PATH
 # -- end rip config -- #
+end_template
+
+  FISH_CONFIG_TEMPLATE = <<-end_template
+# -- start rip config -- #
+set -x RIPDIR %s
+set -x RUBYLIB "$RUBYLIB:$RIPDIR/active/lib"
+set PATH $RIPDIR/active/bin $PATH
+# -- end rip config -- #
 end_template
 
 end