gitdocs 0.4.8 → 0.4.9

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.9 (12/29/2011)
+
+  * Adds configuration for web port in settings
+  * Adds support for 'add' and 'remove' shares in settings
+
 0.4.8 (12/29/2011)
 
   * Only encode to utf-8 on ruby 1.9.x

data/lib/gitdocs.rb

@@ -18,10 +18,12 @@ module Gitdocs
 
   DEBUG = ENV['DEBUG']
 
-  def self.start(config_root = nil, debug = DEBUG, &blk)
+  # Gitdocs.start(:config_root => "...", :debug => true)
+  def self.start(options={}, &blk)
+    options = { :debug => DEBUG, :config_root => nil }.merge(options)
     @manager.stop if @manager
-    @manager = Manager.new(config_root, debug, &blk)
-    @manager.start
+    @manager = Manager.new(options[:config_root], options[:debug], &blk)
+    @manager.start(options[:port])
   end
 
   def self.restart

data/lib/gitdocs/cli.rb

@@ -8,13 +8,14 @@ module Gitdocs
 
     desc "start", "Starts a daemonized gitdocs process"
     method_option :debug, :type => :boolean, :aliases => "-D"
+    method_option :port, :type => :string, :aliases => "-p"
     def start
       if self.stopped? && !options[:debug]
-        self.runner.execute { Gitdocs.start }
+        self.runner.execute { Gitdocs.start(:port => options[:port]) }
         self.running? ? say("Started gitdocs", :green) : say("Failed to start gitdocs", :red)
       elsif self.stopped? && options[:debug]
         say "Starting in debug mode", :yellow
-        Gitdocs.start(nil, true)
+        Gitdocs.start(:debug => true, :port => options[:port])
       else # already running
         say "Gitdocs is already running, please use restart", :red
       end

data/lib/gitdocs/configuration.rb

@@ -35,7 +35,7 @@ module Gitdocs
     end
 
     class Config < ActiveRecord::Base
-      attr_accessible :load_browser_on_startup, :start_web_frontend
+      attr_accessible :load_browser_on_startup, :start_web_frontend, :web_frontend_port
     end
 
     def add_path(path, opts = nil)

data/lib/gitdocs/manager.rb

@@ -23,7 +23,7 @@ module Gitdocs
       results
     end
 
-    def start
+    def start(web_port=nil)
       self.log "Starting Gitdocs v#{VERSION}..."
       self.log "Using configuration root: '#{self.config.config_root}'"
       self.log "Shares: #{config.shares.map(&:inspect).join(", ")}"
@@ -41,12 +41,13 @@ module Gitdocs
           @runners.each(&:run)
           # Start the web front-end
           if self.config.global.start_web_frontend
-            Server.new(self, *@runners).start
+            web_port ||= self.config.global.web_frontend_port
+            Server.new(self, *@runners).start(web_port.to_i)
             EM.defer( proc {
               i = 0
               web_started = false
               begin
-                TCPSocket.open('127.0.0.1', 8888).close
+                TCPSocket.open('127.0.0.1', web_port.to_i).close
                 web_started = true
               rescue Errno::ECONNREFUSED
                 self.log "Retrying server loop..."
@@ -54,7 +55,7 @@ module Gitdocs
                 i += 1
                 retry if i <= 20
               end
-              system("open http://localhost:8888/") if !retrying && self.config.global.load_browser_on_startup && web_started
+              system("open http://localhost:#{web_port}/") if !retrying && self.config.global.load_browser_on_startup && web_started
             }, proc {
               self.log "Web server running!"
             })

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

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

data/lib/gitdocs/public/js/app.js

@@ -34,24 +34,14 @@ GitDocs = {
     var extractor = function(e) { return $(e).data('val') || $(e).text() }
     $("table#fileListing").tablesorter({ textExtraction : extractor, sortList: [[0,0]] });
   },
-  // To make the settings form ajax-y
-  observeSettingsForm : function() {
-    $('#settings').submit(function(e) {
-      e.preventDefault();
-      $.ajax({
-        type: 'POST',
-        url: this.action,
-        data: $(this).serialize(),
-        success: function() {
-          $('.content div.alert-message').remove();
-          var el = $('.content').prepend('<div class="alert-message success"><a class="close" href="#">×</a>' +
-          '<p><strong>Settings saved!</strong> Gitdocs has been restarted with your new settings.</p>' +
-          '</div>');
-          $('div.alert-message').alert();
-        }
-      });
-      return false;
-    });
+  // Displays a closeable alert within the content pane
+  // Gitdocs.showAlert('This is the message', 'success')
+  showAlert : function(body, result) {
+    if (result == null) result = 'info';
+    $('.content div.alert-message').remove();
+    var el = $('.content').prepend('<div class="alert-message ' + result +
+      '"><a class="close" href="#">×</a>' + body + '</div>');
+    $('div.alert-message').alert();
   }
 };
 
@@ -59,7 +49,6 @@ $(document).ready(function() {
   GitDocs.linkBreadcrumbs();
   GitDocs.fillDirMeta();
   StringFormatter.autoLink();
-  GitDocs.observeSettingsForm();
 });
 
 // Redirect to edit page for new file when new file form is submitted

data/lib/gitdocs/public/js/settings.js

@@ -0,0 +1,25 @@
+GitDocs.settings = {
+  // To make the settings form ajax-y
+  observeSettingsForm : function() {
+    $('#settings').submit(function(e) {
+      e.preventDefault();
+      $.ajax({
+        type: 'POST', url: this.action, data: $(this).serialize(),
+        success: function() {
+          GitDocs.showAlert('<p><strong>Settings saved!</strong> Gitdocs has been restarted with your new settings.</p>', 'success')
+        }
+      });
+      return false;
+    });
+  }
+}
+
+$(document).ready(function() {
+  GitDocs.settings.observeSettingsForm();
+});
+
+// Handle delete for settings form
+$('input.remove_share').live('click', function(e){
+  $(this).siblings("input[type=hidden]").val("true")
+  $(this).parents("form").submit()
+});

data/lib/gitdocs/runner.rb

@@ -21,7 +21,8 @@ module Gitdocs
     end
 
     def run
-      return false unless self.valid? && !self.root.empty?
+      return false unless self.valid?
+
       @show_notifications = @share.notification
       @current_remote     = @share.remote_name
       @current_branch     = @share.branch_name
@@ -159,7 +160,7 @@ module Gitdocs
 
     def valid?
       out, status = sh_with_code "git status"
-      status.success?
+      @root.present? && status.success?
     end
 
     def warn(title, msg)

data/lib/gitdocs/server.rb

@@ -18,6 +18,7 @@ module Gitdocs
       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__)
+        use Rack::MethodOverride
         run Renee {
           if request.path_info == '/'
             render! "home", :layout => 'app', :locals => {:conf => manager.config, :nav_state => "home" }
@@ -31,7 +32,10 @@ module Gitdocs
                   if remote_branch = share.delete('remote_branch')
                     share['remote_name'], share['branch_name'] = remote_branch.split('/', 2)
                   end
-                  shares[Integer(idx)].update_attributes(share)
+                  # Update paths
+                  if share['path'] && !share['path'].empty?
+                    shares[Integer(idx)].update_attributes(share)
+                  end
                 end
                 EM.add_timer(0.1) { manager.restart }
                 redirect! '/settings'
@@ -42,8 +46,20 @@ module Gitdocs
               render! "search", :layout => 'app', :locals => {:conf => manager.config, :results => manager.search(request.GET['q']), :nav_state => nil}
             end
 
-            path('shares').post do
-              Configuration::Share.create
+            path('shares') do
+              post do
+                Configuration::Share.create
+                redirect! '/settings'
+              end
+
+              var(:int) do |id|
+                delete do
+                  share = manager.config.shares.find { |s| s.id == id }
+                  halt 404 if share.nil?
+                  share.destroy
+                  redirect! '/settings'
+                end
+              end
             end
 
             var :int do |idx|

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/lib/gitdocs/views/dir.haml

@@ -26,13 +26,13 @@
   %p No files were found in this directory.
 
 .row
-  .span6
-    %form.add
-      %p Add a file in this directory
-      %input{:type => 'text', :name => "path", :class => "edit" }
-      %input{:type => 'submit', :value => "New file", :class => "btn secondary" }
   .span6
     %form.upload{ :method => "post", :enctype => "multipart/form-data", :action => "/#{idx}#{request.path_info}?mode=upload" }
-      %p Upload a file to this directory
+      %p Upload file to this directory
       %input{:type => 'file', :value => "Select a file", :name => "file", :class => "uploader" }
       %input{:type => 'submit', :value => "Upload file", :class => "btn secondary" }
+  .span6
+    %form.add
+      %p Add new file in this directory
+      %input{:type => 'text', :name => "path", :class => "edit", :placeholder => "somefile.md" }
+      %input{:type => 'submit', :value => "New file", :class => "btn secondary" }

data/lib/gitdocs/views/settings.haml

@@ -1,11 +1,17 @@
 - @title = "Settings"
+%script{ :src => "/js/settings.js", :type => "text/javascript", :charset => "utf-8" }
 
 %form#settings{:method => 'POST', :action => '/settings'}
   %h2 Gitdocs
   #config.field.config
-    %input{:type =>'hidden', :value => '0', :name=>"config[load_browser_on_startup]"}
-    %input{:type =>'checkbox', :value => '1', :name=>"config[load_browser_on_startup]", :checked => conf.global.load_browser_on_startup ? 'checked' : nil}
-    %span Open browser on startup?
+    %dl
+      %dt Web Frontend Port
+      %dd
+        %input{:type =>'input', :name=>"config[web_frontend_port]", :value => conf.global.web_frontend_port }
+    %p
+      %input{:type =>'hidden', :value => '0', :name=>"config[load_browser_on_startup]"}
+      %input{:type =>'checkbox', :value => '1', :name=>"config[load_browser_on_startup]", :checked => conf.global.load_browser_on_startup ? 'checked' : nil}
+      %span Open browser on startup?
 
   %h2 Shares
   - conf.shares.each_with_index do |share, idx|
@@ -41,9 +47,9 @@
         %input{:type =>'hidden', :value => '0', :name=>"share[#{idx}][notification]"}
         %input{:type =>'checkbox', :value => '1', :name=>"share[#{idx}][notification]", :checked => share.notification ? 'checked' : nil}
         %span Notifications?
-      .delete{ :style => "display: none;" }
-        %input{:type =>'button', :value => "Delete", :class => "btn danger"}
-        %input{:type =>'hidden', :name=>"share[#{idx}][delete]"}
+      .delete
+        %a{ :href => "/shares/#{share.id}", :class => "btn remove_share danger", :"data-method" => "delete"}
+          Delete
 
   %input{:value => 'Save', :type => 'submit', :class => "btn primary" }
   %a{ :class => "btn secondary new-share", :href => "/shares", :"data-method" => "post" } Add Share

data/test/test_helper.rb

@@ -31,7 +31,7 @@ class MiniTest::Spec
       end
       begin
         puts "RUNNING!"
-        Gitdocs.start(conf_path) do |conf|
+        Gitdocs.start(:config_path => conf_path) do |conf|
           conf.global.update_attributes(:load_browser_on_startup => false, :start_web_frontend => false)
           conf.add_path(path, :polling_interval => 0.1, :notification => false)
         end

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors: 
 - Josh Hull
@@ -262,6 +262,7 @@ files:
 - lib/gitdocs/migration/003_create_configs.rb
 - lib/gitdocs/migration/004_add_index_for_path.rb
 - lib/gitdocs/migration/005_add_start_web_frontend.rb
+- lib/gitdocs/migration/006_add_web_port_to_config.rb
 - lib/gitdocs/public/css/app.css
 - lib/gitdocs/public/css/bootstrap.css
 - lib/gitdocs/public/css/coderay.css
@@ -308,6 +309,7 @@ files:
 - lib/gitdocs/public/js/jquery.js
 - lib/gitdocs/public/js/jquery.tablesorter.js
 - lib/gitdocs/public/js/search.js
+- lib/gitdocs/public/js/settings.js
 - lib/gitdocs/public/js/util.js
 - lib/gitdocs/rendering.rb
 - lib/gitdocs/runner.rb