giternal 0.0.1 → 0.0.2

data/History.txt

@@ -1,4 +1,9 @@
+== 0.0.2 2008-12-03
+
+* Uses giternal binary instead of sake
+* Freeze and unfreeze externals
+
+
 == 0.0.1 2008-08-02
 
-* 1 major enhancement:
-  * Initial release
+* Initial release

data/Manifest.txt

@@ -1,17 +1,22 @@
+.emacs-project
 History.txt
 License.txt
 Manifest.txt
-PostInstall.txt
 README.txt
 Rakefile
+bin/giternal
 config/hoe.rb
 config/requirements.rb
+features/checking_out_externals.feature
+features/freeze_externals.feature
+features/steps/repository_steps.rb
+features/unfreeze_externals.feature
+giternal_helper.rb
 lib/giternal.rb
 lib/giternal/app.rb
 lib/giternal/repository.rb
 lib/giternal/version.rb
 lib/giternal/yaml_config.rb
-lib/tasks/giternal.rake
 script/console
 script/destroy
 script/generate
@@ -22,6 +27,7 @@ spec/giternal/repository_spec.rb
 spec/giternal/yaml_config_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+tasks/cucumber.rake
 tasks/deployment.rake
 tasks/environment.rake
 tasks/rspec.rake

data/README.txt

@@ -26,17 +26,40 @@ rspec-rails:
   repo: git://github.com/dchelimsky/rspec-rails.git
   path: vendor/plugins
 
-Now in project root, run 'sake giternal:update' to update all of your
+Now in project root, run 'giternal update' to update all of your
 git dependencies.
 
-== REQUIREMENTS:
+== FREEZING AND UNFREEZING:
 
-* sake
+Sometimes you want to freeze your dependencies, e.g. when deploying.
+This lets you create a self-contained deploy tag with all externals at
+a known, working version.  giternal will tar up the .git history dir
+for each external, and then add the external to your git index.  You
+can review all the changes before committing.
+
+giternal freeze
+
+Unfreezing, as you might guess, is the opposite of freezing.  It will
+remove your external dir from the git index, and extract each
+external's .git dir, restoring the history and allowing you to commit
+or fetch changes.
+
+giternal unfreeze
+
+== NOTES:
+
+* You're probably using git for your own version control...and if so,
+  you need to add the giternal'd paths to .gitignore.  You don't want
+  to check them into version control!!
+
+* Deploying with vlad or capistrano simply requires you to run
+  'giternal update' after the code has been checked out, if your
+  externals are not frozen.  If deploying a codebase with frozen
+  externals, there's nothing to do.
 
 == INSTALL:
 
 * sudo gem install giternal
-* sudo sake -i 'http://giternal.rubyforge.org/git?p=giternal.git;a=blob_plain;f=lib/tasks/giternal.rake;hb=HEAD'
 
 == LICENSE:
 

data/bin/giternal

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require "rubygems"
+if File.exist?(File.dirname(__FILE__) + '/../lib/giternal.rb')
+  $:.unshift(File.dirname(__FILE__) + '/../lib')
+end
+require 'giternal'
+
+action = ARGV[0]
+available_actions = %w(update freeze unfreeze)
+unless available_actions.include?(action)
+  puts "Usage: giternal (#{available_actions.join(':')})"
+  exit 1
+end
+
+Giternal::Repository.verbose = true
+app = Giternal::App.new(FileUtils.pwd)
+app.run(action)

data/config/hoe.rb

@@ -8,7 +8,6 @@ RUBYFORGE_PROJECT = 'giternal' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
-  ['sake', '>= 1.0']
 ]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"

data/features/checking_out_externals.feature

@@ -0,0 +1,25 @@
+Feature: Checking out and updating externals
+  As a developer
+  I want to check out and update external projects via git
+  So that I can add functionality to my app with little effort
+
+  Scenario: Repository is not yet checked out
+    Given an external repository named 'first_external'
+    And 'first_external' is not yet checked out
+    When I update the externals
+    Then 'first_external' should be checked out
+
+  Scenario: Multiple externals
+    Given an external repository named 'first_external'
+    And an external repository named 'second_external'
+    When I update the externals
+    Then 'first_external' should be checked out
+    And 'second_external' should be checked out
+
+  Scenario: Repository checked out then updated
+    Given an external repository named 'first_external'
+    And the externals are up to date
+    And content is added to 'first_external'
+    Then 'first_external' should not be up to date
+    When I update the externals
+    Then 'first_external' should be up to date

data/features/freeze_externals.feature

@@ -0,0 +1,19 @@
+Story: Freeze externals
+  As a developer
+  I want to freeze externals
+  So that I can test and deploy my app with no worries
+
+  Scenario: Main project has one external
+    Given an external repository named 'first_external'
+    And the externals are up to date
+    When I freeze the externals
+    Then 'first_external' should no longer be a git repo
+    And 'first_external' should be added to the commit index
+
+  Scenario: External has been added to .gitignore
+    Given an external repository named 'first_external'
+    And the external 'first_external' has been added to .gitignore
+    And the externals are up to date
+    When I freeze the externals
+    Then 'first_external' should be added to the commit index
+

data/features/steps/repository_steps.rb

@@ -0,0 +1,105 @@
+require 'spec'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'giternal'
+require 'giternal_helper'
+
+def be_up_to_date
+  Spec::Matchers::SimpleMatcher.new("a giternal'd repository") do |repo_name|
+    File.directory?(GiternalHelper.checked_out_path(repo_name)).should == true
+    GiternalHelper.repo_contents(GiternalHelper.checked_out_path(repo_name)) ==
+      GiternalHelper.repo_contents(GiternalHelper.external_path(repo_name))
+  end
+end
+
+def be_a_git_repo
+  Spec::Matchers::SimpleMatcher.new("a giternal'd repository") do |repo_name|
+    File.directory?(GiternalHelper.checked_out_path(repo_name) + '/.git')
+  end
+end
+
+def be_added_to_commit_index
+  Spec::Matchers::SimpleMatcher.new("a giternal'd repository") do |repo_name|
+    Dir.chdir(GiternalHelper.tmp_path + '/main_repo') do
+      status = `git status`
+      flattened_status = status.split("\n").join(" ")
+      to_be_committed_regex = /new file:\W+dependencies\/#{repo_name}/
+      untracked_files_regex = /Untracked files:.*#{repo_name}/
+      status =~ to_be_committed_regex && !(flattened_status =~ untracked_files_regex)
+    end
+  end
+end
+
+Before do
+  GiternalHelper.clean!
+  GiternalHelper.create_main_repo
+end
+
+After do
+  GiternalHelper.clean!
+end
+
+Given /an external repository named '(.*)'/ do |repo_name|
+  GiternalHelper.create_repo repo_name
+  GiternalHelper.add_content repo_name
+end
+
+Given /'(.*)' is not yet checked out/ do |repo_name|
+  # TODO: Figure out why I can't use should be_false here
+  File.directory?(GiternalHelper.checked_out_path(repo_name)).should == false
+end
+
+Given "the externals are up to date" do
+  GiternalHelper.update_externals
+end
+
+Given "the externals are frozen" do
+  GiternalHelper.freeze_externals
+end
+
+Given /content is added to '(.*)'/ do |repo_name|
+  GiternalHelper.add_content(repo_name)
+end
+
+Given /^the external '(.*)' has been added to \.gitignore$/ do |repo_name|
+  GiternalHelper.add_external_to_ignore(repo_name)
+end
+
+When "I update the externals" do
+  GiternalHelper.update_externals
+end
+
+When "I freeze the externals" do
+  GiternalHelper.freeze_externals
+end
+
+When "I unfreeze the externals" do
+  GiternalHelper.unfreeze_externals
+end
+
+Then /'(.*)' should be checked out/ do |repo_name|
+  repo_name.should be_up_to_date
+end
+
+Then /'(.*)' should be up to date/ do |repo_name|
+  repo_name.should be_up_to_date
+end
+
+Then /'(.*)' should not be up to date/ do |repo_name|
+  repo_name.should_not be_up_to_date
+end
+
+Then /'(.*)' should no longer be a git repo/ do |repo_name|
+  repo_name.should_not be_a_git_repo
+end
+
+Then /'(.*)' should be a git repo/ do |repo_name|
+  repo_name.should be_a_git_repo
+end
+
+Then /'(.*)' should be added to the commit index/ do |repo_name|
+  repo_name.should be_added_to_commit_index
+end
+
+Then /'(.*)' should be removed from the commit index/ do |repo_name|
+  repo_name.should_not be_added_to_commit_index
+end

data/features/unfreeze_externals.feature

@@ -0,0 +1,12 @@
+Story: Unfreeze externals
+  As a developer
+  I want to unfreeze externals
+  So that I can continue to update and develop on them
+
+  Scenario: Main project has one frozen external
+    Given an external repository named 'first_external'
+    And the externals are up to date
+    And the externals are frozen
+    When I unfreeze the externals
+    Then 'first_external' should be a git repo
+    And 'first_external' should be removed from the commit index

data/giternal_helper.rb

@@ -0,0 +1,108 @@
+class GiternalHelper
+  @@giternal_base = File.expand_path(File.dirname(__FILE__))
+  
+  def self.create_main_repo
+    FileUtils.mkdir_p tmp_path
+    Dir.chdir(tmp_path) do
+      FileUtils.mkdir "main_repo"
+      Dir.chdir('main_repo') do
+        `git init`
+        `echo 'first content' > starter_repo`
+        `git add starter_repo`
+        `git commit -m "starter repo"`
+      end
+    end
+  end
+
+  def self.wipe_repos
+    FileUtils.rm_r(tmp_path) if File.directory?(tmp_path)
+  end
+
+  def self.tmp_path
+    "/tmp/giternal_test"
+  end
+
+  def self.giternal_base
+    @@giternal_base
+  end
+
+  def self.base_project_dir
+    tmp_path + '/main_repo' 
+  end
+
+  def self.run(*args)
+    `#{giternal_base}/bin/giternal #{args.join(' ')}`
+  end
+
+  def self.create_repo(repo_name)
+    Dir.chdir(tmp_path) do
+      FileUtils.mkdir_p "externals/#{repo_name}"
+      `cd externals/#{repo_name} && git init`
+    end
+    add_content repo_name
+    add_to_config_file repo_name
+  end
+
+  def self.add_to_config_file(repo_name)
+    config_dir = tmp_path + '/main_repo/config'
+    FileUtils.mkdir(config_dir) unless File.directory?(config_dir)
+    Dir.chdir(config_dir) do
+      `echo #{repo_name}: >> giternal.yml`
+      `echo '  repo: #{external_path(repo_name)}' >> giternal.yml`
+      `echo '  path: dependencies' >> giternal.yml`
+    end
+  end
+
+  def self.add_content(repo_name, content=repo_name)
+    Dir.chdir(tmp_path + "/externals/#{repo_name}") do
+      `echo #{content} >> #{content} && git add #{content}`
+      `git commit #{content} -m "added content to #{content}"`
+    end
+  end
+
+  def self.external_path(repo_name)
+    File.expand_path(tmp_path + "/externals/#{repo_name}")
+  end
+
+  def self.checked_out_path(repo_name)
+    File.expand_path(tmp_path + "/main_repo/dependencies/#{repo_name}")
+  end
+
+  def self.clean!
+    FileUtils.rm_rf tmp_path
+  end
+
+  def self.update_externals
+    Dir.chdir(tmp_path + '/main_repo') do
+      GiternalHelper.run('update')
+    end
+  end
+
+  def self.freeze_externals
+    Dir.chdir(tmp_path + '/main_repo') do
+      GiternalHelper.run('freeze')
+    end
+  end
+
+  def self.unfreeze_externals
+    Dir.chdir(tmp_path + '/main_repo') do
+      GiternalHelper.run('unfreeze')
+    end
+  end
+  
+  def self.repo_contents(path)
+    Dir.chdir(path) do
+      contents = `git cat-file -p HEAD`
+      unless contents.include?('tree') && contents.include?('author')
+        raise "something is wrong with the repo, output doesn't contain expected git elements:\n\n #{contents}"
+      end
+      contents
+    end
+  end
+
+  def self.add_external_to_ignore(repo_name)
+    Dir.chdir(tmp_path + '/main_repo') do
+      `echo 'dependencies/#{repo_name}' >> .gitignore`
+    end
+  end
+end

data/lib/giternal/app.rb

@@ -4,15 +4,39 @@ module Giternal
       @base_dir = base_dir
     end
 
-    def run
+    def update
+      config.each_repo {|r| r.update }
+    end
+
+    def freezify
+      config.each_repo {|r| r.freezify }
+    end
+
+    def unfreezify
+      config.each_repo {|r| r.unfreezify }
+    end
+
+    def run(action)
+      case action
+      when "freeze"
+        freezify
+      when "unfreeze"
+        unfreezify
+      else
+        send(action)
+      end
+    end
+
+    def config
+      return @config if @config
+
       config_file = File.expand_path(@base_dir + '/config/giternal.yml')
       unless File.file?(config_file)
         $stderr.puts "config/giternal.yml is missing"
         exit 1
       end
 
-      config = YamlConfig.new File.read(config_file)
-      config.each_repo {|r| r.update(@base_dir) }
+      @config = YamlConfig.new(@base_dir, File.read(config_file))
     end
   end
 end

data/lib/giternal/repository.rb

@@ -1,24 +1,82 @@
+require 'fileutils'
+
 module Giternal
   class Repository
-    def initialize(name, repo_url, rel_path)
+    class << self
+      attr_accessor :verbose
+    end
+    attr_accessor :verbose
+
+    def initialize(base_dir, name, repo_url, rel_path)
+      @base_dir = base_dir
       @name = name
       @repo_url = repo_url
       @rel_path = rel_path
+      @verbose = self.class.verbose
     end
 
-    def update(target_dir)
-      target_path = File.expand_path(File.join(target_dir, @rel_path))
-      FileUtils.mkdir_p target_path unless File.exist?(target_path)
-      if File.exist?(target_path + "/#{@name}")
-        if !File.exist?(target_path + "/#{@name}/.git")
+    def update
+      return true if frozen?
+      FileUtils.mkdir_p checkout_path unless File.exist?(checkout_path)
+      if checked_out?
+        if !File.exist?(repo_path + '/.git')
           raise "Directory '#{@name}' exists but is not a git repository"
         else
-          `cd #{target_path}/#{@name} && git pull 2>&1`
+					update_output { `cd #{repo_path} && git pull 2>&1` }
         end
       else
-        `cd #{target_path} && git clone #{@repo_url} #{@name}`
+        update_output { `cd #{checkout_path} && git clone #{@repo_url} #{@name}` }
+      end
+      true
+    end
+
+    def freezify
+      return true if frozen? || !checked_out?
+
+      Dir.chdir(repo_path) do
+        `tar czf .git.frozen.tgz .git`
+        FileUtils.rm_r('.git')
+      end
+      `cd #{@base_dir} && git add -f #{rel_repo_path}`
+      true
+    end
+
+    def unfreezify
+      return true unless frozen?
+
+      Dir.chdir(repo_path) do
+        `tar xzf .git.frozen.tgz`
+        FileUtils.rm('.git.frozen.tgz')
       end
+      `cd #{@base_dir} && git rm -r --cached #{rel_repo_path}`
       true
     end
+
+    def frozen?
+      File.exist?(repo_path + '/.git.frozen.tgz')
+    end
+
+    def checked_out?
+      File.exist?(repo_path)
+    end
+
+    private
+    def checkout_path
+      File.expand_path(File.join(@base_dir, @rel_path))
+    end
+
+    def repo_path
+      File.expand_path(checkout_path + '/' + @name)
+    end
+
+    def rel_repo_path
+      @rel_path + '/' + @name
+    end
+
+		def update_output(&block)
+			puts "Updating #{@name}" if verbose
+			block.call
+			puts " ..updated\n" if verbose
+		end
   end
 end

data/lib/giternal/version.rb

@@ -2,7 +2,7 @@ module Giternal
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/giternal/yaml_config.rb

@@ -2,7 +2,8 @@ require 'yaml'
 
 module Giternal
   class YamlConfig
-    def initialize(yaml_string)
+    def initialize(base_dir, yaml_string)
+      @base_dir = base_dir
       @config_hash = YAML.load yaml_string
     end
 
@@ -13,7 +14,7 @@ module Giternal
     private
     def repositories
       @config_hash.map do |name, attributes|
-        Repository.new(name, attributes["repo"], attributes["path"])
+        Repository.new(@base_dir, name, attributes["repo"], attributes["path"])
       end
     end
   end

data/spec/giternal/app_spec.rb

@@ -4,30 +4,50 @@ module Giternal
   describe App do
     before(:each) do
       @app = App.new("some_fake_dir")
-      File.stub!(:file?).and_return true
-      File.stub!(:read).and_return "yaml config"
-
       @mock_config = stub("config", :null_object => true)
-      YamlConfig.stub!(:new).and_return @mock_config
     end
 
-    it "should exit with an error when no config file exists" do
-      File.should_receive(:file?).with(/some_fake_dir\/config\/giternal\.yml/).and_return false
-      $stderr.should_receive(:puts)
-      @app.should_receive(:exit).with(1)
-      @app.run
-    end
+    describe "loading the config file" do
+      before(:each) do
+        File.stub!(:file?).and_return true
+        File.stub!(:read).and_return "yaml config"
+        YamlConfig.stub!(:new).and_return @mock_config
+      end
+
+      it "should exit with an error when no config file exists" do
+        File.should_receive(:file?).with(/some_fake_dir\/config\/giternal\.yml/).and_return false
+        $stderr.should_receive(:puts)
+        @app.should_receive(:exit).with(1)
+        @app.config
+      end
 
-    it "should create a config from the config file" do
-      YamlConfig.should_receive(:new).with("yaml config").and_return @mock_config
-      @app.run
+      it "should create a config from the config file" do
+        YamlConfig.should_receive(:new).with('some_fake_dir', "yaml config").and_return @mock_config
+        @app.config
+      end
     end
 
-    it "should update each of the repositories" do
-      mock_repo = mock("repo")
-      mock_repo.should_receive(:update).with('some_fake_dir')
-      @mock_config.stub!(:each_repo).and_yield(mock_repo)
-      @app.run
+    describe "app actions" do
+      before(:each) do
+        @app.stub!(:config).and_return @mock_config
+        @mock_repo = mock("repo")
+        @mock_config.stub!(:each_repo).and_yield(@mock_repo)
+      end
+
+      it "should update each of the repositories" do
+        @mock_repo.should_receive(:update)
+        @app.update
+      end
+
+      it "should freeze each of the repositories" do
+        @mock_repo.should_receive(:freezify)
+        @app.freezify
+      end
+
+      it "should unfreeze each of the repositories" do
+        @mock_repo.should_receive(:unfreezify)
+        @app.unfreezify
+      end
     end
   end
 end

data/spec/giternal/repository_spec.rb

@@ -3,32 +3,114 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 module Giternal
   describe Repository do
     before(:each) do
-      GiternalTest.create_repo 'foo'
-      @repository = Repository.new("foo", GiternalTest.source_dir('foo'),
-                                   'deps')
+      GiternalHelper.create_main_repo
+      GiternalHelper.create_repo 'foo'
+      @repository = Repository.new(GiternalHelper.base_project_dir, "foo",
+                                   GiternalHelper.external_path('foo'),
+                                   'dependencies')
     end
-    
+
     it "should check itself out to a dir" do
-      @repository.update GiternalTest.base_project_dir
-      File.file?(GiternalTest.base_project_dir + '/deps/foo/foo').should be_true
-      File.read(GiternalTest.base_project_dir + '/deps/foo/foo').strip.
+      @repository.update
+      File.file?(GiternalHelper.checked_out_path('foo/foo')).should be_true
+      File.read(GiternalHelper.checked_out_path('foo/foo')).strip.
         should == 'foo'
     end
 
+    it "should not show any output when verbose mode is off" do
+      @repository.verbose = false
+      @repository.should_not_receive(:puts)
+      @repository.update
+    end
+
+    it "should not show output when verbose mode is on" do
+      @repository.verbose = true
+      @repository.should_receive(:puts).any_number_of_times
+      @repository.update
+    end
+
     it "should update the repo when it's already been checked out" do
-      @repository.update GiternalTest.base_project_dir
-      GiternalTest.add_to_repo 'foo', 'newfile'
-      @repository.update GiternalTest.base_project_dir
-      File.file?(GiternalTest.base_project_dir + '/deps/foo/newfile').should be_true
-      File.read(GiternalTest.base_project_dir + '/deps/foo/newfile').strip.
+      @repository.update
+      GiternalHelper.add_content 'foo', 'newfile'
+      @repository.update
+      File.file?(GiternalHelper.checked_out_path('foo/newfile')).should be_true
+      File.read(GiternalHelper.checked_out_path('foo/newfile')).strip.
         should == 'newfile'
     end
 
     it "should raise an error if the directory exists but there's no .git dir" do
-      FileUtils.mkdir_p(GiternalTest.source_dir('deps/foo'))
+      FileUtils.mkdir_p(GiternalHelper.checked_out_path('foo'))
       lambda {
-        @repository.update GiternalTest.base_project_dir
+        @repository.update
       }.should raise_error(/Directory 'foo' exists but is not a git repository/)
     end
+
+    describe "freezify" do
+      before(:each) do
+        GiternalHelper.create_repo('external')
+        @repository = Repository.new(GiternalHelper.base_project_dir, 'external',
+                                     GiternalHelper.external_path('external'),
+                                     'dependencies')
+        @repository.update
+      end
+
+      it "should archive the .git dir" do
+        @repository.freezify
+        File.file?(GiternalHelper.checked_out_path('external/.git.frozen.tgz')).should be_true
+      end
+
+      it "should get rid of the .git dir" do
+        File.directory?(GiternalHelper.checked_out_path('external/.git')).should be_true
+        @repository.freezify
+        File.directory?(GiternalHelper.checked_out_path('external/.git')).should be_false
+      end
+    end
+
+    it "should simply return if updated when frozen" do
+      @repository.update
+      @repository.freezify
+      lambda { @repository.update }.should_not raise_error
+    end
+
+    it "should simply return when made to freeze when already frozen" do
+      @repository.update
+      @repository.freezify
+      lambda { @repository.freezify }.should_not raise_error
+    end
+
+    it "should simply return when made to freeze before checked out" do
+      lambda { @repository.freezify }.should_not raise_error
+    end
+
+    it "should simply return when made to unfreeze before checked out" do
+      lambda { @repository.unfreezify }.should_not raise_error
+    end
+
+    it "should simply return when made to unfreeze when already unfrozen" do
+      @repository.update
+      lambda { @repository.unfreezify }.should_not raise_error
+    end
+
+    describe "unfreezify" do
+      before(:each) do
+        GiternalHelper.create_repo('main')
+        GiternalHelper.create_repo('external')
+        @repository = Repository.new(GiternalHelper.base_project_dir, 'external',
+                                     GiternalHelper.external_path('external'),
+                                     'dependencies')
+        @repository.update
+        @repository.freezify
+      end
+
+      it "should unarchive the .git dir" do
+        @repository.unfreezify
+        File.directory?(GiternalHelper.checked_out_path('external/.git')).should be_true
+      end
+
+      it "should remove the archived file" do
+        @repository.unfreezify
+        File.file?(GiternalHelper.checked_out_path('external/.git.frozen.tgz')).should be_false
+      end
+    end
   end
 end

data/spec/giternal/yaml_config_spec.rb

@@ -3,10 +3,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 module Giternal
   describe YamlConfig do
     it "should create repositories from the config" do
-      config = YamlConfig.new("rspec:\n  repo: git://rspec\n  path: vendor/plugins\n" +
+      config = YamlConfig.new('base_dir',
+                              "rspec:\n  repo: git://rspec\n  path: vendor/plugins\n" +
                               "foo:\n  repo: git://at/foo\n  path: path/to/foo\n")
-      Repository.should_receive(:new).with("rspec", "git://rspec", "vendor/plugins").and_return :a_repo
-      Repository.should_receive(:new).with("foo", "git://at/foo", "path/to/foo").and_return :a_repo
+      Repository.should_receive(:new).with('base_dir', "rspec", "git://rspec", "vendor/plugins").and_return :a_repo
+      Repository.should_receive(:new).with('base_dir', "foo", "git://at/foo", "path/to/foo").and_return :a_repo
       config.each_repo {|r| r.should == :a_repo}
     end
   end

data/spec/spec_helper.rb

@@ -7,35 +7,13 @@ end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'giternal'
-
-module GiternalTest
-  def self.base_project_dir
-    File.expand_path(File.dirname(__FILE__) + '/test_repos')
-  end
-
-  def self.source_dir(name)
-    base_project_dir + '/' + name
-  end
-
-  def self.create_repo(name)
-    FileUtils.mkdir_p(source_dir(name))
-    `cd #{source_dir(name)} && git init`
-    add_to_repo name, name
-  end
-
-  def self.add_to_repo(repo_name, file)
-    `cd #{source_dir(repo_name)} && echo #{file} > #{file} && git add #{file} && git commit -m "added #{file}"`
-  end
-
-  def self.wipe_repos
-    FileUtils.rm_rf(base_project_dir) if File.directory?(base_project_dir)
-  end
-end
+require 'fileutils'
+require 'giternal_helper'
 
 Spec::Runner.configuration.before(:each) do
-  GiternalTest.wipe_repos
+  GiternalHelper.wipe_repos
 end
 
 Spec::Runner.configuration.after(:each) do
-  GiternalTest.wipe_repos
+  GiternalHelper.wipe_repos
 end

data/tasks/cucumber.rake

@@ -0,0 +1,17 @@
+begin
+  require 'cucumber/rake/task'
+
+  Cucumber::Rake::Task.new do |t|
+    t.cucumber_opts = "--format pretty"
+  end
+
+rescue LoadError
+  at_exit do
+    puts <<-EOS
+
+**********************************************************
+To use cucumber for testing you must install cucumber gem:
+      http://github.com/aslakhellesoy/cucumber/tree/master
+    EOS
+  end
+end

data/tasks/rspec.rake

@@ -1,21 +1,19 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
 begin
   require 'spec/rake/spectask'
+
+  desc "Run the spec suite"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_opts = ['--options', "spec/spec.opts"]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+
 rescue LoadError
-  puts <<-EOS
+  at_exit do
+    puts <<-EOS
+
+****************************************************
 To use rspec for testing you must install rspec gem:
     gem install rspec
 EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: giternal
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Pat Maddox
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-05 00:00:00 -04:00
+date: 2008-12-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -30,37 +20,41 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.1
     version: 
 description: description of gem
 email: 
 - pat.maddox@gmail.com
-executables: []
-
+executables: 
+- giternal
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
 - License.txt
 - Manifest.txt
-- PostInstall.txt
 - README.txt
 - website/index.txt
 files: 
+- .emacs-project
 - History.txt
 - License.txt
 - Manifest.txt
-- PostInstall.txt
 - README.txt
 - Rakefile
+- bin/giternal
 - config/hoe.rb
 - config/requirements.rb
+- features/checking_out_externals.feature
+- features/freeze_externals.feature
+- features/steps/repository_steps.rb
+- features/unfreeze_externals.feature
+- giternal_helper.rb
 - lib/giternal.rb
 - lib/giternal/app.rb
 - lib/giternal/repository.rb
 - lib/giternal/version.rb
 - lib/giternal/yaml_config.rb
-- lib/tasks/giternal.rake
 - script/console
 - script/destroy
 - script/generate
@@ -71,6 +65,7 @@ files:
 - spec/giternal/yaml_config_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tasks/cucumber.rake
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/rspec.rake
@@ -82,15 +77,7 @@ files:
 - website/template.html.erb
 has_rdoc: true
 homepage: http://giternal.rubyforge.org
-post_install_message: |+
-  ** See README.txt **
-  
-  ** Run the following command **
-  sudo sake -i 'http://giternal.rubyforge.org/git?p=giternal.git;a=blob_plain;f=lib/tasks/giternal.rake;hb=HEAD'
-  
-  For more information on giternal, see http://giternal.rubyforge.org
-  
-  
+post_install_message: ""
 rdoc_options: 
 - --main
 - README.txt
@@ -111,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: giternal
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: description of gem

data/PostInstall.txt

@@ -1,8 +0,0 @@
-** See README.txt **
-
-** Run the following command **
-sudo sake -i 'http://giternal.rubyforge.org/git?p=giternal.git;a=blob_plain;f=lib/tasks/giternal.rake;hb=HEAD'
-
-For more information on giternal, see http://giternal.rubyforge.org
-
-

data/lib/tasks/giternal.rake

@@ -1,8 +0,0 @@
-namespace :giternal do
-  desc "Clone or pull giternal repos"
-  task :update do
-    require "giternal"
-
-    Giternal::App.new(FileUtils.pwd).run
-  end
-end