gitdocs 0.4.15 → 0.5.0.pre1

data/lib/gitdocs/migration/001_create_shares.rb

@@ -2,12 +2,12 @@ class CreateShares < ActiveRecord::Migration
   def self.up
     create_table :shares do |t|
       t.column :path, :string
-      t.column :polling_interval, :double, :default => 15
-      t.column :notification, :boolean, :default => true
+      t.column :polling_interval, :double, default: 15
+      t.column :notification, :boolean, default: true
     end
   end
 
   def self.down
-    raise
+    fail
   end
 end

data/lib/gitdocs/migration/002_add_remote_branch.rb

@@ -1,10 +1,10 @@
 class AddRemoteBranch < ActiveRecord::Migration
   def self.up
-    add_column :shares, :remote_name, :string, :default => 'origin'
-    add_column :shares, :branch_name, :string, :default => 'master'
+    add_column :shares, :remote_name, :string, default: 'origin'
+    add_column :shares, :branch_name, :string, default: 'master'
   end
 
   def self.down
-    raise
+    fail
   end
 end

data/lib/gitdocs/migration/003_create_configs.rb

@@ -1,11 +1,11 @@
 class CreateConfigs < ActiveRecord::Migration
   def self.up
     create_table :configs do |t|
-      t.column :load_browser_on_startup, :boolean, :default => true
+      t.column :load_browser_on_startup, :boolean, default: true
     end
   end
 
   def self.down
-    raise
+    fail
   end
-end
+end

data/lib/gitdocs/migration/004_add_index_for_path.rb

@@ -1,10 +1,10 @@
 class AddIndexForPath < ActiveRecord::Migration
   def self.up
-    shares = Gitdocs::Configuration::Share.all.inject(Hash.new{|h,k| h[k] = []}) {|h, s| h[s.path] << s; h}
+    shares = Gitdocs::Configuration::Share.all.reduce(Hash.new { |h, k| h[k] = [] }) { |h, s| h[s.path] << s; h }
     shares.each do |path, shares|
       shares.shift
       shares.each(&:destroy) unless shares.empty?
     end
-    add_index :shares, :path, :unique => true
+    add_index :shares, :path, unique: true
   end
-end
+end

data/lib/gitdocs/migration/005_add_start_web_frontend.rb

@@ -1,9 +1,9 @@
 class AddStartWebFrontend < ActiveRecord::Migration
   def self.up
-    add_column :configs, :start_web_frontend, :boolean, :default => true
+    add_column :configs, :start_web_frontend, :boolean, default: true
   end
 
   def self.down
-    raise
+    fail
   end
 end

data/lib/gitdocs/migration/006_add_web_port_to_config.rb

@@ -1,9 +1,9 @@
 class AddWebPortToConfig < ActiveRecord::Migration
   def self.up
-    add_column :configs, :web_frontend_port, :integer, :default => 8888
+    add_column :configs, :web_frontend_port, :integer, default: 8888
   end
 
   def self.down
-    raise
+    fail
   end
 end

data/lib/gitdocs/rendering.rb

@@ -20,4 +20,4 @@ class RedcarpetCompat
     @text = @text.force_encoding('utf-8') if @text.respond_to?(:force_encoding)
     @markdown.render(@text)
   end
-end
+end

data/lib/gitdocs/runner.rb

@@ -4,11 +4,17 @@ module Gitdocs
 
     attr_reader :root, :listener
 
+    def self.start_all(shares)
+      runners = shares.map { |share| Runner.new(share) }
+      runners.each(&:run)
+      runners
+    end
+
     def initialize(share)
       @share = share
-      @root  = share.path.sub(%r{/+$},'') if share.path
+      @root  = share.path.sub(%r{/+$}, '') if share.path
       @polling_interval = share.polling_interval
-      @icon = File.expand_path("../../img/icon.png", __FILE__)
+      @icon = File.expand_path('../../img/icon.png', __FILE__)
     end
 
     SearchResult = Struct.new(:file, :context)
@@ -17,7 +23,7 @@ module Gitdocs
 
       results = []
       if result_test = sh_string("git grep -i #{ShellTools.escape(term)}")
-        result_test.scan(/(.*?):([^\n]*)/) do |(file, context)| 
+        result_test.scan(/(.*?):([^\n]*)/) do |(file, context)|
           if result = results.find { |s| s.file == file }
             result.context += ' ... ' + context
           else
@@ -34,41 +40,41 @@ module Gitdocs
       @show_notifications = @share.notification
       @current_remote     = @share.remote_name
       @current_branch     = @share.branch_name
-      @current_revision   = sh_string("git rev-parse HEAD")
+      @current_revision   = sh_string('git rev-parse HEAD')
       Guard::Notifier.turn_on if @show_notifications
 
       mutex = Mutex.new
 
-      info("Running gitdocs!", "Running gitdocs in `#{@root}'")
+      info('Running gitdocs!', "Running gitdocs in `#{@root}'")
 
       # Pull changes from remote repository
       syncer = proc do
         EM.defer(proc do
           mutex.synchronize { sync_changes }
         end, proc do
-          EM.add_timer(@polling_interval) {
+          EM.add_timer(@polling_interval) do
             syncer.call
-          }
+          end
         end)
       end
       syncer.call
       # Listen for changes in local repository
 
-      EM.defer(proc{
-        listener = Guard::Listener.select_and_init(@root, :watch_all_modifications => true)
-        listener.on_change { |directories|
+      EM.defer(proc do
+        listener = Guard::Listener.select_and_init(@root, watch_all_modifications: true)
+        listener.on_change do |directories|
           directories.uniq!
-          directories.delete_if {|d| d =~ /\/\.git/}
+          directories.delete_if { |d| d =~ /\/\.git/ }
           unless directories.empty?
             EM.next_tick do
-              EM.defer(proc {
+              EM.defer(proc do
                 mutex.synchronize { push_changes }
-              }, proc {} )
+              end, proc {})
             end
           end
-        }
+        end
         listener.start
-      }, proc{EM.stop_reactor})
+      end, proc { EM.stop_reactor })
     end
 
     def clear_state
@@ -80,36 +86,36 @@ module Gitdocs
       if status.success?
         changes = get_latest_changes
         unless changes.empty?
-          author_list = changes.inject(Hash.new{|h, k| h[k] = 0}) {|h, c| h[c['author']] += 1; h}.to_a.sort{|a,b| b[1] <=> a[1]}.map{|(name, count)| "* #{name} (#{count} change#{count == 1 ? '' : 's'})"}.join("\n")
+          author_list = changes.reduce(Hash.new { |h, k| h[k] = 0 }) { |h, c| h[c['author']] += 1; h }.to_a.sort { |a, b| b[1] <=> a[1] }.map { |(name, count)| "* #{name} (#{count} change#{count == 1 ? '' : 's'})" }.join("\n")
           info("Updated with #{changes.size} change#{changes.size == 1 ? '' : 's'}", "In `#{@root}':\n#{author_list}")
         end
         push_changes
       elsif out[/CONFLICT/]
-        conflicted_files = sh("git ls-files -u --full-name -z").split("\0").
-          inject(Hash.new{|h, k| h[k] = []}) {|h, line|
+        conflicted_files = sh('git ls-files -u --full-name -z').split("\0")
+          .reduce(Hash.new { |h, k| h[k] = [] }) do|h, line|
             parts = line.split(/\t/)
             h[parts.last] << parts.first.split(/ /)
             h
-          }
-        warn("There were some conflicts", "#{conflicted_files.keys.map{|f| "* #{f}"}.join("\n")}")
+          end
+        warn('There were some conflicts', "#{conflicted_files.keys.map { |f| "* #{f}" }.join("\n")}")
         conflicted_files.each do |conflict, ids|
           conflict_start, conflict_end = conflict.scan(/(.*?)(|\.[^\.]+)$/).first
           ids.each do |(mode, sha, id)|
-            author =  " original" if id == "1"
+            author =  ' original' if id == '1'
             system("cd #{@root} && git show :#{id}:#{conflict} > '#{conflict_start} (#{sha[0..6]}#{author})#{conflict_end}'")
           end
-          system("cd #{@root} && git rm #{conflict}") or raise
+          system("cd #{@root} && git rm #{conflict}") || fail
         end
         push_changes
-      elsif sh_string("git remote").nil? # no remote to pull from
+      elsif sh_string('git remote').nil? # no remote to pull from
         # Do nothing, no remote repo yet
       else
-        error("There was a problem synchronizing this gitdoc", "A problem occurred in #{@root}:\n#{out}")
+        error('There was a problem synchronizing this gitdoc', "A problem occurred in #{@root}:\n#{out}")
       end
     end
 
     def push_changes
-      message_file = File.expand_path(".gitmessage~", @root)
+      message_file = File.expand_path('.gitmessage~', @root)
       if File.exist? message_file
         message = File.read message_file
         File.delete message_file
@@ -118,7 +124,7 @@ module Gitdocs
       end
       sh 'find . -type d -regex ``./[^.].*'' -empty -exec touch \'{}/.gitignore\' \;'
       sh 'git add .'
-      sh "git commit -a -m #{ShellTools.escape(message)}" unless sh("git status -s").strip.empty?
+      sh "git commit -a -m #{ShellTools.escape(message)}" unless sh('git status -s').strip.empty?
       if @current_revision.nil? || sh('git status')[/branch is ahead/]
         out, code = sh_with_code("git push #{@current_remote} #{@current_branch}")
         if code.success?
@@ -127,12 +133,19 @@ module Gitdocs
         elsif @current_revision.nil?
           # ignorable
         elsif out[/\[rejected\]/]
-          warn("There was a conflict in #{@root}, retrying", "")
+          warn("There was a conflict in #{@root}, retrying", '')
         else
           error("BAD Could not push changes in #{@root}", out)
-          exit
+          # TODO: need to add a status on shares so that the push problem can be
+          # displayed.
         end
       end
+    rescue
+      # Rescue any standard exceptions which come from the push related
+      # commands. This will prevent problems on a single share from killing
+      # the entire daemon.
+      error("Unexpected error pushing changes in #{@root}")
+      # TODO: get logging and/or put the error message into a status field in the database
     end
 
     def get_latest_changes
@@ -145,7 +158,7 @@ module Gitdocs
           Yajl::Parser.new.parse(out) do |obj|
             lines << obj
           end
-          @current_revision = sh("git rev-parse HEAD").strip
+          @current_revision = sh('git rev-parse HEAD').strip
           lines
         end
       else
@@ -157,30 +170,28 @@ module Gitdocs
     # Returns the list of files in a given directory
     # dir_files("some/dir") => [<Docfile>, <Docfile>]
     def dir_files(dir_path)
-      Dir[File.join(dir_path, "*")].to_a.map { |path| Docfile.new(path) }
+      Dir[File.join(dir_path, '*')].to_a.map { |path| Docfile.new(path) }
     end
 
     # Returns file meta data based on relative file path
     # file_meta("path/to/file")
     #  => { :author => "Nick", :size => 1000, :modified => ... }
     def file_meta(file)
-      result = {}
       file = file.gsub(%r{^/}, '')
       full_path = File.expand_path(file, @root)
       log_result = sh_string("git log --format='%aN|%ai' -n1 #{ShellTools.escape(file)}")
-      result =  {} unless File.exist?(full_path) && log_result
-      author, modified = log_result.split("|")
+      author, modified = log_result.split('|')
       modified = Time.parse(modified.sub(' ', 'T')).utc.iso8601
       size = if File.directory?(full_path)
-               Dir[File.join(full_path, '**', '*')].inject(0) do |size, file|
-                 File.symlink?(file) ? size : size += File.size(file)
-               end
-             else
-               File.symlink?(full_path) ? 0 : File.size(full_path)
-             end
+        Dir[File.join(full_path, '**', '*')].reduce(0) do |size, file|
+          File.symlink?(file) ? size : size += File.size(file)
+        end
+      else
+        File.symlink?(full_path) ? 0 : File.size(full_path)
+      end
       size = -1 if size == 0 # A value of 0 breaks the table sort for some reason
-      result = { :author => author, :size => size, :modified => modified }
-      result
+
+      { author: author, size: size, modified: modified }
     end
 
     # Returns the revisions available for a particular file
@@ -189,9 +200,9 @@ module Gitdocs
       file = file.gsub(%r{^/}, '')
       output = sh_string("git log --format='%h|%s|%aN|%ai' -n100 #{ShellTools.escape(file)}")
       output.to_s.split("\n").map do |log_result|
-        commit, subject, author, date = log_result.split("|")
+        commit, subject, author, date = log_result.split('|')
         date = Time.parse(date.sub(' ', 'T')).utc.iso8601
-        { :commit => commit, :subject => subject, :author => author, :date => date }
+        { commit: commit, subject: subject, author: author, date: date }
       end
     end
 
@@ -207,7 +218,7 @@ module Gitdocs
 
     # Revert a file to a particular revision
     def file_revert(file, ref)
-      if file_revisions(file).map {|r| r[:commit]}.include? ref
+      if file_revisions(file).map { |r| r[:commit] }.include? ref
         file = file.gsub(%r{^/}, '')
         full_path = File.expand_path(file, @root)
         content = File.read(file_revision_at(file, ref))
@@ -216,38 +227,41 @@ module Gitdocs
     end
 
     def valid?
-      out, status = sh_with_code "git status"
+      out, status = sh_with_code 'git status'
       @root.present? && status.success?
     end
 
     def warn(title, msg)
       if @show_notifications
-        Guard::Notifier.notify(msg, :title => title)
+        Guard::Notifier.notify(msg, title: title)
       else
         Kernel.warn("#{title}: #{msg}")
       end
+    rescue # Prevent StandardErrors from stopping the daemon.
     end
 
     def info(title, msg)
       if @show_notifications
-        Guard::Notifier.notify(msg, :title => title, :image => @icon)
+        Guard::Notifier.notify(msg, title: title, image: @icon)
       else
         puts("#{title}: #{msg}")
       end
+    rescue # Prevent StandardErrors from stopping the daemon.
     end
 
     def error(title, msg)
       if @show_notifications
-        Guard::Notifier.notify(msg, :title => title, :image => :failure)
+        Guard::Notifier.notify(msg, title: title, image: :failure)
       else
         Kernel.warn("#{title}: #{msg}")
       end
+    rescue # Prevent StandardErrors from stopping the daemon.
     end
 
     # sh_string("git config branch.`git branch | grep '^\*' | sed -e 's/\* //'`.remote", "origin")
-    def sh_string(cmd, default=nil)
+    def sh_string(cmd, default = nil)
       val = sh(cmd).strip rescue nil
-      (val.nil? || val.empty?) ? default : val
+      val.nil? || val.empty? ? default : val
     end
 
     # Run in shell, return both status and output

data/lib/gitdocs/server.rb

@@ -4,31 +4,33 @@ require 'coderay'
 require 'uri'
 require 'haml'
 require 'mimetype_fu'
+require 'launchy'
 
 module Gitdocs
   class Server
-    def initialize(manager, *gitdocs)
+    def initialize(manager, port = 8888, *gitdocs)
       @manager = manager
+      @port    = port.to_i
       @gitdocs = gitdocs
     end
 
-    def start(port = 8888)
-      gds = @gitdocs
+    def start
+      gds     = @gitdocs
       manager = @manager
       Thin::Logging.debug = @manager.debug
-      Thin::Server.start('127.0.0.1', port) do
-        use Rack::Static, :urls => ['/css', '/js', '/img', '/doc'], :root => File.expand_path("../public", __FILE__)
+      Thin::Server.start('127.0.0.1', @port) do
+        use Rack::Static, urls: ['/css', '/js', '/img', '/doc'], root: File.expand_path('../public', __FILE__)
         use Rack::MethodOverride
         run Renee {
           if request.path_info == '/'
             if manager.config.shares.size == 1
-              redirect! "/0"
+              redirect! '/0'
             else
-              render! "home", :layout => 'app', :locals => {:conf => manager.config, :nav_state => "home" }
+              render! 'home', layout: 'app', locals: { conf: manager.config, nav_state: 'home' }
             end
           else
             path 'settings' do
-              get.render! 'settings', :layout => 'app', :locals => {:conf => manager.config, :nav_state => "settings" }
+              get.render! 'settings', layout: 'app', locals: { conf: manager.config, nav_state: 'settings' }
               post do
                 shares = manager.config.shares
                 manager.config.global.update_attributes(request.POST['config'])
@@ -47,7 +49,7 @@ module Gitdocs
             end
 
             path('search').get do
-              render! "search", :layout => 'app', :locals => {:conf => manager.config, :results => manager.search(request.GET['q']), :nav_state => nil}
+              render! 'search', layout: 'app', locals: { conf: manager.config, results: manager.search(request.GET['q']), nav_state: nil }
             end
 
             path('shares') do
@@ -70,14 +72,13 @@ module Gitdocs
               gd = gds[idx]
               halt 404 if gd.nil?
               file_path = URI.unescape(request.path_info)
-              file_ext  = File.extname(file_path)
               expanded_path = File.expand_path(".#{file_path}", gd.root)
-              message_file = File.expand_path(".gitmessage~", gd.root)
+              message_file = File.expand_path('.gitmessage~', gd.root)
               halt 400 unless expanded_path[/^#{Regexp.quote(gd.root)}/]
               parent = File.dirname(file_path)
               parent = '' if parent == '/'
               parent = nil if parent == '.'
-              locals = {:idx => idx, :parent => parent, :root => gd.root, :file_path => expanded_path, :nav_state => nil }
+              locals = { idx: idx, parent: parent, root: gd.root, file_path: expanded_path, nav_state: nil }
               mime = File.mime_type?(File.open(expanded_path)) if File.file?(expanded_path)
               mode = request.params['mode']
               if mode == 'meta' # Meta
@@ -85,63 +86,86 @@ module Gitdocs
               elsif mode == 'save' # Saving
                 File.open(expanded_path, 'w') { |f| f.print request.params['data'] }
                 File.open(message_file, 'w') { |f| f.print request.params['message'] } unless request.params['message'] == ''
-                redirect! "/" + idx.to_s + file_path
+                redirect! '/' + idx.to_s + file_path
               elsif mode == 'upload'  # Uploading
                 halt 404 unless file = request.params['file']
                 tempfile, filename = file[:tempfile], file[:filename]
                 FileUtils.mv(tempfile.path, File.expand_path(filename, expanded_path))
-                redirect! "/" + idx.to_s + file_path + "/" + filename
+                redirect! '/' + idx.to_s + file_path + '/' + filename
               elsif !File.exist?(expanded_path) && !request.params['dir'] # edit for non-existent file
                 FileUtils.mkdir_p(File.dirname(expanded_path))
                 FileUtils.touch(expanded_path)
-                redirect!  "/" + idx.to_s + file_path + "?mode=edit"
+                redirect!  '/' + idx.to_s + file_path + '?mode=edit'
               elsif !File.exist?(expanded_path) && request.params['dir'] # create directory
                 FileUtils.mkdir_p(expanded_path)
-                redirect!  "/" + idx.to_s + file_path
+                redirect!  '/' + idx.to_s + file_path
               elsif File.directory?(expanded_path) # list directory
                 contents =  gd.dir_files(expanded_path)
                 rendered_readme = nil
-                if readme = Dir[File.expand_path("README.{md,txt}", expanded_path)].first
+                if readme = Dir[File.expand_path('README.{md}', expanded_path)].first
                   rendered_readme = '<h3>' + File.basename(readme) + '</h3><div class="tilt">' + render(readme) + '</div>'
                 end
-                render! "dir", :layout => 'app', :locals => locals.merge(:contents => contents, :rendered_readme => rendered_readme)
-              elsif mode == "revisions" # list revisions
+                render! 'dir', layout: 'app', locals: locals.merge(contents: contents, rendered_readme: rendered_readme)
+              elsif mode == 'revisions' # list revisions
                 revisions = gd.file_revisions(file_path)
-                render! "revisions", :layout => 'app', :locals => locals.merge(:revisions => revisions)
-              elsif mode == "revert" # revert file
+                render! 'revisions', layout: 'app', locals: locals.merge(revisions: revisions)
+              elsif mode == 'revert' # revert file
                 if revision = request.params['revision']
                   File.open(message_file, 'w') { |f| f.print "Reverting '#{file_path}' to #{revision}" }
                   gd.file_revert(file_path, revision)
                 end
-                redirect! "/" + idx.to_s + file_path
+                redirect! '/' + idx.to_s + file_path
               elsif mode == 'delete' # delete file
                 FileUtils.rm(expanded_path)
-                redirect! "/" + idx.to_s + parent
+                redirect! '/' + idx.to_s + parent
               elsif mode == 'edit' && (mime.match(%r{text/}) || mime.match(%r{x-empty})) # edit file
                 contents = File.read(expanded_path)
-                render! "edit", :layout => 'app', :locals => locals.merge(:contents => contents)
+                render! 'edit', layout: 'app', locals: locals.merge(contents: contents)
               elsif mode != 'raw' # render file
                 revision = request.params['revision']
                 expanded_path = gd.file_revision_at(file_path, revision) if revision
                 begin # attempting to render file
                   contents = '<div class="tilt">' + render(expanded_path) + '</div>'
-                rescue RuntimeError => e # not tilt supported
+                rescue RuntimeError # not tilt supported
                   contents = if mime.match(%r{text/})
                     '<pre class="CodeRay">' + CodeRay.scan_file(expanded_path).encode(:html) + '</pre>'
                   else
                     %|<embed class="inline-file" src="/#{idx}#{request.path_info}?mode=raw"></embed>|
                   end
                 end
-                render! "file", :layout => 'app', :locals => locals.merge(:contents => contents)
+                render! 'file', layout: 'app', locals: locals.merge(contents: contents)
               else # other file
                 run! Rack::File.new(gd.root)
               end
             end
           end
         }.setup {
-          views_path File.expand_path("../views", __FILE__)
+          views_path File.expand_path('../views', __FILE__)
         }
       end
     end
+
+    def wait_for_start_and_open(restarting)
+      wait_for_web_server = proc do
+        i = 0
+        begin
+          TCPSocket.open('127.0.0.1', @port).close
+          @manager.log('Web server running!')
+          if !restarting && @manager.config.global.load_browser_on_startup
+            Launchy.open("http://localhost:#{@port}/")
+          end
+        rescue Errno::ECONNREFUSED
+          sleep 0.2
+          i += 1
+          if i <= 20
+            @manager.log('Retrying web server loop...')
+            retry
+          else
+            @manager.log('Web server failed to start')
+          end
+        end
+      end
+      EM.defer(wait_for_web_server)
+    end
   end
 end