gitdocs 0.3.0 → 0.3.1

data/gitdocs.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'haml'
   s.add_dependency 'sqlite3', "~> 1.3.4"
   s.add_dependency 'activerecord', "~> 3.1.0"
+  s.add_dependency 'grit', "~> 2.4.1"
 
   s.add_development_dependency 'minitest', "~> 2.6.1"
   s.add_development_dependency 'rake'

data/lib/gitdocs.rb

@@ -3,44 +3,24 @@ require 'gitdocs/configuration'
 require 'gitdocs/runner'
 require 'gitdocs/server'
 require 'gitdocs/cli'
+require 'gitdocs/manager'
 require 'thread'
 require 'rb-fsevent'
 require 'growl'
 require 'yajl'
 require 'dante'
+require 'socket'
 
 module Gitdocs
 
   DEBUG = ENV['DEBUG']
 
-  def self.run(config_root = nil, debug = DEBUG)
-    loop do
-      config = Configuration.new(config_root)
-      yield config if block_given?
-      puts "Gitdocs v#{VERSION}" if debug
-      puts "Using configuration root: '#{config.config_root}'" if debug
-      puts "Shares: #{config.shares.map(&:inspect).join(", ")}" if debug
-      # Start the repo watchers
-      runners = []
-      threads = config.shares.map do |share|
-        t = Thread.new(runners) { |r|
-          runner = Runner.new(share)
-          r << runner
-          runner.run
-        }
-        t.abort_on_exception = true
-        t
-      end
-      sleep 1
-      unless defined?(pid) && pid
-        # Start the web front-end
-        pid = fork { Server.new(config, *runners).start }
-        at_exit { Process.kill("KILL", pid) rescue nil }
-      end
-      puts "Watch threads: #{threads.map { |t| "Thread status: '#{t.status}', running: #{t.alive?}" }}" if debug
-      puts "Joined #{threads.size} watch threads...running" if debug
-      threads.each(&:join)
-      sleep(60)
-    end
+  def self.run(config_root = nil, debug = DEBUG, &blk)
+    @manager = Manager.new(config_root, debug, &blk)
+    @manager.run
+  end
+
+  def self.restart
+    @manager.restart
   end
 end

data/lib/gitdocs/configuration.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'grit'
 
 module Gitdocs
   class Configuration
@@ -17,6 +18,24 @@ module Gitdocs
 
     class Share < ActiveRecord::Base
       attr_accessible :polling_interval, :path, :notification, :branch_name, :remote_name
+
+      def available_remotes
+        repo = Grit::Repo.new(path)
+        repo.remotes.map{|r| r.name}
+      rescue
+        nil
+      end
+
+      def available_branches
+        repo = Grit::Repo.new(path)
+        repo.heads.map{|r| r.name}
+      rescue
+        nil
+      end
+    end
+
+    class Config < ActiveRecord::Base
+      attr_accessible :load_browser_on_startup
     end
 
     def add_path(path, opts = nil)
@@ -33,6 +52,12 @@ module Gitdocs
       Share.all
     end
 
+    def global
+      raise if Config.all.size > 1
+      Config.create! if Config.all.empty?
+      Config.all.first
+    end
+
     def normalize_path(path)
       File.expand_path(path, Dir.pwd)
     end

data/lib/gitdocs/manager.rb

@@ -0,0 +1,58 @@
+module Gitdocs
+  Restart = Class.new(RuntimeError)
+
+  class Manager
+    attr_reader :config, :debug
+
+    def initialize(config_root, debug)
+      @config = Configuration.new(config_root)
+      @debug  = debug
+      yield @config if block_given?
+    end
+
+    def run
+      loop do
+        puts "Gitdocs v#{VERSION}" if self.debug
+        puts "Using configuration root: '#{self.config.config_root}'" if self.debug
+        puts "Shares: #{config.shares.map(&:inspect).join(", ")}" if self.debug
+        # Start the repo watchers
+        runners = []
+        threads = config.shares.map do |share|
+          t = Thread.new(runners) { |r|
+            runner = Runner.new(share)
+            r << runner
+            runner.run
+          }
+          t.abort_on_exception = true
+          t
+        end
+        trap("USR1") { puts "stopping threads: #{threads.map(&:alive?)}"; runners.each { |r| r.listener.stop } }
+        sleep 1
+        unless @pid
+          # Start the web front-end
+          @pid = fork { Server.new(self, *runners).start }
+          at_exit { Process.kill("KILL", @pid) rescue nil }
+        end
+        puts "Watch threads: #{threads.map { |t| "Thread status: '#{t.status}', running: #{t.alive?}" }}" if self.debug
+        puts "Joined #{threads.size} watch threads...running" if self.debug
+        i = 0
+        web_started = false
+        begin
+          TCPSocket.open('127.0.0.1', 8888).close
+          web_started = true
+        rescue Errno::ECONNREFUSED
+          sleep 0.2
+          i += 1
+          retry if i <= 20
+        end
+        system("open http://localhost:8888/") if self.config.global.load_browser_on_startup && web_started
+        threads.each(&:join)
+        sleep(60) if threads.empty?
+      end
+    end
+
+    def restart
+      Process.kill("USR1", Process.pid)
+    end
+  end
+end

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

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

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

@@ -0,0 +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.each do |path, shares|
+      shares.shift
+      shares.each(&:destroy) unless shares.empty?
+    end
+    add_index :shares, :path, :unique => true
+  end
+end

data/lib/gitdocs/runner.rb

@@ -1,6 +1,6 @@
 module Gitdocs
   class Runner
-    attr_accessor :root
+    attr_reader :root, :listener
 
     def initialize(share)
       @share = share
@@ -29,16 +29,16 @@ module Gitdocs
       end.abort_on_exception = true
 
       # Listen for changes in local repository
-      listener = FSEvent.new
-      listener.watch(@root) do |directories|
+      @listener = FSEvent.new
+      @listener.watch(@root) do |directories|
         directories.uniq!
         directories.delete_if {|d| d =~ /\/\.git/}
         unless directories.empty?
           mutex.synchronize { push_changes }
         end
       end
-      at_exit { listener.stop }
-      listener.run
+      at_exit { @listener.stop }
+      @listener.run
     end
 
     def sync_changes

data/lib/gitdocs/server.rb

@@ -4,14 +4,14 @@ require 'coderay'
 
 module Gitdocs
   class Server
-    def initialize(config, *gitdocs)
-      @config = config
+    def initialize(manager, *gitdocs)
+      @manager = manager
       @gitdocs = gitdocs
     end
 
     def start(port = 8888)
       gds = @gitdocs
-      conf = @config
+      manager = @manager
       Thin::Server.start('127.0.0.1', port) do
         use Rack::Static, :urls => ['/css', '/js', '/img', '/doc'], :root => File.expand_path("../public", __FILE__)
         run Renee {
@@ -19,12 +19,17 @@ module Gitdocs
             render! "home", :layout => 'app', :locals => {:gds => gds}
           else
             path 'settings' do
-              get.render! 'settings', :layout => 'app', :locals => {:conf => conf}
+              get.render! 'settings', :layout => 'app', :locals => {:conf => manager.config}
               post do
-                shares = conf.shares
+                shares = manager.config.shares
+                manager.config.global.update_attributes(request.POST['config'])
                 request.POST['share'].each do |idx, share|
+                  if remote_branch = share.delete('remote_branch')
+                    share['remote_name'], share['branch_name'] = remote_branch.split('/', 2)
+                  end
                   shares[Integer(idx)].update_attributes(share)
                 end
+                manager.restart
                 redirect! '/settings'
               end
             end

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/gitdocs/views/settings.haml

@@ -1,8 +1,16 @@
 %h1 Settings
 
-%h2 Shares
-
 %form{:method => 'POST', :action => '/settings'}
+  %h2 Gitdocs
+  %div{:id => "config", :class => "config"}
+    %dl
+      %dt Open browser on startup?
+      %dd
+        %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}
+
+
+  %h2 Shares
   -conf.shares.each_with_index do |share, idx|
     %div{:id => "share-#{idx}", :class => "share #{idx % 2 == 0 ? 'even' : 'odd'}"}
       %dl
@@ -13,14 +21,23 @@
         %dt Polling interval
         %dd
           %input{:name=>"share[#{idx}][polling_interval]", :value => share.polling_interval}
-      %dl
-        %dt Remote
-        %dd
-          %input{:name=>"share[#{idx}][remote_name]", :value => share.remote_name}
-      %dl
-        %dt Branch
-        %dd
-          %input{:name=>"share[#{idx}][branch_name]", :value => share.branch_name}
+      -if share.available_remotes
+        %dl
+          %dt Remote
+          %dd
+            %select{:name=>"share[#{idx}][remote_branch]"}
+              -share.available_remotes.each do |remote|
+                %option{:value => remote, :selected => remote == "#{share.remote_name}/#{share.branch_name}" ? 'selected' : nil}
+                  =remote
+      -else
+        %dl
+          %dt Remote
+          %dd
+            %input{:name=>"share[#{idx}][remote_name]", :value => share.remote_name}
+        %dl
+          %dt Branch
+          %dd
+            %input{:name=>"share[#{idx}][branch_name]", :value => share.branch_name}
       %dl
         %dt Notifications?
         %dd

data/test/test_helper.rb

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

metadata

@@ -1,202 +1,217 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gitdocs
-version: !ruby/object:Gem::Version
-  version: 0.3.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.3.1
 platform: ruby
-authors:
+authors: 
 - Josh Hull
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-05 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rb-fsevent
-  requirement: &70265086574980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.3.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086574980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: thin
-  requirement: &70265086574080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086574080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: renee
-  requirement: &70265086572080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.3.6
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086572080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: redcarpet
-  requirement: &70265086571200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086571200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &70265086570280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086570280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: coderay
-  requirement: &70265086568440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086568440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: dante
-  requirement: &70265086567200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.0.4
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086567200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: growl
-  requirement: &70265086565200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.3
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086565200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  requirement: &70265086564420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086564420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &70265086563360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086563360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70265086562040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.3.4
   type: :runtime
-  prerelease: false
-  version_requirements: *70265086562040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &70265086560080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.1.0
   type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: grit
   prerelease: false
-  version_requirements: *70265086560080
-- !ruby/object:Gem::Dependency
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.4.1
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &70265086558540 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.6.1
   type: :development
-  prerelease: false
-  version_requirements: *70265086558540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70265086557020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70265086557020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70265086554480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70265086554480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &70265086552960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70265086552960
+  version_requirements: *id017
 description: Open-source Dropbox using Ruby and Git.
-email:
+email: 
 - joshbuddy@gmail.com
 - nesquena@gmail.com
-executables:
+executables: 
 - gitdocs
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -207,8 +222,11 @@ files:
 - lib/gitdocs.rb
 - lib/gitdocs/cli.rb
 - lib/gitdocs/configuration.rb
+- lib/gitdocs/manager.rb
 - lib/gitdocs/migration/001_create_shares.rb
 - lib/gitdocs/migration/002_add_remote_branch.rb
+- lib/gitdocs/migration/003_create_configs.rb
+- lib/gitdocs/migration/004_add_index_for_path.rb
 - lib/gitdocs/public/css/app.css
 - lib/gitdocs/public/css/coderay.css
 - lib/gitdocs/public/css/reset.css
@@ -260,37 +278,35 @@ files:
 - test/configuration_test.rb
 - test/runner_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://engineering.gomiso.com/2011/11/30/collaborate-and-track-tasks-with-ease-using-gitdocs/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -859134024134666501
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -859134024134666501
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: gitdocs
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Open-source Dropbox using Ruby and Git
-test_files:
+test_files: 
 - test/configuration_test.rb
 - test/runner_test.rb
 - test/test_helper.rb