rip 0.0.1 → 0.0.2

data/lib/rip/sh/git.rb

@@ -3,7 +3,7 @@ module Rip
     module Git
       extend self
 
-      def git_ls_remote(source, version)
+      def git_ls_remote(source, version = nil)
         `git ls-remote #{source} #{version} 2> /dev/null`
       end
 
@@ -27,9 +27,13 @@ module Rip
         `git submodule update`
       end
 
-      def git_revparse(repothing)
+      def git_rev_parse(repothing)
         `git rev-parse #{repothing}`
       end
+
+      def git_cat_file(object)
+        `git cat-file -p #{object} 2> /dev/null`
+      end
     end
   end
 end

data/lib/rip/version.rb

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

data/setup.rb

@@ -2,6 +2,9 @@
 # installs rip like so:
 #   ruby setup.rb
 #
+# upgrades rip like so:
+#   ruby setup.rb upgrade
+#
 # also uninstalls rip like so:
 #   ruby setup.rb uninstall
 #
@@ -11,17 +14,28 @@
 __DIR__ = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift File.join(__DIR__, 'lib')
 
-require 'rip'
+require "rip"
 
 include Rip::Setup
 
+# TODO: Use, like, real option parsing. --rue
+
+%w( bindir libdir ripdir ).each do |opt|
+  if given = ARGV.grep(/--#{opt}=\S+/).last
+    Rip::Setup.const_set(opt.upcase, File.expand_path(given.split("=").last))
+  end
+end
+
 if ARGV.include? 'uninstall'
   uninstall :verbose
 elsif ARGV.include? 'reinstall'
   uninstall
   install
+elsif ARGV.include? 'upgrade'
+  upgrade
 elsif installed?
   puts "rip: already installed"
 else
   install
 end
+

data/test/env_test.rb

@@ -34,6 +34,11 @@ context "Creating a ripenv" do
     assert_equal 'must give a ripenv to create', Rip::Env.create(' ')
     assert_equal 'must give a ripenv to create', Rip::Env.create("\t")
     assert_equal 'must give a ripenv to create', Rip::Env.create("\t ")
+    assert_equal "must give a ripenv to create", Rip::Env.call(:create)
+  end
+
+  test 'fails if attempt to name env active' do
+    assert_equal 'invalid environment name', Rip::Env.create('active')
   end
 end
 
@@ -59,13 +64,17 @@ context "Using a ripenv" do
     assert_equal "fake doesn't exist", Rip::Env.use("fake")
   end
 
+  test "fails if the new env is named active " do
+    assert_equal "invalid environment name", Rip::Env.use("active")
+  end
+
   test 'fails if no ripenv is given' do
     assert_equal "must give a ripenv to use", Rip::Env.use('')
     assert_not_equal '', Rip::Env.active
     assert_equal 'must give a ripenv to use', Rip::Env.use(' ')
     assert_equal 'must give a ripenv to use', Rip::Env.use("\t")
     assert_equal 'must give a ripenv to use', Rip::Env.use("\t ")
-
+    assert_equal "must give a ripenv to use", Rip::Env.call(:use)
   end
 end
 
@@ -89,6 +98,10 @@ context "Deleting a ripenv" do
     assert_equal "can't delete active environment", Rip::Env.delete('base')
   end
 
+  test "fails if the ripenv is named active" do
+    assert_equal "invalid environment name", Rip::Env.delete('active')
+  end
+
   test "fails if it doesn't exist" do
     name = 'fake_env'
     assert_equal "can't find #{name}", Rip::Env.delete(name)
@@ -100,6 +113,7 @@ context "Deleting a ripenv" do
     assert_equal 'must give a ripenv to delete', Rip::Env.delete(' ')
     assert_equal 'must give a ripenv to delete', Rip::Env.delete("\t")
     assert_equal 'must give a ripenv to delete', Rip::Env.delete("\t ")
+    assert_equal "must give a ripenv to delete", Rip::Env.call(:delete)
     assert File.exists?(Rip.dir)
   end
 end
@@ -154,6 +168,13 @@ context "Copying the current ripenv" do
     assert_equal @name, Rip::Env.active
   end
 
+  test "properly renames the ripenv file" do
+    Rip::Env.copy(@name)
+
+    assert File.exists?(File.join(@ripenv, "#{@name}.ripenv"))
+    assert !File.exists?(File.join(@ripenv, "base.ripenv"))
+  end
+
   test "makes the new env a copy of the active env"
 
   test "fails if the new env exists" do
@@ -169,5 +190,6 @@ context "Copying the current ripenv" do
     assert_equal 'must give a ripenv to copy to', Rip::Env.copy(' ')
     assert_equal 'must give a ripenv to copy to', Rip::Env.copy("\t")
     assert_equal 'must give a ripenv to copy to', Rip::Env.copy("\t ")
+    assert_equal "must give a ripenv to copy to", Rip::Env.call(:copy)
   end
 end

data/test/file_test.rb

@@ -0,0 +1,34 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
+require 'test_helper'
+
+context 'Installing from a FilePackage' do
+  setup_with_fs do
+    @package = fresh_local_file('simple-file-3.2.1.rb')
+    @source  = @package.source
+  end
+
+  test "installs the lib files" do
+    Rip::Commands.install({}, @source)
+
+    libpath = Rip.dir + '/active/lib/simple-file-3.2.1.rb'
+    assert File.exists?(libpath), 'simple-file-3.2.1.rb should be installed'
+  end
+
+  test "fetching into cache_path" do
+    @package.fetch!
+    assert File.exists?(File.join(@package.cache_path, @package.name)), 'should fetch package and put in local cache'
+  end
+
+  test "finds version from name suffix" do
+    assert_equal '1.2', fresh_local_file('simple-file-1.2.rb').version
+    assert_equal '1.2.3', fresh_local_file('simple-file-1.2.3.rb').version
+    assert_equal '1.2.3.4', fresh_local_file('simple-file-1.2.3.4.rb').version
+  end
+
+  test "defaults to date if not named properly" do
+    date = Date.today
+    fake Date, :today, :with => date do
+      assert_equal date.to_s, fresh_local_file('simple-file.rb').version
+    end
+  end
+end

data/test/git_test.rb

@@ -4,6 +4,8 @@ require 'test_helper'
 context 'Installing from a remote git repo' do
   setup_with_fs do
     @source = fresh_remote_git('simple_c')
+    @libpath = Rip.dir + '/active/lib/simple_c.rb'
+    @addedrb = Rip.dir + '/active/lib/added.rb'
   end
 
   teardown do
@@ -12,9 +14,24 @@ context 'Installing from a remote git repo' do
 
   test "installs the lib files" do
     Rip::Commands.install({}, @source)
+    assert File.exists?(@libpath), 'simple_c.rb should be installed'
+  end
 
-    libpath = Rip.dir + '/active/lib/simple_c.rb'
-    assert File.exists?(libpath), 'simple_c.rb should be installed'
+  test "fails on an unknown version" do
+    Rip::Commands.install({}, @source, 'deadbeef')
+    assert !File.exists?(@libpath), 'simple_c.rb should not be installed'
+  end
+
+  test "works with a real version" do
+    Rip::Commands.install({}, @source, 'master')
+    assert File.exists?(@addedrb), 'added.rb should be installed'
+    assert File.exists?(@libpath), 'simple_c.rb should be installed'
+  end
+
+  test "works with an existing sha" do
+    Rip::Commands.install({}, @source, '3f1d6da')
+    assert !File.exists?(@addedrb), 'added.rb should not be installed'
+    assert File.exists?(@libpath), 'simple_c.rb should be installed'
   end
 end
 
@@ -26,7 +43,7 @@ context 'Installing from a local git repo' do
   teardown do
     Rip::GitPackage.unmock_git
   end
-  
+
   test 'local installs the lib files' do
     Rip::Commands.install({}, @sources)
     libpath = Rip.dir + '/active/lib/simple_c.rb'

data/test/mock_git.rb

@@ -1,7 +1,7 @@
 module Rip
   module Sh
     module MockGit
-      def git_ls_remote(source, version)
+      def git_ls_remote(source, version=nil)
         match_errors = []
         if source != real_source
           match_errors << "source was #{source} instead of #{real_source}"
@@ -13,9 +13,9 @@ module Rip
 
         "67be542ddad55c502daf12fde4f784d88a248617\tHEAD\n67be542ddad55c502daf12fde4f784d88a248617\trefs/heads/master"
       end
-      
+
       def git_fetch(repothing)
-      end 
+      end
 
       def git_clone(source, cache_name)
         match_errors = []
@@ -39,6 +39,10 @@ module Rip
       def git_reset_hard(version)
       end
 
+      def git_cat_file(object)
+        ''
+      end
+
       def real_repo_name
         raise NotImplementedError
       end

data/test/repos/simple-file-3.2.1.rb

@@ -0,0 +1 @@
+require 'simp'

data/test/repos/simple.rip

@@ -0,0 +1,2 @@
+./simple-file-3.2.1.rb
+./simple_c

data/test/repos/simple_c/dot_git/logs/HEAD

@@ -1 +1,2 @@
 0000000000000000000000000000000000000000 3f1d6dacdedf75058e9edf23f48de03fa451f7ce Jeff Hodges <jeff@somethingsimilar.com> 1243833746 -0700	commit (initial): simple_c extension initial commit
+3f1d6dacdedf75058e9edf23f48de03fa451f7ce f1050d684f583a32338ffd77ec37e1196e0d2cc7 Chris Wanstrath <chris@ozmm.org> 1248239402 -0700	commit: add a file

data/test/repos/simple_c/dot_git/logs/refs/heads/master

@@ -1 +1,2 @@
 0000000000000000000000000000000000000000 3f1d6dacdedf75058e9edf23f48de03fa451f7ce Jeff Hodges <jeff@somethingsimilar.com> 1243833746 -0700	commit (initial): simple_c extension initial commit
+3f1d6dacdedf75058e9edf23f48de03fa451f7ce f1050d684f583a32338ffd77ec37e1196e0d2cc7 Chris Wanstrath <chris@ozmm.org> 1248239402 -0700	commit: add a file

data/test/repos/simple_c/dot_git/refs/heads/master

@@ -1 +1 @@
-3f1d6dacdedf75058e9edf23f48de03fa451f7ce
+f1050d684f583a32338ffd77ec37e1196e0d2cc7

data/test/ripfile_test.rb

@@ -0,0 +1,19 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
+require 'test_helper'
+
+context 'Installing from a RipfilePackage' do
+  setup_with_fs do
+    @package = fresh_ripfile('simple.rip')
+    @source  = @package.source
+  end
+
+  test "installs the lib files" do
+    Rip::Commands.install({}, @source)
+
+    filelibpath = Rip.dir + '/active/lib/simple-file-3.2.1.rb'
+    assert File.exists?(filelibpath), 'FilePackage should be installed'
+
+    dirlibpath = Rip.dir + '/active/lib/simple_c.rb'
+    assert File.exists?(dirlibpath), 'DirPackage should be installed'
+  end
+end

data/test/test_helper.rb

@@ -12,6 +12,27 @@ require 'fakefs'
 require 'test/unit'
 require 'test/spec/mini'
 
+begin; require 'redgreen'; rescue LoadError; end
+
+# For super rudimentary mocking...
+def fake(object, method_name, options={})
+  method = object.method(method_name)
+  metaclass = class << object; self end
+  return_value = options[:with]
+
+  metaclass.class_eval do
+    define_method(method_name) { |*args| return_value }
+  end
+
+  begin
+    yield
+  ensure
+    metaclass.class_eval do
+      define_method(method_name, method)
+    end
+  end
+end
+
 def repo_path(repo_name)
   RealFile.expand_path(RealFile.dirname(__FILE__) + '/repos/' + repo_name)
 end
@@ -28,6 +49,10 @@ class Test::Unit::TestCase
       Rip::Env.create('other')
       Rip::Setup.setup_ripenv(Rip.dir)
       Rip::Env.create('base')
+
+      Rip::PackageManager.new('other').save
+      Rip::PackageManager.new('base').save
+
       setup_block
     end
 
@@ -46,6 +71,16 @@ class Test::Unit::TestCase
     FakeFS::FileSystem.clone(repo_path(repo_name))
     Rip::DirPackage.new(repo_path(repo_name))
   end
+
+  def fresh_local_file(repo_name)
+    FakeFS::FileSystem.clone(repo_path(repo_name))
+    Rip::FilePackage.new(repo_path(repo_name))
+  end
+
+  def fresh_ripfile(repo_name)
+    FakeFS::FileSystem.clone(repo_path(''))
+    Rip::RipfilePackage.new(repo_path(repo_name))
+  end
 end
 
 module Rip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rip
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-10 00:00:00 -07:00
+date: 2009-07-21 00:00:00 -07:00
 default_executable: ""
 dependencies: []
 
@@ -35,6 +35,8 @@ files:
 - lib/rip/commands/build.rb
 - lib/rip/commands/core.rb
 - lib/rip/commands/install.rb
+- lib/rip/commands/ruby.rb
+- lib/rip/commands/setup.rb
 - lib/rip/commands/uninstall.rb
 - lib/rip/env.rb
 - lib/rip/installer.rb
@@ -58,8 +60,11 @@ files:
 - test/dev.rip
 - test/dir_test.rb
 - test/env_test.rb
+- test/file_test.rb
 - test/git_test.rb
 - test/mock_git.rb
+- test/repos/simple-file-3.2.1.rb
+- test/repos/simple.rip
 - test/repos/simple_c/dot_git/HEAD
 - test/repos/simple_c/dot_git/config
 - test/repos/simple_c/dot_git/description
@@ -79,18 +84,23 @@ files:
 - test/repos/simple_c/dot_git/logs/refs/heads/master
 - test/repos/simple_c/dot_git/objects/2d/94227280db3ac66875f52592c6a736b4526084
 - test/repos/simple_c/dot_git/objects/3f/1d6dacdedf75058e9edf23f48de03fa451f7ce
+- test/repos/simple_c/dot_git/objects/4f/3f9a42a24970fb72e8a828d95652c08465b3a4
 - test/repos/simple_c/dot_git/objects/53/23e9a7ff897fe7bfc3357d9274775b67f9ade4
 - test/repos/simple_c/dot_git/objects/55/31db58bd71148661c400dc48815bf06b366128
+- test/repos/simple_c/dot_git/objects/64/38cb2cf06f0a0e96326f4223202bece66540a4
+- test/repos/simple_c/dot_git/objects/9f/88aea8cd1b0da9b4d42188b7cf2014392344e6
 - test/repos/simple_c/dot_git/objects/d7/55c6f119520808609a8d79bac1a8dbe0c57424
 - test/repos/simple_c/dot_git/objects/d7/58739ea968ac8e8fe0cbbf1f6451af47f04964
 - test/repos/simple_c/dot_git/objects/e6/7b81a24f0ce4bff84c3599b5c9ba7093f554d8
 - test/repos/simple_c/dot_git/objects/ec/be0a80dc841c16beb2c733bbdd320b45565d89
+- test/repos/simple_c/dot_git/objects/f1/050d684f583a32338ffd77ec37e1196e0d2cc7
 - test/repos/simple_c/dot_git/refs/heads/master
 - test/repos/simple_c/ext/simp/extconf.rb
 - test/repos/simple_c/ext/simp/simp.c
 - test/repos/simple_c/lib/simple_c.rb
 - test/repos/simple_d-1.2.3/lib/simple_d.rb
 - test/rip_test.rb
+- test/ripfile_test.rb
 - test/test_helper.rb
 - test/ui_test.rb
 has_rdoc: true
@@ -101,10 +111,11 @@ post_install_message: |
   ****************************************************
   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 ~/.bashrc
-  or start a new shell session.
+  Run `rip check` to check the status of your
+  installation.
   
   Get started: `rip -h` or http://hellorip.com/
   
@@ -137,12 +148,15 @@ test_files:
 - test/commands_test.rb
 - test/dir_test.rb
 - test/env_test.rb
+- test/file_test.rb
 - test/git_test.rb
 - test/mock_git.rb
+- test/repos/simple-file-3.2.1.rb
 - test/repos/simple_c/ext/simp/extconf.rb
 - test/repos/simple_c/lib/simple_c.rb
 - test/repos/simple_d-1.2.3/lib/simple_d.rb
 - test/rip_test.rb
+- test/ripfile_test.rb
 - test/test_helper.rb
 - test/ui_test.rb
 - examples/debug.rb