@@ -1,4 +1,4 @@ -repos/*.git +repos/*/ public/*.esproj tmp/* .DS_Store .gitignore @@ -7,14 +7,6 @@ require "#{current_path}/lib/ginatra" task :default => ['rake:spec', 'rake:features'] -desc "Adds a Git Repository to Ginatra. Usage: `rake add repo='<git-repo-url>' [name='<name-in-ginatra>']`" -task "add" do |t| - raise ArgumentError, "FATAL: You Must Specify a Git Repository to Clone" if ENV['repo'].empty? - FileUtils.cd(repo_dir) do - puts %x(git clone --bare #{ENV['repo']} #{(ENV['name'] + ".git") unless ENV['name'].nil?}) - end -end - desc "Runs the Cucumber Feature Suite" Cucumber::Rake::Task.new(:features) do |t| t.cucumber_opts = "--format pretty" @@ -55,8 +47,8 @@ namespace :setup do desc "Clones the Test Repository" task :repo do |t| - FileUtils.cd(repo_dir) do - puts `git clone --bare git://github.com/atmos/hancock-client.git test.git` + FileUtils.cd(File.join(current_path, "repos")) do + puts `git clone git://github.com/atmos/hancock-client.git test` end end @@ -73,35 +65,3 @@ namespace :setup do end end - -namespace :test do - - task :spec => ['rake:spec'] do - puts "" - puts "DEPRECIATION WARNING: `rake test:spec` has been replaced with `rake spec` -- I'm making your life easier" - puts "" - end - - task :features => ['rake:features'] do - puts "" - puts "DEPRECIATION WARNING: `rake test:features` has been replaced with `rake features` -- I'm making your life easier" - puts "" - end - -end - -def repo_dir - if Ginatra::App.git_dir - File.expand_path( Ginatra::App.git_dir ) - elsif Ginatra::App.git_dirs - a = Dir.glob(Ginatra::App.git_dirs.first).first - if Dir.entries(a).include?"refs" - a = File.dirname(a) - else - a - end - File.expand_path( a ) - else - raise ArgumentError, "You need to set `git_dir` or `git_dirs` for this rake task to work" - end -end Rakefile @@ -7,27 +7,27 @@ Feature: Page When I open '/' Then I should see "Ginatra" And I should see "View My Git Repositories" - And I should see "Test" - And I should see "Please edit the test.git/description file for this repository and set the description for it." + And I should see "test" + And I should see "description file for this repository and set the description for it." Scenario: When I open '/test' Then I should see "Ginatra" - And I should see "Test" - And I should see "Please edit the test.git/description file for this repository and set the description for it." + And I should see "test" + And I should see "description file for this repository and set the description for it." And I should see "Commits" And I should see "(author)" Scenario: When I open '/test/commit/eefb4c3' Then I should see "Ginatra" - And I should see "Test" - And I should see "Please edit the test.git/description file for this repository and set the description for it." + And I should see "test" + And I should see "description file for this repository and set the description for it." And I should see "Commit: eefb4c3" And I should see "doh, thanks lenary for reminding me of the files i'd forgotten" Scenario: When I open '/test/tree/24f701fd' Then I should see "Ginatra" - And I should see "Test" - And I should see "Please edit the test.git/description file for this repository and set the description for it." + And I should see "test" + And I should see "description file for this repository and set the description for it." And I should see "Tree: 24f701fd" And I should see "README.md" And I should see ".gitignore" features/pages.feature @@ -31,9 +31,6 @@ module Ginatra configure do current_path = File.expand_path(File.dirname(__FILE__)) Config.load! - Config.each_pair do |k, v| - set k, v - end set :raise_errors, Proc.new { test? } set :show_exceptions, Proc.new { development? } set :dump_errors, true lib/ginatra.rb @@ -4,9 +4,8 @@ module Ginatra current_path = File.expand_path("#{File.dirname(__FILE__)}") CONFIG_PATH = File.expand_path("~/.ginatra") DEFAULT_CONFIG = { - :git_dir => File.expand_path("#{current_path}/../../repos"), - :git_dirs => [File.expand_path("#{current_path}/../../repos/*.git")], - :ignored_files => ['.', '..', 'README.md'], + :git_dirs => [File.expand_path("#{current_path}/../../repos/*")], + :ignored_files => ['README.md'], :description => "View My Git Repositories", :port => 9797 } lib/ginatra/config.rb @@ -13,10 +13,10 @@ module Ginatra def initialize(path) @repo = Grit::Repo.new(path) - @param = File.split(path).last.gsub(/\.git$/, '') - @name = @param.capitalize + @param = File.split(path).last + @name = @param @description = @repo.description - @description = "Please edit the #{@param}.git/description file for this repository and set the description for it." if /^Unnamed repository;/.match(@description) + @description = "Please edit the #{@repo.path}/description file for this repository and set the description for it." if /^Unnamed repository;/.match(@description) @repo end @@ -47,13 +47,4 @@ module Ginatra end end - - class MultiRepo < Repo - - attr_reader :name, :param, :description - - def self.create!(param) - @repo = MultiRepoList.find { |r| r.param =~ /^#{Regexp.escape param }$/ } - end - end end \ No newline at end of file lib/ginatra/repo.rb @@ -1,3 +1,5 @@ +require 'singleton' + module Ginatra # Convenience class for me! class RepoList @@ -15,19 +17,20 @@ module Ginatra end def refresh - entries = Dir.entries(Ginatra::Config.git_dir) - entries.each { |e| add(e) unless Ginatra::Config.ignored_files.include?(e) } + Ginatra::Config.git_dirs.map! do |git_dir| + files = Dir.glob(git_dir) + files.each { |e| add(e) unless Ginatra::Config.ignored_files.include?(File.split(e).last) } + end end - def add(e, path = File.expand_path(e, Ginatra::Config.git_dir)) - unless self.has_repo?(e) + def add(path, param = File.split(path).last) + unless self.has_repo?(param) list << Repo.new(path) end end def has_repo?(local_param) - l = local_param.sub(/\.git$/,'') - !list.find { |r| r.param == l }.nil? + !list.find { |r| r.param == local_param }.nil? end def find(local_param) lib/ginatra/repo_list.rb @@ -1,4 +1,6 @@ -require File.join(File.dirname(__FILE__), "spec_helper") +current_path = File.expand_path(File.dirname(__FILE__)) +require File.join(current_path, "spec_helper") + describe "Ginatra" do describe "RepoList" do spec/repo_list_spec.rb @@ -1,4 +1,5 @@ -require File.join(File.dirname(__FILE__), "spec_helper") +current_path = File.expand_path(File.dirname(__FILE__)) +require File.join(current_path, "spec_helper") describe "Ginatra" do describe "Repo" do @@ -6,12 +7,12 @@ describe "Ginatra" do before do @repo_list = Ginatra::RepoList @ginatra_repo = @repo_list.find("test") - @grit_repo = Grit::Repo.new(File.join(Ginatra::App.git_dir, "test.git"), {}) + @grit_repo = Grit::Repo.new(File.join(current_path, "..", "repos", "test"), {}) @commit = @ginatra_repo.commit("910ff56f585bcdfc3ba105c8846b1df0a6abf069") end it "should have a name" do - @ginatra_repo.name == "Test" + @ginatra_repo.name == "test" end it "should have a param for urls" do @@ -19,20 +20,16 @@ describe "Ginatra" do end it "should have a description" do - @ginatra_repo.description == "Unnamed repository; edit this file to name it for gitweb." + @ginatra_repo.description =~ /description file for this repository and set the description for it./ end - it "should have a descripton that matches the grit description" do - @ginatra_repo.description == @grit_repo.description - end - - it "should have an array of commits that match the grit array of commits limited to 25 items" do + it "should have an array of commits that match the grit array of commits limited to 10 items" do @ginatra_repo.commits === @grit_repo.commits @ginatra_repo.commits.length == 10 end it "should be the same thing using #find or #new" do - @repo_list.find("test") == Ginatra::Repo.new(File.join(Ginatra::App.git_dir, "test.git")) + @repo_list.find("test") == Ginatra::Repo.new(File.join(current_path, "..", "repos", "test")) end it "should contain this commit" do spec/repo_spec.rb @@ -16,6 +16,7 @@ Webrat.configure do |config| end Ginatra::App.set :environment, :test +Ginatra::Config[:git_dirs] = ["#{current_path}/../repos/*"] Spec::Runner.configure do |config| def app spec/spec_helper.rb @@ -1,7 +1,7 @@ <h3>Repositories</h3> <div class="active repo-list"> <div class="commit-info"> - <%=h Ginatra::App.description %> + <%=h Ginatra::Config.description %> </div> <dl> <% Ginatra::RepoList.list.each do |repo| %> views/index.erb lib/ginatra/multi_repo_list.rb lib/ginatra/requires.rb spec/ginatra_spec.rb d4510b565ab427cf1c2377c936ed06b0b2cff114 Samuel Elliott sam@lenary.co.uk http://github.com/lenary/ginatra/commit/e50e8fbc9f18b7b90c4990976f2e869480758bca e50e8fbc9f18b7b90c4990976f2e869480758bca 2009-08-19T00:26:19-07:00 2009-08-19T00:26:19-07:00 Implemented Multiple Repository Directories! Closes GH-2 This brings the functionality of MultiRepoList into RepoList itself, and updates everything around it including: - Rakefile: This now no longer has many of the tasks related to adding git repositories. - lib/ginatra/config.rb: This has been updated to remove the :git_dir option. Instead use the :git_dirs array for telling ginatra where to look for a repository. You now access all ginatra-related variables through Ginatra::Config.var, and any sinatra-related variables through Ginatra::App.var - lib/ginatra/repo.rb: This reconfigures the Ginatra::Repo object slightly, including non-capitalised title and path initialisation (i think) - lib/ginatra/repo_list.rb: This is where the main change has been: now a lot of the methods have to take path rather than param, and other things like that. look at the #refresh method to see the main change in working. - spec/spec_helper.rb: This file now sets the Ginatra::Config.git_dirs to ['./repos/*'] so that all the tests work. use 'rake setup:repo' to create the test repository. All tests have been updated or removed due to obsolete functionality. 1010de1bfc58a948c2878f8c9b0c71e91831a7a0 Samuel Elliott sam@lenary.co.uk