AUTHORS
README.textile
TODO
environment.rb
extensions.rb
images/search.png
page.rb
public/app.js
public/favicon.ico
public/jeditable.min.js
public/jquery.min.js
public/sh_diff.min.js
public/sh_main.min.js
public/sh_style.css
public/style.css
sinatra
system/ruby.server.gitwiki.plist
views/attach.erb
views/branch_history.erb
views/branches.erb
views/delta.erb
views/edit.erb
views/history.erb
views/layout.erb
views/list.erb
views/search.erb
views/show.erb
@@ -1,6 +1,3 @@
-[submodule "vendor/sinatra"]
- path = vendor/sinatra
- url = git://github.com/sr/sinatra.git
-[submodule "vendor/haml"]
- path = vendor/haml
- url = git://github.com/nex3/haml.git
+[submodule "sinatra"]
+ path = sinatra
+ url = git://github.com/bmizerany/sinatra.git
.gitmodules
@@ -1,5 +1,4 @@
- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- Version 2, December 2004
+The MIT License
Copyright (C) 2004 Sam Hocevar
14 rue de Plaisance, 75014 Paris, France
@@ -7,8 +6,21 @@
copies of this license document, and changing it is allowed as long
as the name is changed.
- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
- 0. You just DO WHAT THE FUCK YOU WANT TO.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+=======
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
LICENSE
@@ -1,327 +1,190 @@
#!/usr/bin/env ruby
-%w(sinatra haml sass rubygems git redcloth yaml).each do |dependency|
- begin
- $: << File.expand_path(File.dirname(__FILE__) + "/vendor/#{dependency}/lib")
- require dependency
- rescue LoadError
- abort "Unable to load #{dependency}. Did you run 'git submodule init' ? If so install #{dependency}"
- end
+
+require 'fileutils'
+require 'environment'
+require 'sinatra/lib/sinatra'
+
+get('/') { redirect "/#{HOMEPAGE}" }
+
+# page paths
+
+get '/:page' do
+ @page = Page.new(params[:page])
+ @page.tracked? ? show(:show, @page.name) : redirect('/e/' + @page.name)
end
-#included until http://sinatra.lighthouseapp.com/projects/9779/tickets/16-patch-http-authentication is in a released version
-require File.dirname(__FILE__) + '/sinatra_http_auth'
+get '/:page.txt' do
+ content_type 'text/plain', :charset => 'utf-8'
+ @page = Page.new(params[:page])
+ @page.raw_body
+end
-begin
- config = YAML.load(File.read(ENV['CONFIG']))
-rescue
- config = {
- 'username' => nil,
- 'password' => nil
- }
+get '/:page/append' do
+ @page = Page.new(params[:page])
+ @page.body = @page.raw_body + "\n\n" + params[:text]
+ redirect '/' + @page.name
end
-class Page
- class << self
- attr_accessor :repo
- end
+get '/e/:page' do
+ @page = Page.new(params[:page])
+ show :edit, "Editing #{@page.name}"
+end
- def self.find_all
- return [] if (Page.repo.log.size rescue 0) == 0
- Page.repo.log.first.gtree.children.map { |name, blob| Page.new(name) }.sort_by { |p| p.name }
- end
+post '/e/:page' do
+ @page = Page.new(params[:page])
+ @page.update(params[:body], params[:message])
+ redirect '/' + @page.name
+end
- attr_reader :name
+post '/eip/:page' do
+ @page = Page.new(params[:page])
+ @page.update(params[:body])
+ @page.body
+end
- def initialize(name)
- @name = name
- @filename = File.join(GIT_REPOSITORY, @name)
- end
+get '/h/:page' do
+ @page = Page.new(params[:page])
+ show :history, "History of #{@page.name}"
+end
- def body
- RedCloth.new(raw_body).to_html.
- gsub(/\b((?:[A-Z]\w+){2,})/) do |page|
- "<a class='#{Page.new(page).tracked? ? 'exists' : 'unknown'}' href='#{page}'>#{page}</a>"
- end
- end
+get '/h/:page/:rev' do
+ @page = Page.new(params[:page], params[:rev])
+ show :show, "#{@page.name} (version #{params[:rev]})"
+end
- def raw_body
- File.exists?(@filename) ? File.read(@filename) : ''
- end
+get '/d/:page/:rev' do
+ @page = Page.new(params[:page])
+ show :delta, "Diff of #{@page.name}"
+end
- def body=(content)
- return if content == raw_body
- File.open(@filename, 'w') { |f| f << content }
- message = tracked? ? "Edited #{@name}" : "Created #{@name}"
- Page.repo.add(@name)
- Page.repo.commit(message)
- end
+# application paths (/a/ namespace)
- def tracked?
- Page.repo.ls_files.keys.include?(@name)
- end
+get '/a/list' do
+ pages = $repo.log.first.gtree.children
+ @pages = pages.select { |f,bl| f[0,1] != '_'}.sort.map { |name, blob| Page.new(name) } rescue []
+ show(:list, 'Listing pages')
+end
- def to_s
- @name
- end
+get '/a/patch/:page/:rev' do
+ @page = Page.new(params[:page])
+ header 'Content-Type' => 'text/x-diff'
+ header 'Content-Disposition' => 'filename=patch.diff'
+ @page.delta(params[:rev])
end
-use_in_file_templates!
-
-configure do
- GIT_REPOSITORY = ENV['WIKI'] || File.join(ENV['HOME'], 'wiki')
- HOMEPAGE = 'Home'
- set_option :haml, :format => :html4
-
- unless File.exists?(GIT_REPOSITORY) && File.directory?(GIT_REPOSITORY)
- puts "Initializing repository in #{GIT_REPOSITORY}"
- Git.init(GIT_REPOSITORY)
- File.open(File.join(GIT_REPOSITORY, HOMEPAGE), 'w') do |f|
- f.write(<<-EOF)
-## Welcome on git-wiki
-Congratulation, you managed to successfuly run git-wiki!
-Feel free to edit this page (double-clik it) and start to use your wiki.
-To access the page listing, hit <kbd>CTRL+L</kbd> and <kbd>CTRL+H</kbd> to go to the homepage.
-EOF
- end
+get '/a/tarball' do
+ header 'Content-Type' => 'application/x-gzip'
+ header 'Content-Disposition' => 'filename=archive.tgz'
+ archive = $repo.archive('HEAD', nil, :format => 'tgz', :prefix => 'wiki/')
+ File.open(archive).read
+end
- repository = Git.open(GIT_REPOSITORY)
- repository.add(HOMEPAGE)
- repository.commit('Initial commit')
- end
+get '/a/branches' do
+ @branches = $repo.branches
+ show :branches, "Branches List"
+end
- Page.repo = repository || Git.open(GIT_REPOSITORY)
+get '/a/branch/:branch' do
+ $repo.checkout(params[:branch])
+ redirect '/' + HOMEPAGE
end
+get '/a/history' do
+ @history = $repo.log
+ show :branch_history, "Branch History"
+end
-helpers do
- def title(title=nil)
- @title = title unless title.nil?
- @title
+get '/a/revert_branch/:sha' do
+ $repo.with_temp_index do
+ $repo.read_tree params[:sha]
+ $repo.checkout_index
+ $repo.commit('reverted branch')
end
+ redirect '/a/history'
+end
- def list_item(page)
- "<a class='page_name' href='/#{page}'>#{page}</a> <a class='edit' href='/e/#{page}'>edit</a>"
- end
+get '/a/merge_branch/:branch' do
+ $repo.merge(params[:branch])
+ redirect '/' + HOMEPAGE
end
-before do
- # unless config['username'].nil? && config['password'].nil?
- authenticate_or_request_with_http_basic "GitWiki" do
- |user, pass| user == config['username'] && pass == config['password']
- end
- # end
- content_type 'text/html', :charset => 'utf-8'
+get '/a/delete_branch/:branch' do
+ $repo.branch(params[:branch]).delete
+ redirect '/a/branches'
end
-get('/') { redirect '/' + HOMEPAGE }
+post '/a/new_branch' do
+ $repo.branch(params[:branch]).create
+ $repo.checkout(params[:branch])
+ if params[:type] == 'blank'
+ # clear out the branch
+ $repo.chdir do
+ Dir.glob("*").each do |f|
+ File.unlink(f)
+ $repo.remove(f)
+ end
+ touchfile
+ $repo.commit('clean branch start')
+ end
+ end
+ redirect '/a/branches'
+end
-get('/_stylesheet.css') do
- content_type 'text/css', :charset => 'utf-8'
- sass :stylesheet
+post '/a/new_remote' do
+ $repo.add_remote(params[:branch_name], params[:branch_url])
+ $repo.fetch(params[:branch_name])
+ redirect '/a/branches'
end
-get '/_list' do
- @pages = Page.find_all
- haml :list
+get '/a/search' do
+ @search = params[:search]
+ @grep = $repo.grep(@search)
+ show :search, 'Search Results'
end
-get '/:page' do
+# file upload attachments
+
+get '/a/file/upload/:page' do
@page = Page.new(params[:page])
- @page.tracked? ? haml(:show) : redirect("/e/#{@page.name}")
+ show :attach, 'Attach File for ' + @page.name
end
-# Waiting for Black's new awesome route system
-get '/:page.txt' do
+post '/a/file/upload/:page' do
@page = Page.new(params[:page])
- throw :halt, [404, "Unknown page #{params[:page]}"] unless @page.tracked?
- content_type 'text/plain', :charset => 'utf-8'
- @page.raw_body
+ @page.save_file(params[:file], params[:name])
+ redirect '/e/' + @page.name
end
-get '/e/:page' do
+get '/a/file/delete/:page/:file.:ext' do
@page = Page.new(params[:page])
- haml :edit
+ @page.delete_file(params[:file] + '.' + params[:ext])
+ redirect '/e/' + @page.name
end
-post '/e/:page' do
+get '/_attachment/:page/:file.:ext' do
@page = Page.new(params[:page])
- @page.body = params[:body]
- request.xhr? ? @page.body : redirect("/#{@page.name}")
+ send_file(File.join(@page.attach_dir, params[:file] + '.' + params[:ext]))
end
-__END__
-@@ layout
-!!! strict
-%html
- %head
- %title= title
- %link{:rel => 'stylesheet', :href => '/_stylesheet.css', :type => 'text/css'}
- %script{:src => '/jquery-1.2.3.min.js', :type => 'text/javascript'}
- %script{:src => '/jquery.jeditable.js', :type => 'text/javascript'}
- %script{:src => '/jquery.autogrow.js', :type => 'text/javascript'}
- %script{:src => '/jquery.hotkeys.js', :type => 'text/javascript'}
- :javascript
- $(document).ready(function() {
- $('#navigation').hide();
- $('#edit_link').hide();
- $.hotkeys.add('Ctrl+h', function() { document.location = '/#{HOMEPAGE}' })
- $.hotkeys.add('Ctrl+l', function() { document.location = '/_list' })
- })
- %body
- %ul#navigation
- %li
- %a{:href => '/'} Home
- %li
- %a{:href => '/_list'} List
- #content= yield
-
-@@ show
-- title @page.name
-:javascript
- $(document).ready(function() {
- $.editable.addInputType('autogrow', {
- element : function(settings, original) {
- var textarea = $('<textarea>');
- if (settings.rows) {
- textarea.attr('rows', settings.rows);
- } else {
- textarea.height(settings.height);
- }
- if (settings.cols) {
- textarea.attr('cols', settings.cols);
- } else {
- textarea.width(settings.width);
- }
- $(this).append(textarea);
- return(textarea);
- },
- plugin : function(settings, original) {
- $('textarea', this).autogrow(settings.autogrow);
- }
- });
-
- $('#page_content').editable('/e/#{@page}', {
- loadurl: '/#{@page}.txt',
- submit: '<button class="submit" type="submit">Save as the newest version</button>',
- cancel: '<a class="cancel" href="" style="margin-left: 5px;">cancel</a>',
- event: 'dblclick',
- type: 'autogrow',
- cols: 84,
- rows: 20,
- name: 'body',
- onblur: 'ignore',
- tooltip: ' ',
- indicator: 'Saving...',
- loadtext: '',
- cssclass: 'edit_form',
- callback: function(v, s) {
- /**notice = $('<p id="notice">New version successfuly saved!</p>').fadeOut('slow')
- $('#content').prepend(notice.html())*/
- }
- })
- })
-%a#edit_link{:href => "/e/#{@page}"} edit this page
-%h1= title
-#page_content= @page.body
-
-@@ edit
-- title "Editing #{@page}"
-
-%h1= title
-%form{:method => 'POST', :action => "/e/#{@page}"}
- %p
- %textarea{:name => 'body', :rows => 16, :cols => 60}= @page.raw_body
- %p
- %input.submit{:type => :submit, :value => 'Save as the newest version'}
- or
- %a.cancel{:href=>"/#{@page}"} cancel
-
-@@ list
-- title "Listing pages"
-
-%h1 All pages
-- if @pages.empty?
-%p No pages found.
-- else
- %ul#pages_list
- - @pages.each_with_index do |page, index|
- - if (index % 2) == 0
- %li.odd= list_item(page)
- - else
- %li.even= list_item(page)
- - end
-
-@@ stylesheet
-body
- :font
- family: "Lucida Grande", Verdana, Arial, Bitstream Vera Sans, Helvetica, sans-serif
- size: 14px
- color: black
- line-height: 160%
- background-color: white
- margin: 0
- padding: 0
-
-#navigation
- padding-left: 2em
- margin: 0
- li
- list-style-type: none
- display: inline
-
-#content
- padding: 2em
-.notice
- background-color: #ffc
- padding: 6px
-
-a
- padding: 2px
- color: blue
- &.exists
- &:hover
- background-color: blue
- text-decoration: none
- color: white
- &.unknown
- color: gray
- &:hover
- background-color: gray
- color: white
- text-decoration: none
-
-textarea
- font-family: courrier
- padding: 5px
- font-size: 14px
- line-height: 18px
-
-.edit_link
- display: block
- background-color: #ffc
- font-weight: bold
- text-decoration: none
- color: black
- &:hover
- color: white
- background-color: red
-
-.submit
- font-weight: bold
-
-.cancel
- color: red
- &:hover
- text-decoration: none
- background-color: red
- color: white
-ul#pages_list
- list-style-type: none
- margin: 0
- padding: 0
- li
- padding: 5px
- a.edit
- display: none
- &.odd
- background-color: #D3D3D3
+# support methods
+
+def page_url(page)
+ "#{request.env["rack.url_scheme"]}://#{request.env["HTTP_HOST"]}/#{page}"
+end
+
+private
+
+ def show(template, title)
+ @title = title
+ erb(template)
+ end
+
+ def touchfile
+ # adds meta file to repo so we have somthing to commit initially
+ $repo.chdir do
+ f = File.new(".meta", "w+")
+ f.puts($repo.current_branch)
+ f.close
+ $repo.add('.meta')
+ end
+ end
git-wiki.rb
1786144a30eab355df675d39123b1e5eda41a820
9e6c6a09b013a9143afc3414b8eeabd20279deff
Jesse Newland
jnewland@gmail.com
http://github.com/bmizerany/git-wiki/commit/69b32fd2e377c170788c7d7428f509a6ea1bdd48
69b32fd2e377c170788c7d7428f509a6ea1bdd48
2008-05-14T19:31:48-07:00
2008-05-14T19:31:48-07:00
merge al3x/master
9a6b3f75df4f481cd6491f0689529ffaed57b5f3
Jesse Newland
jnewland@gmail.com