smeagol 0.2.4 → 0.3.0

data/README.md

@@ -8,7 +8,7 @@ Smeagol is a server that can run a read-only version of a
 to maintain a standalone copy of a Github wiki but you want to update it through
 the Github interface.
 
-Gollum follows the rules of [Semantic Versioning](http://semver.org/) and uses
+Smeagol follows the rules of [Semantic Versioning](http://semver.org/) and uses
 [TomDoc](http://tomdoc.org/) for inline documentation.
 
 

data/bin/smeagol

@@ -1,28 +1,44 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'bundler/setup'
+require 'daemons'
 require 'optparse'
 require 'ostruct'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/smeagol')
 
+# Catch signals
+Signal.trap('TERM') do
+  Process.kill('KILL', 0)
+end
+
 # Parse options
 options = Smeagol::OptionParser.parse(ARGV)
 
+# Show repositories being served
+$stderr.puts "\n  Now serving:"
+options.repositories.each do |repository|
+  $stderr.puts "  #{repository.path} (#{repository.cname})"
+end
+$stderr.puts "\n"
+
 # Run the auto update process
 if options.git && options.auto_update
   Thread.new do
     while true do
       sleep 86400
-      Smeagol::Updater.update(options.git, options.gollum_path)
+      options.repositories.each do |repository|
+        Smeagol::Updater.update(options.git, repository.path)
+      end
     end
   end
 end
 
-# Clear the cache
-Smeagol::Cache.new(Gollum::Wiki.new(options.gollum_path)).clear()
+# Clear the caches
+options.repositories.each do |repository|
+  Smeagol::Cache.new(Gollum::Wiki.new(repository.path)).clear()
+end
 
 # Run the web server
-Smeagol::App.set(:gollum_path, options.gollum_path)
+Smeagol::App.set(:repositories, options.repositories)
 Smeagol::App.set(:git, options.git)
 Smeagol::App.set(:cache_enabled, options.cache_enabled)
 Smeagol::App.run!(:port => options.port)

data/bin/smeagold

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'daemons'
+
+filename = File.expand_path('smeagol', File.dirname(__FILE__))
+Daemons.run(filename)

data/lib/smeagol/app.rb

@@ -24,7 +24,7 @@ module Smeagol
 
     # Update the gollum repository
     get '/update' do
-      if Updater.update(settings.git, settings.gollum_path)
+      if Updater.update(settings.git, repository)
         'ok'
       else
         'error'
@@ -37,10 +37,10 @@ module Smeagol
       name = "Home" if name == ""
       name = name.gsub(/\/+$/, '')
       name = File.sanitize_path(name)
-      file_path = "#{settings.gollum_path}/#{name}"
+      file_path = "#{repository.path}/#{name}"
       
       # Load the wiki settings
-      wiki = Smeagol::Wiki.new(settings.gollum_path)
+      wiki = Smeagol::Wiki.new(repository.path)
       cache = Smeagol::Cache.new(wiki)
       
       # First check the cache
@@ -78,8 +78,8 @@ module Smeagol
     # repository if it exists. Otherwise, it uses the default page.mustache file
     # packaged with the Smeagol library.
     def page_template
-      if File.exists?("#{settings.gollum_path}/page.mustache")
-        IO.read("#{settings.gollum_path}/page.mustache")
+      if File.exists?("#{repository.path}/page.mustache")
+        IO.read("#{repository.path}/page.mustache")
       else
         IO.read(File.join(File.dirname(__FILE__), 'templates/page.mustache'))
       end
@@ -98,5 +98,19 @@ module Smeagol
       
       return 'text/plain'
     end
+
+    # Determines the repository to use based on the hostname.
+    def repository
+      # Match on hostname
+      settings.repositories.each do |repository|
+        next if repository.cname.nil?
+        if repository.cname.upcase == request.host.upcase
+          return repository
+        end
+      end
+      
+      # If no match, use the first repository as the default
+      settings.repositories.first
+    end
   end
 end

data/lib/smeagol/option_parser.rb

@@ -57,8 +57,16 @@ module Smeagol
       # Attempt to find the git binary
       update_git_path(opts)
 
-      # Set the path to the Gollum repository if not already set
-      opts.gollum_path ||= args[0] || Dir.pwd
+      # Append repositories from the command line.
+      opts.repositories ||= []
+      if !args.first.nil?
+        opts.repositories.unshift({:path => args.first}.to_ostruct)
+      end
+      
+      # Set repository to present working directory if no paths specified.
+      if opts.repositories.empty?
+        opts.repositories = [{:path => Dir.pwd}.to_ostruct]
+      end
       
       # Merge all options
       return opts
@@ -96,7 +104,6 @@ module Smeagol
         end
         
         config = YAML.load(IO.read(path))
-        p config
       end
 
       return config

data/lib/smeagol/public/smeagol/html5.js

@@ -0,0 +1,5 @@
+// html5shiv MIT @rem remysharp.com/html5-enabling-script
+// iepp v1.5.1 MIT @jon_neal iecss.com/print-protector
+/*@cc_on(function(p,e){var q=e.createElement("div");q.innerHTML="<z>i</z>";q.childNodes.length!==1&&function(){function r(a,b){if(g[a])g[a].styleSheet.cssText+=b;else{var c=s[l],d=e[j]("style");d.media=a;c.insertBefore(d,c[l]);g[a]=d;r(a,b)}}function t(a,b){for(var c=new RegExp("\\b("+m+")\\b(?!.*[;}])","gi"),d=function(k){return".iepp_"+k},h=-1;++h<a.length;){b=a[h].media||b;t(a[h].imports,b);r(b,a[h].cssText.replace(c,d))}}for(var s=e.documentElement,i=e.createDocumentFragment(),g={},m="abbr article aside audio canvas details figcaption figure footer header hgroup mark meter nav output progress section summary time video".replace(/ /g, '|'),
+n=m.split("|"),f=[],o=-1,l="firstChild",j="createElement";++o<n.length;){e[j](n[o]);i[j](n[o])}i=i.appendChild(e[j]("div"));p.attachEvent("onbeforeprint",function(){for(var a,b=e.getElementsByTagName("*"),c,d,h=new RegExp("^"+m+"$","i"),k=-1;++k<b.length;)if((a=b[k])&&(d=a.nodeName.match(h))){c=new RegExp("^\\s*<"+d+"(.*)\\/"+d+">\\s*$","i");i.innerHTML=a.outerHTML.replace(/\r|\n/g," ").replace(c,a.currentStyle.display=="block"?"<div$1/div>":"<span$1/span>");c=i.childNodes[0];c.className+=" iepp_"+
+d;c=f[f.length]=[a,c];a.parentNode.replaceChild(c[1],c[0])}t(e.styleSheets,"all")});p.attachEvent("onafterprint",function(){for(var a=-1,b;++a<f.length;)f[a][1].parentNode.replaceChild(f[a][0],f[a][1]);for(b in g)s[l].removeChild(g[b]);g={};f=[]})}()})(this,document);@*/

data/lib/smeagol/templates/page.mustache

@@ -5,6 +5,10 @@
     <title>{{wiki_title}} - {{page_title}}</title>
     <link rel="stylesheet" href="/smeagol/main.css" type="text/css"/> 
     <link rel="stylesheet" href="/smeagol/pygment.css" type="text/css"/> 
+
+    <!--[if lt IE 9]>
+    <script src="/smeagol/html5.js"></script>
+    <![endif]-->
   </head>
 
   <body>

data/lib/smeagol/updater.rb

@@ -3,19 +3,22 @@ module Smeagol
     # Public: Updates the repository that the server is point at.
     # 
     # git  - The path to the git binary.
-    # repo - The path to the git repository to update.
+    # path - The paths to the git repository to update.
     #
     # Returns true if successful. Otherwise returns false.
-    def self.update(git, repo)
+    def self.update(git, path)
+      # TODO: Change this method to raise errors if something goes wrong instead
+      #       of returning a status.
+      
       # If the git executable is available, pull from master and check status.
-      if !git.nil? && !repo.nil?
-        output = `cd #{repo} && #{git} pull origin master 2>/dev/null`
-        
+      if !git.nil? && !path.nil?
+        output = `cd #{path} && #{git} pull origin master 2>/dev/null`
+    
         # Write update to log if something happened
         if output.index('Already up-to-date').nil?
-          puts "==Repository updated at #{Time.new()}=="
+          $stderr.puts "==Repository updated at #{Time.new()} : #{path}=="
         end
-        
+    
         return $? == 0
       # Otherwise return false.
       else

data/lib/smeagol/version.rb

@@ -1,3 +1,3 @@
 module Smeagol
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/test/helper.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'bundler/setup'
 require 'minitest/autorun'
 require 'mocha'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smeagol
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ben Johnson
@@ -15,27 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -06:00
+date: 2010-10-01 00:00:00 -06:00
 default_executable: smeagol
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id001
-  type: :runtime
-  name: bundler
+  name: rack
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -46,12 +32,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id002
   type: :runtime
-  name: rack
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: gollum
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +48,12 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  requirement: *id003
   type: :runtime
-  name: gollum
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: sinatra
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +63,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id004
   type: :runtime
-  name: sinatra
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: mustache
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +79,12 @@ dependencies:
         - 11
         - 2
         version: 0.11.2
-  requirement: *id005
   type: :runtime
-  name: mustache
-  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: OptionParser
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,40 +95,28 @@ dependencies:
         - 5
         - 1
         version: 0.5.1
-  requirement: *id006
   type: :runtime
-  name: OptionParser
-  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-  type: :runtime
-  name: rdiscount
+  name: daemons
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        version: "0"
-  requirement: *id008
+        version: 1.1.0
   type: :runtime
-  name: RedCloth
-  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -153,12 +127,12 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
-  requirement: *id009
   type: :development
-  name: rake
-  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: minitest
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -169,12 +143,12 @@ dependencies:
         - 7
         - 0
         version: 1.7.0
-  requirement: *id010
   type: :development
-  name: minitest
-  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: mocha
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -185,12 +159,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id011
   type: :development
-  name: mocha
-  prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: cucumber
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -201,12 +175,12 @@ dependencies:
         - 8
         - 5
         version: 0.8.5
-  requirement: *id012
   type: :development
-  name: cucumber
-  prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -217,12 +191,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id013
   type: :development
-  name: rspec
-  prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  name: capybara
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -233,15 +207,14 @@ dependencies:
         - 3
         - 9
         version: 0.3.9
-  requirement: *id014
   type: :development
-  name: capybara
-  prerelease: false
+  version_requirements: *id012
 description: 
 email: 
 - benbjohnson@yahoo.com
 executables: 
 - smeagol
+- smeagold
 extensions: []
 
 extra_rdoc_files: []
@@ -252,6 +225,7 @@ files:
 - lib/smeagol/cache.rb
 - lib/smeagol/hash.rb
 - lib/smeagol/option_parser.rb
+- lib/smeagol/public/smeagol/html5.js
 - lib/smeagol/public/smeagol/main.css
 - lib/smeagol/public/smeagol/pygment.css
 - lib/smeagol/templates/page.mustache
@@ -267,6 +241,7 @@ files:
 - test/test_hash.rb
 - test/test_wiki.rb
 - bin/smeagol
+- bin/smeagold
 has_rdoc: true
 homepage: http://smeagolrb.info
 licenses: []