ginatra 2.2.0 → 2.2.1

data/Rakefile

@@ -48,7 +48,7 @@ namespace :setup do
 
   desc "Clones the Test Repository"
   task :repo do |t|
-    FileUtils.cd(File.join(current_path, "repos")) do
+    FileUtils.cd(File.join(Dir.pwd, "repos")) do
       puts `git clone git://github.com/atmos/hancock-client.git test`
     end
   end

data/config.ru

@@ -2,6 +2,8 @@ $:.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
 
 require "ginatra"
 
+
+
 map '/' do
   run Ginatra::App
 end

data/features/support/env.rb

@@ -1,5 +1,5 @@
-current_path = File.expand_path(File.dirname(__FILE__))
-require "#{current_path}/../../spec/spec_helper"
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../../spec")
+require "spec_helper"
 
 World do
   def app

data/lib/ginatra.rb

@@ -41,7 +41,7 @@ module Ginatra
     end
   end
 
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 
   # The main application class.
   #

data/lib/ginatra/helpers.rb

@@ -242,6 +242,8 @@ module Ginatra
         [stdout, stderr].each {|io| io.close }
       end
       html_output
+    rescue Errno::ENOENT
+      return "<div class=\"highlight\"><pre>#{content}</pre></div>"
     end
 
     def pygmentize_type(filename)
@@ -251,6 +253,8 @@ module Ginatra
         [stdin, stdout, stderr].each {|io| io.close }
       end
       type
+    rescue Errno::ENOENT
+      return "text"
     end
   end
 end

data/rackup.ru

@@ -2,6 +2,8 @@ $:.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
 
 require "ginatra"
 
+
+
 map '/' do
   run Ginatra::App
 end

data/spec/repo_list_spec.rb

@@ -1,10 +1,14 @@
-current_path = File.expand_path(File.dirname(__FILE__))
-require File.join(current_path, "spec_helper")
+$:.unshift File.dirname(__FILE__)
+require "spec_helper"
 
 describe "Ginatra" do
 
   describe "RepoList" do
 
+    def current_path
+      File.expand_path(File.dirname(__FILE__))
+    end
+
     before do
       @repo_list = Ginatra::RepoList.list
       @repo = Ginatra::RepoList.find("test")
@@ -28,9 +32,6 @@ describe "Ginatra" do
 
     describe "New repos added to repo directory" do
 
-      NEW_REPO_NAME = "temp-new-repo"
-      REPO_DIR = File.join(current_path, "..", "repos")
-
       def print_repos_found
         Ginatra::Config.git_dirs.map! do |git_dir|
           files = Dir.glob(git_dir)
@@ -39,9 +40,12 @@ describe "Ginatra" do
       end
 
       before(:each) do
-        FileUtils.cd(REPO_DIR) do |dir|
-          FileUtils.mkdir(NEW_REPO_NAME)
-          FileUtils.cd(NEW_REPO_NAME) do |dir|
+        @new_repo_name = "temp-new-repo"
+        @repo_dir = File.join(current_path, "..", "repos")
+
+        FileUtils.cd(@repo_dir) do |dir|
+          FileUtils.mkdir(@new_repo_name)
+          FileUtils.cd(@new_repo_name) do |dir|
             `git init`
           end
         end
@@ -50,31 +54,31 @@ describe "Ginatra" do
       it "should detect new repo after refresh" do
         repo_list = Ginatra::RepoList.list # calling this should refresh the list
 
-        Ginatra::RepoList.instance.has_repo?(NEW_REPO_NAME).should == true
+        Ginatra::RepoList.instance.has_repo?(@new_repo_name).should == true
 
-        new_repo = Ginatra::RepoList.find(NEW_REPO_NAME)
+        new_repo = Ginatra::RepoList.find(@new_repo_name)
         repo_list.should include(new_repo)
       end
 
       it "should detect when a repo has been removed after refresh" do
         repo_list = Ginatra::RepoList.list # calling this should refresh the list
 
-        Ginatra::RepoList.instance.has_repo?(NEW_REPO_NAME).should == true
+        Ginatra::RepoList.instance.has_repo?(@new_repo_name).should == true
 
-        new_repo = Ginatra::RepoList.find(NEW_REPO_NAME)
+        new_repo = Ginatra::RepoList.find(@new_repo_name)
         repo_list.should include(new_repo)
 
         # remove the new repository from the file system
-        FileUtils.rm_rf File.join(REPO_DIR, NEW_REPO_NAME), :secure => true
+        FileUtils.rm_rf File.join(@repo_dir, @new_repo_name), :secure => true
 
         repo_list = Ginatra::RepoList.list # refresh the repo list
 
-        Ginatra::RepoList.instance.has_repo?(NEW_REPO_NAME).should == false
+        Ginatra::RepoList.instance.has_repo?(@new_repo_name).should == false
         repo_list.should_not include(new_repo)
       end
 
       after(:each) do
-        FileUtils.rm_rf File.join(REPO_DIR, NEW_REPO_NAME), :secure => true
+        FileUtils.rm_rf File.join(@repo_dir, @new_repo_name), :secure => true
       end
     end
   end

data/spec/repo_spec.rb

@@ -1,9 +1,13 @@
-current_path = File.expand_path(File.dirname(__FILE__))
-require File.join(current_path, "spec_helper")
+$:.unshift File.dirname(__FILE__)
+require "spec_helper"
 
 describe "Ginatra" do
   describe "Repo" do
-   
+
+    def current_path
+      File.expand_path(File.dirname(__FILE__))
+    end
+
     before do
       @repo_list = Ginatra::RepoList
       @ginatra_repo = @repo_list.find("test")
@@ -31,28 +35,28 @@ describe "Ginatra" do
     it "should be the same thing using #find or #new" do
       @repo_list.find("test") == Ginatra::Repo.new(File.join(current_path, "..", "repos", "test"))
     end
-    
+
     it "should contain this commit" do
       @commit.refs.should_not be_empty
     end
-    
+
     it "should not contain this other commit" do
       lambda { @ginatra_repo.commit("totallyinvalid") }.should raise_error(Ginatra::InvalidCommit, "Could not find a commit with the id of totallyinvalid")
     end
-    
+
     it "should have a list of commits" do
       @ginatra_repo.commits.should_not be_blank
     end
-    
+
     it "should raise an error when asked to invert itself" do
       lambda { @ginatra_repo.commits("master", -1) }.should raise_error(Ginatra::Error, "max_count cannot be less than 0")
     end
-    
+
     it "should be able to add refs to a commit" do
       @commit.refs = []
       @ginatra_repo.add_refs(@commit)
       @commit.refs.should_not be_empty
     end
- 
+
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 require 'rubygems'
 
-gem 'rspec'
+#gem 'rspec'
 require 'spec'
 
-current_path = File.expand_path(File.dirname(__FILE__))
-require "#{current_path}/../lib/ginatra"
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
+require "ginatra"
 
-gem 'webrat', '>=0.4.4'
+#gem 'webrat', '>=0.4.4'
 begin
   # When using webrat 0.6.0, there is no webrat/sinatra.rb file.
   # Looking at the gem's code, it looks like it autoloads the sinatra adapter at webrat/adapters/sinatra.rb.
@@ -17,23 +17,25 @@ rescue LoadError
   require 'webrat'
 end
 
-gem 'rack-test', '>=0.3.0'
+#gem 'rack-test', '>=0.3.0'
 require 'rack/test'
 
 Webrat.configure do |config|
   config.mode = :sinatra
 end
 
+current_path = File.expand_path(File.dirname(__FILE__))
+
 Ginatra::App.set :environment, :test
 Ginatra::Config[:git_dirs] = ["#{current_path}/../repos/*"]
- 
+
 Spec::Runner.configure do |config|
   def app
     Ginatra::App
   end
-  
+
   config.include(Rack::Test::Methods)
   config.include(Webrat::Methods)
   config.include(Webrat::Matchers)
-end 
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ginatra
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Sam Elliott