smeagol 0.6.0 → 0.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 51e6f36277b0f6f7d5261c251f6bbb475587bd9f
+  data.tar.gz: 3443d535ff9bced5c866c31fe816a2a0715b99a5
+SHA512:
+  metadata.gz: 192b9a278897314cc70fc3d4c03559c21edf8665f5dafd0a97cd391be8797a0357c7521c0522547171f0b0eb49557590c056a05bf61d3fd3fe8567b4d2f357a0
+  data.tar.gz: f5193495ba0067f9e3da33b79a12125a3f616e6406edb0d8a12ce808672cee5cf36fa1db7ff49f095ec70e8630757e6f564f42510c0e9ecfa587e51d4b9d8b81

data/.index

@@ -0,0 +1,82 @@
+---
+revision: 2013
+type: ruby
+sources:
+- var
+authors:
+- name: Ben Johnson
+  email: benbjohnson@yahoo.com
+- name: Thomas Sawyer
+  email: transfire@gmail.com
+organizations: []
+requirements:
+- version: 1.5+
+  name: rack
+- version: 2.5+
+  name: gollum
+- version: 2.5+
+  name: grit
+- version: 1.4+
+  name: sinatra
+- version: 0.5+
+  name: rubypython
+- groups:
+  - development
+  - test
+  development: true
+  name: citron
+- groups:
+  - develpoment
+  - test
+  development: true
+  name: ae
+- groups:
+  - development
+  - test
+  development: true
+  name: rack-test
+- groups:
+  - development
+  - doc
+  development: true
+  name: rdiscount
+conflicts: []
+alternatives: []
+resources:
+- type: home
+  uri: http://rubyworks.github.com/smeagol
+  label: Homepage
+- type: code
+  uri: http://github.com/rubyworks/smeagol
+  label: Source Code
+- type: docs
+  uri: http://rubydoc.info/gems/smeagol/frames
+  label: Documentation
+- type: mail
+  uri: http://groups.google.com/groups/rubyworks-mailinglist
+  label: Mailing List
+repositories:
+- name: upstream
+  scm: git
+  uri: git://github.com/rubyworks/smeagol.git
+categories: []
+copyrights:
+- holder: Ben Johnson
+  year: '2010'
+- holder: Rubyworks
+  year: '2011'
+  license: BSD-2-Clause
+customs: []
+paths:
+  lib:
+  - lib
+name: smeagol
+title: Semagol
+summary: Wiki Cum Website
+created: '2010-08-16'
+description: |-
+  Smeagol is a customizable read-only Gollum wiki server.
+  Smeagol makes it possible to maintain a standalone website,
+  but update it through the Gollum wiki interface, e.g. via GitHub.
+version: 0.6.1
+date: '2013-08-08'

data/HISTORY.md

@@ -1,5 +1,19 @@
 # RELEASE HISTORY
 
+## v0.6.1 / 2013-08-01
+
+This release of Smeagol is a minor point release to update its dependencies.
+The Grit dependency in particular had become a problem when running under
+Ruby 2.0. To fix we had to vendor the `styx/grit` fork and bundle it with
+the gem. In the future we might migrate the backend to Rugged (volunteers
+welcome!)
+
+Changes:
+
+* Vendor styx/grit in place of grit gem.
+* Set default_options in Gollum::Wiki subclass.
+
+
 ## v0.6.0 / 2012-07-30
 
 Version 0.6 is a major refactoring of the code base. While most previous

data/lib/smeagol.rb

@@ -38,7 +38,8 @@ module Smeagol
 
 end
 
-require 'gollum'
+#require 'gollum'
+require 'gollum-lib'
 require 'rack/file'
 require 'mustache'
 require 'tmpdir'

data/lib/smeagol/app.rb

@@ -50,7 +50,7 @@ module Smeagol
 
     # All other resources go through Gollum.
     get '/*' do
-      wiki  = Smeagol::Wiki.new(repository.path, {:base_path => mount_path})
+      wiki  = Smeagol::Wiki.new(repository.path, :base_path => mount_path)
       cache = Smeagol::Cache.new(wiki)
       ctrl  = Smeagol::Controller.new(wiki) # settings)
 

data/lib/smeagol/gollum/file.rb

@@ -24,7 +24,7 @@ module Gollum
     attr_accessor :version
 
     # Recent addition to Gollum.
-    alias filename name unless method_defined?(:filename)
+    #alias filename name unless method_defined?(:filename)
 
     # Public: The title will be constructed from the
     # filename by stripping the extension and replacing any dashes with

data/lib/smeagol/wiki.rb

@@ -13,6 +13,7 @@ module Smeagol
     self.default_committer_name  = 'Anonymous'
     self.default_committer_email = 'anon@anon.com'
     self.default_ws_subs = ['_','-']
+    self.default_options = {}
 
     # Public: The Smeagol wiki settings. These can be found in the _settings.yml
     # file at the root of the repository.

data/vendor/grit/lib/grit.rb

@@ -0,0 +1,75 @@
+$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+
+# core
+require 'fileutils'
+require 'time'
+
+# stdlib
+require 'timeout'
+require 'logger'
+require 'digest/sha1'
+
+# third party
+
+begin
+  require 'mime/types'
+  require 'rubygems'
+rescue LoadError
+  require 'rubygems'
+  begin
+    gem "mime-types", ">=0"
+    require 'mime/types'
+  rescue Gem::LoadError => e
+    puts "WARNING: Gem LoadError: #{e.message}"
+  end
+end
+
+# ruby 1.9 compatibility
+require 'grit/ruby1.9'
+
+# internal requires
+require 'grit/lazy'
+require 'grit/errors'
+require 'grit/git-ruby'
+require 'grit/git' unless defined? Grit::Git
+require 'grit/ref'
+require 'grit/tag'
+require 'grit/commit'
+require 'grit/commit_stats'
+require 'grit/tree'
+require 'grit/blob'
+require 'grit/actor'
+require 'grit/diff'
+require 'grit/config'
+require 'grit/repo'
+require 'grit/index'
+require 'grit/status'
+require 'grit/submodule'
+require 'grit/blame'
+require 'grit/merge'
+
+module Grit
+  VERSION = '2.5.0'
+
+  class << self
+    # Set +debug+ to true to log all git calls and responses
+    attr_accessor :debug
+    attr_accessor :use_git_ruby
+    attr_accessor :no_quote
+
+    # The standard +logger+ for debugging git calls - this defaults to a plain STDOUT logger
+    attr_accessor :logger
+    def log(str)
+      logger.debug { str }
+    end
+  end
+  self.debug = false
+  self.use_git_ruby = true
+  self.no_quote = false
+
+  @logger ||= ::Logger.new(STDOUT)
+
+  def self.version
+    VERSION
+  end
+end

data/vendor/grit/lib/grit/actor.rb

@@ -0,0 +1,52 @@
+module Grit
+
+  class Actor
+    attr_reader :name
+    attr_reader :email
+
+    def initialize(name, email)
+      @name = name
+      @email = email
+    end
+    alias_method :to_s, :name
+
+    # Create an Actor from a string.
+    #
+    # str - The String in this format: 'John Doe <jdoe@example.com>'
+    #
+    # Returns Git::Actor.
+    def self.from_string(str)
+      case str
+        when /<.+>/
+          m, name, email = *str.match(/(.*) <(.+?)>/)
+          return self.new(name, email)
+        else
+          return self.new(str, nil)
+      end
+    end
+
+    # Outputs an actor string for Git commits.
+    #
+    #   actor = Actor.new('bob', 'bob@email.com')
+    #   actor.output(time) # => "bob <bob@email.com> UNIX_TIME +0700"
+    #
+    # time - The Time the commit was authored or committed.
+    #
+    # Returns a String.
+    def output(time)
+      offset = time.utc_offset / 60
+      "%s <%s> %d %+.2d%.2d" % [
+        @name,
+        @email || "null",
+        time.to_i,
+        offset / 60,
+        offset.abs % 60]
+    end
+
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Actor "#{@name} <#{@email}>">}
+    end
+  end # Actor
+
+end # Grit

data/vendor/grit/lib/grit/blame.rb

@@ -0,0 +1,70 @@
+module Grit
+
+  class Blame
+
+    attr_reader :lines
+
+    def initialize(repo, file, commit, lines=nil)
+      @repo = repo
+      @file = file
+      @commit = commit
+      if lines.nil?
+        @lines = []
+        load_blame
+      else
+        @lines = lines
+      end
+    end
+
+    def load_blame
+      output = @repo.git.blame({'p' => true}, @commit, '--', @file)
+      process_raw_blame(output)
+    end
+
+    def process_raw_blame(output)
+      lines, final = [], []
+      info, commits = {}, {}
+
+      # process the output
+      output.split("\n").each do |line|
+        if line[0, 1] == "\t"
+          lines << line[1, line.size]
+        elsif m = /^(\w{40}) (\d+) (\d+)/.match(line)
+          commit_id, old_lineno, lineno = m[1], m[2].to_i, m[3].to_i
+          commits[commit_id] = nil if !commits.key?(commit_id)
+          info[lineno] = [commit_id, old_lineno]
+        end
+      end
+
+      # load all commits in single call
+      @repo.batch(*commits.keys).each do |commit|
+        commits[commit.id] = commit
+      end
+
+      # get it together
+      info.sort.each do |lineno, (commit_id, old_lineno)|
+        commit = commits[commit_id]
+        final << BlameLine.new(lineno, old_lineno, commit, lines[lineno - 1])
+      end
+
+      @lines = final
+    end
+
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Blame "#{@file} <#{@commit}>">}
+    end
+
+    class BlameLine
+      attr_accessor :lineno, :oldlineno, :commit, :line
+      def initialize(lineno, oldlineno, commit, line)
+        @lineno = lineno
+        @oldlineno = oldlineno
+        @commit = commit
+        @line = line
+      end
+    end
+
+  end # Blame
+
+end # Grit

data/vendor/grit/lib/grit/blob.rb

@@ -0,0 +1,126 @@
+module Grit
+
+  class Blob
+    DEFAULT_MIME_TYPE = "text/plain"
+
+    attr_reader :id
+    attr_reader :mode
+    attr_reader :name
+
+    # Create an unbaked Blob containing just the specified attributes
+    #   +repo+ is the Repo
+    #   +atts+ is a Hash of instance variable data
+    #
+    # Returns Grit::Blob (unbaked)
+    def self.create(repo, atts)
+      self.allocate.create_initialize(repo, atts)
+    end
+
+    # Initializer for Blob.create
+    #   +repo+ is the Repo
+    #   +atts+ is a Hash of instance variable data
+    #
+    # Returns Grit::Blob (unbaked)
+    def create_initialize(repo, atts)
+      @repo = repo
+      atts.each do |k, v|
+        instance_variable_set("@#{k}".to_sym, v)
+      end
+      self
+    end
+
+    # The size of this blob in bytes
+    #
+    # Returns Integer
+    def size
+      @size ||= @repo.git.cat_file({:s => true}, id).chomp.to_i
+    end
+
+    # The binary contents of this blob.
+    #
+    # Returns String
+    def data
+      @data ||= @repo.git.cat_file({:p => true}, id)
+    end
+
+    # The mime type of this file (based on the filename)
+    #
+    # Returns String
+    def mime_type
+      guesses = MIME::Types.type_for(self.name) rescue []
+      guesses.first ? guesses.first.simplified : DEFAULT_MIME_TYPE
+    end
+
+    # The blame information for the given file at the given commit
+    #
+    # Returns Array: [Grit::Commit, Array: [<line>]]
+    def self.blame(repo, commit, file)
+      data = repo.git.blame({:p => true}, commit, '--', file)
+
+      commits = {}
+      blames = []
+      info = nil
+
+      data.split("\n").each do |line|
+        parts = line.split(/\s+/, 2)
+        case parts.first
+          when /^[0-9A-Fa-f]{40}$/
+            case line
+              when /^([0-9A-Fa-f]{40}) (\d+) (\d+) (\d+)$/
+                _, id, origin_line, final_line, group_lines = *line.match(/^([0-9A-Fa-f]{40}) (\d+) (\d+) (\d+)$/)
+                info = {:id => id}
+                blames << [nil, []]
+              when /^([0-9A-Fa-f]{40}) (\d+) (\d+)$/
+                _, id, origin_line, final_line = *line.match(/^([0-9A-Fa-f]{40}) (\d+) (\d+)$/)
+                info = {:id => id}
+            end
+          when /^(author|committer)/
+            case parts.first
+              when /^(.+)-mail$/
+                info["#{$1}_email".intern] = parts.last
+              when /^(.+)-time$/
+                info["#{$1}_date".intern] = Time.at(parts.last.to_i)
+              when /^(author|committer)$/
+                info[$1.intern] = parts.last
+            end
+          when /^filename/
+            info[:filename] = parts.last
+          when /^summary/
+            info[:summary] = parts.last
+          when ''
+            c = commits[info[:id]]
+            unless c
+              c = Commit.create(repo, :id => info[:id],
+                                      :author => Actor.from_string(info[:author] + ' ' + info[:author_email]),
+                                      :authored_date => info[:author_date],
+                                      :committer => Actor.from_string(info[:committer] + ' ' + info[:committer_email]),
+                                      :committed_date => info[:committer_date],
+                                      :message => info[:summary])
+              commits[info[:id]] = c
+            end
+            _, text = *line.match(/^\t(.*)$/)
+            blames.last[0] = c
+            blames.last[1] << text
+            info = nil
+        end
+      end
+
+      blames
+    end
+
+    def basename
+      File.basename(name)
+    end
+
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Blob "#{@id}">}
+    end
+
+    # Compares blobs by name
+    def <=>(other)
+      name <=> other.name
+    end
+  end # Blob
+
+end # Grit